From 3cc0cb84104bb3d69ab276fe81a1ce42ec31cc4e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 24 Nov 2011 17:57:44 +0300
Subject: various layout tweaks fix logout action

---
 res/layout/article_fragment.xml       |  6 +++---
 res/layout/feeds_fragment.xml         |  2 +-
 res/layout/feeds_row.xml              |  4 ++--
 res/layout/feeds_row_selected.xml     |  4 ++--
 res/layout/headlines_row.xml          |  6 +++---
 res/layout/headlines_row_selected.xml |  6 +++---
 res/layout/headlines_row_unread.xml   |  6 +++---
 res/menu/login_menu.xml               | 15 ---------------
 res/menu/main_menu.xml                | 19 ++++++++++++++-----
 res/values/strings.xml                |  2 +-
 res/values/style.xml                  |  4 ++--
 11 files changed, 34 insertions(+), 40 deletions(-)
 delete mode 100644 res/menu/login_menu.xml

(limited to 'res')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index de8caed0..48b597de 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -7,10 +7,10 @@
             android:layout_weight="1"
             android:layout_height="match_parent" android:orientation="vertical">
             <LinearLayout android:background="?articleHeader" android:layout_gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/article_header" android:padding="10dip">
-                <TextView android:singleLine="true" android:layout_weight="1" android:text="TextView" android:layout_height="wrap_content" android:ellipsize="end" android:layout_width="match_parent" android:id="@+id/title" android:textSize="15dip"></TextView>
-                <Button android:text="Close"  android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/close_button"></Button>
+                <TextView  android:singleLine="true" android:layout_weight="1" android:text="" android:layout_height="wrap_content" android:ellipsize="end" android:layout_width="match_parent" android:id="@+id/title" android:textSize="18dip"></TextView>
+                
             </LinearLayout>
-            <ImageView android:background="?articleDivider" android:paddingTop="2dip" android:layout_weight="0" android:layout_height="wrap_content" android:layout_width="match_parent"></ImageView>
+            <ImageView android:background="?feedlistDivider" android:paddingTop="2dip" android:layout_weight="0" android:layout_height="wrap_content" android:layout_width="match_parent"></ImageView>
             <WebView android:layout_weight="0" android:layout_width="match_parent" android:padding="3dip" android:layout_height="match_parent" android:id="@+id/content"></WebView>
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index 0dcbc1c4..32f2d229 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -6,6 +6,6 @@
         <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar>
         <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView>
     </LinearLayout>
-    <ListView android:divider="#00000000"  android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
+    <ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
         
     </FrameLayout>
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index 08eafd32..8ef8bbac 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -10,7 +10,7 @@
             android:layout_weight="1"           
             android:layout_gravity="center_vertical"    
             android:paddingLeft="6dip"   
-            android:text="{FEED}" android:layout_width="wrap_content" android:textSize="21dp"/>
+            android:text="{FEED}" android:layout_width="wrap_content" android:textSize="18dip"/>
         <TextView
             android:id="@+id/unread_counter"
             android:gravity="right"
@@ -20,6 +20,6 @@
             android:layout_gravity="center_vertical"            
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="{123}" android:textSize="16dp"/>
+            android:text="{123}" android:textSize="13dip"/>
                    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 7ee526f7..a694119b 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -11,7 +11,7 @@
             android:layout_weight="1"           
             android:layout_gravity="center_vertical"    
             android:paddingLeft="6dip"   
-            android:text="{FEED}" android:layout_width="wrap_content" android:textSize="21dp"/>
+            android:text="{FEED}" android:layout_width="wrap_content" android:textSize="18dip"/>
         <TextView
             android:id="@+id/unread_counter"
             android:gravity="right"
@@ -21,6 +21,6 @@
             android:layout_gravity="center_vertical"            
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="{123}" android:textSize="16dp"/>
+            android:text="{123}" android:textSize="13dip"/>
                    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 69a94a04..79de6413 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -12,10 +12,10 @@
     </LinearLayout>
     <LinearLayout
         android:id="@+id/linerLayout3"
-        android:layout_width="wrap_content" android:gravity="center"
+        android:layout_width="wrap_content" android:gravity="center" android:padding="3dip" 
         android:layout_height="wrap_content" android:orientation="vertical">
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView>
-        <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#909090" android:textSize="13sp" android:id="@+id/date" android:text="Jan 01"></TextView>
+        <ImageView android:clickable="true" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
     </LinearLayout>
                    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index ff755483..92740519 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -14,11 +14,11 @@
         </LinearLayout>
 	
 	    <LinearLayout
