From d20ca0be399bf4debc9d1f26262c12608ff94b6b Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 6 Aug 2022 15:09:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tieba/post/activities/MainActivity.kt | 2 +-
.../editprofile/view/EditProfileActivity.kt | 85 ++++++++++---------
.../tieba/post/utils/NavigationHelper.java | 4 +-
.../tieba/post/widgets/compose/TextFields.kt | 11 +--
.../drawable/ic_round_browse_gallery_24.xml | 13 +++
app/src/main/res/values/strings.xml | 6 +-
app/src/main/res/xml/preferences.xml | 10 ++-
7 files changed, 81 insertions(+), 50 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_round_browse_gallery_24.xml
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
index a293fab2..a65535f9 100644
--- 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(
diff --git 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
index 0ab68657..ec8f7299 100644
--- 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
+ )
+ }
}
}
}
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/NavigationHelper.java b/app/src/main/java/com/huanchengfly/tieba/post/utils/NavigationHelper.java
index ff3b6f54..a6d028a8 100644
--- 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,
diff --git 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
index 826b86a4..fd326b5b 100644
--- 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()
}
}
diff --git a/app/src/main/res/drawable/ic_round_browse_gallery_24.xml b/app/src/main/res/drawable/ic_round_browse_gallery_24.xml
new file mode 100644
index 00000000..b9613cce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_browse_gallery_24.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 093f24c3..d2ce1d18 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,7 +214,7 @@
要允许 %1$s 访问您的%2$s吗？
要允许 %1$s 写入您的剪贴板吗？
要允许 %1$s 打开您的%2$s吗？
- 应用
+ 应用
状态栏遮罩
开启后非白色主题状态栏将略微变暗
更改将于下次启动时生效
@@ -477,7 +477,7 @@
大
极大
修改已保存，即将重启 App 以应用设置
- 崩溃了！
+ 崩溃了！
非常抱歉，应用在使用中发生了崩溃。\n您可以复制崩溃报告链接来向开发者反馈。
复制报告链接
获取链接失败
@@ -545,4 +545,6 @@
关注
粉丝
贴子
+ 使用官方一键签到
+ （实验性特性）先使用官方一键签到减少需签到吧数量，以加快签到速度
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index a77cb7be..6ff4ba81 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -208,12 +208,20 @@
+
+