Merge pull request #237 from sora-xor/sa-230

sa-230 nightmode
sora-xor · Oct 17, 2023 · 7ea3843 · 7ea3843
2 parents 7775de8 + 46b6875
commit 7ea3843
Show file tree

Hide file tree

Showing 24 changed files with 63 additions and 582 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,11 +39,11 @@ buildscript {
             insetter               : '0.6.1',
             truth                  : '1.1.5',
             lottie                 : '4.2.0',
-            xNetworking            : '0.2.2',
+            xNetworking            : '0.2.3',
             compose                : '1.5.3',
             composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
-            uiCore                 : '0.2.8',
+            uiCore                 : '0.2.9',
             soraCard               : '0.1.56',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',

diff --git a/...n/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt b/...n/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt
@@ -129,7 +129,7 @@ fun BasicBannerCard(
                     order = Order.TERTIARY,
                     shape = CircleShape,
                     onClick = onCloseCard,
-                    leftIcon = painterResource(R.drawable.ic_cross),
+                    leftIcon = painterResource(jp.co.soramitsu.ui_core.R.drawable.ic_cross),
                 )
             }
         }

diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Buttons.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Buttons.kt
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/Colors.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/Colors.kt
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt
@@ -63,15 +63,15 @@ import jp.co.soramitsu.ui_core.theme.lightColors
 @Composable
 fun SoraAppTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     AppTheme(
         darkTheme = darkTheme,
         lightColors = soraLightColors,
         darkColors = soraDarkColors,
         typography = soraTypography,
         borderRadius = soraBorderRadius,
-        content = content
+        content = content,
     )
 }
 

diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/TextStyles.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/TextStyles.kt