diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
3 files changed, 67 insertions, 20 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 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> diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml index 5144f823..62b3fea4 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml @@ -1,23 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/article_pager_container" +<androidx.viewpager.widget.ViewPager + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/article_pager" android:background="?android:colorBackground" android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <androidx.viewpager.widget.ViewPager - android:id="@+id/article_pager" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/article_pager_indicator" - android:layout_alignParentTop="true"/> - - <com.viewpagerindicator.UnderlinePageIndicator - android:id="@+id/article_pager_indicator" - android:layout_width="fill_parent" - android:layout_height="2dp" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" /> - - -</RelativeLayout>
\ No newline at end of file + android:layout_height="fill_parent"/> 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 2226cffe..0dd14149 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -130,6 +130,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:descendantFocusability="blocksDescendants" android:orientation="vertical" > <TextView |