From c8a5e0c29bcb14fba2eef2ad07982734655cee12 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Tue, 22 Jul 2025 23:46:17 +0800
Subject: [PATCH 1/2] chore: profile string ids style

---
 .../im/angry/openeuicc/ui/EuiccManagementFragment.kt     | 4 ++--
 app-common/src/main/res/layout/euicc_profile.xml         | 4 ++--
 app-common/src/main/res/values-ja/strings.xml            | 6 +++---
 app-common/src/main/res/values-zh-rCN/strings.xml        | 6 +++---
 app-common/src/main/res/values-zh-rTW/strings.xml        | 6 +++---
 app-common/src/main/res/values/strings.xml               | 9 +++++----
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
index 3c94c6c..42d9646 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
@@ -380,9 +380,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
 
             state.setText(
                 if (profile.isEnabled) {
-                    R.string.enabled
+                    R.string.profile_state_enabled
                 } else {
-                    R.string.disabled
+                    R.string.profile_state_disabled
                 }
             )
             provider.text = profile.providerName
diff --git a/app-common/src/main/res/layout/euicc_profile.xml b/app-common/src/main/res/layout/euicc_profile.xml
index 74c1d7a..021c53b 100644
--- a/app-common/src/main/res/layout/euicc_profile.xml
+++ b/app-common/src/main/res/layout/euicc_profile.xml
@@ -54,7 +54,7 @@
 
             <TextView
                 android:id="@+id/provider_label"
-                android:text="@string/provider"
+                android:text="@string/profile_provider"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -106,7 +106,7 @@
 
             <TextView
                 android:id="@+id/iccid_label"
-                android:text="@string/iccid"
+                android:text="@string/profile_iccid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
diff --git a/app-common/src/main/res/values-ja/strings.xml b/app-common/src/main/res/values-ja/strings.xml
index d51e2c7..543ee96 100644
--- a/app-common/src/main/res/values-ja/strings.xml
+++ b/app-common/src/main/res/values-ja/strings.xml
@@ -7,9 +7,9 @@
     <string name="help">ヘルプ</string>
     <string name="reload">スロットを再読み込み</string>
     <string name="channel_name_format">論理スロット %d</string>
-    <string name="enabled">有効済み</string>
-    <string name="disabled">無効済み</string>
-    <string name="provider">プロバイダー:</string>
+    <string name="profile_state_enabled">有効済み</string>
+    <string name="profile_state_disabled">無効済み</string>
+    <string name="profile_provider">プロバイダー:</string>
     <string name="profile_class">クラス:</string>
     <string name="profile_class_testing">テスト中</string>
     <string name="profile_class_provisioning">プロビジョニング</string>
diff --git a/app-common/src/main/res/values-zh-rCN/strings.xml b/app-common/src/main/res/values-zh-rCN/strings.xml
index 32ced90..6884bc4 100644
--- a/app-common/src/main/res/values-zh-rCN/strings.xml
+++ b/app-common/src/main/res/values-zh-rCN/strings.xml
@@ -6,9 +6,9 @@
     <string name="help">帮助</string>
     <string name="reload">重新加载卡槽</string>
     <string name="channel_name_format">逻辑卡槽 %d</string>
-    <string name="enabled">已启用</string>
-    <string name="disabled">已禁用</string>
-    <string name="provider">提供商:</string>
+    <string name="profile_state_enabled">已启用</string>
+    <string name="profile_state_disabled">已禁用</string>
+    <string name="profile_provider">提供商:</string>
     <string name="profile_class">类型:</string>
     <string name="enable">启用</string>
     <string name="disable">禁用</string>
diff --git a/app-common/src/main/res/values-zh-rTW/strings.xml b/app-common/src/main/res/values-zh-rTW/strings.xml
index 5136bf7..679491a 100644
--- a/app-common/src/main/res/values-zh-rTW/strings.xml
+++ b/app-common/src/main/res/values-zh-rTW/strings.xml
@@ -6,9 +6,9 @@
     <string name="help">幫助</string>
     <string name="reload">重新載入卡槽</string>
     <string name="channel_name_format">虛擬卡槽 %d</string>
