From 95e2f8273673d1478e24a3916aa48b8438bdeafe Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sat, 14 Sep 2024 14:08:13 +0200
Subject: [PATCH] code cleanup

---
 .../jrpie/android/launcher/ui/HomeActivity.kt |  6 ++---
 .../actions/SettingsFragmentActions.kt        | 26 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
index f2fe06e..ba5f260 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
@@ -186,11 +186,11 @@ class HomeActivity : UIObject, AppCompatActivity(),
         if (e1 == null) return false
 
 
-        val displayMetrics: DisplayMetrics? = DisplayMetrics()
+        val displayMetrics: DisplayMetrics = DisplayMetrics()
         windowManager.defaultDisplay.getMetrics(displayMetrics)
 
-        val width = displayMetrics!!.widthPixels
-        val height = displayMetrics!!.heightPixels
+        val width = displayMetrics.widthPixels
+        val height = displayMetrics.heightPixels
 
         val diffX = e1.x - e2.x
         val diffY = e1.y - e2.y
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActions.kt
index 3f17795..2b74042 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActions.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActions.kt
@@ -33,26 +33,24 @@ SettingsFragmentActions : Fragment(), UIObject {
     ): View {
         binding = SettingsActionsBinding.inflate(inflater, container, false)
 
+        binding?.root?.viewTreeObserver?.addOnGlobalLayoutListener {
+            val buttonHeight =
+                binding?.settingsActionsButtons?.height ?: return@addOnGlobalLayoutListener
+            val height = binding?.root?.height ?: return@addOnGlobalLayoutListener
+
+            if (buttonHeight > 0.2 * height) {
+                binding?.settingsActionsButtons?.visibility = View.GONE
+            } else {
+                binding?.settingsActionsButtons?.visibility = View.VISIBLE
+            }
+        }
+
         return binding!!.root
     }
 
     override fun onStart() {
         super<Fragment>.onStart()
         super<UIObject>.onStart()
-
-        binding?.root?.viewTreeObserver?.addOnGlobalLayoutListener {
-            binding?.settingsActionsButtons?.height?.let { buttonHeight ->
-                binding?.root?.height?.let { height ->
-                    if (buttonHeight > 0.2 * height) {
-                        binding?.settingsActionsButtons?.visibility = View.GONE
-                    } else {
-                        binding?.settingsActionsButtons?.visibility = View.VISIBLE
-                    }
-                }
-            }
-
-
-        }
     }
 
     override fun setOnClicks() {