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

@@ -19,9 +19,6 @@ import android.widget.PopupMenu
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -79,21 +76,6 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         fab = view.requireViewById(R.id.fab)
         profileList = view.requireViewById(R.id.profile_list)
 
-        val origFabMarginRight = (fab.layoutParams as ViewGroup.MarginLayoutParams).rightMargin
-        val origFabMarginBottom = (fab.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin
-        ViewCompat.setOnApplyWindowInsetsListener(fab) { v, insets ->
-            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-
-            v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                rightMargin = origFabMarginRight + bars.right
-                bottomMargin = origFabMarginBottom + bars.bottom
-            }
-
-            WindowInsetsCompat.CONSUMED
-        }
-
-        setupRootViewInsets(profileList)
-
         return view
     }
 

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

@@ -49,8 +49,6 @@ class LogsActivity : AppCompatActivity() {
         scrollView = requireViewById(R.id.scroll_view)
         logText = requireViewById(R.id.log_text)
 
-        setupRootViewInsets(scrollView)
-
         swipeRefresh.setOnRefreshListener {
             lifecycleScope.launch {
                 reload()

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

@@ -42,17 +42,15 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         setSupportActionBar(requireViewById(R.id.toolbar))
         setupToolbarInsets()
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-
-        swipeRefresh = requireViewById(R.id.swipe_refresh)
-        notificationList = requireViewById(R.id.recycler_view)
-
-        setupRootViewInsets(notificationList)
     }
 
     override fun onInit() {
         euiccChannel = euiccChannelManager
             .findEuiccChannelBySlotBlocking(intent.getIntExtra("logicalSlotId", 0))!!
 
+        swipeRefresh = requireViewById(R.id.swipe_refresh)
+        notificationList = requireViewById(R.id.recycler_view)
+
         notificationList.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         notificationList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))

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

@@ -3,9 +3,6 @@ package im.angry.openeuicc.ui
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.datastore.preferences.core.Preferences
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.CheckBoxPreference
@@ -49,14 +46,6 @@ class SettingsFragment: PreferenceFragmentCompat() {
             ?.bindBooleanFlow(preferenceRepository.disableSafeguardFlow, PreferenceKeys.DISABLE_SAFEGUARD_REMOVABLE_ESIM)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return super.onCreateView(inflater, container, savedInstanceState).also(::setupRootViewInsets)
-    }
-
     private fun CheckBoxPreference.bindBooleanFlow(flow: Flow<Boolean>, key: Preferences.Key<Boolean>) {
         lifecycleScope.launch {
             flow.collect { isChecked = it }

app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt

@@ -52,20 +52,7 @@ fun AppCompatActivity.setupToolbarInsets() {
             height = v.top
         }
 
-        WindowInsetsCompat.CONSUMED
-    }
-}
-
-fun setupRootViewInsets(view: View) {
-    ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-        val bars = insets.getInsets(
-            WindowInsetsCompat.Type.systemBars()
-                    or WindowInsetsCompat.Type.displayCutout()
-        )
-
-        // Don't set padding bottom because we do want scrolling root views to extend into nav bar
-        v.updatePadding(bars.left, v.paddingTop, bars.right, v.paddingBottom)
-
+        android.util.Log.d("aaa",  "${(v as Toolbar).minimumHeight}")
         WindowInsetsCompat.CONSUMED
     }
 }

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

@@ -26,7 +26,7 @@ class CompatibilityCheckActivity: AppCompatActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_compatibility_check)
-        setSupportActionBar(requireViewById(im.angry.openeuicc.common.R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
         setupToolbarInsets()
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
@@ -35,8 +35,6 @@ class CompatibilityCheckActivity: AppCompatActivity() {
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         compatibilityCheckList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
         compatibilityCheckList.adapter = adapter
-
-        setupRootViewInsets(compatibilityCheckList)
     }
 
     override fun onStart() {