app stays the same, but edgetoedge handling is not compatible with An…

…droid 15
seemoo-lab · Dec 20, 2024 · 7d114f3 · 7d114f3
1 parent 49153ff
commit 7d114f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -109,6 +109,7 @@
 
         <activity
             android:name=".ui.MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:allowTaskReparenting="true"
             android:exported="true">
             <intent-filter>

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/MainActivity.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/MainActivity.kt
@@ -2,6 +2,7 @@ package de.seemoo.at_tracking_detection.ui
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
@@ -34,6 +35,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
     lateinit var backgroundWorkScheduler: BackgroundWorkScheduler
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         sharedPreferences.registerOnSharedPreferenceChangeListener(this)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    >
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/main_nav_view"

diff --git a/app/src/main/res/layout/fragment_dashboard_risk.xml b/app/src/main/res/layout/fragment_dashboard_risk.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:bind="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".ui.dashboard.DashboardRiskFragment">
 
     <data>
-
         <variable
             name="vm"
             type="de.seemoo.at_tracking_detection.ui.dashboard.RiskCardViewModel" />