diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-31 01:02:06 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-31 02:02:52 +0400 |
| commit | 7746b4636e4b7b0122a5046f501ff91f2f5d6b27 (patch) | |
| tree | 73127e1494f564b00937e44235f3b4f2720fbf2f /org.fox.ttrss/src/main/res/layout-sw600dp-port | |
| parent | 519602d92a5aeeb8fe0546402226983f6f9804fe (diff) | |
switch to drawerlayout where applicable
remove loading_container stuff
various other changes related to drawerlayout
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout-sw600dp-port')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml | 48 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml | 18 |
2 files changed, 24 insertions, 42 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 index e6daa46c..ba5b20e3 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml @@ -1,35 +1,35 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" - android:fitsSystemWindows="true" - android:orientation="vertical" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" - android:layout_height="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:layout_height="wrap_content" + android:visibility="gone" > </FrameLayout> - <LinearLayout - android:id="@+id/loading_container" + <android.support.v4.widget.DrawerLayout + android:id="@+id/headlines_drawer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:visibility="gone" > + android:layout_height="match_parent"> - <TextView - android:id="@+id/loading_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" /> - </LinearLayout> + <FrameLayout + android:id="@+id/headlines_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?smallScreenBackground"></FrameLayout> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="300dp" + android:layout_gravity="start" + android:background="?smallScreenBackground" + android:layout_height="match_parent" > + </FrameLayout> + + </android.support.v4.widget.DrawerLayout> - <FrameLayout - android:id="@+id/headlines_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" > - </FrameLayout> -</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml index 36b29751..4809a230 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml @@ -13,24 +13,6 @@ </FrameLayout> <LinearLayout - android:id="@+id/loading_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?loadingBackground" - android:gravity="center" - android:orientation="vertical" - android:visibility="visible" > - - <TextView - android:id="@+id/loading_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="@string/loading_message" - android:textAppearance="?android:attr/textAppearanceLarge" /> - </LinearLayout> - - <LinearLayout android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" |