Release 1.8.9.6-gms

app/build.gradle.kts

@@ -45,6 +45,10 @@ android {
         enableV4Signing = true
     }
 
+    val branch = providers.exec {
+        commandLine = "git branch --show-current".split(' ')
+    }.standardOutput.asText.get().trim()
+
     val commitSha = providers.exec {
         commandLine = "git rev-parse --short=7 HEAD".split(' ')
     }.standardOutput.asText.get().trim()
@@ -64,7 +68,7 @@ android {
         minSdk = 28
         targetSdk = 34
         versionCode = 180043
-        versionName = "1.8.9.5-gms"
+        versionName = "1.8.9.6-gms"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -81,6 +85,7 @@ android {
                 "nb-rNO",
             ),
         )
+        buildConfigField("String", "BRANCH", "\"$branch\"")
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
         buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
         buildConfigField("String", "REPO_NAME", "\"$repoName\"")

app/src/main/java/com/hippo/ehviewer/Settings.kt

@@ -60,6 +60,7 @@ object Settings : DataStorePreferences(null) {
     var removeImageFiles by boolPref("include_pic", true)
     var needSignIn by boolPref("need_sign_in", true)
     var blackDarkTheme by boolPref("black_dark_theme", false).observed { updateWhenAmoledModeChanges() }
+    var harmonizeCategoryColor by boolPref("harmonize_category_color", true)
     var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
     var downloadOriginImage by boolPref("download_origin_image", false)
     var thumbSizeDp by intPref("thumb_size_", 120)

app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt

@@ -126,12 +126,18 @@ object EhUtils {
             MISC -> BG_COLOR_MISC
             else -> BG_COLOR_UNKNOWN
         }.toInt()
-        return harmonizeWithRole(context, primary)
+        return if (Settings.harmonizeCategoryColor) {
+            harmonizeWithRole(context, primary)
+        } else {
+            primary
+        }
     }
 
     @Composable
     fun getCategoryColor(category: Int) = Color(getCategoryColor(LocalContext.current, category))
 
+    val categoryTextColor = Color(0xffe6e0e9)
+
     fun signOut() {
         EhCookieStore.signOut()
         Settings.avatar = null

app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt

@@ -21,6 +21,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.ShapeDefaults
 import androidx.compose.material3.Text
+import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
@@ -28,12 +29,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
@@ -109,6 +112,7 @@ fun GalleryInfoListItem(
                             start.linkTo(parent.start)
                             bottom.linkTo(parent.bottom)
                         }.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp),
