initial

9 files changed, 247 insertions, 35 deletions

diff --git a/res/layout-sw600dp-port/headlines.xml b/res/layout-sw600dp-port/headlines.xml
new file mode 100644
index 00000000..84d8d654
--- /dev/null
+++ b/res/layout-sw600dp-port/headlines.xml
@@ -0,0 +1,48 @@
+<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: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:orientation="vertical" >

+

+        <FrameLayout

+            android:id="@+id/headlines_fragment"

+            android:layout_width="match_parent"

+            android:layout_height="0dp"

+            android:layout_weight="0.3"

+            android:background="?headlinesBackgroundSolid" >

+        </FrameLayout>

+

+        <FrameLayout

+            android:id="@+id/article_fragment"

+            android:layout_width="match_parent"

+            android:layout_height="0dp"

+            android:layout_weight="0.7"

+            android:background="?articleBackground" >

+        </FrameLayout>

+    </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/feeds.xml b/res/layout-sw600dp/feeds.xml
new file mode 100644
index 00000000..1bc48b2b
--- /dev/null
+++ b/res/layout-sw600dp/feeds.xml
@@ -0,0 +1,47 @@
+<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: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" >

+

+        <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:orientation="horizontal" >

+

+        <FrameLayout

+            android:id="@+id/feeds_fragment"

+            android:layout_width="0dp"

+            android:layout_height="match_parent"

+            android:layout_weight="0.4"

+            android:background="?feedlistBackground" >

+        </FrameLayout>

+

+        <FrameLayout

+            android:id="@+id/headlines_fragment"

+            android:layout_width="0dp"

+            android:layout_height="match_parent"

+            android:layout_weight="0.6"

+            android:background="?headlinesBackground" >

+        </FrameLayout>

+    </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp/headlines.xml
new file mode 100644
index 00000000..1d9addbc
--- /dev/null
+++ b/res/layout-sw600dp/headlines.xml
@@ -0,0 +1,48 @@
+<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:orientation="horizontal" >

+

+        <FrameLayout

+            android:id="@+id/headlines_fragment"

+            android:layout_width="0dp"

+            android:layout_height="match_parent"

+            android:layout_weight="0.4"

+            android:background="?headlinesBackground" >

+        </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
diff --git a/res/layout/feeds.xml b/res/layout/feeds.xml
new file mode 100644
index 00000000..c3f7be59
--- /dev/null
+++ b/res/layout/feeds.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:id="@+id/main"

+    android:layout_width="fill_parent"

+    android:layout_height="fill_parent" >

+

+    <LinearLayout

+        android:id="@+id/loading_container"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent"

+        android:gravity="center"

+        android:orientation="vertical" >

+

+        <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" />

+    </LinearLayout>

+

+    <FrameLayout

+        android:id="@+id/feeds_fragment"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent" >

+    </FrameLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml
new file mode 100644
index 00000000..60c24b91
--- /dev/null
+++ b/res/layout/headlines.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:id="@+id/headlines"

+    android:layout_width="fill_parent"

+    android:layout_height="fill_parent" >

+

+    <LinearLayout

+        android:id="@+id/loading_container"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent"

+        android:gravity="center"

+        android:orientation="vertical" >

+

+        <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" />

+    </LinearLayout>

+

+    <FrameLayout

+        android:id="@+id/fragment_container"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent" >

+    </FrameLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/online.xml b/res/layout/online.xml
new file mode 100644
index 00000000..d94aa147
--- /dev/null
+++ b/res/layout/online.xml
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:id="@+id/online"

+    android:layout_width="fill_parent"

+    android:layout_height="fill_parent" >

+

+    <LinearLayout

+        android:id="@+id/loading_container"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent"

+        android:gravity="center"

+        android:orientation="vertical" >

+

+        <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" />

+    </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/headlines_menu.xml b/res/menu/headlines_context_menu.xml
index 073ecb37..073ecb37 100644
--- a/res/menu/headlines_menu.xml
+++ b/res/menu/headlines_context_menu.xml
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index c6e49511..68625729 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -2,41 +2,6 @@
 
     <group android:id="@+id/menu_group_logged_in" >
 
-        <group android:id="@+id/menu_group_feeds" >
-
-            <!--
-                 <item
-                android:id="@+id/back_to_categories"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction=""
-                android:title="@string/back_to_categories"/>
-            -->
-
-            <item
-                android:id="@+id/show_feeds"
-                android:icon="@android:drawable/ic_menu_agenda"
-                android:showAsAction=""
-                android:title="@string/menu_all_feeds"/>
-
-            <item
-                android:id="@+id/update_feeds"
-                android:icon="@android:drawable/ic_menu_rotate"
-                android:showAsAction="ifRoom"
-                android:title="@string/update_feeds"/>
-
-            <item
-                android:id="@+id/go_offline"
-                android:icon="@drawable/ic_menu_cloud"
-                android:showAsAction=""
-                android:title="@string/go_offline"/>
-
-            <item
-                android:id="@+id/logout"
-                android:icon="@drawable/ic_menu_exit"
-                android:showAsAction=""
-                android:title="@string/logout"/>
-        </group>
-
         <group android:id="@+id/menu_group_headlines" >
 
             <item
diff --git a/res/menu/online_menu.xml b/res/menu/online_menu.xml
new file mode 100644
index 00000000..d299eb6f
--- /dev/null
+++ b/res/menu/online_menu.xml
@@ -0,0 +1,29 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <group android:id="@+id/menu_group_logged_in" >
+
+     <item
+           android:id="@+id/logout"
+           android:icon="@drawable/ic_menu_exit"
+           android:showAsAction=""
+           android:title="@string/logout"/>
+
+    </group>
+
+    <group android:id="@+id/menu_group_logged_out" >
+
+        <item
+            android:id="@+id/login"
+            android:icon="@android:drawable/ic_menu_rotate"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/login_login"/>
+    </group>
+
+    <item
+        android:id="@+id/preferences"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction=""
+        android:title="@string/preferences"/>
+    
+
+</menu>
\ No newline at end of file