From f82da5e62d06007a88ffb4d3cc5acd8af6d152f9 Mon Sep 17 00:00:00 2001 From: HissPirat Date: Thu, 20 Aug 2020 12:19:39 +0200 Subject: [PATCH] #2301 rate dialog now shows text instead of numbers --- .../core/main/CoreReaderFragment.java | 2 +- .../kiwixmobile/core/utils/KiwixDialog.kt | 26 ++++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java index 58f9efe79..50fdade15 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java @@ -659,7 +659,7 @@ public abstract class CoreReaderFragment extends BaseFragment } private void showRateDialog() { - alertDialogShower.show(new KiwixDialog.ShowRate(getIconResId()), + alertDialogShower.show(new KiwixDialog.ShowRate(getIconResId(), requireActivity()), () -> { visitCounterPref.setNoThanksState(true); goToRateApp(); diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt index b1131196c..46d2caefc 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt @@ -18,6 +18,7 @@ package org.kiwix.kiwixmobile.core.utils +import android.app.Activity import android.net.wifi.WifiConfiguration import android.view.View import org.kiwix.kiwixmobile.core.R @@ -127,17 +128,22 @@ sealed class KiwixDialog( neutralMessage = R.string.do_not_ask_anymore ) - data class ShowRate(override val args: List, val customIcon: Int?) : KiwixDialog( - R.string.rate_dialog_title, - R.string.triple_arg_format_string, - R.string.rate_dialog_positive, - R.string.no_thanks, - icon = customIcon, - neutralMessage = R.string.rate_dialog_neutral - ), + data class ShowRate(override val args: List, val customIcon: Int?) : + KiwixDialog( + R.string.rate_dialog_title, + R.string.triple_arg_format_string, + R.string.rate_dialog_positive, + R.string.no_thanks, + icon = customIcon, + neutralMessage = R.string.rate_dialog_neutral + ), HasBodyFormatArgs { - constructor(icon: Int?) : this( - listOf(R.string.rate_dialog_msg_1, R.string.app_name, R.string.rate_dialog_msg_2), + constructor(icon: Int?, activity: Activity) : this( + listOf( + activity.getString(R.string.rate_dialog_msg_1), + activity.getString(R.string.app_name), + activity.getString(R.string.rate_dialog_msg_2) + ), icon ) }