diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/activity_logcat.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/activity_master.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_pager.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_cats.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_feeds.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_headlines.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/toolbar.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/arrays.xml | 6 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/values/strings.xml | 18 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/xml/preferences.xml | 78 |
12 files changed, 90 insertions, 44 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml index 39275c03..f6cccd22 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml @@ -6,7 +6,7 @@ <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/logcat_swipe_container" android:layout_below="@+id/toolbar" android:layout_alignParentBottom="true" @@ -21,6 +21,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 69ef2c15..3cd0a62a 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -1,4 +1,4 @@ - <android.support.v4.widget.DrawerLayout + <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:id="@+id/headlines_drawer" @@ -41,4 +41,4 @@ </org.fox.ttrss.util.ScrimInsetsFrameLayout> - </android.support.v4.widget.DrawerLayout> + </androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml index ff17fb0c..5144f823 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml @@ -5,12 +5,12 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/article_pager" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@+id/article_pager_indicator" - android:layout_alignParentTop="true"></android.support.v4.view.ViewPager> + android:layout_alignParentTop="true"/> <com.viewpagerindicator.UnderlinePageIndicator android:id="@+id/article_pager_indicator" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index e871a4a2..86875240 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -36,7 +36,7 @@ android:textColor="?feedlistTextColor" android:textSize="14sp" /> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml index ff2e8307..64240be6 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="fill_parent" > - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -16,5 +16,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" > </ListView> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index eec49bc6..2d8d963b 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -4,7 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -18,5 +18,5 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> </ListView> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index d8b70aee..177ef32f 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -6,7 +6,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/headlines_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -17,7 +17,7 @@ android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" /> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <com.shamanland.fab.FloatingActionButton android:id="@+id/headlines_fab" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml index c263c852..56a1137a 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml @@ -6,7 +6,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.widget.SwipeRefreshLayout + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/headlines_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -16,7 +16,7 @@ android:drawSelectorOnTop="true" android:layout_width="match_parent" android:layout_height="match_parent" /> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <com.shamanland.fab.FloatingActionButton android:id="@+id/headlines_fab" diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index 5093a342..99235ca2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar +<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml index 47cac770..25b2bd58 100644 --- a/org.fox.ttrss/src/main/res/values/arrays.xml +++ b/org.fox.ttrss/src/main/res/values/arrays.xml @@ -46,4 +46,10 @@ <item>@string/widget_background_dark</item> <item>@string/widget_background_transparent</item> </string-array> + <string-array name="pref_headlines_request_values" translatable="false"> + <item>10</item> + <item>15</item> + <item>30</item> + <item>45</item> + </string-array> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index ae2f1cc7..b73a3394 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ <string name="article_set_labels">Set labels</string> <string name="search">Search</string> <string name="cancel">Cancel</string> - <string name="pref_font_size">Article text size</string> + <string name="pref_font_size">Text size</string> <string name="dialog_close">Close</string> <string name="article_link_copy">Copy link to clipboard</string> <string name="text_copied_to_clipboard">Text copied to clipboard</string> @@ -139,7 +139,7 @@ <string name="offline_articles_to_download">Amount of articles to download</string> <string name="offline_articles_to_download_long">How many articles to download for offline mode (newest first)</string> <string name="pref_headlines_show_content_long">Show content previews in headlines list</string> - <string name="pref_headlines_show_content">Preview article content</string> + <string name="pref_headlines_show_content">Show content preview</string> <string name="api_too_low">This action requires newer version of Tiny Tiny RSS</string> <string name="share_url_hint">Article URL</string> <string name="share_content_hint">Article Content</string> @@ -183,7 +183,7 @@ <item quantity="other">%1$d unread articles</item> </plurals> - <string name="pref_headline_font_size">Headline text size</string> + <string name="pref_headline_font_size">Text size</string> <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string> <string name="accel_webview_summary">Disable if you see flicker or visual glitches</string> <string name="accel_webview_title">Accelerate web views (3.0+)</string> @@ -214,7 +214,7 @@ <string name="prefs_enable_fab">Enable FAB</string> <string name="prefs_enable_fab_long">Show floating action button when reading</string> <string name="prefs_open_fresh_on_startup">Open Fresh articles on startup</string> - <string name="prefs_headline_display_mode">Headline display mode</string> + <string name="prefs_headline_display_mode">Display mode</string> <string name="prefs_headline_display_mode_long">Default, no images, or compact mode</string> <string name="headline_display_mode_default">Default</string> <string name="headline_display_mode_no_images">No images</string> @@ -239,6 +239,8 @@ <string name="headlines_row_top_changed">New articles found, reload feed to continue.</string> <string name="prefs_custom_tabs_summary">Open external links with browser custom tabs (faster, used if available)</string> <string name="prefs_use_custom_tabs">Use quick preview</string> + <string name="prefs_always_open_uri">Always open in browser</string> + <string name="prefs_always_open_uri_summary">Open articles directly in your web browser, instead of going to the detail view</string> <string name="ask_me_every_time">Ask me every time</string> <!-- <string name="open_link">Open link</string> --> <string name="quick_preview">Quick preview</string> @@ -269,4 +271,12 @@ <string name="logcat_title">Log viewer</string> <string name="cat_labels">Labels</string> <string name="cat_uncategorized">Uncategorized</string> + <string name="prefs_headline_request_size">How many headlines to request</string> + <string name="prefs_headline_request_size_long">Use lower values on slow connections</string> + <string name="headlines">Headlines</string> + <string name="prefs_headline_images_wifi_only">Show images on Wi-Fi only</string> + <string name="prefs_headline_images_wifi_only_long">Overrides previous setting</string> + <string name="prefs_inline_video_player">Experimental. Long tap to open separate player</string> + <string name="prefs_enable_image_downsampling">Auto-resize images</string> + <string name="prefs_enable_image_downsampling_long">Asks backend to downsample images if not on Wi-Fi. Needs a plugin (ttrss-api-resize).</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index bf893468..f6f9b9bc 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -50,6 +50,7 @@ android:defaultValue="false" android:key="enable_cats" android:title="@string/enable_cats" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:dependency="enable_cats" @@ -59,56 +60,80 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="true" - android:key="headlines_show_content" - android:summary="@string/pref_headlines_show_content_long" - android:title="@string/pref_headlines_show_content" /> + android:key="open_fresh_on_startup" + android:title="@string/prefs_open_fresh_on_startup" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="category_headlines" + android:title="@string/headlines" > + + <org.fox.ttrss.util.FontSizeDialogPreference + android:defaultValue="13" + android:key="headlines_font_size_sp" + android:dialogMessage="@string/pref_headline_font_size" + android:title="@string/pref_headline_font_size" /> + + <ListPreference + android:defaultValue="HL_DEFAULT" + android:entries="@array/headline_mode_names" + android:entryValues="@array/headline_mode_values" + android:key="headline_mode" + android:summary="@string/prefs_headline_display_mode_long" + android:title="@string/prefs_headline_display_mode" /> + + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" + android:key="headline_images_wifi_only" + android:summary="@string/prefs_headline_images_wifi_only_long" + android:title="@string/prefs_headline_images_wifi_only" /> <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="true" - android:dependency="headlines_mark_read_scroll" - android:key="headlines_swipe_to_dismiss" - android:summary="@string/pref_headlines_swipe_to_dismiss_long" - android:title="@string/pref_headlines_swipe_to_dismiss" /> + android:key="headlines_show_content" + android:title="@string/pref_headlines_show_content" /> <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:disableDependentsState="true" android:key="headlines_mark_read_scroll" - android:summary="@string/pref_headlines_mark_read_scroll_long" android:title="@string/pref_headlines_mark_read_scroll" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="true" + android:dependency="headlines_mark_read_scroll" + android:key="headlines_swipe_to_dismiss" + android:summary="@string/pref_headlines_swipe_to_dismiss_long" + android:title="@string/pref_headlines_swipe_to_dismiss" /> + <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:key="enable_condensed_fonts" android:summary="@string/pref_headlines_use_condensed_fonts_long" android:title="@string/pref_headlines_use_condensed_fonts" /> --> - <org.fox.ttrss.util.FontSizeDialogPreference - android:defaultValue="13" - android:key="headlines_font_size_sp" - android:dialogMessage="@string/pref_headline_font_size" - android:title="@string/pref_headline_font_size" /> - <ListPreference - android:defaultValue="HL_DEFAULT" - android:entries="@array/headline_mode_names" - android:entryValues="@array/headline_mode_values" - android:key="headline_mode" - android:summary="@string/prefs_headline_display_mode_long" - android:title="@string/prefs_headline_display_mode" /> + android:defaultValue="15" + android:entries="@array/pref_headlines_request_values" + android:entryValues="@array/pref_headlines_request_values" + android:key="headlines_request_size" + android:summary="@string/prefs_headline_request_size_long" + android:title="@string/prefs_headline_request_size" /> <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="true" - android:key="open_fresh_on_startup" - android:title="@string/prefs_open_fresh_on_startup" /> + android:defaultValue="false" + android:key="enable_image_downsampling" + android:title="@string/prefs_enable_image_downsampling" + android:summary="@string/prefs_enable_image_downsampling_long" /> <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:key="inline_video_player" - android:summary="Experimental: play videos inside headlines list. Long tap to open separate player" + android:summary="@string/prefs_inline_video_player" android:title="Inline video player" /> </PreferenceCategory> + <PreferenceCategory android:title="@string/reading" > <org.fox.ttrss.util.FontSizeDialogPreference android:defaultValue="16" @@ -148,6 +173,11 @@ android:defaultValue="true" android:key="custom_tabs_ask_always" android:title="@string/ask_me_every_time" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" + android:key="always_open_uri" + android:summary="@string/prefs_always_open_uri_summary" + android:title="@string/prefs_always_open_uri" /> </PreferenceCategory> <PreferenceCategory android:title="@string/offline_mode" > <ListPreference |