Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b52daab authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Opt-out from edge-to-edge

parent 7ab57a0f

opentasks-theme/src/main/res/values-night-v27/theme_daynight.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="OpenTasks_BaseTheme.DayNight.NoActionBar">

        <item name="windowActionBar">false</item>
@@ -11,6 +11,7 @@ 
        <item name="android:statusBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarDividerColor">@color/e_action_bar</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

    </style>



</resources>

opentasks-theme/src/main/res/values-v27/theme_dark.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="OpenTasks_BaseTheme.Dark.NoActionBar">

        <item name="windowActionBar">false</item>
@@ -11,6 +11,7 @@ 
        <item name="android:statusBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarDividerColor">@color/e_action_bar</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

    </style>



</resources>

opentasks-theme/src/main/res/values-v27/theme_daynight.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="OpenTasks_BaseTheme.DayNight.NoActionBar">

        <item name="windowActionBar">false</item>
@@ -11,6 +11,7 @@ 
        <item name="android:statusBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarDividerColor">@color/e_action_bar</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

    </style>



</resources>

opentasks-theme/src/main/res/values-v27/theme_light.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="OpenTasks_BaseTheme.Light.NoActionBar">

        <item name="windowActionBar">false</item>
@@ -11,6 +11,7 @@ 
        <item name="android:statusBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarColor">@color/e_action_bar</item>

        <item name="android:navigationBarDividerColor">@color/e_action_bar</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

    </style>



</resources>

opentasks/src/main/java/org/dmfs/tasks/utils/BaseActivity.java

+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package org.dmfs.tasks.utils;



import android.Manifest;

import android.app.Activity;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.os.Build;
@@ -24,6 +25,10 @@ import android.os.Bundle; 
import androidx.appcompat.app.AppCompatActivity;

import androidx.core.app.ActivityCompat;

import androidx.core.content.ContextCompat;

import androidx.core.graphics.Insets;

import androidx.core.view.ViewCompat;

import androidx.core.view.WindowInsetsCompat;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -54,6 +59,10 @@ public abstract class BaseActivity extends AppCompatActivity { 


        RetentionMagic.init(this, getIntent().getExtras());



        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {

            setupEdgeToEdge(this);

        }



        if (savedInstanceState == null) {

            RetentionMagic.init(this, mPrefs);

        } else {
@@ -112,4 +121,13 @@ public abstract class BaseActivity extends AppCompatActivity { 
            ActivityCompat.requestPermissions(this, permissions.toArray(new String[0]), REQUEST_PERMISSIONS);

        }

    }



    public static void setupEdgeToEdge(Activity activity) {

        ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content), (v, windowInsets) -> {

            Insets insets = windowInsets

                    .getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());

            v.setPadding(insets.left, insets.top, insets.right, insets.bottom);

            return WindowInsetsCompat.CONSUMED;

        });

    }

}