-    <string name="enabled">已啟用</string>
-    <string name="disabled">已停用</string>
-    <string name="provider">電信業者:</string>
+    <string name="profile_state_enabled">已啟用</string>
+    <string name="profile_state_disabled">已停用</string>
+    <string name="profile_provider">電信業者:</string>
     <string name="profile_class">類型:</string>
     <string name="enable">啟用</string>
     <string name="disable">停用</string>
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 38bb976..abdd5f3 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -11,14 +11,15 @@
     <string name="usb" translatable="false">USB</string>
     <string name="omapi" translatable="false">OpenMobile API (OMAPI)</string>
 
-    <string name="enabled">Enabled</string>
-    <string name="disabled">Disabled</string>
-    <string name="provider">Provider:</string>
+    <!-- Profile -->
+    <string name="profile_state_enabled">Enabled</string>
+    <string name="profile_state_disabled">Disabled</string>
+    <string name="profile_provider">Provider:</string>
     <string name="profile_class">Class:</string>
     <string name="profile_class_testing">Testing</string>
     <string name="profile_class_provisioning">Provisioning</string>
     <string name="profile_class_operational">Operational</string>
-    <string name="iccid" translatable="false">ICCID:</string>
+    <string name="profile_iccid" translatable="false">ICCID:</string>
     <string name="profile_sequence_number_format" translatable="false">#%d</string>
 
     <string name="enable">Enable</string>
-- 
2.45.3


From 658398944fe8f74d0a17a862b2bf322d88406a1f Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 23 Jul 2025 10:34:27 +0800
Subject: [PATCH 2/2] chore: profile strings style

---
 .../openeuicc/di/DefaultCustomizableTextProvider.kt  |  2 +-
 .../im/angry/openeuicc/ui/EuiccManagementFragment.kt |  2 +-
 .../im/angry/openeuicc/ui/ProfileRenameFragment.kt   |  2 +-
 .../src/main/res/menu/fragment_profile_rename.xml    |  2 +-
 app-common/src/main/res/menu/profile_options.xml     |  8 ++++----
 app-common/src/main/res/values-ja/strings.xml        | 12 ++++++------
 app-common/src/main/res/values-zh-rCN/strings.xml    | 12 ++++++------
 app-common/src/main/res/values-zh-rTW/strings.xml    | 12 ++++++------
 app-common/src/main/res/values/strings.xml           | 12 ++++++------
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt b/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
index b493611..76227fd 100644
--- a/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
@@ -8,7 +8,7 @@ open class DefaultCustomizableTextProvider(private val context: Context) : Custo
         get() = context.getString(R.string.no_euicc)
 
     override val profileSwitchingTimeoutMessage: String
