refactor: Rename EuiccFragmentMarker

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

@@ -31,7 +31,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.lang.Exception
 
-open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, EuiccFragmentMarker {
+open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
+    EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "EuiccManagementFragment"
 

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

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import java.lang.Exception
 
-class ProfileDeleteFragment : DialogFragment(), EuiccFragmentMarker {
+class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileDeleteFragment"
 

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

@@ -26,7 +26,7 @@ import net.typeblog.lpac_jni.ProfileDownloadCallback
 import kotlin.Exception
 
 class ProfileDownloadFragment : BaseMaterialDialogFragment(),
-    Toolbar.OnMenuItemClickListener, EuiccFragmentMarker {
+    Toolbar.OnMenuItemClickListener, EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileDownloadFragment"
 

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

@@ -6,7 +6,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
@@ -20,7 +19,7 @@ import kotlinx.coroutines.withContext
 import java.lang.Exception
 import java.lang.RuntimeException
 
-class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccFragmentMarker {
+class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileRenameFragment"
 

app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt → app-common/src/main/java/im/angry/openeuicc/util/EuiccChannelFragmentUtils.kt

@@ -1,13 +1,15 @@
-package im.angry.openeuicc.ui
+package im.angry.openeuicc.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.*
 
-interface EuiccFragmentMarker: OpenEuiccContextMarker
+interface EuiccChannelFragmentMarker: OpenEuiccContextMarker
 
-fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments: Bundle.() -> Unit = {}): T where T: Fragment, T: EuiccFragmentMarker {
+// We must use extension functions because there is no way to add bounds to the type of "self"
+// in the definition of an interface, so the only way is to limit where the extension functions
+// can be applied.
+fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments: Bundle.() -> Unit = {}): T where T: Fragment, T: EuiccChannelFragmentMarker {
     val instance = clazz.newInstance()
     instance.arguments = Bundle().apply {
         putInt("slotId", slotId)
@@ -17,12 +19,12 @@ fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments
     return instance
 }
 
-val <T> T.slotId: Int where T: Fragment, T: EuiccFragmentMarker
+val <T> T.slotId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("slotId")
-val <T> T.portId: Int where T: Fragment, T: EuiccFragmentMarker
+val <T> T.portId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("portId")
 
-val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccFragmentMarker
+val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccChannelFragmentMarker
     get() =
         euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)!!