fix: snack bar & pull refresh color mismatch

urFate · Sep 21, 2024 · dfa30f0 · dfa30f0
1 parent de33030
commit dfa30f0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt
@@ -635,7 +635,9 @@ fun Resource(
         ) {
             PullRefreshIndicator(
                 refreshing = isRefreshing,
-                state = pullRefreshState
+                state = pullRefreshState,
+                contentColor = MaterialTheme.colorScheme.primary,
+                backgroundColor = MaterialTheme.colorScheme.surfaceContainer
             )
         }
     }

diff --git a/app/src/main/java/org/shirabox/app/ui/component/general/SpecialSnackbar.kt b/app/src/main/java/org/shirabox/app/ui/component/general/SpecialSnackbar.kt
@@ -49,7 +49,11 @@ fun SpecialSnackBar(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 icon()
-                Text(text = message, overflow = TextOverflow.Ellipsis)
+                Text(
+                    text = message,
+                    color = contentColor,
+                    overflow = TextOverflow.Ellipsis
+                )
             }
 
             if(closeable) {
@@ -58,7 +62,7 @@ fun SpecialSnackBar(
                     contentAlignment = Alignment.CenterEnd
                 ) {
                     IconButton(onClick = onCloseClick) {
-                        Icon(imageVector = Icons.Rounded.Close, contentDescription = "Close")
+                        Icon(imageVector = Icons.Rounded.Close, tint = contentColor, contentDescription = "Close")
                     }
                 }
             }

diff --git a/app/src/main/java/org/shirabox/app/ui/screen/explore/AppUpdateSnackBar.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/AppUpdateSnackBar.kt
@@ -68,13 +68,15 @@ fun AppUpdateSnackbarHost(){
         ) { snackbarData: SnackbarData ->
             SpecialSnackBar(
                 icon = {
-                Icon(
-                    imageVector = Icons.Rounded.RocketLaunch,
-                    contentDescription = "rocket launch"
-                )
-            },
+                    Icon(
+                        imageVector = Icons.Rounded.RocketLaunch,
+                        tint = MaterialTheme.colorScheme.onPrimary,
+                        contentDescription = "rocket launch"
+                    )
+                },
                 message = snackbarData.visuals.message,
                 containerColor = MaterialTheme.colorScheme.primary,
+                contentColor = MaterialTheme.colorScheme.onPrimary,
                 onClick = {
                     snackbarData.performAction()
                     context.startActivity(Intent(context, AppUpdateActivity::class.java))

diff --git a/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreScreen.kt
@@ -64,7 +64,8 @@ fun ExploreScreen(
                 refreshing = model.refreshing.collectAsStateWithLifecycle().value,
                 state = pullRefreshState,
                 scale = true,
-                contentColor = MaterialTheme.colorScheme.primary
+                contentColor = MaterialTheme.colorScheme.primary,
+                backgroundColor = MaterialTheme.colorScheme.surfaceContainer
             )
         }
     }