Set divider's color directly into material's colors

Infomaniak · Aug 19, 2024 · 7afcd7e · 7afcd7e
1 parent fdf235a
commit 7afcd7e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt
@@ -67,7 +67,7 @@ private fun MainScaffold(
                 Box(modifier = Modifier.weight(1f)) {
                     content()
                 }
-                HorizontalDivider(color = SwissTransferTheme.colors.divider)
+                HorizontalDivider()
             }
         }
     }

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -84,9 +84,9 @@ private fun UploadSourceChoiceBottomSheet(
             content = {
                 Column {
                     BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /*TODO*/ }
-                    HorizontalDivider(Modifier.padding(horizontal = Margin.Medium), color = SwissTransferTheme.colors.divider)
+                    HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
                     BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) { /*TODO*/ }
-                    HorizontalDivider(Modifier.padding(horizontal = Margin.Medium), color = SwissTransferTheme.colors.divider)
+                    HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
                     BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /*TODO*/ }
                 }
             },

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorDark.kt
@@ -55,6 +55,8 @@ val DarkColorScheme = darkColorScheme(
     surfaceContainerLow = Color(dark2), // Used for bottom sheet backgrounds
     surfaceContainerHighest = Color(dark2),
 
+    outlineVariant = Color(dark3), // Used for divider's color
+
     error = Color(error),
     // onError: uses default  values
 )
@@ -63,6 +65,5 @@ val CustomDarkColorScheme = CustomColorScheme(
     primaryTextColor = Color(rabbit),
     secondaryTextColor = Color(shark),
     navigationItemBackground = Color(dark2),
-    divider = Color(dark3),
     tertiaryButtonBackground = Color(dark2),
 )
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/ColorLight.kt
@@ -60,6 +60,8 @@ val LightColorScheme = lightColorScheme(
     surfaceContainerLow = Color(white), // Same value as background. Used for bottom sheet backgrounds
     surfaceContainerHighest = Color(polar_bear),
 
+    outlineVariant = Color(mouse), // Used for divider's color
+
     error = Color(error),
     // onError: uses default values
 )
@@ -68,6 +70,5 @@ val CustomLightColorScheme = CustomColorScheme(
     primaryTextColor = Color(orca),
     secondaryTextColor = Color(elephant),
     navigationItemBackground = LightColorScheme.background,
-    divider = Color(mouse),
     tertiaryButtonBackground = Color(rabbit),
 )
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt
@@ -64,6 +64,5 @@ data class CustomColorScheme(
     val primaryTextColor: Color = Color.Unspecified,
     val secondaryTextColor: Color = Color.Unspecified,
     val navigationItemBackground: Color = Color.Unspecified,
-    val divider: Color = Color.Unspecified,
     val tertiaryButtonBackground: Color = Color.Unspecified,
 )