app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt

@@ -1,13 +1,9 @@
 package im.angry.openeuicc.di
 
-import androidx.fragment.app.Fragment
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
-import im.angry.openeuicc.ui.NoEuiccPlaceholderFragment
 
 open class DefaultUiComponentFactory : UiComponentFactory {
     override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
         EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
-
-    override fun createNoEuiccPlaceholderFragment(): Fragment = NoEuiccPlaceholderFragment()
 }

app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt

@@ -1,10 +1,8 @@
 package im.angry.openeuicc.di
 
-import androidx.fragment.app.Fragment
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.ui.EuiccManagementFragment
 
 interface UiComponentFactory {
     fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment
-    fun createNoEuiccPlaceholderFragment(): Fragment
 }

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

@@ -25,11 +25,12 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
     }
 
     private lateinit var spinnerAdapter: ArrayAdapter<String>
-    private lateinit var spinnerItem: MenuItem
     private lateinit var spinner: Spinner
 
     private val fragments = arrayListOf<EuiccManagementFragment>()
 
+    private lateinit var noEuiccPlaceholder: View
+
     protected lateinit var tm: TelephonyManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -37,10 +38,7 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
         setContentView(R.layout.activity_main)
         setSupportActionBar(requireViewById(R.id.toolbar))
 
-        supportFragmentManager.beginTransaction().replace(
+        noEuiccPlaceholder = requireViewById(R.id.no_euicc_placeholder)
-            R.id.fragment_root,
-            appContainer.uiComponentFactory.createNoEuiccPlaceholderFragment()
-        ).commit()
 
         tm = telephonyManager
 
@@ -55,11 +53,7 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
         menuInflater.inflate(R.menu.activity_main, menu)
 
         if (!this::spinner.isInitialized) {
-            spinnerItem = menu.findItem(R.id.spinner)
+            spinner = menu.findItem(R.id.spinner).actionView as Spinner
-            spinner = spinnerItem.actionView as Spinner
-            if (spinnerAdapter.isEmpty) {
-                spinnerItem.isVisible = false
-            }
             spinner.adapter = spinnerAdapter
             spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -114,9 +108,7 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
             }
 
             if (fragments.isNotEmpty()) {
-                if (this@MainActivity::spinner.isInitialized) {
+                noEuiccPlaceholder.visibility = View.GONE
-                    spinnerItem.isVisible = true
-                }
                 supportFragmentManager.beginTransaction().replace(R.id.fragment_root, fragments.first()).commit()
             }
         }

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

@@ -1,18 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import im.angry.openeuicc.common.R
-
-class NoEuiccPlaceholderFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_no_euicc_placeholder, container, false)
-    }
-}

app-common/src/main/res/layout/activity_main.xml

@@ -21,6 +21,15 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        <TextView
+            android:id="@+id/no_euicc_placeholder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="40dp"
+            android:layout_marginEnd="40dp"
+            android:gravity="center"
+            android:text="@string/no_euicc" />
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/layout/fragment_no_euicc_placeholder.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TextView
-        android:id="@+id/no_euicc_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="40dp"
-        android:gravity="center"
-        android:text="@string/no_euicc" />
-</FrameLayout>

app-common/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="no_euicc">No removable eUICC card accessible by this app is detected on this device.</string>
+    <string name="no_euicc">No eUICC card on this device is accessible by this app.\nInsert a supported eUICC card, or try out the privileged OpenEUICC app instead.</string>
     <string name="unknown">Unknown</string>
     <string name="help">Help</string>
 

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

@@ -1,17 +1,12 @@
 package im.angry.openeuicc
 
 import android.content.Intent
-import im.angry.openeuicc.di.UnprivilegedAppContainer
 import im.angry.openeuicc.ui.LogsActivity
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.runBlocking
 import kotlin.system.exitProcess
 
 class UnprivilegedOpenEuiccApplication : OpenEuiccApplication() {
-    override val appContainer by lazy {
-        UnprivilegedAppContainer(this)
-    }
-
     override fun onCreate() {
         super.onCreate()
 

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt

@@ -1,9 +0,0 @@
-package im.angry.openeuicc.di
-
-import android.content.Context
-
-class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
-    override val uiComponentFactory by lazy {
-        UnprivilegedUiComponentFactory()
-    }
-}

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt

@@ -1,9 +0,0 @@
-package im.angry.openeuicc.di
-
-import androidx.fragment.app.Fragment
-import im.angry.openeuicc.ui.UnprivilegedNoEuiccPlaceholderFragment
-
-class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
-    override fun createNoEuiccPlaceholderFragment(): Fragment =
-        UnprivilegedNoEuiccPlaceholderFragment()
-}

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

@@ -1,29 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import im.angry.easyeuicc.R
-
-class UnprivilegedNoEuiccPlaceholderFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(
-            R.layout.fragment_no_euicc_placeholder_unprivileged,
-            container,
-            false
-        )
-
-        view.findViewById<View>(R.id.compatibility_check).setOnClickListener {
-            startActivity(Intent(requireContext(), CompatibilityCheckActivity::class.java))
-        }
-
-        return view
-    }
-}

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
-        android:id="@+id/no_euicc_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="40dp"
-        android:gravity="center"
-        android:text="@string/no_euicc"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/compatibility_check"
-        android:text="@string/compatibility_check"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/no_euicc_placeholder"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>