From 07263e19f1b6879412fcad576b555aafd4248df0 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sat, 8 Aug 2020 18:02:58 +0400 Subject: [PATCH] fixed url changer --- .../manager/ui/dialogs/DialogContainer.kt | 116 ++++++++++-------- .../manager/ui/fragments/URLChangeFragment.kt | 7 +- 2 files changed, 70 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt index 33187dbc..01b0d370 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt @@ -16,40 +16,45 @@ import com.vanced.manager.utils.MiuiHelper object DialogContainer { fun showSecurityDialog(context: Context) { - MaterialAlertDialogBuilder(context) - .setTitle(context.resources.getString(R.string.welcome)) - .setMessage(context.resources.getString(R.string.security_context)) - .setPositiveButton(context.resources.getString(R.string.close)) { dialog, _ -> + MaterialAlertDialogBuilder(context).apply { + setTitle(context.resources.getString(R.string.welcome)) + setMessage(context.resources.getString(R.string.security_context)) + setPositiveButton(context.resources.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } - .setOnDismissListener { + setOnDismissListener { if (MiuiHelper.isMiui()) { showMiuiDialog(context) } } - .setOnCancelListener { + setOnCancelListener { if (MiuiHelper.isMiui()) { showMiuiDialog(context) } } - .create() - .show() - + create() + show() + } val prefs = PreferenceManager.getDefaultSharedPreferences(context) prefs.edit().putBoolean("firstStart", false).apply() } private fun showMiuiDialog(context: Context) { - MaterialAlertDialogBuilder(context) - .setTitle(context.getString(R.string.miui_one_title)) - .setMessage(context.getString(R.string.miui_one)) - .setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } - .setPositiveButton(context.getString(R.string.guide)) { _, _ -> - openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context) + MaterialAlertDialogBuilder(context).apply { + setTitle(context.getString(R.string.miui_one_title)) + setMessage(context.getString(R.string.miui_one)) + setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + setPositiveButton(context.getString(R.string.guide)) { _, _ -> + openUrl( + "https://telegra.ph/How-to-install-v15-on-MIUI-02-11", + R.color.Telegram, + context + ) } - .setCancelable(false) - .create() - .show() + setCancelable(false) + create() + show() + } } //TODO @@ -69,29 +74,36 @@ object DialogContainer { } fun showRootDialog(activity: Activity) { - MaterialAlertDialogBuilder(activity) - .setTitle(activity.getString(R.string.hold_on)) - .setMessage(activity.getString(R.string.disable_signature)) - .setNeutralButton(activity.getString(R.string.button_dismiss)) { dialog, _ -> + MaterialAlertDialogBuilder(activity).apply { + setTitle(activity.getString(R.string.hold_on)) + setMessage(activity.getString(R.string.disable_signature)) + setNeutralButton(activity.getString(R.string.button_dismiss)) { dialog, _ -> dialog.dismiss() } - .setPositiveButton(activity.getString(R.string.guide)) { _, _ -> - openUrl("https://lmgtfy.com/?q=andnixsh+apk+verification+disable", R.color.Twitter, activity) + setPositiveButton(activity.getString(R.string.guide)) { _, _ -> + openUrl( + "https://lmgtfy.com/?q=andnixsh+apk+verification+disable", + R.color.Twitter, + activity + ) } - .setOnDismissListener { PreferenceManager.getDefaultSharedPreferences(activity).edit().putBoolean("show_root_dialog", false).apply() } - .setOnCancelListener { PreferenceManager.getDefaultSharedPreferences(activity).edit().putBoolean("show_root_dialog", false).apply() } - .create() - .show() + setCancelable(false) + create() + show() + } + PreferenceManager.getDefaultSharedPreferences(activity).edit() + .putBoolean("show_root_dialog", false).apply() } //Easter Egg fun statementFalse(context: Context) { - MaterialAlertDialogBuilder(context) - .setTitle("Wait what?") - .setMessage("So this statement is false huh? I'll go with True!") - .setPositiveButton("wut?") { dialog, _ -> dialog.dismiss() } - .create() - .show() + MaterialAlertDialogBuilder(context).apply { + setTitle("Wait what?") + setMessage("So this statement is false huh? I'll go with True!") + setPositiveButton("wut?") { dialog, _ -> dialog.dismiss() } + create() + show() + } val prefs = PreferenceManager.getDefaultSharedPreferences(context) prefs.edit().putBoolean("statement", true).apply() @@ -101,18 +113,20 @@ object DialogContainer { MaterialAlertDialogBuilder(context).apply { setTitle(context.getString(R.string.error)) setMessage(msg) - setPositiveButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } when (msg) { context.getString(R.string.installation_signature) -> { - setNeutralButton(context.getString(R.string.guide)) { _, _ -> + setPositiveButton(context.getString(R.string.guide)) { _, _ -> openUrl("https://lmgtfy.com/?q=andnixsh+apk+verification+disable", R.color.Twitter, context) } + setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } } context.getString(R.string.installation_miui) -> { - setNeutralButton(context.getString(R.string.guide)) { _, _ -> + setPositiveButton(context.getString(R.string.guide)) { _, _ -> openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context) } + setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } } + else -> setPositiveButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } } create() show() @@ -120,12 +134,13 @@ object DialogContainer { } fun basicDialog(title: String, msg: String, activity: Activity) { - MaterialAlertDialogBuilder(activity) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } - .create() - .show() + MaterialAlertDialogBuilder(activity).apply { + setTitle(title) + setMessage(msg) + setPositiveButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + create() + show() + } } fun launchVanced(activity: Activity) { @@ -135,18 +150,19 @@ object DialogContainer { ComponentName("com.google.android.youtube", "com.google.android.youtube.HomeActivity") else ComponentName("com.vanced.android.youtube", "com.google.android.youtube.HomeActivity") - MaterialAlertDialogBuilder(activity) - .setTitle(activity.getString(R.string.success)) - .setMessage(activity.getString(R.string.vanced_installed)) - .setPositiveButton(activity.getString(R.string.launch)) { _, _ -> + MaterialAlertDialogBuilder(activity).apply { + setTitle(activity.getString(R.string.success)) + setMessage(activity.getString(R.string.vanced_installed)) + setPositiveButton(activity.getString(R.string.launch)) { _, _ -> run { startActivity(activity, intent, null) activity.finish() } } - .setNegativeButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } - .create() - .show() + setNegativeButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + create() + show() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt index 298e7605..cf5d4f5d 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt @@ -33,10 +33,11 @@ class URLChangeFragment : DialogFragment() { urlField.setText(prefs.getString("install_url", baseUrl), TextView.BufferType.EDITABLE) view.findViewById(R.id.url_save).setOnClickListener { val finalUrl = - if (!urlField.text.startsWith("https://") || !urlField.text.startsWith("http://")) - "https://${urlField.text}".removeSuffix("/") - else + if (urlField.text.startsWith("https://") || urlField.text.startsWith("http://")) urlField.text.removeSuffix("/").toString() + else + "https://${urlField.text}".removeSuffix("/") + prefs.edit().putString("install_url", finalUrl).apply() dismiss()