From 75584e2b198b5595c748a73750e2e1d6dbfc629e Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 11 Feb 2021 02:34:00 -0800 Subject: [PATCH] App string resources overhaul --- .../magisk/core/download/ManagerHandler.kt | 2 +- .../topjohnwu/magisk/core/tasks/HideAPK.kt | 6 ++-- .../magisk/ui/settings/SettingsItems.kt | 14 ++++---- .../magisk/ui/settings/SettingsViewModel.kt | 2 +- .../topjohnwu/magisk/view/Notifications.kt | 26 ++------------ .../main/res/layout/include_home_manager.xml | 4 +-- app/src/main/res/values-ar/strings.xml | 18 ---------- app/src/main/res/values-az/strings.xml | 12 ------- app/src/main/res/values-be/strings.xml | 19 ----------- app/src/main/res/values-bg/strings.xml | 10 ------ app/src/main/res/values-ca/strings.xml | 21 +----------- app/src/main/res/values-cs/strings.xml | 20 ----------- app/src/main/res/values-de/strings.xml | 20 ----------- app/src/main/res/values-el/strings.xml | 7 ---- app/src/main/res/values-es/strings.xml | 19 ----------- app/src/main/res/values-et/strings.xml | 19 ----------- app/src/main/res/values-fa/strings.xml | 19 ----------- app/src/main/res/values-fr/strings.xml | 20 ----------- app/src/main/res/values-hi/strings.xml | 20 ----------- app/src/main/res/values-hr/strings.xml | 19 ----------- app/src/main/res/values-in/strings.xml | 20 ----------- app/src/main/res/values-it/strings.xml | 20 ----------- app/src/main/res/values-iw/strings.xml | 34 ++++--------------- app/src/main/res/values-ja/strings.xml | 19 ----------- app/src/main/res/values-ka/strings.xml | 18 ---------- app/src/main/res/values-ko/strings.xml | 19 ----------- app/src/main/res/values-lt/strings.xml | 10 ------ app/src/main/res/values-mk/strings.xml | 10 ------ app/src/main/res/values-nb/strings.xml | 10 ------ app/src/main/res/values-nl/strings.xml | 21 +----------- app/src/main/res/values-pa/strings.xml | 20 ----------- app/src/main/res/values-pl/strings.xml | 20 ----------- app/src/main/res/values-pt-rBR/strings.xml | 23 ++----------- app/src/main/res/values-pt-rPT/strings.xml | 5 --- app/src/main/res/values-ro/strings.xml | 20 ----------- app/src/main/res/values-ru/strings.xml | 20 ----------- app/src/main/res/values-sk/strings.xml | 22 +----------- app/src/main/res/values-sq/strings.xml | 19 ----------- app/src/main/res/values-sr/strings.xml | 7 ---- app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 10 ------ app/src/main/res/values-tr/strings.xml | 20 ----------- app/src/main/res/values-uk/strings.xml | 20 ----------- app/src/main/res/values-vi/strings.xml | 10 ------ app/src/main/res/values-zh-rCN/strings.xml | 20 ----------- app/src/main/res/values-zh-rTW/strings.xml | 20 ----------- app/src/main/res/values/strings.xml | 31 ++++++----------- 47 files changed, 40 insertions(+), 726 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt index 167986e90..4c72f60a2 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt @@ -25,7 +25,7 @@ private fun Context.patch(apk: File) { private fun BaseDownloader.notifyHide(id: Int) { update(id) { it.setProgress(0, 0, true) - .setContentTitle(getString(R.string.hide_manager_title)) + .setContentTitle(getString(R.string.hide_app_title)) .setContentText("") } } diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt index a64f868c3..dba447f39 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt @@ -127,13 +127,13 @@ object HideAPK { @Suppress("DEPRECATION") fun hide(context: Context, label: String) { - val dialog = ProgressDialog.show(context, context.getString(R.string.hide_manager_title), "", true) + val dialog = ProgressDialog.show(context, context.getString(R.string.hide_app_title), "", true) GlobalScope.launch { val result = withContext(Dispatchers.IO) { patchAndHide(context, label) } if (!result) { - Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG) + Utils.toast(R.string.failure, Toast.LENGTH_LONG) dialog.dismiss() } } @@ -164,7 +164,7 @@ object HideAPK { restoreImpl(context) } if (!result) { - Utils.toast(R.string.restore_manager_fail_toast, Toast.LENGTH_LONG) + Utils.toast(R.string.failure, Toast.LENGTH_LONG) dialog.dismiss() } } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt index d2124c3b3..412ad2188 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt @@ -61,10 +61,10 @@ object Theme : BaseSettingsItem.Blank() { override val title = R.string.section_theme.asTransitive() } -// --- Manager +// --- App -object Manager : BaseSettingsItem.Section() { - override val title = R.string.manager.asTransitive() +object AppSettings : BaseSettingsItem.Section() { + override val title = R.string.home_app_title.asTransitive() } object ClearRepoCache : BaseSettingsItem.Blank() { @@ -77,8 +77,8 @@ object ClearRepoCache : BaseSettingsItem.Blank() { } object Hide : BaseSettingsItem.Input() { - override val title = R.string.settings_hide_manager_title.asTransitive() - override val description = R.string.settings_hide_manager_summary.asTransitive() + override val title = R.string.settings_hide_app_title.asTransitive() + override val description = R.string.settings_hide_app_summary.asTransitive() override var value = "" set(value) = setV(value, field, { field = it }) @@ -106,8 +106,8 @@ object Hide : BaseSettingsItem.Input() { } object Restore : BaseSettingsItem.Blank() { - override val title = R.string.settings_restore_manager_title.asTransitive() - override val description = R.string.settings_restore_manager_summary.asTransitive() + override val title = R.string.settings_restore_app_title.asTransitive() + override val description = R.string.settings_restore_app_summary.asTransitive() override fun refresh() { isEnabled = Info.remote.magisk.versionCode > 0 } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt index 68f9d6274..624eff3f0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt @@ -54,7 +54,7 @@ class SettingsViewModel( // Manager list.addAll(listOf( - Manager, + AppSettings, UpdateChannel, UpdateChannelUrl, DoHToggle, UpdateChecker, DownloadPath )) if (Info.env.isActive) { diff --git a/app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt b/app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt index 0d164a97d..1094fbcdb 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt @@ -3,24 +3,20 @@ package com.topjohnwu.magisk.view import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager -import android.app.PendingIntent import android.content.Context import android.os.Build.VERSION.SDK_INT -import androidx.core.app.TaskStackBuilder import androidx.core.content.getSystemService import androidx.core.graphics.drawable.toIcon import com.topjohnwu.magisk.R import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const.ID.PROGRESS_NOTIFICATION_CHANNEL import com.topjohnwu.magisk.core.Const.ID.UPDATE_NOTIFICATION_CHANNEL -import com.topjohnwu.magisk.core.SplashActivity -import com.topjohnwu.magisk.core.cmp import com.topjohnwu.magisk.core.download.DownloadService import com.topjohnwu.magisk.core.download.Subject -import com.topjohnwu.magisk.core.intent import com.topjohnwu.magisk.ktx.get import com.topjohnwu.magisk.ktx.getBitmap +@Suppress("DEPRECATION") object Notifications { val mgr by lazy { get().getSystemService()!! } @@ -49,29 +45,11 @@ object Notifications { } } - fun magiskUpdate(context: Context) { - val intent = context.intent() - .putExtra(Const.Key.OPEN_SECTION, "magisk") - val stackBuilder = TaskStackBuilder.create(context) - stackBuilder.addParentStack(SplashActivity::class.java.cmp(context.packageName)) - stackBuilder.addNextIntent(intent) - val pendingIntent = stackBuilder.getPendingIntent( - Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, PendingIntent.FLAG_UPDATE_CURRENT) - - val builder = updateBuilder(context) - .setContentTitle(context.getString(R.string.magisk_update_title)) - .setContentText(context.getString(R.string.manager_download_install)) - .setAutoCancel(true) - .setContentIntent(pendingIntent) - - mgr.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build()) - } - fun managerUpdate(context: Context) { val intent = DownloadService.pendingIntent(context, Subject.Manager()) val builder = updateBuilder(context) - .setContentTitle(context.getString(R.string.manager_update_title)) + .setContentTitle(context.getString(R.string.magisk_update_title)) .setContentText(context.getString(R.string.manager_download_install)) .setAutoCancel(true) .setContentIntent(intent) diff --git a/app/src/main/res/layout/include_home_manager.xml b/app/src/main/res/layout/include_home_manager.xml index fc02b9635..de39944ed 100644 --- a/app/src/main/res/layout/include_home_manager.xml +++ b/app/src/main/res/layout/include_home_manager.xml @@ -43,14 +43,14 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/l1" - android:text="@string/manager" + android:text="@string/home_app_title" android:textAppearance="@style/AppearanceFoundation.Title" android:textColor="?colorPrimary" app:layout_constraintBottom_toBottomOf="@+id/home_manager_icon" app:layout_constraintEnd_toStartOf="@+id/home_manager_button" app:layout_constraintStart_toEndOf="@+id/home_manager_icon" app:layout_constraintTop_toTopOf="parent" - tools:text="@string/manager" /> + tools:text="@string/home_app_title" />