More quick availability -> quick compatibility

app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt

@@ -38,19 +38,19 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     }
 
     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 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_availability_skip)
+        requireView().requireViewById(R.id.quick_compatibility_skip)
     }
 
     override fun onCreateView(
@@ -58,15 +58,15 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View = inflater.inflate(R.layout.fragment_quick_compatibility, container, false).apply {
-        requireViewById<TextView>(R.id.quick_availability_device_information)
+        requireViewById<TextView>(R.id.quick_compatibility_device_information)
             .text = formatDeviceInformation()
-        requireViewById<Button>(R.id.quick_availability_button_continue)
+        requireViewById<Button>(R.id.quick_compatibility_button_continue)
             .setOnClickListener { onContinueToApp() }
         // Can't use the lazy field yet
-        requireViewById<CheckBox>(R.id.quick_availability_skip).setOnCheckedChangeListener { compoundButton, b ->
+        requireViewById<CheckBox>(R.id.quick_compatibility_skip).setOnCheckedChangeListener { compoundButton, b ->
             if (compoundButton.isVisible) {
                 runBlocking {
-                    preferenceRepository.skipQuickAvailabilityFlow
+                    preferenceRepository.skipQuickCompatibilityFlow
                         .updatePreference(b)
                 }
             }
@@ -91,7 +91,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (result.compatibility == Compatibility.COMPATIBLE) {
             // Don't show the message again, ever, if the result is compatible
             runBlocking {
-                preferenceRepository.skipQuickAvailabilityFlow
+                preferenceRepository.skipQuickCompatibilityFlow
                     .updatePreference(true)
             }
             resultSlots.isVisible = true

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.runBlocking
 class UnprivilegedMainActivity : MainActivity(), UnprivilegedEuiccContextMarker {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (runBlocking { !preferenceRepository.skipQuickAvailabilityFlow.first() }) {
+        if (runBlocking { !preferenceRepository.skipQuickCompatibilityFlow.first() }) {
             startActivity(Intent(this, QuickCompatibilityActivity::class.java))
         }
     }

app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt

@@ -5,10 +5,10 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 
 internal object UnprivilegedPreferenceKeys {
     // ---- Miscellaneous ----
-    val SKIP_QUICK_AVAILABILITY = booleanPreferencesKey("skip_quick_availability")
+    val SKIP_QUICK_COMPATIBILITY = booleanPreferencesKey("skip_quick_compatibility")
 }
 
 class UnprivilegedPreferenceRepository(context: Context) : PreferenceRepository(context) {
     // ---- Miscellaneous ----
-    val skipQuickAvailabilityFlow = bindFlow(UnprivilegedPreferenceKeys.SKIP_QUICK_AVAILABILITY, false)
+    val skipQuickCompatibilityFlow = bindFlow(UnprivilegedPreferenceKeys.SKIP_QUICK_COMPATIBILITY, false)
 }

app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml

@@ -8,7 +8,7 @@
     android:textAlignment="center">
 
     <TextView
-        android:id="@+id/quick_availability_conclusion"
+        android:id="@+id/quick_compatibility_conclusion"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -17,7 +17,7 @@
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/quick_availability_device_information"
+        android:id="@+id/quick_compatibility_device_information"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
@@ -25,28 +25,28 @@
         android:textAlignment="center" />
 
     <TextView
-        android:id="@+id/quick_availability_result_slots"
+        android:id="@+id/quick_compatibility_result_slots"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:visibility="gone" />
 
     <TextView
-        android:id="@+id/quick_availability_result_notes"
+        android:id="@+id/quick_compatibility_result_notes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/quick_compatibility_result_notes"
         android:visibility="gone" />
 
     <CheckBox
-        android:id="@+id/quick_availability_skip"
+        android:id="@+id/quick_compatibility_skip"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/quick_compatibility_skip" />
 
     <Button
-        android:id="@+id/quick_availability_button_continue"
+        android:id="@+id/quick_compatibility_button_continue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"