diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-28 15:47:44 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-28 15:47:44 +0400 |
| commit | e84345ce5a744a72879087566621232896c52e10 (patch) | |
| tree | 629580ea4a9b4c6e2ef625baf2b7c8c78252c7c1 /res | |
| parent | 3fcdae62aa524ac5c9f6bf6363603221892b7481 (diff) | |
use slidingmenu for sw600dp devices in portrait mode, misc menu-related
fixes
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp-land/headlines.xml (renamed from res/layout-sw600dp/headlines.xml) | 6 | ||||
| -rw-r--r-- | res/layout-sw600dp-land/headlines_articles.xml (renamed from res/layout-sw600dp/headlines_articles.xml) | 0 | ||||
| -rw-r--r-- | res/layout-sw600dp-port/headlines.xml | 35 | ||||
| -rw-r--r-- | res/layout-sw700dp/headlines.xml | 55 | ||||
| -rw-r--r-- | res/layout-sw700dp/headlines_articles.xml | 49 |
5 files changed, 142 insertions, 3 deletions
diff --git a/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp-land/headlines.xml index 7e7f0e52..93324ebb 100644 --- a/res/layout-sw600dp/headlines.xml +++ b/res/layout-sw600dp-land/headlines.xml @@ -32,14 +32,14 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
- android:weightSum="1.3"
+ android:weightSum="1.1"
android:orientation="horizontal" >
<FrameLayout
android:id="@+id/feeds_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1.1"
+ android:layout_weight="1"
android:background="?feedlistBackground" >
</FrameLayout>
@@ -47,7 +47,7 @@ android:id="@+id/headlines_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1.9"
+ android:layout_weight="2"
android:background="?headlinesBackground" >
</FrameLayout>
</LinearLayout>
diff --git a/res/layout-sw600dp/headlines_articles.xml b/res/layout-sw600dp-land/headlines_articles.xml index b6cb1c38..b6cb1c38 100644 --- a/res/layout-sw600dp/headlines_articles.xml +++ b/res/layout-sw600dp-land/headlines_articles.xml diff --git a/res/layout-sw600dp-port/headlines.xml b/res/layout-sw600dp-port/headlines.xml new file mode 100644 index 00000000..866c31a6 --- /dev/null +++ b/res/layout-sw600dp-port/headlines.xml @@ -0,0 +1,35 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <FrameLayout
+ android:id="@+id/sw600dp_port_anchor"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/loading_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone" >
+
+ <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:background="?smallScreenBackground"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw700dp/headlines.xml b/res/layout-sw700dp/headlines.xml new file mode 100644 index 00000000..93324ebb --- /dev/null +++ b/res/layout-sw700dp/headlines.xml @@ -0,0 +1,55 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/main"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="?headlinesBackgroundSolid"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:id="@+id/sw600dp_anchor"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone" >
+
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/loading_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone" >
+
+ <TextView
+ android:id="@+id/loading_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/fragment_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:weightSum="1.1"
+ android:orientation="horizontal" >
+
+ <FrameLayout
+ android:id="@+id/feeds_fragment"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?feedlistBackground" >
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/headlines_fragment"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:background="?headlinesBackground" >
+ </FrameLayout>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw700dp/headlines_articles.xml b/res/layout-sw700dp/headlines_articles.xml new file mode 100644 index 00000000..b6cb1c38 --- /dev/null +++ b/res/layout-sw700dp/headlines_articles.xml @@ -0,0 +1,49 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <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"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
+
+ <FrameLayout
+ android:id="@+id/headlines_fragment"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0.4"
+ android:background="?feedlistBackground" >
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/article_fragment"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0.6"
+ android:background="?articleBackground" >
+ </FrameLayout>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file |