gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-14 13:57:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

App string resources overhaul

Browse Source
This commit is contained in:
topjohnwu
2021-02-11 02:34:00 -08:00
parent 1426ee2ebd
commit 75584e2b19
47 changed files with 40 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt
View File

@@ -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("")
}
}

6
app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt
View File

@@ -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()
}
}

14
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View File

@@ -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
}

2
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View File

@@ -54,7 +54,7 @@ class SettingsViewModel(
// Manager
list.addAll(listOf(
Manager,
AppSettings,
UpdateChannel, UpdateChannelUrl, DoHToggle, UpdateChecker, DownloadPath
))
if (Info.env.isActive) {

26
app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
View File

@@ -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<Context>().getSystemService<NotificationManager>()!! }
@@ -49,29 +45,11 @@ object Notifications {
}
}
fun magiskUpdate(context: Context) {
val intent = context.intent<SplashActivity>()
.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)