-        get() = context.getString(R.string.enable_disable_timeout)
+        get() = context.getString(R.string.profile_switch_timeout)
 
     override fun formatInternalChannelName(logicalSlotId: Int): String =
         context.getString(R.string.channel_name_format, logicalSlotId)
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
index 42d9646..016e96f 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
@@ -253,7 +253,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                     if (!isUsb) {
                         withContext(Dispatchers.Main) {
                             AlertDialog.Builder(requireContext()).apply {
-                                setMessage(R.string.switch_did_not_refresh)
+                                setMessage(R.string.profile_switch_did_not_refresh)
                                 setPositiveButton(android.R.string.ok) { dialog, _ ->
                                     dialog.dismiss()
                                     requireActivity().finish()
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
index c588254..281e625 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
@@ -65,7 +65,7 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
         super.onViewCreated(view, savedInstanceState)
         profileRenameNewName.editText!!.setText(currentName)
         toolbar.apply {
-            setTitle(R.string.rename)
+            setTitle(R.string.profile_rename)
             setNavigationOnClickListener {
                 if (!renaming) dismiss()
             }
diff --git a/app-common/src/main/res/menu/fragment_profile_rename.xml b/app-common/src/main/res/menu/fragment_profile_rename.xml
index bde850f..f55c56c 100644
--- a/app-common/src/main/res/menu/fragment_profile_rename.xml
+++ b/app-common/src/main/res/menu/fragment_profile_rename.xml
@@ -4,6 +4,6 @@
     <item
         android:id="@+id/ok"
         android:icon="@drawable/ic_check_black"
-        android:title="@string/rename"
+        android:title="@string/profile_rename"
         app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app-common/src/main/res/menu/profile_options.xml b/app-common/src/main/res/menu/profile_options.xml
index 6add53d..60722d6 100644
--- a/app-common/src/main/res/menu/profile_options.xml
+++ b/app-common/src/main/res/menu/profile_options.xml
@@ -2,18 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/enable"
-        android:title="@string/enable"/>
+        android:title="@string/profile_enable"/>
 
     <item
         android:id="@+id/disable"
         android:visible="false"
-        android:title="@string/disable"/>
+        android:title="@string/profile_disable"/>
 
     <item
         android:id="@+id/rename"
-        android:title="@string/rename"/>
+        android:title="@string/profile_rename"/>
 
     <item
         android:id="@+id/delete"
-        android:title="@string/delete"/>
+        android:title="@string/profile_delete"/>
 </menu>
\ No newline at end of file
diff --git a/app-common/src/main/res/values-ja/strings.xml b/app-common/src/main/res/values-ja/strings.xml
index 543ee96..e631d52 100644
--- a/app-common/src/main/res/values-ja/strings.xml
+++ b/app-common/src/main/res/values-ja/strings.xml
@@ -14,12 +14,12 @@
     <string name="profile_class_testing">テスト中</string>
     <string name="profile_class_provisioning">プロビジョニング</string>
     <string name="profile_class_operational">稼働中</string>
-    <string name="enable">有効化</string>
-    <string name="disable">無効化</string>
-    <string name="delete">削除</string>
-    <string name="rename">名前を変更</string>
-    <string name="enable_disable_timeout">eSIM チップがプロファイルの切り替えの待機中にタイムアウトしました。これはデバイスのモデムファームウェアのバグの可能性があります。機内モードに切り替えるかアプリを再起動、デバイスを再起動してください。</string>
-    <string name="switch_did_not_refresh">操作は成功しましたが、デバイスのモデムが更新を拒否しました。新しいプロファイルを使用するには機内モードに切り替えるか、再起動する必要があります。</string>
+    <string name="profile_enable">有効化</string>
+    <string name="profile_disable">無効化</string>
+    <string name="profile_delete">削除</string>
+    <string name="profile_rename">名前を変更</string>
+    <string name="profile_switch_timeout">eSIM チップがプロファイルの切り替えの待機中にタイムアウトしました。これはデバイスのモデムファームウェアのバグの可能性があります。機内モードに切り替えるかアプリを再起動、デバイスを再起動してください。</string>
+    <string name="profile_switch_did_not_refresh">操作は成功しましたが、デバイスのモデムが更新を拒否しました。新しいプロファイルを使用するには機内モードに切り替えるか、再起動する必要があります。</string>
     <string name="toast_profile_enable_failed">新しい eSIM プロファイルに切り替えることができません。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">確認文字列が一致しません</string>
     <string name="toast_iccid_copied">ICCID をクリップボードにコピーしました</string>
diff --git a/app-common/src/main/res/values-zh-rCN/strings.xml b/app-common/src/main/res/values-zh-rCN/strings.xml
index 6884bc4..b0938d3 100644
--- a/app-common/src/main/res/values-zh-rCN/strings.xml
+++ b/app-common/src/main/res/values-zh-rCN/strings.xml
@@ -10,12 +10,12 @@
     <string name="profile_state_disabled">已禁用</string>
     <string name="profile_provider">提供商:</string>
     <string name="profile_class">类型:</string>
-    <string name="enable">启用</string>
-    <string name="disable">禁用</string>
-    <string name="delete">删除</string>
-    <string name="rename">重命名</string>
-    <string name="enable_disable_timeout">等待 eSIM 芯片切换配置文件时超时。这可能是您手机基带固件中的一个错误。请尝试切换飞行模式、重新启动应用程序或重新启动手机</string>
-    <string name="switch_did_not_refresh">操作成功, 但是您手机的基带拒绝刷新。您可能需要切换飞行模式或重新启动，以便使用新的配置文件。</string>
+    <string name="profile_enable">启用</string>
+    <string name="profile_disable">禁用</string>
+    <string name="profile_delete">删除</string>
+    <string name="profile_rename">重命名</string>
+    <string name="profile_switch_timeout">等待 eSIM 芯片切换配置文件时超时。这可能是您手机基带固件中的一个错误。请尝试切换飞行模式、重新启动应用程序或重新启动手机</string>
+    <string name="profile_switch_did_not_refresh">操作成功, 但是您手机的基带拒绝刷新。您可能需要切换飞行模式或重新启动，以便使用新的配置文件。</string>
     <string name="toast_profile_enable_failed">无法切换到新的 eSIM 配置文件。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">输入的确认文本不匹配</string>
     <string name="toast_iccid_copied">已复制 ICCID 到剪贴板</string>
diff --git a/app-common/src/main/res/values-zh-rTW/strings.xml b/app-common/src/main/res/values-zh-rTW/strings.xml
index 679491a..e0334c6 100644
--- a/app-common/src/main/res/values-zh-rTW/strings.xml
+++ b/app-common/src/main/res/values-zh-rTW/strings.xml
@@ -10,12 +10,12 @@
     <string name="profile_state_disabled">已停用</string>
     <string name="profile_provider">電信業者:</string>
     <string name="profile_class">類型:</string>
-    <string name="enable">啟用</string>
-    <string name="disable">停用</string>
-    <string name="delete">刪除</string>
-    <string name="rename">重新命名</string>
-    <string name="enable_disable_timeout">等待 eSIM 切換設定檔時逾時。這可能是您手機基頻處理器韌體中的一個錯誤。請嘗試切換飛航模式、重新啟動應用程式或重新啟動手機</string>
-    <string name="switch_did_not_refresh">操作成功, 但是您手機的基頻處理器沒有重新整理。您可能需要切換飛航模式或重新啟動，以便使用新的設定檔。</string>
+    <string name="profile_enable">啟用</string>
+    <string name="profile_disable">停用</string>
+    <string name="profile_delete">刪除</string>
+    <string name="profile_rename">重新命名</string>
+    <string name="profile_switch_timeout">等待 eSIM 切換設定檔時逾時。這可能是您手機基頻處理器韌體中的一個錯誤。請嘗試切換飛航模式、重新啟動應用程式或重新啟動手機</string>
+    <string name="profile_switch_did_not_refresh">操作成功, 但是您手機的基頻處理器沒有重新整理。您可能需要切換飛航模式或重新啟動，以便使用新的設定檔。</string>
     <string name="toast_profile_enable_failed">無法切換到新的 eSIM 設定檔。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">輸入的確認文字不匹配</string>
     <string name="toast_iccid_copied">已複製 ICCID 到剪貼簿</string>
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index abdd5f3..d526238 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -22,13 +22,13 @@
     <string name="profile_iccid" translatable="false">ICCID:</string>
     <string name="profile_sequence_number_format" translatable="false">#%d</string>
 
-    <string name="enable">Enable</string>
-    <string name="disable">Disable</string>
-    <string name="delete">Delete</string>
-    <string name="rename">Rename</string>
+    <string name="profile_enable">Enable</string>
+    <string name="profile_disable">Disable</string>
+    <string name="profile_delete">Delete</string>
+    <string name="profile_rename">Rename</string>
 
-    <string name="enable_disable_timeout">Timed out waiting for the eSIM chip to switch profiles. This may be a bug in your phone\'s modem firmware. Try toggling airplane mode, restarting the application, or rebooting the phone.</string>
-    <string name="switch_did_not_refresh">The operation was successful, but your phone\'s modem refused to refresh. You might need to toggle airplane mode or reboot in order to use the new profile.</string>
+    <string name="profile_switch_timeout">Timed out waiting for the eSIM chip to switch profiles. This may be a bug in your phone\'s modem firmware. Try toggling airplane mode, restarting the application, or rebooting the phone.</string>
+    <string name="profile_switch_did_not_refresh">The operation was successful, but your phone\'s modem refused to refresh. You might need to toggle airplane mode or reboot in order to use the new profile.</string>
 
     <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>
     <string name="toast_profile_delete_confirm_text_mismatched">Confirmation string mismatch</string>
-- 
2.45.3