fix: 修复 Bug

2022-08-06 15:09:21 +08:00 · 2022-08-06 15:09:21 +08:00 · d20ca0be39
parent b4a6863ef3
commit d20ca0be39
7 changed files with 81 additions and 50 deletions
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
@ -189,7 +189,7 @@ open class MainActivity : BaseActivity(), NavigationBarView.OnItemSelectedListen
                    Crashes.getLastSessionCrashReport().thenAccept {
                        val device = it.device
                        showDialog {
-                            setTitle(R.string.title_dialog_crash)
+                            setTitle(R.string.title_dialog_copy_crash_report)
                            setMessage(R.string.message_dialog_crash)
                            setPositiveButton(R.string.button_copy_crash) { _, _ ->
                                TiebaUtil.copyText(
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/editprofile/view/EditProfileActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/editprofile/view/EditProfileActivity.kt
@ -455,7 +455,10 @@ fun PageEditProfile(
                    ) {
                        Box(modifier = Modifier
                            .fillMaxSize()
-                            .clickable {
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null
+                            ) {
                                showDialog = false
                            }
                        ) {
@ -474,46 +477,50 @@ fun PageEditProfile(
                                    indication = null
                                ) {}
                            ) {
-                                Text(
-                                    text = stringResource(id = R.string.title_modify_sex),
-                                    style = MaterialTheme.typography.h6,
-                                    modifier = Modifier
-                                        .padding(horizontal = 24.dp)
-                                        .padding(bottom = 16.dp)
-                                        .align(Alignment.CenterHorizontally)
-                                )
-                                Spacer(modifier = Modifier.height(16.dp))
-                                SingleSelector(
-                                    itemTitles = listOf(
-                                        stringResource(id = R.string.profile_sex_male),
-                                        stringResource(id = R.string.profile_sex_female)
-                                    ),
-                                    itemValues = listOf(1, 2),
-                                    selectedPosition = if (sex == 1) 0 else if (sex == 2) 1 else -1,
-                                    onItemSelected = { _, _, value, _ ->
-                                        sex = value
-                                        showDialog = false
-                                    }
-                                )
-                                Column(
-                                    modifier = Modifier
-                                        .padding(horizontal = 24.dp)
-                                        .padding(top = 16.dp)
-                                ) {
-                                    TextButton(
-                                        onClick = { showDialog = false },
-                                        modifier = Modifier.fillMaxWidth(),
-                                        shape = RoundedCornerShape(100),
-                                        colors = ButtonDefaults.textButtonColors(
-                                            backgroundColor = ExtendedTheme.colors.text.copy(alpha = 0.1f),
-                                            contentColor = ExtendedTheme.colors.text
+                                ProvideContentColor(color = ExtendedTheme.colors.text) {
+                                    Text(
+                                        text = stringResource(id = R.string.title_modify_sex),
+                                        style = MaterialTheme.typography.h6,
+                                        modifier = Modifier
+                                            .padding(horizontal = 24.dp)
+                                            .padding(bottom = 16.dp)
+                                            .align(Alignment.CenterHorizontally)
+                                    )
+                                    Spacer(modifier = Modifier.height(16.dp))
+                                    SingleSelector(
+                                        itemTitles = listOf(
+                                            stringResource(id = R.string.profile_sex_male),
+                                            stringResource(id = R.string.profile_sex_female)
                                        ),
-                                        contentPadding = PaddingValues(vertical = 12.dp)
+                                        itemValues = listOf(1, 2),
+                                        selectedPosition = if (sex == 1) 0 else if (sex == 2) 1 else -1,
+                                        onItemSelected = { _, _, value, _ ->
+                                            sex = value
+                                            showDialog = false
+                                        }
+                                    )
+                                    Column(
+                                        modifier = Modifier
+                                            .padding(horizontal = 24.dp)
+                                            .padding(top = 16.dp)
                                    ) {
-                                        Text(
-                                            text = stringResource(id = R.string.button_cancel),
-                                            fontSize = 16.sp
-                                        )
+                                        TextButton(
+                                            onClick = { showDialog = false },
+                                            modifier = Modifier.fillMaxWidth(),
+                                            shape = RoundedCornerShape(100),
+                                            colors = ButtonDefaults.textButtonColors(
+                                                backgroundColor = ExtendedTheme.colors.text.copy(
+                                                    alpha = 0.1f
+                                                ),
+                                                contentColor = ExtendedTheme.colors.text
+                                            ),
+                                            contentPadding = PaddingValues(vertical = 12.dp)
+                                        ) {
+                                            Text(
+                                                text = stringResource(id = R.string.button_cancel),
+                                                fontSize = 16.sp
+                                            )
+                                        }
                                    }
                                }
                            }
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/NavigationHelper.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/NavigationHelper.java
@ -275,7 +275,7 @@ public final class NavigationHelper {
                        PackageManager pManager = mContext.getPackageManager();
                        appName = resolveInfo.loadLabel(pManager).toString();
                    } else {
-                        appName = mContext.getString(R.string.name_multiapp);
+                        appName = mContext.getString(R.string.name_multi_app);
                    }
                    new PermissionDialog(mContext,
                            new PermissionBean(PermissionDialog.CustomPermission.PERMISSION_START_APP,
@ -303,7 +303,7 @@ public final class NavigationHelper {
                        PackageManager pManager = mContext.getPackageManager();
                        appName = resolveInfo.loadLabel(pManager).toString();
                    } else {
-                        appName = mContext.getString(R.string.name_multiapp);
+                        appName = mContext.getString(R.string.name_multi_app);
                    }
                    new PermissionDialog(mContext,
                            new PermissionBean(PermissionDialog.CustomPermission.PERMISSION_START_APP,
--- a/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/TextFields.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/TextFields.kt
@ -6,10 +6,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.ContentAlpha
-import androidx.compose.material.LocalContentColor
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.Text
+import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@ -171,9 +168,13 @@ fun PlaceholderDecoration(
@Composable
 fun ProvideContentColor(
    color: Color,
+    alpha: Float = color.alpha,
    content: @Composable () -> Unit
 ) {
-    CompositionLocalProvider(LocalContentColor provides color) {
+    CompositionLocalProvider(
+        LocalContentColor provides color,
+        LocalContentAlpha provides alpha
+    ) {
        content()
    }
 }
--- a/app/src/main/res/drawable/ic_round_browse_gallery_24.xml
+++ b/app/src/main/res/drawable/ic_round_browse_gallery_24.xml
@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9s9,-4.03 9,-9S13.97,3 9,3zM11.09,15.5L8.59,13C8.21,12.62 8,12.12 8,11.59V8c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v3.59l2.5,2.5c0.39,0.39 0.39,1.02 0,1.41l0,0C12.11,15.89 11.48,15.89 11.09,15.5z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17.99,5.08L17.99,5.08c0,0.37 0.21,0.69 0.53,0.88C20.6,7.17 22,9.42 22,12c0,2.58 -1.4,4.83 -3.48,6.04c-0.32,0.19 -0.53,0.51 -0.53,0.88v0c0,0.77 0.84,1.25 1.51,0.86C22.18,18.22 24,15.32 24,12c0,-3.32 -1.82,-6.22 -4.5,-7.78C18.83,3.83 17.99,4.31 17.99,5.08z" />
+</vector>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -214,7 +214,7 @@
    <string name="title_ask_permission">要允许 %1$s 访问您的%2$s吗？</string>
    <string name="title_ask_permission_clipboard_copy">要允许 %1$s 写入您的剪贴板吗？</string>
    <string name="title_start_app_permission">要允许 %1$s 打开您的%2$s吗？</string>
-    <string name="name_multiapp">应用</string>
+    <string name="name_multi_app">应用</string>
    <string name="settings_status_bar_darker">状态栏遮罩</string>
    <string name="tip_status_bar_darker">开启后非白色主题状态栏将略微变暗</string>
    <string name="summary_change_need_restart">更改将于下次启动时生效</string>
@ -477,7 +477,7 @@
    <string name="text_size_large">大</string>
    <string name="text_size_very_large">极大</string>
    <string name="toast_after_change_will_restart">修改已保存，即将重启 App 以应用设置</string>
-    <string name="title_dialog_crash">崩溃了！</string>
+    <string name="title_dialog_copy_crash_report">崩溃了！</string>
    <string name="message_dialog_crash">非常抱歉，应用在使用中发生了崩溃。\n您可以复制崩溃报告链接来向开发者反馈。</string>
    <string name="button_copy_crash_link">复制报告链接</string>
    <string name="toast_get_link_failed">获取链接失败</string>
@ -545,4 +545,6 @@
    <string name="title_follow_num">关注</string>
    <string name="title_fans_num">粉丝</string>
    <string name="title_posts_num">贴子</string>
+    <string name="title_oksign_use_official_oksign">使用官方一键签到</string>
+    <string name="summary_oksign_use_official_oksign">（实验性特性）先使用官方一键签到减少需签到吧数量，以加快签到速度</string>
 </resources>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@ -208,12 +208,20 @@
    <androidx.preference.PreferenceCategory android:title="@string/title_sign_preference">
        <SwitchPreference
            android:defaultValue="true"
-            android:icon="@drawable/ic_round_speed"
+            android:icon="@drawable/ic_round_browse_gallery_24"
            android:key="oksign_slow_mode"
            android:summaryOff="@string/summary_oksign_slow_mode"
            android:summaryOn="@string/summary_oksign_slow_mode_on"
            android:title="@string/title_oksign_slow_mode" />

+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_round_speed"
+            android:key="oksign_use_official_oksign"
+            android:summary="@string/summary_oksign_use_official_oksign"
+            android:title="@string/title_oksign_use_official_oksign"
+            app:isPreferenceVisible="false" />
+
        <SwitchPreference
            android:defaultValue="false"
            android:icon="@drawable/ic_round_offline_pin_blue"