Added custom dialog for setting app's name after repackaging

app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt

@@ -25,3 +25,5 @@ fun String.trimEmptyToNull(): String? = if (isBlank()) null else this
 fun String.legalFilename() = replace(" ", "_").replace("'", "").replace("\"", "")
         .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
         .replace("#", "").replace("@", "").replace("\\", "_")
+
+fun String.isEmptyInternal() = isNullOrBlank()

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt

@@ -17,6 +17,7 @@ import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.base.BasePreferenceFragment
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.CustomDownloadDialogBinding
+import com.topjohnwu.magisk.databinding.DialogCustomNameBinding
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.toLangTag
 import com.topjohnwu.magisk.model.download.DownloadService
@@ -67,8 +68,9 @@ class SettingsFragment : BasePreferenceFragment() {
         val suCategory = findPreference<PreferenceCategory>("superuser")!!
         val hideManager = findPreference<Preference>("hide")!!
         hideManager.setOnPreferenceClickListener {
-            // TODO: Add UI to allow user to customize app name
-            PatchAPK.hideManager(requireContext(), "Manager")
+            showManagerNameDialog {
+                PatchAPK.hideManager(requireContext(), "Manager")
+            }
             true
         }
         val restoreManager = findPreference<Preference>("restore")
@@ -224,26 +226,26 @@ class SettingsFragment : BasePreferenceFragment() {
     private fun setLocalePreference(lp: ListPreference) {
         lp.isEnabled = false
         availableLocales.map {
-                val names = mutableListOf<String>()
-                val values = mutableListOf<String>()
+            val names = mutableListOf<String>()
+            val values = mutableListOf<String>()
 
-                names.add(
-                    ResourceMgr.getString(defaultLocale, R.string.system_default)
-                )
-                values.add("")
+            names.add(
+                ResourceMgr.getString(defaultLocale, R.string.system_default)
+            )
+            values.add("")
 
-                it.forEach { locale ->
-                    names.add(locale.getDisplayName(locale))
-                    values.add(locale.toLangTag())
-                }
-
-                Pair(names.toTypedArray(), values.toTypedArray())
-            }.subscribeK { (names, values) ->
-                lp.isEnabled = true
-                lp.entries = names
-                lp.entryValues = values
-                lp.summary = currentLocale.getDisplayName(currentLocale)
+            it.forEach { locale ->
+                names.add(locale.getDisplayName(locale))
+                values.add(locale.toLangTag())
             }
+
+            Pair(names.toTypedArray(), values.toTypedArray())
+        }.subscribeK { (names, values) ->
+            lp.isEnabled = true
+            lp.entries = names
+            lp.entryValues = values
+            lp.summary = currentLocale.getDisplayName(currentLocale)
+        }
     }
 
     private fun setSummary(key: String) {
@@ -327,4 +329,27 @@ class SettingsFragment : BasePreferenceFragment() {
             .setNegativeButton(R.string.close, null)
             .show()
     }
+
+    private inline fun showManagerNameDialog(
+        crossinline onSuccess: (String) -> Unit
+    ) {
+        val data = ManagerNameData()
+        val view = DialogCustomNameBinding
+            .inflate(LayoutInflater.from(requireContext()))
+            .also { it.data = data }
+
+        AlertDialog.Builder(requireActivity())
+            .setTitle(R.string.settings_app_name)
+            .setView(view.root)
+            .setPositiveButton(R.string.ok) { _, _ ->
+                if (view.dialogNameInput.error.isNullOrBlank()) {
+                    onSuccess(data.name.value)
+                }
+            }
+            .show()
+    }
+
+    inner class ManagerNameData {
+        val name = KObservableField(resources.getString(R.string.re_app_name))
+    }
 }

app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationView
+import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.extensions.replaceRandomWithSpecial
 import com.topjohnwu.magisk.extensions.subscribeK
@@ -220,4 +221,11 @@ fun getScrollPosition(view: RecyclerView) = (view.layoutManager as? LinearLayout
 @BindingAdapter("isEnabled")
 fun setEnabled(view: View, isEnabled: Boolean) {
     view.isEnabled = isEnabled
+}
+
+@BindingAdapter("error")
+fun TextInputLayout.setErrorString(error: String) {
+    val newError = error.let { if (it.isEmpty()) null else it }
+    if (this.error == null && newError == null) return
+    this.error = newError
 }