adjustUIForAPILevel35

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java

@@ -8,19 +8,29 @@
 
 import static it.niedermann.owncloud.notes.branding.BrandingUtil.readBrandMainColorLiveData;
 
+import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.Menu;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.android.material.R;
 
+import it.niedermann.owncloud.notes.shared.util.extensions.AppCompatActivityExtensionsKt;
+
 public abstract class BrandedActivity extends AppCompatActivity implements Branded {
 
     @ColorInt
     protected int colorAccent;
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java

@@ -23,13 +23,15 @@
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ActivityExceptionBinding;
 import it.niedermann.owncloud.notes.exception.tips.TipsAdapter;
+import it.niedermann.owncloud.notes.shared.util.extensions.AppCompatActivityExtensionsKt;
 
 public class ExceptionActivity extends AppCompatActivity {
 
     private static final String KEY_THROWABLE = "throwable";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
         super.onCreate(savedInstanceState);
 
         final var binding = ActivityExceptionBinding.inflate(getLayoutInflater());

app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java

@@ -40,6 +40,7 @@
 import it.niedermann.owncloud.notes.persistence.SyncWorker;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.shared.model.IResponseCallback;
+import it.niedermann.owncloud.notes.shared.util.extensions.AppCompatActivityExtensionsKt;
 
 public class ImportAccountActivity extends AppCompatActivity {
 
@@ -53,6 +54,7 @@ public class ImportAccountActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
         super.onCreate(savedInstanceState);
 
         Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));

app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/AppCompatActivityExtensions.kt

@@ -0,0 +1,19 @@
+package it.niedermann.owncloud.notes.shared.util.extensions
+
+import android.graphics.Color
+import android.os.Build
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+
+fun AppCompatActivity.adjustUIForAPILevel35() {
+    val isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= 35)
+    if (!isApiLevel35OrHigher) {
+        return
+    }
+
+    val style = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+    enableEdgeToEdge(style, style)
+
+    window.addSystemBarPaddings()
+}

app/src/main/java/it/niedermann/owncloud/notes/shared/util/extensions/WindowExtensions.kt

@@ -0,0 +1,33 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package it.niedermann.owncloud.notes.shared.util.extensions
+
+import android.view.View
+import android.view.Window
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+
+fun Window?.addSystemBarPaddings() {
+    if (this == null) {
+        return
+    }
+
+    ViewCompat.setOnApplyWindowInsetsListener(decorView) { v: View, insets: WindowInsetsCompat ->
+        val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+        v.updatePadding(
+            left = bars.left,
+            top = bars.top,
+            right = bars.right,
+            bottom = bars.bottom
+        )
+
+        WindowInsetsCompat.CONSUMED
+    }
+}

app/src/main/res/layout/drawer_layout.xml

@@ -23,8 +23,7 @@
         android:id="@+id/navigation_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true">
+        android:layout_gravity="start">
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"