diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e40be60..8096d6c 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -8,30 +8,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 73f33d1..3eb09c0 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
@@ -17,6 +17,6 @@ open class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
override fun createSettingsFragment(): Fragment =
UnprivilegedSettingsFragment()
- open fun createQuickAvailabilityFragment(): Fragment =
+ open fun createQuickCompatibilityFragment(): Fragment =
QuickCompatibilityFragment()
}
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
index d83903b..d5e599f 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
@@ -1,6 +1,5 @@
package im.angry.openeuicc.ui
-import android.content.Intent
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
@@ -14,12 +13,12 @@ class QuickCompatibilityActivity : AppCompatActivity(), OpenEuiccContextMarker {
enableEdgeToEdge()
setContentView(R.layout.activity_quick_compatibility)
- val quickAvailabilityFragment =
+ val quickCompatibilityFragment =
(appContainer.uiComponentFactory as UnprivilegedUiComponentFactory)
- .createQuickAvailabilityFragment()
+ .createQuickCompatibilityFragment()
supportFragmentManager.beginTransaction()
- .replace(R.id.quick_availability_container, quickAvailabilityFragment)
+ .replace(R.id.quick_compatibility_container, quickCompatibilityFragment)
.commit()
}
}
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 9f684d9..137f3d6 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
+import android.widget.CheckBox
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
@@ -32,20 +33,29 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
data class CompatibilityResult(
val compatibility: Compatibility,
- val slots: List = emptyList()
+ val slotsOmapi: List = emptyList(),
+ val slotsIsdr: List = emptyList()
)
}
private val conclusion: TextView by lazy {
- requireView().requireViewById(R.id.quick_availability_conclusion)
+ requireView().requireViewById(R.id.quick_compatibility_conclusion)
}
private val resultSlots: TextView by lazy {
- requireView().requireViewById(R.id.quick_availability_result_slots)
+ requireView().requireViewById(R.id.quick_compatibility_result_slots)
+ }
+
+ private val resultSlotsIsdr: TextView by lazy {
+ requireView().requireViewById(R.id.quick_compatibility_result_slots_isdr)
}
private val resultNotes: TextView by lazy {
- requireView().requireViewById(R.id.quick_availability_result_notes)
+ requireView().requireViewById(R.id.quick_compatibility_result_notes)
+ }
+
+ private val skipCheckBox: CheckBox by lazy {
+ requireView().requireViewById(R.id.quick_compatibility_skip)
}
override fun onCreateView(
@@ -53,10 +63,19 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
container: ViewGroup?,
savedInstanceState: Bundle?
): View = inflater.inflate(R.layout.fragment_quick_compatibility, container, false).apply {
- requireViewById(R.id.quick_availability_device_information)
+ requireViewById(R.id.quick_compatibility_device_information)
.text = formatDeviceInformation()
- requireViewById