diff options
Diffstat (limited to 'app/src/main/res')
27 files changed, 176 insertions, 214 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 011aa4c8b..a7f7d9f12 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -10,6 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:focusableInTouchMode="true" android:padding="8dp"> <android.support.v7.widget.CardView @@ -27,6 +28,8 @@ <ImageView android:layout_width="40dp" android:layout_height="match_parent" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" android:contentDescription="@string/search_podcast_hint" app:srcCompat="?attr/action_search" android:scaleType="center"/> @@ -39,8 +42,10 @@ android:inputType="text" android:imeOptions="actionSearch" android:importantForAutofill="no" - android:layout_marginLeft="8dp" + android:layout_marginStart="0dp" + android:layout_marginLeft="0dp" android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" android:paddingTop="16dp" android:paddingBottom="16dp" android:hint="@string/search_podcast_hint" @@ -109,16 +114,17 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="8dp" android:layout_gravity="center_horizontal" android:orientation="horizontal"> <LinearLayout android:id="@+id/advanced_search" - android:layout_width="96dp" + android:layout_width="120dp" android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal" - android:padding="16dp" + android:padding="8dp" android:background="?android:attr/selectableItemBackground"> <ImageView @@ -127,8 +133,7 @@ android:contentDescription="@string/advanced_search" app:srcCompat="?attr/action_search" android:scaleType="center" - android:layout_marginBottom="4dp" - android:tint="?android:attr/textColorPrimary"/> + android:layout_marginBottom="4dp"/> <TextView android:layout_width="match_parent" @@ -140,11 +145,11 @@ <LinearLayout android:id="@+id/btn_opml_import" - android:layout_width="96dp" + android:layout_width="120dp" android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal" - android:padding="16dp" + android:padding="8dp" android:background="?android:attr/selectableItemBackground"> <ImageView @@ -153,8 +158,7 @@ android:contentDescription="@string/opml_import_label" app:srcCompat="?attr/av_download" android:scaleType="center" - android:layout_marginBottom="4dp" - android:tint="?android:attr/textColorPrimary"/> + android:layout_marginBottom="4dp"/> <TextView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 89f900a1f..53636c2b6 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -1,19 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> + <TextView + android:id="@+id/txtvInformation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:paddingTop="2dp" + android:paddingBottom="2dp" + android:visibility="gone" + tools:text="(i) Information" /> <android.support.v7.widget.RecyclerView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_below="@+id/txtvInformation" + android:layout_marginTop="0dp" + android:layout_marginBottom="0dp" android:clipToPadding="false" android:paddingTop="@dimen/list_vertical_padding" android:paddingBottom="@dimen/list_vertical_padding" - android:scrollbarStyle="outsideOverlay" + app:fastScrollEnabled="true" + app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable" + app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable" + app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable" + app:fastScrollVerticalTrackDrawable="@drawable/line_drawable" tools:itemCount="13" tools:listitem="@layout/new_episodes_listitem" /> @@ -21,12 +39,13 @@ android:id="@+id/progLoading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:gravity="center" android:indeterminateOnly="true" android:visibility="gone" + android:layout_centerInParent="true" tools:visibility="gone" tools:layout_width="match_parent" tools:layout_height="64dp" tools:background="@android:color/holo_red_light"/> -</FrameLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/bug_report.xml b/app/src/main/res/layout/bug_report.xml new file mode 100644 index 000000000..e97e85265 --- /dev/null +++ b/app/src/main/res/layout/bug_report.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> + <Button + android:id="@+id/btn_open_bug_tracker" + android:text="@string/open_bug_tracker" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Button + android:id="@+id/btn_copy_log" + android:text="@string/copy_to_clipboard" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <TextView + android:layout_marginTop="8dp" + android:id="@+id/crash_report_logs" + android:textIsSelectable="true" + android:textSize="12sp" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> + +</LinearLayout> diff --git a/app/src/main/res/layout/checkbox_do_not_show_again.xml b/app/src/main/res/layout/checkbox_do_not_show_again.xml new file mode 100644 index 000000000..15f26e8b4 --- /dev/null +++ b/app/src/main/res/layout/checkbox_do_not_show_again.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp"> + + <CheckBox + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/checkbox_do_not_show_again" + android:text="@string/checkbox_do_not_show_again"/> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml index 65a08251f..3f8065466 100644 --- a/app/src/main/res/layout/downloaded_episodeslist_item.xml +++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml @@ -17,7 +17,7 @@ android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:contentDescription="@string/cover_label" android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml index 984e960d8..ad453afbe 100644 --- a/app/src/main/res/layout/episodes_apply_action_fragment.xml +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -29,17 +29,14 @@ android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:elevation="@dimen/sd_close_elevation" - tools:ignore="UnusedAttribute"> - <!-- android:elevation: - 1. Needs to match the speed dial's minimal elevation, - or the speed dial can't be clicked at all - --> + android:elevation="@dimen/sd_open_elevation" + tools:ignore="UnusedAttribute" > + <com.leinardi.android.speeddial.SpeedDialView android:id="@+id/fabSD" android:layout_width="match_parent" android:layout_height="wrap_content" - app:sdMainFabClosedSrc="@drawable/ic_fab_edit" + app:sdMainFabClosedSrc="?attr/batch_edit_fab_icon" app:sdOverlayLayout="@id/fabSDOverlay" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index 78c0b3b16..b047b3da0 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -36,7 +36,8 @@ android:layout_marginBottom="16dp" android:contentDescription="@string/cover_label" android:gravity="center_vertical" - tools:src="@drawable/ic_stat_antenna_default" + android:foreground="?attr/selectableItemBackground" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark" /> <TextView @@ -47,6 +48,7 @@ android:layout_alignTop="@id/imgvCover" android:layout_toRightOf="@id/imgvCover" android:layout_toEndOf="@id/imgvCover" + android:foreground="?attr/selectableItemBackground" tools:text="Podcast title" tools:background="@android:color/holo_green_dark" /> diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index e1f451e9e..596135d88 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -27,7 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:contentDescription="@string/cover_label" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> <ImageButton diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 27a8bbdca..6e02fa090 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -23,7 +23,7 @@ android:contentDescription="@string/cover_label" android:cropToPadding="true" android:scaleType="fitXY" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark" /> <LinearLayout diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml index 4848563b1..b2411c5df 100644 --- a/app/src/main/res/layout/itunes_podcast_listitem.xml +++ b/app/src/main/res/layout/itunes_podcast_listitem.xml @@ -25,7 +25,7 @@ android:cropToPadding="true" android:scaleType="fitXY" tools:background="@android:color/holo_green_dark" - tools:src="@drawable/ic_stat_antenna_default" /> + tools:src="@drawable/ic_antenna" /> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml index a6427e985..c4217db54 100644 --- a/app/src/main/res/layout/mediaplayerinfo_activity.xml +++ b/app/src/main/res/layout/mediaplayerinfo_activity.xml @@ -155,11 +155,11 @@ android:layout_marginTop="-8dp" android:gravity="center" android:text="30" - android:textSize="10sp" + android:textSize="12sp" android:textColor="?android:attr/textColorSecondary" android:clickable="false"/> - <Button + <ImageButton android:id="@+id/butPlaybackSpeed" android:layout_width="@dimen/audioplayer_playercontrols_length" android:layout_height="@dimen/audioplayer_playercontrols_length" @@ -167,13 +167,28 @@ android:layout_toStartOf="@id/butRev" android:background="?attr/selectableItemBackground" android:contentDescription="@string/set_playback_speed_label" - android:src="?attr/av_fast_forward" - android:textSize="@dimen/text_size_medium" - android:textAllCaps="false" - android:maxLines="1" + android:src="?attr/av_speed" + android:scaleType="fitCenter" + tools:src="@drawable/ic_playback_speed_white" tools:visibility="gone" tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvPlaybackSpeed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/butPlaybackSpeed" + android:layout_alignLeft="@id/butPlaybackSpeed" + android:layout_alignStart="@id/butPlaybackSpeed" + android:layout_alignRight="@id/butPlaybackSpeed" + android:layout_alignEnd="@id/butPlaybackSpeed" + android:layout_marginTop="-8dp" + android:gravity="center" + android:text="1.00" + android:textSize="12sp" + android:textColor="?android:attr/textColorSecondary" + android:clickable="false"/> + <ImageButton android:id="@+id/butCastDisconnect" android:layout_width="@dimen/audioplayer_playercontrols_length" @@ -216,7 +231,7 @@ android:layout_marginTop="-8dp" android:gravity="center" android:text="30" - android:textSize="10sp" + android:textSize="12sp" android:textColor="?android:attr/textColorSecondary" android:clickable="false"/> diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index 816870d1c..52833b3cd 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -25,7 +25,7 @@ android:scaleType="centerCrop" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> <TextView diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 6b41b68d5..1dcc34bce 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -51,7 +51,7 @@ android:layout_height="@dimen/thumbnail_length_queue_item" android:layout_centerVertical="true" android:contentDescription="@string/cover_label" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> </RelativeLayout> diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml index 50374c737..4a055fea9 100644 --- a/app/src/main/res/layout/searchlist_item.xml +++ b/app/src/main/res/layout/searchlist_item.xml @@ -18,7 +18,7 @@ android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding" android:contentDescription="@string/cover_label" android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> <LinearLayout diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml index b186add9e..f52aa73e0 100644 --- a/app/src/main/res/layout/statistics_listitem.xml +++ b/app/src/main/res/layout/statistics_listitem.xml @@ -23,7 +23,7 @@ android:scaleType="centerCrop" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - tools:src="@drawable/ic_stat_antenna_default" + tools:src="@drawable/ic_antenna" tools:background="@android:color/holo_green_dark"/> <TextView diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml deleted file mode 100644 index 907bc9334..000000000 --- a/app/src/main/res/menu/allepisodes_context.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@id/skip_episode_item" - android:menuCategory="container" - android:title="@string/skip_episode_label" /> - - - <item - android:id="@+id/remove_new_flag_item" - android:menuCategory="container" - android:title="@string/remove_new_flag_label" /> - - <item - android:id="@+id/mark_read_item" - android:menuCategory="container" - android:title="@string/mark_read_label" /> - <item - android:id="@+id/mark_unread_item" - android:menuCategory="container" - android:title="@string/mark_unread_label" /> - - <item - android:id="@+id/add_to_queue_item" - android:menuCategory="container" - android:title="@string/add_to_queue_label" /> - <item - android:id="@+id/remove_from_queue_item" - android:menuCategory="container" - android:title="@string/remove_from_queue_label" /> - <item - android:id="@+id/add_to_favorites_item" - android:menuCategory="container" - android:title="@string/add_to_favorite_label" /> - <item - android:id="@+id/remove_from_favorites_item" - android:menuCategory="container" - android:title="@string/remove_from_favorite_label" /> - <item - android:id="@+id/reset_position" - android:menuCategory="container" - android:title="@string/reset_position" /> - - <item - android:id="@+id/activate_auto_download" - android:menuCategory="container" - android:title="@string/activate_auto_download" /> - <item - android:id="@+id/deactivate_auto_download" - android:menuCategory="container" - android:title="@string/deactivate_auto_download" /> - - <item - android:id="@+id/visit_website_item" - android:menuCategory="container" - android:title="@string/visit_website_label" /> - <item - android:id="@+id/share_item" - android:menuCategory="container" - android:title="@string/share_label"> - <menu> - <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <item - android:id="@+id/share_link_with_position_item" - android:menuCategory="container" - android:title="@string/share_link_with_position_label" /> - <item - android:id="@+id/share_download_url_item" - android:menuCategory="container" - android:title="@string/share_item_url_label" /> - <item - android:id="@+id/share_download_url_with_position_item" - android:menuCategory="container" - android:title="@string/share_item_url_with_position_label" /> - <item - android:id="@+id/share_file" - android:menuCategory="container" - android:title="@string/share_file_label" /> - </menu> - </item> -</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml index 23c8f862a..1e1aa8f56 100644 --- a/app/src/main/res/menu/episodes.xml +++ b/app/src/main/res/menu/episodes.xml @@ -18,10 +18,19 @@ android:icon="?attr/navigation_refresh"/> <item + android:id="@+id/filter_items" + android:icon="?attr/ic_filter" + android:menuCategory="container" + android:title="@string/filter" + android:visible="false" + custom:showAsAction="ifRoom"/> + + <item android:id="@+id/mark_all_read_item" android:title="@string/mark_all_read_label" android:menuCategory="container" custom:showAsAction="collapseActionView" + android:visible="false" android:icon="?attr/navigation_accept"/> <item @@ -29,6 +38,7 @@ android:title="@string/remove_all_new_flags_label" android:menuCategory="container" custom:showAsAction="collapseActionView" + android:visible="false" android:icon="?attr/navigation_accept"/> </menu> diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml index 300068007..f20d679a5 100644 --- a/app/src/main/res/menu/feedinfo.xml +++ b/app/src/main/res/menu/feedinfo.xml @@ -11,7 +11,7 @@ <item android:id="@+id/share_link_item" custom:showAsAction="collapseActionView" - android:title="@string/share_link_label"> + android:title="@string/share_website_url_label"> </item> <item android:id="@+id/share_download_url_item" diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index 0801b79a1..e415ff85a 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -9,6 +9,11 @@ </item> <item + android:id="@+id/remove_new_flag_item" + custom:showAsAction="collapseActionView" + android:title="@string/remove_new_flag_label" /> + + <item android:id="@+id/mark_read_item" custom:showAsAction="collapseActionView" android:title="@string/mark_read_label"> diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml index df13cb027..6e4966206 100644 --- a/app/src/main/res/menu/feeditemlist_context.xml +++ b/app/src/main/res/menu/feeditemlist_context.xml @@ -8,6 +8,11 @@ android:title="@string/skip_episode_label" /> <item + android:id="@+id/remove_new_flag_item" + android:menuCategory="container" + android:title="@string/remove_new_flag_label" /> + + <item android:id="@+id/mark_read_item" android:menuCategory="container" android:title="@string/mark_read_label" /> diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index e62fc9d36..4144c392f 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -33,7 +33,7 @@ <item android:id="@+id/action_search" android:icon="?attr/action_search" - custom:showAsAction="always" + custom:showAsAction="always|collapseActionView" custom:actionViewClass="android.support.v7.widget.SearchView" android:title="@string/search_label"/> @@ -49,7 +49,7 @@ android:id="@+id/share_link_item" android:menuCategory="container" custom:showAsAction="collapseActionView" - android:title="@string/share_link_label"> + android:title="@string/share_website_url_label"> </item> <item android:id="@+id/share_download_url_item" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 44d511ee4..055951760 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -35,6 +35,14 @@ </item> <item + android:id="@+id/open_feed_item" + android:icon="?attr/feed" + custom:showAsAction="collapseActionView" + android:title="@string/open_podcast" + android:visible="false"> + </item> + + <item android:id="@+id/visit_website_item" android:icon="?attr/location_web_site" custom:showAsAction="collapseActionView" diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml index e1c3e6216..522e712e2 100644 --- a/app/src/main/res/menu/queue_context.xml +++ b/app/src/main/res/menu/queue_context.xml @@ -11,77 +11,6 @@ android:id="@+id/move_to_bottom_item" android:menuCategory="container" android:title="@string/move_to_bottom_label" /> + <!-- rest of the menu items can be found in the generic feeditemlist_context.xml --> - <item - android:id="@+id/mark_read_item" - android:menuCategory="container" - android:title="@string/mark_read_label" /> - - <item - android:id="@+id/mark_unread_item" - android:menuCategory="container" - android:title="@string/mark_unread_label" /> - - <item - android:id="@+id/remove_from_queue_item" - android:menuCategory="container" - android:title="@string/remove_from_queue_label" /> - <item - android:id="@+id/remove_item" - android:menuCategory="container" - android:title="@string/delete_label" /> - - <item - android:id="@+id/add_to_favorites_item" - android:menuCategory="container" - android:title="@string/add_to_favorite_label" /> - <item - android:id="@+id/remove_from_favorites_item" - android:menuCategory="container" - android:title="@string/remove_from_favorite_label" /> - <item - android:id="@+id/reset_position" - android:menuCategory="container" - android:title="@string/reset_position" /> - - <item - android:id="@+id/activate_auto_download" - android:menuCategory="container" - android:title="@string/activate_auto_download" /> - <item - android:id="@+id/deactivate_auto_download" - android:menuCategory="container" - android:title="@string/deactivate_auto_download" /> - - <item - android:id="@+id/visit_website_item" - android:menuCategory="container" - android:title="@string/visit_website_label" /> - <item - android:id="@+id/share_item" - android:menuCategory="container" - android:title="@string/share_label"> - <menu> - <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <item - android:id="@+id/share_link_with_position_item" - android:menuCategory="container" - android:title="@string/share_link_with_position_label" /> - <item - android:id="@+id/share_download_url_item" - android:menuCategory="container" - android:title="@string/share_item_url_label" /> - <item - android:id="@+id/share_download_url_with_position_item" - android:menuCategory="container" - android:title="@string/share_item_url_with_position_label" /> - <item - android:id="@+id/share_file" - android:menuCategory="container" - android:title="@string/share_file_label" /> - </menu> - </item> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index f39e0ac97..1780592d5 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -3,6 +3,13 @@ xmlns:custom="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + custom:showAsAction="always" + android:icon="?attr/navigation_refresh"/> + + <item android:id="@+id/subscription_num_columns" android:title="@string/subscription_num_columns" custom:showAsAction="never"> diff --git a/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml b/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml index e531395c0..1b90da786 100644 --- a/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml +++ b/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <!-- increase FAB speed dial label's max width if the screen is wide enough (300dp ~ 1.875 inch, devices with 3.5-inch screens have a width of ~ 1.9in so the setup is applicable for most phones) --> - <dimen name="sd_label_max_width">240dp</dimen> + <dimen name="sd_label_max_width" tools:ignore="MissingDefaultResource">240dp</dimen> </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index f45847e54..37707ead6 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:search="http://schemas.android.com/apk/res-auto"> <com.bytehamster.lib.preferencesearch.SearchPreference - android:key="searchPreference" /> + android:key="searchPreference" + search:textHint="@string/preference_search_hint" + search:textNoResults="@string/preference_search_no_results" + search:textClearHistory="@string/preference_search_clear_history" /> <Preference android:key="prefScreenInterface" @@ -39,16 +43,14 @@ <Preference android:key="prefFaq" android:title="@string/pref_faq" - android:icon="?attr/ic_question_answer" /> - + android:icon="?attr/ic_questionmark" /> <Preference - android:key="prefKnownIssues" - android:title="@string/pref_known_issues" - android:icon="?attr/ic_known_issues" /> + android:key="prefViewMailingList" + android:title="@string/view_mailing_list" + android:icon="?attr/ic_chat" /> <Preference - android:key="prefSendCrashReport" - android:title="@string/crash_report_title" - android:summary="@string/crash_report_sum" + android:key="prefSendBugReport" + android:title="@string/bug_report_title" android:icon="?attr/ic_bug" /> <Preference android:key="prefAbout" diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 1d970a5f7..c48e9adc8 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -10,7 +10,7 @@ android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" - android:defaultValue="0" + android:defaultValue="system" app:useStockLayout="true"/> <Preference android:key="prefHiddenDrawerItems" |