From 0818abf71b9990d033c403b84734643111cfc9b1 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 22 Dec 2024 10:35:54 -0500 Subject: [PATCH] jmp: Migrate customized text to CustomizableTextProvider --- .../java/im/angry/openeuicc/di/JmpAppContainer.kt | 4 ++++ .../openeuicc/di/JmpCustomizableTextProvider.kt | 12 ++++++++++++ .../res/layout/fragment_no_euicc_placeholder_jmp.xml | 2 +- app-unpriv/src/jmp/res/values/strings.xml | 4 ++-- .../di/UnprivilegedCustomizableTextProvider.kt | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpCustomizableTextProvider.kt diff --git a/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpAppContainer.kt b/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpAppContainer.kt index 9306a6af..aae1bb72 100644 --- a/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpAppContainer.kt +++ b/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpAppContainer.kt @@ -6,4 +6,8 @@ class JmpAppContainer(context: Context) : UnprivilegedAppContainer(context) { override val uiComponentFactory by lazy { JmpUiComponentFactory() } + + override val customizableTextProvider by lazy { + JmpCustomizableTextProvider(context) + } } \ No newline at end of file diff --git a/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpCustomizableTextProvider.kt b/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpCustomizableTextProvider.kt new file mode 100644 index 00000000..cc46cb31 --- /dev/null +++ b/app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpCustomizableTextProvider.kt @@ -0,0 +1,12 @@ +package im.angry.openeuicc.di + +import android.content.Context +import im.angry.easyeuicc.R + +class JmpCustomizableTextProvider(private val context: Context) : + UnprivilegedCustomizableTextProvider(context) { + override val noEuiccExplanation: String + get() = context.getString(R.string.no_euicc_jmp) + override val profileSwitchingTimeoutMessage: String + get() = context.getString(R.string.enable_disable_timeout_jmp) +} \ No newline at end of file diff --git a/app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml b/app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml index 43bd343f..6253eb20 100644 --- a/app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml +++ b/app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml @@ -11,7 +11,7 @@ android:layout_marginStart="40dp" android:layout_marginEnd="40dp" android:gravity="center" - android:text="@string/no_euicc" + android:text="@string/no_euicc_jmp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app-unpriv/src/jmp/res/values/strings.xml b/app-unpriv/src/jmp/res/values/strings.xml index 45b28aa1..985b9d9b 100644 --- a/app-unpriv/src/jmp/res/values/strings.xml +++ b/app-unpriv/src/jmp/res/values/strings.xml @@ -1,10 +1,10 @@ JMP SIM Manager - No JMP eSIM Adapter found on this device. Insert one into the device or through a USB card reader. + No JMP eSIM Adapter found on this device. Insert one into the device or through a USB card reader. Buy JMP eSIM Adapter https://jmp.chat/esim-adapter https://gitea.angry.im/jmp-sim/jmp-sim-manager - Timed out waiting for the eSIM chip to switch profiles. Please manually refresh the eSIM adapter by going to SIM Toolkit, and select Tools -> Reboot. + Timed out waiting for the eSIM chip to switch profiles. Please manually refresh the eSIM adapter by going to SIM Toolkit, and select Tools -> Reboot. \ No newline at end of file diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedCustomizableTextProvider.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedCustomizableTextProvider.kt index 929ce84c..807f66d4 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedCustomizableTextProvider.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedCustomizableTextProvider.kt @@ -3,7 +3,7 @@ package im.angry.openeuicc.di import android.content.Context import im.angry.easyeuicc.R -class UnprivilegedCustomizableTextProvider(private val context: Context) : +open class UnprivilegedCustomizableTextProvider(private val context: Context) : DefaultCustomizableTextProvider(context) { override fun formatInternalChannelName(logicalSlotId: Int): String = context.getString(R.string.channel_name_format_unpriv, logicalSlotId)