From 94462b69bcd76b32a9145817b31a06917ae012fe Mon Sep 17 00:00:00 2001 From: tateisu Date: Sun, 12 Feb 2023 03:10:00 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=A0=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=AB=E3=83=95=E3=82=A1=E5=80=A4=E3=81=8C?= =?UTF-8?q?=E4=BD=8E=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AB=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subwaytooter/ActColumnCustomize.kt | 53 ++++++++----------- .../main/res/layout/act_column_customize.xml | 18 +++++-- app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt b/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt index 8c75edc2..9523f8f8 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt @@ -29,10 +29,7 @@ import jp.juggler.util.log.LogCategory import jp.juggler.util.log.showToast import jp.juggler.util.log.withCaption import jp.juggler.util.media.createResizedBitmap -import jp.juggler.util.ui.ActivityResultHandler -import jp.juggler.util.ui.hideKeyboard -import jp.juggler.util.ui.isNotOk -import jp.juggler.util.ui.setNavigationBack +import jp.juggler.util.ui.* import org.jetbrains.anko.textColor import java.io.File import java.io.FileOutputStream @@ -323,14 +320,7 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke if (loadingBusy) return if (!fromUser) return column.columnBgImageAlpha = progress / PROGRESS_MAX.toFloat() - views.ivColumnBackground.alpha = column.columnBgImageAlpha - views.etAlpha.setText( - String.format( - defaultLocale(this@ActColumnCustomize), - "%.4f", - column.columnBgImageAlpha - ) - ) + showAlpha(updateText = true, updateSeek = false) } }) @@ -342,16 +332,13 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke override fun afterTextChanged(s: Editable) { if (loadingBusy) return try { - var f = NumberFormat.getInstance(defaultLocale(this@ActColumnCustomize)) .parse(views.etAlpha.text.toString())?.toFloat() - if (f != null && !f.isNaN()) { if (f < 0f) f = 0f if (f > 1f) f = 1f column.columnBgImageAlpha = f - views.ivColumnBackground.alpha = column.columnBgImageAlpha - views.sbColumnBackgroundAlpha.progress = (0.5f + f * PROGRESS_MAX).toInt() + showAlpha(updateText = false, updateSeek = true) } } catch (ex: Throwable) { log.e(ex, "alpha parse failed.") @@ -390,21 +377,7 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke ViewCompat.setBackground(views.flColumnBackground, null) } - var alpha = column.columnBgImageAlpha - if (alpha.isNaN()) { - alpha = 1f - column.columnBgImageAlpha = alpha - } - views.ivColumnBackground.alpha = alpha - views.sbColumnBackgroundAlpha.progress = (0.5f + alpha * PROGRESS_MAX).toInt() - - views.etAlpha.setText( - String.format( - defaultLocale(this@ActColumnCustomize), - "%.4f", - column.columnBgImageAlpha - ) - ) + showAlpha(updateText = true, updateSeek = true) loadImage(views.ivColumnBackground, column.columnBgImage) @@ -415,6 +388,24 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke } } + private fun showAlpha(updateText: Boolean, updateSeek: Boolean) { + var alpha = column.columnBgImageAlpha + if (alpha.isNaN()) { + alpha = 1f + column.columnBgImageAlpha = alpha + } + views.ivColumnBackground.alpha = alpha + val hasAlphaWarning = alpha < 0.3 && column.columnBgImage.isNotEmpty() + views.tvBackgroundError.vg(hasAlphaWarning)?.text = + getString(R.string.image_alpha_too_low) + if (updateText) { + views.etAlpha.setText("%.4f".format(column.columnBgImageAlpha)) + } + if (updateSeek) { + views.sbColumnBackgroundAlpha.progress = (0.5f + alpha * PROGRESS_MAX).toInt() + } + } + private fun closeBitmaps() { try { views.ivColumnBackground.setImageDrawable(null) diff --git a/app/src/main/res/layout/act_column_customize.xml b/app/src/main/res/layout/act_column_customize.xml index 602250d0..6bfebbc3 100644 --- a/app/src/main/res/layout/act_column_customize.xml +++ b/app/src/main/res/layout/act_column_customize.xml @@ -117,7 +117,10 @@ style="@style/setting_row_label" android:text="@string/column" /> - + - @@ -251,8 +253,18 @@ android:paddingStart="32dp" /> - + + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b86a5af3..b85b951b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1258,4 +1258,5 @@ バグ報告 アプリは過去数日間のログを保持していますが、勝手に外部に送信することはありません。ユーザが明示的にログを送信する操作した時だけ参照されます。 ログの重要度。 この設定より重要度が低いログは収集されません。 + 背景画像のアルファが低すぎます。 画像を見ることができますか？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 746d4bf3..fcd76321 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1266,4 +1266,5 @@ Bug report The app keeps logs for the past few days, but does not send them outside without permission. It is only referenced when the user explicitly sends logs. Log severity level. Logs with a severity less than this setting will not be collected. + background image alpha is too low. can you view the image?