-        android:id="@+id/linerLayout3"
+        android:id="@+id/linerLayout3" android:padding="3dip" 
         android:layout_width="wrap_content" android:gravity="center"
         android:layout_height="wrap_content" android:orientation="vertical">
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView>
-        <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#909090" android:textSize="13sp" android:id="@+id/date" android:text="Jan 01"></TextView>
+        <ImageView android:clickable="true" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
     </LinearLayout>
 	                   
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index f6fef283..12d089eb 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -15,10 +15,10 @@
 	
 	    <LinearLayout
         android:id="@+id/linerLayout3"
-        android:layout_width="wrap_content" android:gravity="center"
+        android:layout_width="wrap_content" android:gravity="center" android:padding="3dip" 
         android:layout_height="wrap_content" android:orientation="vertical">
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/date" android:text="Jan 01"></TextView>
-        <ImageView android:clickable="true" android:id="@+id/imageView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#909090" android:textSize="13sp" android:id="@+id/date" android:text="Jan 01"></TextView>
+        <ImageView android:clickable="true" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@android:drawable/star_off"></ImageView>
     </LinearLayout>
 	                   
 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/login_menu.xml b/res/menu/login_menu.xml
deleted file mode 100644
index 0c244247..00000000
--- a/res/menu/login_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-    <menu xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:id="@+id/preferences"
-          android:icon="@android:drawable/ic_menu_preferences"
-          android:title="@string/preferences" 
-          android:showAsAction="ifRoom|withText"
-          />
-                    
-     <item android:id="@+id/login"
-          android:icon="@android:drawable/ic_menu_rotate"
-          android:title="@string/login_login" 
-          android:showAsAction="ifRoom|withText"
-          />    
-              
-    </menu>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index a4dcb9f3..57b6a65d 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -7,17 +7,20 @@
           android:title="@string/login" 
           android:showAsAction="ifRoom|withText"/>
 
-    <item android:id="@+id/logout"
-    	  android:visible="false"
-          android:title="@string/logout" 
-          android:showAsAction=""/>
-    
+  
     <item android:id="@+id/show_feeds"
     	  android:visible="false"    	  
           android:icon="@android:drawable/ic_menu_rotate"
           android:title="@string/menu_all_feeds" 
           android:showAsAction=""/>
           
+     <item android:id="@+id/close_article"
+     	  android:visible="false"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/close_article" 
+          android:showAsAction="ifRoom|withText"/>
+        
+          
      <item android:id="@+id/update"
      	  android:visible="false"
           android:icon="@android:drawable/ic_menu_rotate"
@@ -28,4 +31,10 @@
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/preferences" 
           android:showAsAction="ifRoom|withText"/>
+          
+     <item android:id="@+id/logout"
+    	  android:visible="false"
+          android:title="@string/logout" 
+          android:showAsAction=""/>
+    
     </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5947deb9..ca217315 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,5 +29,5 @@
     <string name="menu_unread_feeds">Show unread feeds</string>
     <string name="menu_all_feeds">Show all feeds</string>
     <string name="update">Update</string>
-    
+    <string name="close_article">Close article</string>
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index ba524ccc..f931d5cb 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -5,7 +5,7 @@
 		<item name="unreadCounterColor">#0000ff</item>
 		<item name="headlinesBackground">#ffffff</item>
 		<item name="articleDivider">#96c5ff</item>
-		<item name="articleHeader">#ffffff</item>		
+		<item name="articleHeader">@android:color/transparent</item>		
 		<item name="headlineSelectedBackground">#fff7d5</item>
 		<item name="headlineUnreadBackground">#ffffff</item>
 		<item name="feedsSelectedBackground">#96C5FF</item>
@@ -20,7 +20,7 @@
 		<item name="unreadCounterColor">#0000ff</item>
 		<item name="headlinesBackground">#000000</item>
 		<item name="articleDivider">#303030</item>
-		<item name="articleHeader">#101010</item>
+		<item name="articleHeader">@android:color/transparent</item>
 		<item name="headlineSelectedBackground">#303060</item>
 		<item name="headlineUnreadBackground">#303030</item>
 		<item name="feedsSelectedBackground">#303060</item>
-- 
cgit v1.2.3-54-g00ecf