diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
4 files changed, 82 insertions, 65 deletions
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 e9cfdc35..c35ab296 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml @@ -1,24 +1,9 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" - android:fitsSystemWindows="true" - android:animateLayoutChanges="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> +<?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"> - <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?articleBackground"> - </FrameLayout> + <include layout="@layout/activity_detail_phone" /> - <FrameLayout - android:id="@+id/headlines_fragment" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp" - android:background="?headlinesBackground"> - </FrameLayout> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </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 new file mode 100644 index 00000000..e9cfdc35 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -0,0 +1,24 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines" + android:fitsSystemWindows="true" + android:animateLayoutChanges="true" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <FrameLayout + android:id="@+id/article_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?articleBackground"> + </FrameLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp" + android:background="?headlinesBackground"> + </FrameLayout> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> +</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 3cd0a62a..9bb9bff5 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -1,44 +1,8 @@ - <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"> - - <FrameLayout - android:fitsSystemWindows="true" - android:animateLayoutChanges="true" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/headlines_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?headlinesBackground"></FrameLayout> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </FrameLayout> - - <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> +<?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/activity_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 new file mode 100644 index 00000000..de3db618 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -0,0 +1,44 @@ + <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"> + + <FrameLayout + android:fitsSystemWindows="true" + android:animateLayoutChanges="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?headlinesBackground" /> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </FrameLayout> + + <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> |