From 6140b2a422e31a85195918fe9a570bfa2f5efbe3 Mon Sep 17 00:00:00 2001 From: sim Date: Sat, 9 Nov 2024 16:51:46 +0000 Subject: [PATCH] Fix edge to edge view, force by SDK 35 --- .../distributor/nextpush/activities/MainActivity.kt | 6 ++++++ app/src/main/res/layout/activity_main.xml | 3 +-- app/src/main/res/values-night/themes.xml | 2 ++ app/src/main/res/values/themes.xml | 8 ++++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt index d62b401..c3931d0 100644 --- a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt +++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt @@ -18,6 +18,7 @@ import android.util.TypedValue import android.view.ActionMode import android.view.Menu import android.view.MenuItem +import android.view.View import android.widget.* // ktlint-disable no-wildcard-imports import android.widget.AbsListView.MultiChoiceModeListener import androidx.appcompat.app.AlertDialog @@ -70,6 +71,11 @@ class MainActivity : AppCompatActivity() { invalidateOptionsMenu() RestartWorker.startPeriodic(this) setDebugInformationListener() + findViewById(android.R.id.content)?.setOnApplyWindowInsetsListener { _, insets -> + val statusBarSize = insets.systemWindowInsetTop + findViewById(R.id.toolbar).setPadding(0, statusBarSize , 0, 0) + return@setOnApplyWindowInsetsListener insets + } } override fun onStart() { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8fc1b45..222a7b3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -14,8 +14,7 @@ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index c70f4c8..9166c6b 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -13,5 +13,7 @@ ?attr/colorPrimaryVariant + true + @style/Theme.NextPush.AppBarOverlay \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 04f4d6d..1a4405b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - -