diff options
Diffstat (limited to 'org.fox.ttrss/src')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/activity_detail.xml | 9 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml | 48 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/activity_master.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/activity_master_phone.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml | 44 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/layout_master_phone.xml (renamed from org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml) | 0 |
7 files changed, 58 insertions, 49 deletions
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"> - <include layout="@layout/master_drawer_layout" /> + <include layout="@layout/layout_master_phone" /> </FrameLayout>
\ 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 @@ <?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"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> -<include layout="@layout/activity_detail_phone" /> + <include layout="@layout/layout_detail_phone" /> </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 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 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" - android:animateLayoutChanges="true" +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_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/detail_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/baseline_open_in_browser_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/article_fragment" - app:layout_behavior=".util.DetailActivityScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - </FrameLayout> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp"> - </FrameLayout> + <include layout="@layout/layout_detail_phone" /> </FrameLayout>
\ 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"> - <include layout="@layout/master_drawer_layout" /> + <include layout="@layout/layout_master_phone" /> </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 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"> - <include layout="@layout/master_drawer_layout" /> + <include layout="@layout/layout_master_phone" /> </FrameLayout>
\ 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 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines" + 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/detail_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_open_in_browser_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/article_fragment" + app:layout_behavior=".util.DetailActivityScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + </FrameLayout> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp"> + </FrameLayout> + +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml index e19d4c90..e19d4c90 100644 --- a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml +++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml |