diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/main.xml | 1 | ||||
| -rw-r--r-- | res/layout/main.xml | 1 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml index eb0beb31..571f1ad5 100644 --- a/res/layout-port/main.xml +++ b/res/layout-port/main.xml @@ -7,6 +7,7 @@ </LinearLayout> <LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent"> <FrameLayout android:layout_height="match_parent" android:layout_width="300dp" android:layout_weight="0" android:id="@+id/feeds_fragment"></FrameLayout> + <FrameLayout android:layout_height="match_parent" android:layout_width="300dp" android:layout_weight="0" android:id="@+id/cats_fragment"></FrameLayout> <LinearLayout android:id="@+id/linearLayout2" android:layout_height="match_parent" android:orientation="vertical" android:layout_width="match_parent"> diff --git a/res/layout/main.xml b/res/layout/main.xml index 9973a225..e0a8394c 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -7,6 +7,7 @@ </LinearLayout> <LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent"> <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.3" android:id="@+id/feeds_fragment"></FrameLayout> + <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.3" android:id="@+id/cats_fragment"></FrameLayout> <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/headlines_fragment"></FrameLayout> <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/article_fragment"></FrameLayout> </LinearLayout> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 04bea68e..3c699bf3 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -16,7 +16,12 @@ android:icon="@android:drawable/ic_menu_agenda" android:title="@string/menu_all_feeds" android:showAsAction=""/> - + + <item android:id="@+id/back_to_categories" + android:icon="@android:drawable/ic_menu_revert" + android:title="@string/back_to_categories" + android:showAsAction="ifRoom|withText"/> + <item android:id="@+id/close_article" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:title="@string/close_article" diff --git a/res/values/strings.xml b/res/values/strings.xml index 0f3b089f..9f82a190 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -56,4 +56,5 @@ <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string> <string name="download_feed_icons">Download and display feed icons</string> <string name="enable_cats">Enable feed categories</string> + <string name="back_to_categories">Close category</string> </resources> |