diff options
Diffstat (limited to 'org.fox.ttrss')
13 files changed, 87 insertions, 120 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 9f130852..34d31f9c 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -110,6 +110,7 @@ dependencies { implementation 'com.github.bumptech.glide:glide:3.8.0' implementation files('libs/glide-transformations-2.0.2.jar') implementation 'androidx.recyclerview:recyclerview:1.4.0' + implementation 'androidx.activity:activity:1.10.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.appcompat:appcompat-resources:1.7.0' diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 31824310..4eb5b6f0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -33,6 +33,7 @@ import android.view.Display; import android.view.View; import android.widget.CheckBox; +import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; import androidx.browser.customtabs.CustomTabsCallback; @@ -231,6 +232,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc @Override public void onCreate(Bundle savedInstanceState) { + EdgeToEdge.enable(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationManager nmgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); 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 6976c873..f44e0e4a 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 @@ -1,6 +1,7 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" + android:fitsSystemWindows="true" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"> @@ -46,7 +47,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + <com.google.android.material.appbar.MaterialToolbar + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" + app:layout_scrollFlags="scroll|enterAlways" + app:titleTextAppearance="?attr/textAppearanceTitleMedium" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:background="?colorSurfaceContainer" + android:minHeight="?attr/actionBarSize"/> + </com.google.android.material.appbar.AppBarLayout> 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 fa1612f8..9bb837cb 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 @@ -1,57 +1,8 @@ -<!-- we don't hide actionbar on tablets even in portrait so this is a bit different from activity_master_phone.xml --> - -<androidx.drawerlayout.widget.DrawerLayout +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines_drawer" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_below="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/master_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/baseline_refresh_24" - android:layout_margin="16dp" /> - - <FrameLayout - android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - </RelativeLayout> - - <com.google.android.material.navigation.NavigationView - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/navigationView" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - app:elevation="8dp"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?colorSurfaceContainer" - android:layout_height="match_parent" > - </FrameLayout> - - </com.google.android.material.navigation.NavigationView> + android:layout_width="match_parent" + android:layout_height="match_parent"> -</androidx.drawerlayout.widget.DrawerLayout> + <include layout="@layout/master_drawer_layout" /> +</FrameLayout>
\ 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 6d2f94ea..56500d38 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,6 +1,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines" android:animateLayoutChanges="true" + android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent"> 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"> - <include layout="@layout/activity_master_phone" /> + <include layout="@layout/master_drawer_layout" /> </FrameLayout>
\ 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 f1c5e9d3..9bb837cb 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,53 +1,8 @@ - <androidx.drawerlayout.widget.DrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines_drawer" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/master_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/baseline_refresh_24" - android:layout_margin="16dp" /> - - <com.google.android.material.appbar.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <com.google.android.material.navigation.NavigationView - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/navigationView" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?colorSurfaceContainer" - android:layout_height="match_parent" > - </FrameLayout> - - </com.google.android.material.navigation.NavigationView> - - </androidx.drawerlayout.widget.DrawerLayout> +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/master_drawer_layout" /> +</FrameLayout>
\ No newline at end of file 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 f4954259..3540c094 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 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="72dp" + android:layout_height="96dp" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index e8fe04aa..0b1f1f0e 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/article_fragment" android:layout_width="fill_parent" + android:background="?colorSurfaceContainer" android:layout_height="match_parent"> <FrameLayout @@ -16,7 +17,6 @@ android:layout_height="wrap_content"> <com.google.android.material.appbar.AppBarLayout - android:backgroundTint="?colorSurfaceContainerLow" android:layout_width="match_parent" android:layout_height="match_parent"> 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 new file mode 100644 index 00000000..4ce1249a --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml @@ -0,0 +1,54 @@ +<androidx.drawerlayout.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines_drawer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + android:fitsSystemWindows="true" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/master_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_refresh_24" + android:layout_margin="16dp" /> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + <com.google.android.material.navigation.NavigationView + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/navigationView" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start"> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:background="?colorSurfaceContainer" + android:layout_height="match_parent" > + </FrameLayout> + + </com.google.android.material.navigation.NavigationView> + +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index c256e587..989292b2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -3,10 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" - android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" app:titleTextAppearance="?attr/textAppearanceTitleMedium" android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="?colorSurfaceContainerLow" android:minHeight="?attr/actionBarSize"/> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index 196b4ad4..83268f38 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -1,8 +1,5 @@ <resources> <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar"> - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:windowLightStatusBar">false</item> - <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> <item name="ic_star">@drawable/baseline_star_24</item> diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index 4cc0d590..ae4ba058 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -1,8 +1,5 @@ <resources> <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:windowLightStatusBar">true</item> - <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> <item name="ic_star">@drawable/baseline_star_24</item> |