diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/autoflattr_preference_dialog.xml | 35 | ||||
| -rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/flattr_auth.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/gpodnetauth_credentials.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/gpodnetauth_device.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/mediaplayerinfo_activity.xml | 20 | ||||
| -rw-r--r-- | app/src/main/res/menu/allepisodes_context.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/menu/episodes.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/menu/feedinfo.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/menu/feeditem_options.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/menu/feeditemlist_context.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/menu/feedlist.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/menu/mediaplayer.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/menu/nav_feed_context.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/menu/queue_context.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences_flattr.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences_integrations.xml | 8 |
17 files changed, 26 insertions, 159 deletions
diff --git a/app/src/main/res/layout/autoflattr_preference_dialog.xml b/app/src/main/res/layout/autoflattr_preference_dialog.xml deleted file mode 100644 index fc2df30d7..000000000 --- a/app/src/main/res/layout/autoflattr_preference_dialog.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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"> - - <CheckBox - android:id="@+id/chkAutoFlattr" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/auto_flattr_enable" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - - <SeekBar - android:id="@+id/skbPercent" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:max="100" /> - - <TextView - android:id="@+id/txtvStatus" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:ellipsize="end" - android:lines="2" - android:text="@string/auto_flattr_after_percent" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index fec7be26c..8e0ec3679 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -26,7 +26,8 @@ android:contentDescription="@string/cover_label" android:scaleType="fitCenter" android:transitionName="coverTransition" - tools:src="@android:drawable/sym_def_app_icon" /> + tools:src="@android:drawable/sym_def_app_icon" + android:foreground="?attr/selectableItemBackground" /> <TextView android:id="@+id/txtvEpisodeTitle" diff --git a/app/src/main/res/layout/flattr_auth.xml b/app/src/main/res/layout/flattr_auth.xml deleted file mode 100644 index 9244b786d..000000000 --- a/app/src/main/res/layout/flattr_auth.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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" > - - <TextView - android:id="@+id/txtvExplanation" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:text="@string/flattr_auth_explanation" /> - - <Button - android:id="@+id/but_authenticate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_margin="8dp" - android:text="@string/authenticate_label" /> - - <Button - android:id="@+id/but_return_home" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/return_home_label" - android:visibility="gone" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index f995ae4cc..e8948fc52 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -36,7 +36,7 @@ android:cursorVisible="true" android:maxLines="1" android:inputType="text" - android:imeOptions="actionNext" + android:imeOptions="actionNext|flagNoFullscreen" android:nextFocusForward="@id/etxtPassword"/> <EditText @@ -50,7 +50,7 @@ android:focusable="true" android:focusableInTouchMode="true" android:cursorVisible="true" - android:imeOptions="actionGo" + android:imeOptions="actionGo|flagNoFullscreen" android:imeActionLabel="@string/gpodnetauth_login_butLabel"/> <Button diff --git a/app/src/main/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml index 5840fe955..1f38bf457 100644 --- a/app/src/main/res/layout/gpodnetauth_device.xml +++ b/app/src/main/res/layout/gpodnetauth_device.xml @@ -30,7 +30,8 @@ android:layout_height="wrap_content" android:hint="@string/gpodnetauth_device_caption" android:layout_below="@id/txtvDescription" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:imeOptions="flagNoFullscreen"/> <TextView android:id="@+id/txtvDeviceID" @@ -53,7 +54,8 @@ android:layout_toEndOf="@id/txtvDeviceID" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:imeOptions="flagNoFullscreen"/> <Button android:id="@+id/butCreateNewDevice" diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml index c9e93e149..a6427e985 100644 --- a/app/src/main/res/layout/mediaplayerinfo_activity.xml +++ b/app/src/main/res/layout/mediaplayerinfo_activity.xml @@ -51,11 +51,13 @@ android:orientation="vertical"> - <RelativeLayout + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:paddingTop="@dimen/scrubber_vertical_padding" + android:paddingBottom="@dimen/scrubber_vertical_padding"> - <TextView + <TextView android:id="@+id/txtvPosition" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -67,9 +69,9 @@ android:text="@string/position_default_label" android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/text_size_micro" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> - <TextView + <TextView android:id="@+id/txtvLength" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -81,9 +83,9 @@ android:text="@string/position_default_label" android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/text_size_micro" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> - <SeekBar + <SeekBar android:id="@+id/sbPosition" android:layout_width="0dp" android:layout_height="wrap_content" @@ -97,9 +99,9 @@ android:layout_toRightOf="@id/txtvPosition" android:layout_toEndOf="@id/txtvPosition" android:max="500" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> - </RelativeLayout> + </RelativeLayout> <RelativeLayout android:id="@+id/player_control" diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml index 28493c5b6..907bc9334 100644 --- a/app/src/main/res/menu/allepisodes_context.xml +++ b/app/src/main/res/menu/allepisodes_context.xml @@ -9,9 +9,9 @@ <item - android:id="@+id/mark_as_seen_item" + android:id="@+id/remove_new_flag_item" android:menuCategory="container" - android:title="@string/mark_as_seen_label" /> + android:title="@string/remove_new_flag_label" /> <item android:id="@+id/mark_read_item" @@ -83,10 +83,4 @@ android:title="@string/share_file_label" /> </menu> </item> - - <item - android:id="@+id/support_item" - android:menuCategory="container" - android:title="@string/support_label" /> - </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 e21aac04e..23c8f862a 100644 --- a/app/src/main/res/menu/episodes.xml +++ b/app/src/main/res/menu/episodes.xml @@ -25,8 +25,8 @@ android:icon="?attr/navigation_accept"/> <item - android:id="@+id/mark_all_seen_item" - android:title="@string/mark_all_seen_label" + android:id="@+id/remove_all_new_flags_item" + android:title="@string/remove_all_new_flags_label" android:menuCategory="container" custom:showAsAction="collapseActionView" android:icon="?attr/navigation_accept"/> diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml index 9fdd56b6c..300068007 100644 --- a/app/src/main/res/menu/feedinfo.xml +++ b/app/src/main/res/menu/feedinfo.xml @@ -9,12 +9,6 @@ android:visible="true"> </item> <item - android:id="@+id/support_item" - custom:showAsAction="ifRoom|collapseActionView" - android:title="@string/support_label" - android:visible="false"> - </item> - <item android:id="@+id/share_link_item" custom:showAsAction="collapseActionView" android:title="@string/share_link_label"> diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index 7e111d816..0801b79a1 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -92,12 +92,6 @@ </item> <item - android:id="@+id/support_item" - custom:showAsAction="collapseActionView" - android:title="@string/support_label"> - </item> - - <item android:id="@+id/open_podcast" custom:showAsAction="collapseActionView" android:title="@string/open_podcast"> diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml index 1f4f09faa..df13cb027 100644 --- a/app/src/main/res/menu/feeditemlist_context.xml +++ b/app/src/main/res/menu/feeditemlist_context.xml @@ -83,11 +83,4 @@ android:title="@string/share_file_label" /> </menu> </item> - - - <item - android:id="@+id/support_item" - android:menuCategory="container" - android:title="@string/support_label" /> - </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 3882cdff1..e62fc9d36 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -38,14 +38,6 @@ android:title="@string/search_label"/> <item - android:id="@+id/support_item" - android:menuCategory="container" - android:title="@string/support_label" - android:visible="false" - custom:showAsAction="collapseActionView"> - </item> - - <item android:id="@+id/visit_website_item" android:icon="?attr/location_web_site" android:menuCategory="container" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 98c7478a6..44d511ee4 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -78,11 +78,4 @@ android:title="@string/share_file_label" /> </menu> </item> - <item - android:id="@+id/support_item" - custom:showAsAction="collapseActionView" - android:title="@string/support_label" - android:visible="false"> - </item> - </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml index 4da40441f..7fdee5661 100644 --- a/app/src/main/res/menu/nav_feed_context.xml +++ b/app/src/main/res/menu/nav_feed_context.xml @@ -2,9 +2,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/mark_all_seen_item" + android:id="@+id/remove_all_new_flags_item" android:menuCategory="container" - android:title="@string/mark_all_seen_label" /> + android:title="@string/remove_all_new_flags_label" /> <item android:id="@+id/mark_all_read_item" diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml index c88620665..e1c3e6216 100644 --- a/app/src/main/res/menu/queue_context.xml +++ b/app/src/main/res/menu/queue_context.xml @@ -84,10 +84,4 @@ android:title="@string/share_file_label" /> </menu> </item> - <item - android:id="@+id/support_item" - android:menuCategory="container" - android:title="@string/support_label" /> - - </menu>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences_flattr.xml b/app/src/main/res/xml/preferences_flattr.xml deleted file mode 100644 index 6b4c38a0b..000000000 --- a/app/src/main/res/xml/preferences_flattr.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> - - <PreferenceScreen - android:key="pref_flattr_authenticate" - android:summary="@string/pref_flattr_auth_sum" - android:title="@string/pref_flattr_auth_title"> - <intent android:action=".activities.FlattrAuthActivity"/> - </PreferenceScreen> - - <Preference - android:key="prefAutoFlattrPrefs" - android:summary="@string/pref_auto_flattr_sum" - android:title="@string/pref_auto_flattr_title"/> - <Preference - android:key="prefRevokeAccess" - android:summary="@string/pref_revokeAccess_sum" - android:title="@string/pref_revokeAccess_title"/> - -</PreferenceScreen> diff --git a/app/src/main/res/xml/preferences_integrations.xml b/app/src/main/res/xml/preferences_integrations.xml index c0fd299ec..716f6c476 100644 --- a/app/src/main/res/xml/preferences_integrations.xml +++ b/app/src/main/res/xml/preferences_integrations.xml @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <Preference - android:key="prefFlattrSettings" - android:title="@string/flattr_label" - android:summary="@string/flattr_summary" /> + xmlns:android="http://schemas.android.com/apk/res/android"> <Preference android:key="prefGpodderSettings" |