From a354d2a348099be7e3cacc0441dd5c19944cd7a6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 18:59:22 +0300 Subject: add m3 edge-to-edge --- org.fox.ttrss/src/main/res/layout/activity_master.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_master.xml') diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 9bb9bff5..9bb837cb 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -4,5 +4,5 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 4c03c594838e3f75b4f6ae72b2839e0219f37347 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 19:11:04 +0300 Subject: disable drawer edge-to-edge because of issues with cutout displays --- org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml | 1 + org.fox.ttrss/src/main/res/layout/activity_master.xml | 1 + org.fox.ttrss/src/main/res/layout/activity_master_phone.xml | 1 + org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_master.xml') diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml index 9bb837cb..583161a6 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -2,6 +2,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 9bb837cb..583161a6 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -2,6 +2,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index 9bb837cb..29c37c86 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,6 +1,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml index 4ce1249a..e19d4c90 100644 --- a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml +++ b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml @@ -5,7 +5,6 @@ android:layout_height="fill_parent"> -- cgit v1.2.3-54-g00ecf From d0dd04ec83050fbab10c5a29d461d9605a1e0e01 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 22:03:04 +0300 Subject: extract detail layout into separate include --- .../res/layout-sw600dp-port/activity_master.xml | 2 +- .../src/main/res/layout/activity_detail.xml | 9 ++-- .../src/main/res/layout/activity_detail_phone.xml | 48 +++----------------- .../src/main/res/layout/activity_master.xml | 2 +- .../src/main/res/layout/activity_master_phone.xml | 2 +- .../src/main/res/layout/layout_detail_phone.xml | 44 ++++++++++++++++++ .../src/main/res/layout/layout_master_phone.xml | 53 ++++++++++++++++++++++ .../src/main/res/layout/master_drawer_layout.xml | 53 ---------------------- 8 files changed, 111 insertions(+), 102 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml create mode 100644 org.fox.ttrss/src/main/res/layout/layout_master_phone.xml delete mode 100644 org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml (limited to 'org.fox.ttrss/src/main/res/layout/activity_master.xml') diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml index 583161a6..1f422b6a 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -5,5 +5,5 @@ android:fitsSystemWindows="true" android:layout_height="match_parent"> - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml index 8f36bbd6..8cb1ba10 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml @@ -1,9 +1,10 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index 56500d38..8cb1ba10 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -1,46 +1,10 @@ - + + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 583161a6..1f422b6a 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -5,5 +5,5 @@ android:fitsSystemWindows="true" android:layout_height="match_parent"> - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index 29c37c86..f6e5db8f 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -5,5 +5,5 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml new file mode 100644 index 00000000..9421f008 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml new file mode 100644 index 00000000..e19d4c90 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml deleted file mode 100644 index e19d4c90..00000000 --- a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-54-g00ecf From 50fda990597685a641cf12387d882c90ee05c2a3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 8 May 2025 12:16:17 +0300 Subject: enable main window edge-to-edge attempt after reading documentation a bit --- .../main/java/org/fox/ttrss/MasterActivity.java | 33 ++++++++++++++++++++-- .../res/layout-sw600dp-land/activity_master.xml | 2 +- .../res/layout-sw600dp-port/activity_master.xml | 1 - .../src/main/res/layout/activity_master.xml | 1 - .../src/main/res/layout/activity_master_phone.xml | 1 - .../src/main/res/layout/drawer_header.xml | 2 +- .../src/main/res/layout/layout_master_phone.xml | 3 +- 7 files changed, 35 insertions(+), 8 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_master.xml') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 7ccfb646..9d9d0901 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -2,7 +2,6 @@ package org.fox.ttrss; import android.annotation.SuppressLint; -import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; @@ -17,7 +16,10 @@ import android.view.View; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.widget.Toolbar; +import androidx.core.graphics.Insets; import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -68,6 +70,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); + applyEdgeToEdgeInsets(); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -221,7 +225,32 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } } - protected void onPostCreate(Bundle savedInstanceState) { + private void applyEdgeToEdgeInsets() { + // https://stackoverflow.com/questions/79018063/trying-to-understand-edge-to-edge-in-android + // https://developer.android.com/develop/ui/views/layout/edge-to-edge + + View coordinatorView = findViewById(R.id.headlines_coordinator); + + if (coordinatorView != null) { + ViewCompat.setOnApplyWindowInsetsListener(coordinatorView, (v, windowInsets) -> { + Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, insets.top, 0, insets.bottom); + return windowInsets; + }); + } + + View navigationView = findViewById(R.id.modal_navigation_view); + + if (navigationView != null) { + ViewCompat.setOnApplyWindowInsetsListener(navigationView, (v, windowInsets) -> { + Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, insets.top, 0, insets.bottom); + return windowInsets; + }); + } + } + + protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); // Sync the toggle state after onRestoreInstanceState has occurred. if (m_drawerToggle != null) m_drawerToggle.syncState(); diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index f44e0e4a..eb2d9c91 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -22,7 +22,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 1f422b6a..4ea81118 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -2,7 +2,6 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index f6e5db8f..4ea81118 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,7 +1,6 @@ diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 3540c094..f4954259 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,7 +1,7 @@ @@ -36,7 +37,7 @@ -- cgit v1.2.3-54-g00ecf