From a14df3fc0c7634980f85913efca5c316d20bfd4a Mon Sep 17 00:00:00 2001 From: GG Bond Date: Mon, 27 Nov 2023 20:45:15 +0800 Subject: [PATCH] Fix bigicon tint in nightmode --- .../kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt | 4 ++-- .../kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt | 4 ++-- .../kotlin/com/hippo/ehviewer/ui/scene/ProgressFragment.kt | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt index db18b4fcd..988492781 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt @@ -2,7 +2,6 @@ package com.hippo.ehviewer.ui.scene import android.content.Intent import androidx.compose.animation.core.animateDpAsState -import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -471,10 +470,11 @@ fun DownloadsScreen(navigator: DestinationsNavigator) { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - Image( + Icon( imageVector = EhIcons.Big.Default.Download, contentDescription = null, modifier = Modifier.padding(16.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( text = stringResource(id = R.string.no_download_info), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt index 252acdd23..a1d8aa793 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt @@ -1,6 +1,5 @@ package com.hippo.ehviewer.ui.scene -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -151,10 +150,11 @@ fun HistoryScreen(navigator: DestinationsNavigator) { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - Image( + Icon( imageVector = EhIcons.Big.Default.History, contentDescription = null, modifier = Modifier.padding(16.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( text = stringResource(id = R.string.no_history), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressFragment.kt index ff64ebcdf..0b809529d 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressFragment.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressFragment.kt @@ -1,12 +1,12 @@ package com.hippo.ehviewer.ui.scene -import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -62,10 +62,11 @@ fun ProgressScreen(gid: Long, token: String, page: Int, navigator: DestinationsN verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - Image( + Icon( imageVector = EhIcons.Big.Default.SadAndroid, contentDescription = null, modifier = Modifier.padding(16.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( text = wrong,