diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml | 36 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml (renamed from org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml) | 31 |
2 files changed, 18 insertions, 49 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml deleted file mode 100644 index 01737c68..00000000 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml +++ /dev/null @@ -1,36 +0,0 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fitsSystemWindows="true"> - - <FrameLayout - android:id="@+id/sw600dp_port_anchor" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" > - </FrameLayout> - - <android.support.v4.widget.DrawerLayout - android:id="@+id/headlines_drawer" - 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> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="300dp" - android:layout_gravity="start" - android:background="?feedlistBackground" - android:layout_height="match_parent" > - </FrameLayout> - - </android.support.v4.widget.DrawerLayout> - - -</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml index 7ed80c18..f4ff2c59 100644 --- a/org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml @@ -1,9 +1,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main" + android:id="@+id/headlines" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> + android:orientation="vertical" > <FrameLayout android:id="@+id/sw600dp_anchor" @@ -12,25 +12,30 @@ android:visibility="gone" > </FrameLayout> - <android.support.v4.widget.DrawerLayout - android:id="@+id/headlines_drawer" + <LinearLayout + android:id="@+id/fragment_container" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:baselineAligned="false" + android:orientation="horizontal" > <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="match_parent" + android:paddingRight="4dp" + android:id="@+id/headlines_fragment" + android:layout_width="0dp" android:layout_height="match_parent" - android:background="?articleBackground"> + android:layout_weight="0.4" + android:background="?headlinesBackground" > </FrameLayout> <FrameLayout - android:id="@+id/headlines_fragment" + android:id="@+id/article_fragment" + android:layout_width="0dp" android:layout_height="match_parent" - android:layout_width="500dp" - android:layout_gravity="start" - android:background="?headlinesBackground"> + android:layout_weight="0.6" + android:elevation="4dp" + android:background="?articleBackground" > </FrameLayout> - </android.support.v4.widget.DrawerLayout> + </LinearLayout> </LinearLayout>
\ No newline at end of file |