diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/headlines_row.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_selected.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_unread.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw600dp-port/headlines.xml | 48 | ||||
| -rw-r--r-- | res/layout-sw600dp-port/main.xml | 61 | ||||
| -rw-r--r-- | res/layout-sw600dp/feeds.xml (renamed from res/layout-sw600dp/main.xml) | 103 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines.xml | 49 | ||||
| -rw-r--r-- | res/layout/article_fragment.xml | 24 | ||||
| -rw-r--r-- | res/layout/feeds.xml (renamed from res/layout/main.xml) | 2 | ||||
| -rw-r--r-- | res/layout/headlines.xml | 27 | ||||
| -rw-r--r-- | res/layout/headlines_row_loadmore.xml | 13 | ||||
| -rw-r--r-- | res/layout/login.xml | 14 | ||||
| -rw-r--r-- | res/menu/category_menu.xml | 4 | ||||
| -rw-r--r-- | res/menu/feed_menu.xml | 8 | ||||
| -rw-r--r-- | res/menu/headlines_context_menu.xml (renamed from res/menu/headlines_menu.xml) | 0 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 63 | ||||
| -rw-r--r-- | res/menu/offline_menu.xml | 14 | ||||
| -rw-r--r-- | res/values-v11/style.xml | 2 | ||||
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/strings.xml | 11 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 49 |
21 files changed, 293 insertions, 227 deletions
diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index 8f65f7ec..4a6679bc 100644 --- a/res/layout-port/headlines_row.xml +++ b/res/layout-port/headlines_row.xml @@ -7,11 +7,6 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index 8c5af7f9..ad5ab33f 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/res/layout-port/headlines_row_selected.xml @@ -7,11 +7,6 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index 35b2dead..ce0cf9a3 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/res/layout-port/headlines_row_unread.xml @@ -7,11 +7,6 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
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-port/main.xml b/res/layout-sw600dp-port/main.xml deleted file mode 100644 index 02732ba4..00000000 --- a/res/layout-sw600dp-port/main.xml +++ /dev/null @@ -1,61 +0,0 @@ -<FrameLayout 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/fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" > - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="0.6" - android:background="?feedlistBackground" > - </FrameLayout> - - <LinearLayout - android:id="@+id/vertical_fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="0.4" - android:orientation="vertical" > - - <FrameLayout - android:id="@+id/headlines_fragment" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.30" - android:background="?headlinesBackgroundSolid" > - </FrameLayout> - - <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="match_parent" - android:layout_height="0dp" - android:background="?articleBackground" - android:layout_weight="0.70" > - </FrameLayout> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/loading_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:background="?loadingBackground" - 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> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/main.xml b/res/layout-sw600dp/feeds.xml index 9df4e048..3e75a37c 100644 --- a/res/layout-sw600dp/main.xml +++ b/res/layout-sw600dp/feeds.xml @@ -1,55 +1,48 @@ -<FrameLayout 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/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.3" - android:background="?feedlistBackground" > - </FrameLayout> - - <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 - 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> - -</FrameLayout>
\ No newline at end of file +<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:baselineAligned="false"
+ 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..54eabd01 --- /dev/null +++ b/res/layout-sw600dp/headlines.xml @@ -0,0 +1,49 @@ +<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:baselineAligned="false"
+ 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/article_fragment.xml b/res/layout/article_fragment.xml index 94e0a42e..0b847017 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,18 +1,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/article_fragment"
android:layout_width="fill_parent"
+ android:padding="5sp"
android:layout_height="fill_parent"
- android:orientation="horizontal" > -
- <LinearLayout
- xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/article_holder"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical"
- android:padding="5sp" >
+ android:orientation="vertical" > <LinearLayout
android:id="@+id/article_header"
@@ -24,6 +15,7 @@ <TextView
android:id="@+id/title"
+ android:textColor="?linkColor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -92,12 +84,18 @@ android:text="@string/attachment_view" />
<Button
+ android:id="@+id/attachment_share"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_share" />
+
+ <Button
android:id="@+id/attachment_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/attachment_copy" />
</LinearLayout>
- </LinearLayout>
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/main.xml b/res/layout/feeds.xml index eb06058c..c3f7be59 100644 --- a/res/layout/main.xml +++ b/res/layout/feeds.xml @@ -19,7 +19,7 @@ </LinearLayout>
<FrameLayout
- android:id="@+id/fragment_container"
+ android:id="@+id/feeds_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml new file mode 100644 index 00000000..c3027217 --- /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/headlines_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_loadmore.xml b/res/layout/headlines_row_loadmore.xml index d2eda7a6..ab7adc87 100644 --- a/res/layout/headlines_row_loadmore.xml +++ b/res/layout/headlines_row_loadmore.xml @@ -4,18 +4,10 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineNormalBackground"
- android:gravity="center_vertical"
+ android:gravity="center"
+ android:padding="5dp"
android:orientation="horizontal" >
- <LinearLayout
- android:id="@+id/loadmore_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_weight="1"
- android:orientation="horizontal"
- android:padding="10dp" >
-
<ProgressBar
android:id="@+id/loadmore_progress"
style="?android:attr/progressBarStyleSmall"
@@ -29,6 +21,5 @@ android:layout_height="wrap_content"
android:textColor="?headlineTextColor"
android:text="@string/loading_message" />
- </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/login.xml b/res/layout/login.xml new file mode 100644 index 00000000..1ed26afa --- /dev/null +++ b/res/layout/login.xml @@ -0,0 +1,14 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/loading_container"
+ android:layout_width="fill_parent"
+ android:gravity="center"
+ android:layout_height="fill_parent" >
+
+ <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>
\ No newline at end of file diff --git a/res/menu/category_menu.xml b/res/menu/category_menu.xml index a1e5f81b..69f26554 100644 --- a/res/menu/category_menu.xml +++ b/res/menu/category_menu.xml @@ -1,6 +1,10 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item + android:id="@+id/browse_headlines" + android:title="@string/category_browse_headlines"/> + + <item android:id="@+id/browse_articles" android:title="@string/category_browse_articles"/> diff --git a/res/menu/feed_menu.xml b/res/menu/feed_menu.xml index ff58a881..df8e4862 100644 --- a/res/menu/feed_menu.xml +++ b/res/menu/feed_menu.xml @@ -1,6 +1,14 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item + android:id="@+id/browse_headlines" + android:title="@string/category_browse_headlines"/> + + <item + android:id="@+id/browse_articles" + android:title="@string/category_browse_articles"/> + + <item android:id="@+id/catchup_feed" android:title="@string/catchup"/> 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..a4d168a5 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -1,7 +1,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <group android:id="@+id/menu_group_logged_in" > - <group android:id="@+id/menu_group_feeds" > <!-- @@ -17,136 +16,125 @@ 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 - android:id="@+id/go_offline" - android:icon="@drawable/ic_menu_cloud" - android:title="@string/go_offline"/> - + android:id="@+id/update_headlines" + android:icon="@android:drawable/ic_menu_rotate" + android:showAsAction="ifRoom" + android:title="@string/update_headlines"/> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" android:icon="@android:drawable/ic_menu_search" android:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> - <item android:id="@+id/headlines_mark_as_read" android:icon="@drawable/ic_menu_tick" android:showAsAction="" android:title="@string/headlines_mark_as_read"/> - <item android:id="@+id/headlines_select" android:icon="@drawable/ic_menu_database" - android:showAsAction="ifRoom" + android:showAsAction="" 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"/> - - </group> + --> + </group> <group android:id="@+id/menu_group_headlines_selection" > - <item android:id="@+id/selection_toggle_unread" android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> - <item android:id="@+id/selection_toggle_marked" android:icon="@drawable/ic_menu_marked" android:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> - <item android:id="@+id/selection_toggle_published" android:icon="@drawable/ic_menu_rss" android:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> - <item android:id="@+id/selection_select_none" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" android:title="@string/selection_select_none"/> </group> - <group android:id="@+id/menu_group_article" > - <item android:id="@+id/toggle_marked" android:icon="@drawable/ic_menu_marked" android:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> - <item android:id="@+id/toggle_published" android:icon="@drawable/ic_menu_rss" android:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> - <item android:id="@+id/share_article" + android:actionProviderClass="android.widget.ShareActionProvider" android:icon="@android:drawable/ic_menu_share" android:showAsAction="" - android:actionProviderClass="android.widget.ShareActionProvider" android:title="@string/share_article"/> - <item android:id="@+id/set_unread" android:icon="@android:drawable/ic_menu_recent_history" android:showAsAction="" android:title="@string/article_set_unread"/> - <item android:id="@+id/catchup_above" android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> - <item android:id="@+id/set_labels" android:icon="@drawable/ic_menu_marked" android:title="@string/article_set_labels"/> - - <item - android:id="@+id/article_set_note" - android:showAsAction="" - android:title="@string/article_set_note"/> - <item + android:id="@+id/article_set_note" + android:showAsAction="" + android:title="@string/article_set_note"/> + + <!-- + <item android:id="@+id/close_article" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" android:title="@string/close_article"/> - + --> + </group> + + <item + android:id="@+id/donate" + android:showAsAction="" + android:title="@string/donate"/> </group> <item @@ -154,9 +142,8 @@ android:icon="@android:drawable/ic_menu_preferences" android:showAsAction="" android:title="@string/preferences"/> - - <group android:id="@+id/menu_group_logged_out" > + <group android:id="@+id/menu_group_logged_out" > <item android:id="@+id/login" android:icon="@android:drawable/ic_menu_rotate" diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index 26444ef8..137184d4 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -23,11 +23,11 @@ android:title="@string/menu_all_feeds"/> </group> <group android:id="@+id/menu_group_headlines" > - <item + <!-- <item android:id="@+id/go_online" android:icon="@drawable/ic_menu_cloud" android:title="@string/go_online" - android:visible="false"/> + android:visible="false"/> --> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" @@ -41,13 +41,13 @@ <item android:id="@+id/headlines_select" android:icon="@drawable/ic_menu_database" - android:showAsAction="ifRoom" + android:showAsAction="" 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> <group android:id="@+id/menu_group_headlines_selection" > <item @@ -97,11 +97,11 @@ android:id="@+id/catchup_above" android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> - <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> <item diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 2d49b8c4..6b3d9e2c 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -28,7 +28,7 @@ <item name="feedlistBackground">@drawable/ics_divider_vertical</item>
<item name="unreadCounterColor">#303030</item>
<item name="headlinesBackground">@drawable/headlines_dark</item>
- <item name="headlinesBackgroundSolid">@android:color/transparent</item>
+ <item name="headlinesBackgroundSolid">@drawable/headlines_dark</item>
<item name="articleBackground">@android:color/black</item>
<item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
<item name="headlineSelectedBackgroundSolid">@color/ics_cyan</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ef479753..961bd955 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -17,5 +17,13 @@ <item>1</item> <item>2</item> </string-array> - + <string-array name="pref_view_mode_names"> + <item>@string/category_browse_headlines</item> + <item>@string/category_browse_articles</item> + </string-array> + <string-array name="pref_view_mode_values"> + <item>HEADLINES</item> + <item>ARTICLES</item> + </string-array> + </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3a3fc913..2c766d85 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -24,7 +24,7 @@ <string name="loading_message">Loading, please wait…</string> <string name="menu_unread_feeds">Show unread feeds</string> <string name="menu_all_feeds">Show all feeds</string> - <string name="update_feeds">Refresh feeds</string> + <string name="update_feeds">Refresh</string> <string name="share_article">Share article</string> <string name="catchup">Mark read</string> <string name="sort_feeds_by_unread">Sort feeds by unread count</string> @@ -128,6 +128,11 @@ <string name="notify_article_published">Article published</string> <string name="notify_article_unpublished">Article unpublished</string> <string name="notify_article_note_set">Article note saved</string> - <string name="force_small_tablet_ui">Force compact interface</string> - <string name="prefs_for_tablets">Tablets</string> + <string name="update_headlines">Refresh</string> + <string name="attachment_share">Share</string> + <string name="error_network_unavailable">Error: network unavailable</string> + <string name="category_browse_headlines">Browse headlines</string> + <string name="pref_default_view_mode">Default feed view</string> + <string name="pref_default_view_mode_long">Which feed view to open by default on smartphones</string> + <string name="donate_thanks">Donation found, thank you for support!</string> </resources>
\ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 6bc4c427..d6b81026 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -2,18 +2,21 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceCategory android:title="@string/connection" >
+
<EditTextPreference
android:key="login"
android:singleLine="true"
android:summary="@string/login_summary"
android:title="@string/login" >
</EditTextPreference>
+
<EditTextPreference
android:key="password"
android:password="true"
android:singleLine="true"
android:title="@string/password" >
</EditTextPreference>
+
<EditTextPreference
android:hint="@string/default_url"
android:inputType="textUri"
@@ -28,13 +31,16 @@ android:key="ssl_trust_any"
android:title="@string/ssl_trust_any" />
</PreferenceCategory>
+
<PreferenceCategory android:title="@string/http_authentication" >
+
<EditTextPreference
android:key="http_login"
android:singleLine="true"
android:summary="@string/http_login_summary"
android:title="@string/login" >
</EditTextPreference>
+
<EditTextPreference
android:key="http_password"
android:password="true"
@@ -42,9 +48,9 @@ android:title="@string/password" >
</EditTextPreference>
</PreferenceCategory>
- <PreferenceCategory
- android:key="category_look_and_feel"
- android:title="@string/look_and_feel" >
+
+ <PreferenceCategory android:key="category_look_and_feel" android:title="@string/look_and_feel" >
+
<ListPreference
android:defaultValue="THEME_DARK"
android:entries="@array/pref_theme_names"
@@ -52,6 +58,7 @@ android:key="theme"
android:summary="@string/pref_theme_long"
android:title="@string/pref_theme" />
+
<ListPreference
android:defaultValue="0"
android:entries="@array/pref_font_size_names"
@@ -63,50 +70,56 @@ android:defaultValue="false"
android:key="sort_feeds_by_unread"
android:title="@string/sort_feeds_by_unread" />
+
<CheckBoxPreference
android:defaultValue="false"
android:key="download_feed_icons"
android:title="@string/download_feed_icons" />
+
<CheckBoxPreference
android:defaultValue="false"
android:key="enable_cats"
android:title="@string/enable_cats" />
+
<CheckBoxPreference
android:defaultValue="false"
- android:dependency="enable_cats"
android:key="browse_cats_like_feeds"
+ android:dependency="enable_cats"
android:summary="@string/browse_cats_like_feeds_summary"
android:title="@string/browse_cats_like_feeds" />
- <CheckBoxPreference
+
+ <!-- <CheckBoxPreference
android:defaultValue="false"
android:key="combined_mode"
android:summary="@string/combined_mode_summary"
- android:title="@string/combined_mode" />
+ android:title="@string/combined_mode" /> -->
+
<CheckBoxPreference
android:defaultValue="true"
android:key="justify_article_text"
android:title="@string/justify_article_text" />
+
+ <ListPreference
+ android:defaultValue="HEADLINES"
+ android:entries="@array/pref_view_mode_names"
+ android:entryValues="@array/pref_view_mode_values"
+ android:key="default_view_mode"
+ android:summary="@string/pref_default_view_mode_long"
+ android:title="@string/pref_default_view_mode" />
+
</PreferenceCategory>
- <PreferenceCategory
- android:key="category_tablets"
- android:title="@string/prefs_for_tablets" >
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="tablet_article_swipe"
- android:title="@string/tablet_article_swipe" />
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="force_small_tablet_ui"
- android:title="@string/force_small_tablet_ui" />
- </PreferenceCategory>
+
<PreferenceCategory android:title="@string/offline_mode" >
+
<CheckBoxPreference
android:defaultValue="false"
android:key="offline_image_cache_enabled"
android:summary="@string/offline_image_cache_enabled_summary"
android:title="@string/offline_image_cache_enabled" />
</PreferenceCategory>
+
<PreferenceCategory android:title="@string/debugging" >
+
<CheckBoxPreference
android:defaultValue="false"
android:key="transport_debugging"
|