diff options
author | Andrew Dolgov <[email protected]> | 2012-09-16 19:25:47 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-09-16 19:25:47 +0400 |
commit | c52ea94c4418626847c19bb6346a1e81d536e5ec (patch) | |
tree | cd6c301bad7b00373bc61370490a947038b468a2 /res | |
parent | ced80be1aea975b59db5a0e6dd14acb054e7910e (diff) |
more experimental stuff
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/headlines.xml | 2 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 43 | ||||
-rw-r--r-- | res/menu/online_menu.xml | 29 |
3 files changed, 40 insertions, 34 deletions
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml index 60c24b91..c3027217 100644 --- a/res/layout/headlines.xml +++ b/res/layout/headlines.xml @@ -19,7 +19,7 @@ </LinearLayout>
<FrameLayout
- android:id="@+id/fragment_container"
+ android:id="@+id/headlines_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 68625729..4bacf2f9 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -2,6 +2,41 @@ <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 @@ -28,11 +63,11 @@ android:showAsAction="ifRoom" android:title="@string/headlines_select"/> - <item + <!-- <item android:id="@+id/close_feed" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" - android:title="@string/close_feed"/> + android:title="@string/close_feed"/> --> </group> @@ -105,11 +140,11 @@ android:showAsAction="" android:title="@string/article_set_note"/> - <item + <!-- <item android:id="@+id/close_article" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" - android:title="@string/close_article"/> + android:title="@string/close_article"/> --> </group> </group> diff --git a/res/menu/online_menu.xml b/res/menu/online_menu.xml deleted file mode 100644 index d299eb6f..00000000 --- a/res/menu/online_menu.xml +++ /dev/null @@ -1,29 +0,0 @@ -<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 |