wip

meikpiep · Jan 11, 2025 · a46d8f3 · a46d8f3
1 parent 32c9f31
commit a46d8f3
Show file tree

Hide file tree

Showing 16 changed files with 76 additions and 25 deletions.
diff --git a/gauguin-app/build.gradle.kts b/gauguin-app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
     defaultConfig {
         applicationId = "org.piepmeyer.gauguin"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
     }
 
     if (keystoreExists) {
@@ -147,6 +147,7 @@ dependencies {
     implementation(libs.android.material)
 
     implementation(libs.androidx.ktx)
+    implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.drawerlayout)
     implementation(libs.androidx.fragment)

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/AboutActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/AboutActivity.kt
@@ -2,6 +2,7 @@ package org.piepmeyer.gauguin.ui
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import org.koin.android.ext.android.inject
 import org.piepmeyer.gauguin.R
@@ -16,6 +17,7 @@ class AboutActivity : AppCompatActivity() {
         setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
         binding = ActivityAboutBinding.inflate(layoutInflater)
+        enableEdgeToEdge()
         setContentView(binding.root)
 
         activityUtils.configureFullscreen(this)
@@ -26,7 +28,9 @@ class AboutActivity : AppCompatActivity() {
 
         binding.aboutShareApplicationLog.setOnClickListener {
             val reversedLines =
-                Runtime.getRuntime().exec("logcat -d")
+                Runtime
+                    .getRuntime()
+                    .exec("logcat -d")
                     .inputStream
                     .bufferedReader()
                     .readLines()

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/LoadGameListActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/LoadGameListActivity.kt
@@ -4,6 +4,7 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -26,6 +27,7 @@ class LoadGameListActivity : AppCompatActivity() {
         setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
 
+        enableEdgeToEdge()
         setContentView(R.layout.activity_savegame)
 
         val recyclerView = findViewById<RecyclerView>(android.R.id.list)

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/SettingsActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/SettingsActivity.kt
@@ -1,6 +1,7 @@
 package org.piepmeyer.gauguin.ui
 
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.commit
 import androidx.preference.ListPreference
@@ -17,7 +18,9 @@ class SettingsActivity : AppCompatActivity() {
         setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
 
+        enableEdgeToEdge()
         setContentView(R.layout.activity_settings)
+
         if (savedInstanceState == null) {
             val settings = SettingsFragment()
 

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainActivity.kt
@@ -7,8 +7,11 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -40,8 +43,11 @@ class MainActivity : AppCompatActivity() {
     private lateinit var bottomAppBarService: MainBottomAppBarService
 
     public override fun onCreate(savedInstanceState: Bundle?) {
+        // configureActivity()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
+
         setContentView(binding.root)
 
         PreferenceManager.setDefaultValues(this, R.xml.root_preferences, false)
@@ -70,8 +76,6 @@ class MainActivity : AppCompatActivity() {
         val navigationViewService = MainNavigationViewService(this, binding)
         navigationViewService.initialize()
 
-        configureActivity()
-
         FerrisWheelConfigurer(binding.ferrisWheelView).configure()
 
         val specialListener =
@@ -88,6 +92,40 @@ class MainActivity : AppCompatActivity() {
 
         navigationViewService.updateMainBottomBarMargins()
 
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.gameTopFrame,
+        ) { v, insets ->
+            val innerPadding =
+                insets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout(),
+                )
+            v.setPadding(
+                innerPadding.left,
+                innerPadding.top,
+                innerPadding.right,
+                0,
+            )
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.mainBottomAppBar,
+        ) { v, insets ->
+            val innerPadding =
+                insets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout(),
+                )
+            v.setPadding(
+                innerPadding.left,
+                0,
+                innerPadding.right,
+                innerPadding.bottom,
+            )
+            insets
+        }
+
         val viewModel: MainViewModel by viewModels()
 
         lifecycleScope.launch {
@@ -179,7 +217,7 @@ class MainActivity : AppCompatActivity() {
     public override fun onResume() {
         gameLifecycle.setCoroutineScope(this.lifecycleScope)
 
-        configureActivity()
+        // configureActivity()
 
         binding.konfettiView.reset()
 
@@ -210,7 +248,7 @@ class MainActivity : AppCompatActivity() {
         activityUtils.configureKeepScreenOn(this)
         activityUtils.configureFullscreen(this)
 
-        binding.gridview.updateTheme()
+        // binding.gridview.updateTheme()
     }
 
     fun showNewGameDialog() {

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainNavigationViewService.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainNavigationViewService.kt
@@ -3,11 +3,8 @@ package org.piepmeyer.gauguin.ui.main
 import android.content.Intent
 import android.net.Uri
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.view.ContextThemeWrapper
-import androidx.core.view.marginStart
-import androidx.core.view.updateLayoutParams
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.commit
 import com.mikepenz.materialdrawer.holder.StringHolder
@@ -177,7 +174,7 @@ class MainNavigationViewService(
     }
 
     private fun updateMainBottomBarMargins(right: Int) {
-        mainActivity.runOnUiThread {
+        /*mainActivity.runOnUiThread {
             if (binding.mainBottomAppBar.marginStart != 0 && right > 0 && binding.mainBottomAppBar.marginStart != right) {
                 val marginParams =
                     binding.mainBottomAppBar.layoutParams as ViewGroup.MarginLayoutParams
@@ -186,7 +183,7 @@ class MainNavigationViewService(
                 binding.mainBottomAppBar.updateLayoutParams<ViewGroup.MarginLayoutParams> { }
                 binding.mainBottomAppBar.invalidate()
             }
-        }
+        }*/
     }
 
     private fun createDrawerClickListener(): (v: View?, item: IDrawerItem<*>, position: Int) -> Boolean =

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivity.kt
@@ -1,6 +1,7 @@
 package org.piepmeyer.gauguin.ui.newgame
 
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +21,7 @@ class NewGameActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         val binding = ActivityNewgameBinding.inflate(layoutInflater)
+        enableEdgeToEdge()
         setContentView(binding.root)
 
         activityUtils.configureTheme(this)

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt
@@ -3,6 +3,7 @@ package org.piepmeyer.gauguin.ui.statistics
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat.getString
 import androidx.fragment.app.commit
@@ -38,6 +39,7 @@ class StatisticsActivity : AppCompatActivity() {
         setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
         binding = ActivityStatisticsBinding.inflate(layoutInflater)
+        enableEdgeToEdge()
         setContentView(binding.root)
 
         binding.clearstats.setOnClickListener { _: View? ->

diff --git a/gauguin-app/src/main/res/layout-land/activity_main.xml b/gauguin-app/src/main/res/layout-land/activity_main.xml
@@ -8,7 +8,7 @@
     android:layout_height="fill_parent"
     android:orientation="horizontal"
     tools:context=".ui.main.MainActivity"
-    android:fitsSystemWindows="true">
+    >
 
     <nl.dionsegijn.konfetti.xml.KonfettiView
         android:id="@+id/konfettiView"
@@ -19,7 +19,7 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout-sw600dp-land/activity_main.xml b/gauguin-app/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -8,7 +8,7 @@
     android:layout_height="fill_parent"
     android:orientation="horizontal"
     tools:context=".ui.main.MainActivity"
-    android:fitsSystemWindows="true">
+    >
 
     <nl.dionsegijn.konfetti.xml.KonfettiView
         android:id="@+id/konfettiView"
@@ -19,7 +19,7 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout-sw600dp/activity_main.xml b/gauguin-app/src/main/res/layout-sw600dp/activity_main.xml
@@ -8,13 +8,12 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
     tools:context=".ui.main.MainActivity"
-    android:fitsSystemWindows="false"
     >
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="false">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout-sw840dp-land/activity_main.xml b/gauguin-app/src/main/res/layout-sw840dp-land/activity_main.xml
@@ -8,7 +8,7 @@
     android:layout_height="fill_parent"
     android:orientation="horizontal"
     tools:context=".ui.main.MainActivity"
-    android:fitsSystemWindows="true">
+    >
 
     <nl.dionsegijn.konfetti.xml.KonfettiView
         android:id="@+id/konfettiView"
@@ -19,7 +19,7 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout-sw840dp/activity_main.xml b/gauguin-app/src/main/res/layout-sw840dp/activity_main.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal"
     tools:context=".ui.main.MainActivity"
     app:layout_collapseMode="none"
-    android:fitsSystemWindows="true">
+    >
 
     <nl.dionsegijn.konfetti.xml.KonfettiView
         android:id="@+id/konfettiView"
@@ -20,7 +20,7 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout/activity_main.xml b/gauguin-app/src/main/res/layout/activity_main.xml
@@ -8,13 +8,12 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
     tools:context=".ui.main.MainActivity"
-    android:fitsSystemWindows="false"
     >
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="false">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainConstraintLayout"

diff --git a/gauguin-app/src/main/res/layout/activity_savegame.xml b/gauguin-app/src/main/res/layout/activity_savegame.xml
@@ -30,9 +30,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.recyclerview.widget.RecyclerView android:id="@android:id/list"
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@android:id/list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+        />
 
         <TextView android:id="@android:id/empty"
             android:layout_width="fill_parent"

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -25,6 +25,7 @@ android-material = { group = "com.google.android.material", name = "material", v
 
 androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.9.1" }
 androidx-ktx = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
+androidx-activity = { group = "androidx.activity", name = "activity-ktx", version = "1.9.3" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.2.0" }
 androidx-drawerlayout = { group = "androidx.drawerlayout", name = "drawerlayout", version = "1.2.0" }
 androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version = "1.8.5" }