diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout-sw600dp-land')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml | 43 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml | 25 |
2 files changed, 20 insertions, 48 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml deleted file mode 100644 index 0e904edc..00000000 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml +++ /dev/null @@ -1,43 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" - android:fitsSystemWindows="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - <FrameLayout - android:id="@+id/sw600dp_anchor" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" > - </FrameLayout> - - <LinearLayout - android:id="@+id/fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:baselineAligned="false" - android:orientation="horizontal" > - - <FrameLayout - android:paddingRight="4dp" - android:id="@+id/headlines_fragment" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.3" - android:background="?headlinesBackground" > - </FrameLayout> - - <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.7" - android:elevation="4dp" - android:background="?articleBackground" > - </FrameLayout> - </LinearLayout> - -</LinearLayout>
\ No newline at end of file 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 c89f3baa..9ba663f6 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 @@ -2,6 +2,7 @@ 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"> <include layout="@layout/toolbar" android:id="@+id/toolbar" /> @@ -29,16 +30,30 @@ android:background="?feedlistBackground" > </FrameLayout> - <FrameLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="0dp" android:layout_weight="0.75" - android:id="@+id/headlines_fragment" - android:background="?headlinesBackground" android:elevation="4dp" + android:background="?headlinesBackground" android:layout_height="match_parent"> - </FrameLayout> - </LinearLayout> + <FrameLayout + android:layout_width="match_parent" + android:id="@+id/headlines_fragment" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" + 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" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + </LinearLayout> </RelativeLayout> |