From 4dd14d23f24d6dd7694571970c56cb98499bd85a Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 4 Mar 2024 18:51:10 -0500
Subject: [PATCH] refactor: Add UiComponentFactory to manual DI

---
 .../main/java/im/angry/openeuicc/di/AppContainer.kt    |  1 +
 .../java/im/angry/openeuicc/di/DefaultAppContainer.kt  |  4 ++++
 .../im/angry/openeuicc/di/DefaultUiComponentFactory.kt |  9 +++++++++
 .../java/im/angry/openeuicc/di/UiComponentFactory.kt   |  8 ++++++++
 .../main/java/im/angry/openeuicc/ui/MainActivity.kt    |  6 +-----
 .../im/angry/openeuicc/di/PrivilegedAppContainer.kt    |  4 ++++
 .../angry/openeuicc/di/PrivilegedUiComponentFactory.kt | 10 ++++++++++
 .../im/angry/openeuicc/ui/PrivilegedMainActivity.kt    |  4 ----
 8 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt
 create mode 100644 app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt
 create mode 100644 app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt

diff --git a/app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt b/app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt
index 65c2aa9..a29fcf8 100644
--- a/app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt
@@ -10,4 +10,5 @@ interface AppContainer {
     val euiccChannelManager: IEuiccChannelManager
     val subscriptionManager: SubscriptionManager
     val preferenceRepository: PreferenceRepository
+    val uiComponentFactory: UiComponentFactory
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt b/app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt
index dd7826c..6a03835 100644
--- a/app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt
@@ -23,4 +23,8 @@ open class DefaultAppContainer(context: Context) : AppContainer {
     override val preferenceRepository by lazy {
         PreferenceRepository(context)
     }
+
+    override val uiComponentFactory by lazy {
+        DefaultUiComponentFactory()
+    }
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt b/app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt
new file mode 100644
index 0000000..86af007
--- /dev/null
+++ b/app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt
@@ -0,0 +1,9 @@
+package im.angry.openeuicc.di
+
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+
+open class DefaultUiComponentFactory : UiComponentFactory {
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
+        EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
+}
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt b/app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt
new file mode 100644
index 0000000..d311876
--- /dev/null
+++ b/app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt
@@ -0,0 +1,8 @@
+package im.angry.openeuicc.di
+
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+
+interface UiComponentFactory {
+    fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment
+}
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index af6cbf4..ca6715d 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -88,10 +88,6 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
             else -> super.onOptionsItemSelected(item)
         }
 
-
-    protected open fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
-
     private suspend fun init() {
         withContext(Dispatchers.IO) {
             euiccChannelManager.enumerateEuiccChannels()
@@ -108,7 +104,7 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
         withContext(Dispatchers.Main) {
             euiccChannelManager.knownChannels.sortedBy { it.logicalSlotId }.forEach { channel ->
                 spinnerAdapter.add(getString(R.string.channel_name_format, channel.logicalSlotId))
-                fragments.add(createEuiccManagementFragment(channel))
+                fragments.add(appContainer.uiComponentFactory.createEuiccManagementFragment(channel))
             }
 
             if (fragments.isNotEmpty()) {
diff --git a/app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt b/app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt
index a849a27..64e45eb 100644
--- a/app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt
+++ b/app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt
@@ -8,4 +8,8 @@ class PrivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
     override val euiccChannelManager: IEuiccChannelManager by lazy {
         PrivilegedEuiccChannelManager(context)
     }
+
+    override val uiComponentFactory by lazy {
+        PrivilegedUiComponentFactory()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt b/app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt
new file mode 100644
index 0000000..d3c5cdb
--- /dev/null
+++ b/app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt
@@ -0,0 +1,10 @@
+package im.angry.openeuicc.di
+
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+import im.angry.openeuicc.ui.PrivilegedEuiccManagementFragment
+
+class PrivilegedUiComponentFactory : DefaultUiComponentFactory() {
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
+        PrivilegedEuiccManagementFragment.newInstance(channel.slotId, channel.portId)
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/ui/PrivilegedMainActivity.kt b/app/src/main/java/im/angry/openeuicc/ui/PrivilegedMainActivity.kt
index 1261932..f3c2b3c 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/PrivilegedMainActivity.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/PrivilegedMainActivity.kt
@@ -4,7 +4,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
 import im.angry.openeuicc.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.util.*
 
 class PrivilegedMainActivity : MainActivity() {
@@ -37,7 +36,4 @@ class PrivilegedMainActivity : MainActivity() {
         }
         else -> super.onOptionsItemSelected(item)
     }
-
-    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        PrivilegedEuiccManagementFragment.newInstance(channel.slotId, channel.portId)
 }
\ No newline at end of file