diff --git a/app/src/main/java/com/amaze/fileutilities/utilis/Utils.kt b/app/src/main/java/com/amaze/fileutilities/utilis/Utils.kt index 40f35652..335fe70c 100644 --- a/app/src/main/java/com/amaze/fileutilities/utilis/Utils.kt +++ b/app/src/main/java/com/amaze/fileutilities/utilis/Utils.kt @@ -123,6 +123,7 @@ class Utils { var log: Logger = LoggerFactory.getLogger(Utils::class.java) const val URL_PRIVACY_POLICY = "https://teamamaze.xyz/privacy-policy-utilities" + const val URL_SUBSCRIPTION_TERMS = "https://teamamaze.xyz/subscription-terms-utilities" const val URL_LICENSE_AGREEMENT = "https://github.com/TeamAmaze/AmazeFileUtilities/blob/main/LICENSE.txt" const val URL_GITHUB_ISSUES = @@ -147,6 +148,7 @@ class Utils { fun openURL(url: String?, context: Context) { val intent = Intent(Intent.ACTION_VIEW) intent.data = Uri.parse(url) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) try { context.startActivity(intent) } catch (e: ActivityNotFoundException) { @@ -740,9 +742,9 @@ class Utils { dialog.dismiss() } .setNegativeButton( - context.resources.getString(R.string.close) - ) { dialog, _ -> - dialog.dismiss() + context.resources.getString(R.string.terms_and_conditions) + ) { _, _ -> + openURL(URL_SUBSCRIPTION_TERMS, context) } return builder } @@ -1253,9 +1255,12 @@ class Utils { inputEditTextViewPair.second.filters = arrayOf(InputFilterMinMaxLong(1, upperBound)) } if (lowerBound != null) { - inputEditTextViewPair.second.filters = arrayOf(InputFilterMinMaxLong(lowerBound, - Integer.MAX_VALUE.toLong() - )) + inputEditTextViewPair.second.filters = arrayOf( + InputFilterMinMaxLong( + lowerBound, + Integer.MAX_VALUE.toLong() + ) + ) } val dialogBuilder = AlertDialog.Builder(context, R.style.Custom_Dialog_Dark) diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-en-rUS/strings.xml +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ml-rIN/strings.xml +++ b/app/src/main/res/values-ml-rIN/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 552a5b28..bdeb6a21 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1033,4 +1033,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 953a5309..5e1156bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1041,4 +1041,6 @@ Group By Sort By + + Terms and Conditions diff --git a/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt b/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt index e0a3baab..911072f7 100644 --- a/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt +++ b/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt @@ -556,6 +556,9 @@ class Billing(val context: Context, private var uniqueId: String) : .setTitle(R.string.subscribe) .setNegativeButton(R.string.close) { dialog, _ -> dialog.dismiss() + }.setNeutralButton(context.getString(R.string.terms_and_conditions)) { + _, _ -> + Utils.openURL(Utils.URL_SUBSCRIPTION_TERMS, context) } val inflater = activity.layoutInflater val dialogView: View = inflater