app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt

@@ -27,7 +27,7 @@ import kotlinx.coroutines.launch
 import net.typeblog.lpac_jni.impl.PKID_GSMA_LIVE_CI
 import net.typeblog.lpac_jni.impl.PKID_GSMA_TEST_CI
 
-class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
+class EuiccInfoActivity : BaseEuiccAccessActivity() {
     companion object {
         private val YES_NO = Pair(R.string.yes, R.string.no)
     }
@@ -64,7 +64,7 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
             getString(R.string.usb)
         } else {
-            appContainer.customizableTextProvider.formatInternalChannelName(logicalSlotId)
+            getString(R.string.channel_name_format, logicalSlotId)
         }
 
         title = getString(R.string.euicc_info_activity_title, channelTitle)

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -62,7 +62,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
             getString(R.string.usb)
         } else {
-            appContainer.customizableTextProvider.formatInternalChannelName(logicalSlotId)
+            getString(R.string.channel_name_format, logicalSlotId)
         }
 
         title = getString(R.string.profile_notifications_detailed_format, channelTitle)

app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt

@@ -45,7 +45,7 @@ open class SettingsFragment: PreferenceFragmentCompat() {
             setOnPreferenceClickListener(::onAppVersionClicked)
         }
 
-        findPreference<Preference>("pref_advanced_language")?.apply {
+        findPreference<Preference>("pref_language")?.apply {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return@apply
             isVisible = true
             intent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply {

app-common/src/main/res/values-ja/strings.xml

@@ -125,8 +125,8 @@
     <string name="pref_info">情報</string>
     <string name="pref_info_app_version">アプリバージョン</string>
     <string name="pref_info_source_code">ソースコード</string>
-    <string name="pref_advanced_language">言語</string>
-    <string name="pref_advanced_language_desc">アプリの言語を選択</string>
+    <string name="pref_language">言語</string>
+    <string name="pref_language_desc">アプリの言語を選択</string>
     <string name="pref_developer_unfiltered_profile_list">すべてのプロファイルを表示</string>
     <string name="pref_developer_unfiltered_profile_list_desc">プロダクション以外のプロファイルも表示する</string>
     <string name="profile_class">タイプ:</string>

app-common/src/main/res/values-zh-rCN/strings.xml

@@ -126,8 +126,8 @@
     <string name="no">否</string>
     <string name="developer_options_steps">还有 %d 步成为开发者</string>
     <string name="developer_options_enabled">你现在是开发者了！</string>
-    <string name="pref_advanced_language">语言</string>
-    <string name="pref_advanced_language_desc">选择 App 语言</string>
+    <string name="pref_language">语言</string>
+    <string name="pref_language_desc">选择 App 语言</string>
     <string name="pref_developer">开发者选项</string>
     <string name="pref_developer_unfiltered_profile_list">显示未经过滤的配置文件列表</string>
     <string name="pref_developer_unfiltered_profile_list_desc">在配置文件列表中包括非生产环境的配置文件</string>

app-common/src/main/res/values/strings.xml

@@ -153,8 +153,8 @@
     <string name="pref_advanced_disable_safeguard_removable_esim_desc">By default, this app prevents you from disabling the active profile on a removable eSIM inserted in the device, because doing so may <i>sometimes</i> render it inaccessible.\nCheck this box to <i>remove</i> this safeguard.</string>
     <string name="pref_advanced_verbose_logging">Verbose Logging</string>
     <string name="pref_advanced_verbose_logging_desc">Enable verbose logs, which may contain sensitive information. Only share your logs with someone you trust after turning this on.</string>
-    <string name="pref_advanced_language">Language</string>
-    <string name="pref_advanced_language_desc">Select app language</string>
+    <string name="pref_language">Language</string>
+    <string name="pref_language_desc">Select app language</string>
     <string name="pref_advanced_logs">Logs</string>
     <string name="pref_advanced_logs_desc">View recent debug logs of the application</string>
     <string name="pref_developer">Developer Options</string>

app-common/src/main/res/xml/pref_settings.xml

@@ -40,9 +40,9 @@
         <Preference
             app:iconSpaceReserved="false"
             app:isPreferenceVisible="false"
-            app:key="pref_advanced_language"
-            app:summary="@string/pref_advanced_language_desc"
-            app:title="@string/pref_advanced_language" />
+            app:key="pref_language"
+            app:summary="@string/pref_language_desc"
+            app:title="@string/pref_language" />
 
         <Preference
             app:key="pref_advanced_logs"