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 index 32550d6..86af007 100644 --- a/app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt +++ b/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() } \ 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 index 4e09a70..d311876 100644 --- a/app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt +++ b/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 } \ 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 2d80e33..c7699e0 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 @@ -25,11 +25,12 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker { } private lateinit var spinnerAdapter: ArrayAdapter - private lateinit var spinnerItem: MenuItem private lateinit var spinner: Spinner private val fragments = arrayListOf() + 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( - R.id.fragment_root, - appContainer.uiComponentFactory.createNoEuiccPlaceholderFragment() - ).commit() + noEuiccPlaceholder = requireViewById(R.id.no_euicc_placeholder) 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 = spinnerItem.actionView as Spinner - if (spinnerAdapter.isEmpty) { - spinnerItem.isVisible = false - } + spinner = menu.findItem(R.id.spinner).actionView as Spinner 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) { - spinnerItem.isVisible = true - } + noEuiccPlaceholder.visibility = View.GONE supportFragmentManager.beginTransaction().replace(R.id.fragment_root, fragments.first()).commit() } } diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/NoEuiccPlaceholderFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/NoEuiccPlaceholderFragment.kt deleted file mode 100644 index e9e44b1..0000000 --- a/app-common/src/main/java/im/angry/openeuicc/ui/NoEuiccPlaceholderFragment.kt +++ /dev/null @@ -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) - } -} \ No newline at end of file diff --git a/app-common/src/main/res/layout/activity_main.xml b/app-common/src/main/res/layout/activity_main.xml index 4f1020d..74b7799 100644 --- a/app-common/src/main/res/layout/activity_main.xml +++ b/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"> + + \ No newline at end of file diff --git a/app-common/src/main/res/layout/fragment_no_euicc_placeholder.xml b/app-common/src/main/res/layout/fragment_no_euicc_placeholder.xml deleted file mode 100644 index b040fda..0000000 --- a/app-common/src/main/res/layout/fragment_no_euicc_placeholder.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml index 5218785..040c910 100644 --- a/app-common/src/main/res/values/strings.xml +++ b/app-common/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - No removable eUICC card accessible by this app is detected on this device. + No eUICC card on this device is accessible by this app.\nInsert a supported eUICC card, or try out the privileged OpenEUICC app instead. Unknown Help diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt b/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt index 5541501..23e7be9 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt +++ b/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() diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt deleted file mode 100644 index 22d5a62..0000000 --- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt +++ /dev/null @@ -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() - } -} \ 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 deleted file mode 100644 index f117038..0000000 --- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt +++ /dev/null @@ -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() -} \ No newline at end of file diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt deleted file mode 100644 index 92cda23..0000000 --- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt +++ /dev/null @@ -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(R.id.compatibility_check).setOnClickListener { - startActivity(Intent(requireContext(), CompatibilityCheckActivity::class.java)) - } - - return view - } -} \ No newline at end of file diff --git a/app-unpriv/src/main/res/layout/fragment_no_euicc_placeholder_unprivileged.xml b/app-unpriv/src/main/res/layout/fragment_no_euicc_placeholder_unprivileged.xml deleted file mode 100644 index 7f9e65c..0000000 --- a/app-unpriv/src/main/res/layout/fragment_no_euicc_placeholder_unprivileged.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file