summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-10-03 17:51:21 +0300
committerAndrew Dolgov <[email protected]>2020-10-03 17:51:21 +0300
commit6a667a6d83b15b87818d22754ff6ccdb54573f28 (patch)
treed51405a258c00e8993e820ab4ea819a755588d23
parent3f8b18ff46953212bd9308e631b5a195ae57a749 (diff)
don't hide actionbar on tablets in portrait (bump version)
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rw-r--r--org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml62
2 files changed, 64 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 2ffa2458..057483a1 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="522"
- android:versionName="1.288">
+ android:versionCode="523"
+ android:versionName="1.289">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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
new file mode 100644
index 00000000..95cb35e0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
@@ -0,0 +1,62 @@
+<!-- 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
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fitsSystemWindows="true"
+ 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/ic_refresh"
+ 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"
+ android:background="?headlinesBackground" />
+
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+ </RelativeLayout>
+
+ <org.fox.ttrss.util.ScrimInsetsFrameLayout
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/scrimInsetsFrameLayout"
+ android:layout_width="300dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:background="@android:color/white"
+ android:elevation="10dp"
+ android:fitsSystemWindows="true"
+ app:insetForeground="#4000">
+
+ <FrameLayout
+ android:id="@+id/feeds_fragment"
+ android:layout_width="match_parent"
+ android:background="?feedlistBackground"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+ </org.fox.ttrss.util.ScrimInsetsFrameLayout>
+
+</androidx.drawerlayout.widget.DrawerLayout>