summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-12-06 15:15:55 +0300
committerAndrew Dolgov <[email protected]>2011-12-06 15:15:55 +0300
commit5178ba7287bbe0a2337497787110f0e7d61e28f4 (patch)
tree78f4449fec09d275664b40801f680da7e8ceed80 /res
parent581f79b3c1fc3942032685aee7943d7ea97aecfd (diff)
properly sort feedlist by unread, misc cleanup
Diffstat (limited to 'res')
-rw-r--r--res/menu/main_menu.xml17
-rw-r--r--res/menu/offline_menu.xml6
-rw-r--r--res/values/strings.xml1
3 files changed, 10 insertions, 14 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 378e0fbd..72f05555 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -5,12 +5,6 @@
<group android:id="@+id/menu_group_feeds" >
<item
- android:id="@+id/go_offline"
- android:icon="@drawable/ic_menu_cloud"
- android:showAsAction="ifRoom|withText"
- android:title="@string/go_offline"/>
-
- <item
android:id="@+id/back_to_categories"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:showAsAction="ifRoom|withText"
@@ -25,10 +19,16 @@
<item
android:id="@+id/update_feeds"
android:icon="@android:drawable/ic_menu_rotate"
- android:showAsAction=""
+ android:showAsAction="ifRoom|"
android:title="@string/update_feeds"/>
<item
+ android:id="@+id/go_offline"
+ android:icon="@drawable/ic_menu_cloud"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/go_offline"/>
+
+ <item
android:id="@+id/logout"
android:icon="@drawable/ic_menu_exit"
android:showAsAction=""
@@ -36,7 +36,7 @@
</group>
<group android:id="@+id/menu_group_headlines" >
-
+
<item
android:id="@+id/go_offline"
android:icon="@drawable/ic_menu_cloud"
@@ -46,6 +46,7 @@
<item
android:id="@+id/headlines_mark_as_read"
android:icon="@drawable/ic_menu_tick"
+ android:showAsAction=""
android:title="@string/headlines_mark_as_read"/>
<item
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 4cb744f3..c4027d6b 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -20,12 +20,6 @@
android:icon="@android:drawable/ic_menu_agenda"
android:showAsAction=""
android:title="@string/menu_all_feeds"/>
-
- <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" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a508cc5..ea69bd1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,4 +101,5 @@
<string name="dialog_offline_go">Go offline</string>
<string name="dialog_cancel">Cancel</string>
<string name="syncing_offline_data">Synchronizing offline data...</string>
+ <string name="dialog_offline_switch_prompt">Download unread articles and go offline?</string>
</resources> \ No newline at end of file