diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines.xml | 29 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/login.xml | 2 |
2 files changed, 19 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml index fefced8c..233a6a69 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines.xml @@ -1,11 +1,9 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" android:id="@+id/headlines_drawer" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="fill_parent" + android:layout_height="fill_parent"> <FrameLayout android:fitsSystemWindows="true" @@ -23,17 +21,24 @@ </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="240dp" - android:layout_gravity="start" + android:layout_width="match_parent" android:background="?feedlistBackground" - android:elevation="4dp" android:layout_height="match_parent" > </FrameLayout> - </android.support.v4.widget.DrawerLayout> - + </org.fox.ttrss.util.ScrimInsetsFrameLayout> -</FrameLayout>
\ No newline at end of file + </android.support.v4.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/login.xml b/org.fox.ttrss/src/main/res/layout/login.xml index f64a14f1..a81faa56 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/login.xml +++ b/org.fox.ttrss/src/main/res/layout/login.xml @@ -1,11 +1,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/loading_container" + android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> <TextView + android:background="?android:colorBackground" android:id="@+id/loading_message" android:layout_width="match_parent" android:layout_height="match_parent" |