+                        color = if (Settings.harmonizeCategoryColor) Color.Unspecified else EhUtils.categoryTextColor,
                         textAlign = TextAlign.Center,
                     )
                     Row(
@@ -198,10 +202,11 @@ fun GalleryInfoGridItem(
                 modifier = Modifier.aspectRatio(aspect).fillMaxWidth(),
                 contentScale = ContentScale.Crop,
             )
+            val categoryColor = EhUtils.getCategoryColor(info.category)
             Badge(
                 modifier = Modifier.align(Alignment.TopEnd).width(32.dp).height(24.dp),
-                containerColor = EhUtils.getCategoryColor(info.category),
-                contentColor = MaterialTheme.colorScheme.onSurface,
+                containerColor = categoryColor,
+                contentColor = if (Settings.harmonizeCategoryColor) contentColorFor(categoryColor) else EhUtils.categoryTextColor,
             ) {
                 simpleLang?.let {
                     Text(text = it.uppercase())

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt

@@ -46,6 +46,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalContext
@@ -809,6 +810,7 @@ class DownloadsScene :
                 Text(
                     text = categoryText,
                     modifier = Modifier.clip(ShapeDefaults.Small).background(categoryColor).padding(vertical = 2.dp, horizontal = 8.dp),
+                    color = if (Settings.harmonizeCategoryColor) Color.Unspecified else EhUtils.categoryTextColor,
                     textAlign = TextAlign.Center,
                     style = MaterialTheme.typography.labelLarge,
                 )

app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt

@@ -224,6 +224,10 @@ fun EhScreen() {
                 title = stringResource(id = R.string.black_dark_theme),
                 value = Settings::blackDarkTheme,
             )
+            SwitchPreference(
+                title = stringResource(id = R.string.harmonize_category_color),
+                value = Settings::harmonizeCategoryColor,
+            )
             SimpleMenuPreferenceInt(
                 title = stringResource(id = R.string.settings_eh_launch_page),
                 entry = R.array.launch_page_entries,

app/src/main/java/com/hippo/ehviewer/ui/tools/CircularLayout.kt

@@ -3,7 +3,6 @@ package com.hippo.ehviewer.ui.tools
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.unit.Dp
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.roundToInt
@@ -15,7 +14,6 @@ private const val QuarterCircle = PI / 2
 @Composable
 fun CircularLayout(
     modifier: Modifier = Modifier,
-    radius: Dp,
     placeFirstItemInCenter: Boolean = false,
     content: @Composable () -> Unit,
 ) {
@@ -23,7 +21,7 @@ fun CircularLayout(
         modifier = modifier,
         content = content,
     ) { measurables, constraints ->
-        val radiusPx = radius.toPx()
+        val radiusPx = constraints.maxWidth * 0.4
         val itemConstraints = constraints.copy(minWidth = 0, minHeight = 0)
         val placeables = measurables.map { measurable -> measurable.measure(itemConstraints) }
         val outPlaceables = if (placeFirstItemInCenter) placeables.drop(1) else placeables

app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt

@@ -41,11 +41,11 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import com.jamal.composeprefs3.ui.ifNotNullThen
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -183,6 +183,7 @@ class DialogState {
             }
             AlertDialog(
                 onDismissRequest = { cont.cancel() },
+                properties = DialogProperties(usePlatformDefaultWidth = respectDefaultWidth),
                 content = {
                     Surface(
                         modifier = with(Modifier) { if (!respectDefaultWidth) defaultMinSize(280.dp) else width(280.dp) },
@@ -248,12 +249,10 @@ class DialogState {
         @StringRes title: Int,
         @StringRes hint: Int,
         maxChar: Int,
-        adjustTextPosition: Boolean = true,
     ): Pair<Int, String> = showNoButton(false) {
         Column {
             Text(text = stringResource(id = title), modifier = Modifier.padding(horizontal = 16.dp).padding(top = 16.dp), style = MaterialTheme.typography.titleMedium)
             CircularLayout(
-                radius = 112.dp,
                 modifier = Modifier.fillMaxWidth().aspectRatio(1F),
                 placeFirstItemInCenter = true,
             ) {
@@ -261,8 +260,7 @@ class DialogState {
                 TextField(
                     value = note,
                     onValueChange = { note = it },
-                    modifier = Modifier.width(128.dp),
-                    textStyle = TextStyle(fontFamily = FontFamily.Monospace),
+                    modifier = Modifier.fillMaxWidth(0.45F).aspectRatio(1F),
                     label = { Text(text = stringResource(id = hint)) },
                     trailingIcon = {
                         if (note.isNotEmpty()) {
@@ -278,7 +276,6 @@ class DialogState {
                             textAlign = TextAlign.End,
                         )
                     },
-                    maxLines = 6,
                     shape = ShapeDefaults.ExtraSmall,
                     colors = TextFieldDefaults.colors(
                         focusedIndicatorColor = Color.Transparent,
@@ -287,16 +284,18 @@ class DialogState {
                 )
                 items.forEachIndexed { index, (icon, text) ->
                     Column(
-                        modifier = Modifier.clip(IconWithTextCorner).clickable { dismissWith(index to note) },
+                        modifier = Modifier.clip(IconWithTextCorner).clickable { dismissWith(index to note) }
+                            .fillMaxWidth(0.2F),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
-                        if (index == 0 && adjustTextPosition) {
-                            Text(text = text, style = MaterialTheme.typography.bodySmall)
-                            Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor)
-                        } else {
-                            Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor)
-                            Text(text = text, style = MaterialTheme.typography.bodySmall)
-                        }
+                        Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor)
+                        Text(
+                            text = text,
+                            textAlign = TextAlign.Center,
+                            overflow = TextOverflow.Ellipsis,
+                            maxLines = 2,
+                            style = MaterialTheme.typography.bodySmall,
+                        )
                     }
                 }
             }

app/src/main/java/com/hippo/ehviewer/updater/AppUpdater.kt

@@ -9,7 +9,6 @@ import io.ktor.util.encodeBase64
 import moe.tarsin.coroutines.runSuspendCatching
 import okhttp3.Request
 import okio.sink
-import org.json.JSONObject
 import tachiyomi.data.release.GithubArtifacts
 import tachiyomi.data.release.GithubCommitComparison
 import tachiyomi.data.release.GithubRelease
@@ -20,7 +19,9 @@ import java.time.temporal.ChronoUnit
 import java.util.zip.ZipInputStream
 
 private const val API_URL = "https://api.github.com/repos/${BuildConfig.REPO_NAME}"
-private const val LATEST_RELEASE_URL = "$API_URL/releases/latest"
+private const val RELEASE_URL = "$API_URL/releases"
+private const val LATEST_RELEASE_URL = "$RELEASE_URL/latest"
+private const val GMS_SUFFIX = "-gms"
 
 object AppUpdater {
     suspend fun checkForUpdate(forceCheck: Boolean = false): Release? {
@@ -31,10 +32,7 @@ object AppUpdater {
             Settings.lastUpdateDay = now.epochSecond
             if (Settings.useCIUpdateChannel) {
                 val curSha = BuildConfig.COMMIT_SHA
-                val branch = ghRequest(API_URL).execute {
-                    JSONObject(body.string()).getString("default_branch")
-                }
-                val workflowRunsUrl = "$API_URL/actions/workflows/ci.yml/runs?branch=$branch&status=success&per_page=1"
+                val workflowRunsUrl = "$API_URL/actions/workflows/ci.yml/runs?branch=${BuildConfig.BRANCH}&status=success&per_page=1"
                 val workflowRun = ghRequest(workflowRunsUrl).executeAndParseAs<GithubWorkflowRuns>().workflowRuns[0]
                 val shortSha = workflowRun.headSha.take(7)
                 if (shortSha != curSha) {
@@ -51,10 +49,11 @@ object AppUpdater {
             } else {
                 val curVersion = BuildConfig.VERSION_NAME
                 val release = ghRequest(LATEST_RELEASE_URL).executeAndParseAs<GithubRelease>()
-                val latestVersion = release.version
+                val latestVersion = release.version + GMS_SUFFIX
                 val description = release.info
-                val downloadUrl = release.getDownloadLink()
                 if (latestVersion != curVersion) {
+                    val downloadUrl = ghRequest("$RELEASE_URL/tags/$latestVersion")
+                        .executeAndParseAs<GithubRelease>().getDownloadLink()
                     return Release(latestVersion, description, downloadUrl)
                 }
             }

app/src/main/res/values-zh-rCN/strings.xml

@@ -419,7 +419,7 @@
     <string name="default_favorites_collection">默认收藏夹</string>
     <string name="default_favorites_warning">启用此项将无法添加收藏备注</string>
     <string name="let_me_select">让我选择</string>
-    <string name="favorite_note">备注</string>
+    <string name="favorite_note">收藏备注</string>
     <string name="collections">收藏夹</string>
     <string name="need_sign_in">需要登录</string>
     <!-- Progress Scene -->
@@ -476,6 +476,7 @@
     <string name="download_service">下载服务</string>
     <string name="favorite_name">收藏画廊</string>
     <string name="black_dark_theme">纯黑深色主题</string>
+    <string name="harmonize_category_color">类别颜色适配动态配色</string>
     <string name="use_ci_update_channel">使用持续集成(CI)构建频道更新</string>
     <string name="download_filter">过滤</string>
     <string name="download_all">全部</string>

app/src/main/res/values/strings.xml

@@ -477,7 +477,7 @@
     <string name="default_favorites_collection">Default favorites collection</string>
     <string name="default_favorites_warning">You won\'t be able to add favorite notes if you enable this</string>
     <string name="let_me_select">Let me select</string>
-    <string name="favorite_note">Note</string>
+    <string name="favorite_note">Favorite Note</string>
     <string name="collections">Collections</string>
     <string name="need_sign_in">Signing in is required</string>
     <!-- Progress Scene -->
@@ -541,6 +541,7 @@
     <string name="download_service">Download Service</string>
     <string name="favorite_name">Favorite</string>
     <string name="black_dark_theme">Black dark theme</string>
+    <string name="harmonize_category_color">Harmonize category color for Dynamic Color</string>
     <string name="download_filter">Filter</string>
     <string name="download_all">All</string>
     <string name="download_start_all_reversed">Start all (reversed)</string>