From bcc563aa8336d8d00cf45437f9972728752408a3 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 19 Mar 2024 20:00:35 -0400 Subject: [PATCH 1/2] jmp: Customize default placeholder when eUICC is missing --- app-unpriv/src/jmp/AndroidManifest.xml | 4 +- .../openeuicc/JmpSimManagerApplication.kt | 9 +++++ .../im/angry/openeuicc/di/JmpAppContainer.kt | 9 +++++ .../openeuicc/di/JmpUiComponentFactory.kt | 9 +++++ .../ui/JmpNoEuiccPlaceholderFragment.kt | 39 +++++++++++++++++++ .../fragment_no_euicc_placeholder_jmp.xml | 38 ++++++++++++++++++ app-unpriv/src/jmp/res/values/strings.xml | 3 ++ .../UnprivilegedOpenEuiccApplication.kt | 2 +- .../openeuicc/di/UnprivilegedAppContainer.kt | 2 +- .../di/UnprivilegedUiComponentFactory.kt | 2 +- 10 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 app-unpriv/src/jmp/java/im/angry/openeuicc/JmpSimManagerApplication.kt create mode 100644 app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpAppContainer.kt create mode 100644 app-unpriv/src/jmp/java/im/angry/openeuicc/di/JmpUiComponentFactory.kt create mode 100644 app-unpriv/src/jmp/java/im/angry/openeuicc/ui/JmpNoEuiccPlaceholderFragment.kt create mode 100644 app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml diff --git a/app-unpriv/src/jmp/AndroidManifest.xml b/app-unpriv/src/jmp/AndroidManifest.xml index bc492dda..d9058f08 100644 --- a/app-unpriv/src/jmp/AndroidManifest.xml +++ b/app-unpriv/src/jmp/AndroidManifest.xml @@ -2,8 +2,8 @@ (R.id.compatibility_check).setOnClickListener { + startActivity(Intent(requireContext(), CompatibilityCheckActivity::class.java)) + } + + view.findViewById(R.id.purchase_esim).setOnClickListener { + startActivity( + Intent( + Intent.ACTION_VIEW, + Uri.parse(getString(R.string.purchase_sim_url)) + ) + ) + } + + return view + } +} \ 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 new file mode 100644 index 00000000..43bd343f --- /dev/null +++ b/app-unpriv/src/jmp/res/layout/fragment_no_euicc_placeholder_jmp.xml @@ -0,0 +1,38 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app-unpriv/src/jmp/res/values/strings.xml b/app-unpriv/src/jmp/res/values/strings.xml index 5d7431a6..982ca0c3 100644 --- a/app-unpriv/src/jmp/res/values/strings.xml +++ b/app-unpriv/src/jmp/res/values/strings.xml @@ -1,4 +1,7 @@ JMP SIM Manager + No JMP eSIM Adapter found on this device. + Buy JMP eSIM Adapter + https://jmp.chat/esim-adapter \ No newline at end of file diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt b/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt index 55415012..f139840e 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt @@ -7,7 +7,7 @@ import im.angry.openeuicc.util.* import kotlinx.coroutines.runBlocking import kotlin.system.exitProcess -class UnprivilegedOpenEuiccApplication : OpenEuiccApplication() { +open class UnprivilegedOpenEuiccApplication : OpenEuiccApplication() { override val appContainer by lazy { UnprivilegedAppContainer(this) } diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt index 22d5a62d..e424b1fd 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt @@ -2,7 +2,7 @@ package im.angry.openeuicc.di import android.content.Context -class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) { +open class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) { override val uiComponentFactory by lazy { UnprivilegedUiComponentFactory() } diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt index f1170382..b62231c7 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt @@ -3,7 +3,7 @@ package im.angry.openeuicc.di import androidx.fragment.app.Fragment import im.angry.openeuicc.ui.UnprivilegedNoEuiccPlaceholderFragment -class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() { +open class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() { override fun createNoEuiccPlaceholderFragment(): Fragment = UnprivilegedNoEuiccPlaceholderFragment() } \ No newline at end of file From 02ef31199b8a07028c1dc0249fc42c35d3d12aec Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 19 Mar 2024 20:02:22 -0400 Subject: [PATCH 2/2] jmp: Customize source code URL --- app-unpriv/src/jmp/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app-unpriv/src/jmp/res/values/strings.xml b/app-unpriv/src/jmp/res/values/strings.xml index 982ca0c3..a4610a76 100644 --- a/app-unpriv/src/jmp/res/values/strings.xml +++ b/app-unpriv/src/jmp/res/values/strings.xml @@ -4,4 +4,5 @@ No JMP eSIM Adapter found on this device. Buy JMP eSIM Adapter https://jmp.chat/esim-adapter + https://gitea.angry.im/jmp-sim/jmp-sim-manager \ No newline at end of file