Fix sample app colors. (#2595)

* Fix sample app colors. * Update color.
coil-kt · Oct 26, 2024 · 2b8bda7 · 2b8bda7
1 parent 9a65ba6
commit 2b8bda7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/samples/compose/src/commonMain/kotlin/sample/compose/App.kt b/samples/compose/src/commonMain/kotlin/sample/compose/App.kt
@@ -250,10 +250,13 @@ const val Title = "Coil"
 
 private val darkColors = darkColorScheme(
     background = Color(0xFF141218),
-    surface = Color(0xFF121212),
+    surface = Color(0xFF141218),
 )
 
-private val lightColors = lightColorScheme()
+private val lightColors = lightColorScheme(
+    background = Color.White,
+    surface = Color.White,
+)
 
 @OptIn(ExperimentalResourceApi::class)
 private val resourceDetailScreen = Screen.Detail(

diff --git a/samples/shared/src/androidMain/res/values-night/styles.xml b/samples/shared/src/androidMain/res/values-night/styles.xml
@@ -1,11 +1,11 @@
 <resources>
 
     <style name="AppTheme.v21" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="colorPrimary">#121212</item>
-        <item name="colorPrimaryDark">#121212</item>
-        <item name="colorAccent">#121212</item>
-
-        <item name="android:statusBarColor">#121212</item>
+        <item name="colorPrimary">#141218</item>
+        <item name="colorPrimaryDark">#141218</item>
+        <item name="colorAccent">#141218</item>
+        <item name="android:background">#141218</item>
+        <item name="android:statusBarColor">#141218</item>
     </style>
 
     <style name="AppTheme" parent="AppTheme.v21"/>

diff --git a/samples/shared/src/androidMain/res/values/styles.xml b/samples/shared/src/androidMain/res/values/styles.xml
@@ -4,7 +4,7 @@
         <item name="colorPrimary">#FFF</item>
         <item name="colorPrimaryDark">#FFF</item>
         <item name="colorAccent">#FFF</item>
-
+        <item name="android:background">#FFF</item>
         <item name="android:statusBarColor">#FFF</item>
     </style>
 

diff --git a/samples/view/src/main/res/layout/activity_main.xml b/samples/view/src/main/res/layout/activity_main.xml
@@ -7,21 +7,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"/>
-    </com.google.android.material.appbar.AppBarLayout>
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
@@ -30,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/app_bar"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
 
     <ImageView
         android:id="@+id/detail"
@@ -40,5 +34,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/app_bar"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
 </androidx.constraintlayout.widget.ConstraintLayout>