diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/audio_controls.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/choose_data_folder_dialog.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/layout/choose_data_folder_dialog_entry.xml | 7 | ||||
-rw-r--r-- | app/src/main/res/layout/edit_text_dialog.xml | 15 | ||||
-rw-r--r-- | app/src/main/res/layout/numberpicker.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/proxy_settings.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/quick_feed_discovery.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/time_dialog.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/layout/videoplayer_activity.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_autodownload.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_playback.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_user_interface.xml | 15 |
12 files changed, 61 insertions, 45 deletions
diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml index 090aec47f..5049db215 100644 --- a/app/src/main/res/layout/audio_controls.xml +++ b/app/src/main/res/layout/audio_controls.xml @@ -3,7 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:padding="16dp"> <LinearLayout android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/choose_data_folder_dialog.xml b/app/src/main/res/layout/choose_data_folder_dialog.xml new file mode 100644 index 000000000..bac14a108 --- /dev/null +++ b/app/src/main/res/layout/choose_data_folder_dialog.xml @@ -0,0 +1,12 @@ +<?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"> + + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/recyclerView" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/choose_data_folder_dialog_entry.xml b/app/src/main/res/layout/choose_data_folder_dialog_entry.xml index f4a2ff703..ae59c0614 100644 --- a/app/src/main/res/layout/choose_data_folder_dialog_entry.xml +++ b/app/src/main/res/layout/choose_data_folder_dialog_entry.xml @@ -37,12 +37,11 @@ android:layout_height="wrap_content" tools:text="2 GB" /> - <me.zhanghai.android.materialprogressbar.MaterialProgressBar + <ProgressBar android:id="@+id/used_space" - style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" + style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - app:mpb_progressStyle="horizontal" /> + android:layout_height="wrap_content" /> </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/layout/edit_text_dialog.xml b/app/src/main/res/layout/edit_text_dialog.xml new file mode 100644 index 000000000..6bf0bc6cb --- /dev/null +++ b/app/src/main/res/layout/edit_text_dialog.xml @@ -0,0 +1,15 @@ +<?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"> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="text" + android:ems="10" + android:id="@+id/text" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/numberpicker.xml b/app/src/main/res/layout/numberpicker.xml index 813326bd6..d493f2e6c 100644 --- a/app/src/main/res/layout/numberpicker.xml +++ b/app/src/main/res/layout/numberpicker.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="32dp"> + android:padding="16dp"> <EditText android:layout_width="match_parent" diff --git a/app/src/main/res/layout/proxy_settings.xml b/app/src/main/res/layout/proxy_settings.xml index 983325030..e4e57cc92 100644 --- a/app/src/main/res/layout/proxy_settings.xml +++ b/app/src/main/res/layout/proxy_settings.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:orientation="vertical"> + android:layout_width="match_parent" + android:orientation="vertical" + android:padding="16dp"> <TextView android:id="@+id/txtvType" diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml index e791d19d7..a80b9381a 100644 --- a/app/src/main/res/layout/quick_feed_discovery.xml +++ b/app/src/main/res/layout/quick_feed_discovery.xml @@ -70,7 +70,7 @@ <TextView android:id="@+id/discover_error" - android:textColor="@color/md_edittext_error" + android:textColor="@color/download_failed_red" android:layout_width="match_parent" android:layout_centerInParent="true" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml index ba4249268..b3742c20c 100644 --- a/app/src/main/res/layout/time_dialog.xml +++ b/app/src/main/res/layout/time_dialog.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:gravity="center"> + android:gravity="center" + android:padding="16dp"> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -33,7 +34,7 @@ </LinearLayout> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml index 4de46810e..b26ef304c 100644 --- a/app/src/main/res/layout/videoplayer_activity.xml +++ b/app/src/main/res/layout/videoplayer_activity.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/black" @@ -33,27 +34,27 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:background="@drawable/md_transparent" + android:background="@android:color/transparent" android:contentDescription="@string/rewind_label" - android:src="@drawable/ic_av_fast_rewind_white_80dp" /> + app:srcCompat="@drawable/ic_av_fast_rewind_white_80dp" /> <ImageButton android:id="@+id/butPlay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:background="@drawable/md_transparent" + android:background="@android:color/transparent" android:contentDescription="@string/pause_label" - android:src="@drawable/ic_av_pause_white_80dp" /> + app:srcCompat="@drawable/ic_av_pause_white_80dp" /> <ImageButton android:id="@+id/butFF" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:background="@drawable/md_transparent" + android:background="@android:color/transparent" android:contentDescription="@string/fast_forward_label" - android:src="@drawable/ic_av_fast_forward_white_80dp" /> + app:srcCompat="@drawable/ic_av_fast_forward_white_80dp" /> </LinearLayout> diff --git a/app/src/main/res/xml/preferences_autodownload.xml b/app/src/main/res/xml/preferences_autodownload.xml index a4967c839..333224aa0 100644 --- a/app/src/main/res/xml/preferences_autodownload.xml +++ b/app/src/main/res/xml/preferences_autodownload.xml @@ -15,16 +15,14 @@ android:key="prefEpisodeCacheSize" android:title="@string/pref_episode_cache_title" android:summary="@string/pref_episode_cache_summary" - android:entryValues="@array/episode_cache_size_values" - app:useStockLayout="true"/> + android:entryValues="@array/episode_cache_size_values"/> <ListPreference android:defaultValue="-1" android:entries="@array/episode_cleanup_entries" android:key="prefEpisodeCleanup" android:title="@string/pref_episode_cleanup_title" android:summary="@string/pref_episode_cleanup_summary" - android:entryValues="@array/episode_cleanup_values" - app:useStockLayout="true"/> + android:entryValues="@array/episode_cleanup_values"/> <SwitchPreference android:key="prefEnableAutoDownloadOnBattery" android:title="@string/pref_automatic_download_on_battery_title" diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml index b01105376..7a7535dda 100644 --- a/app/src/main/res/xml/preferences_playback.xml +++ b/app/src/main/res/xml/preferences_playback.xml @@ -1,7 +1,5 @@ <?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"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/interruptions"> <SwitchPreference @@ -42,8 +40,7 @@ android:entryValues="@array/video_background_behavior_values" android:key="prefVideoBehavior" android:summary="@string/pref_videoBehavior_sum" - android:title="@string/pref_videoBehavior_title" - app:useStockLayout="true"/> + android:title="@string/pref_videoBehavior_title"/> </PreferenceCategory> <PreferenceCategory android:title="@string/playback_control"> @@ -95,8 +92,7 @@ android:entries="@array/enqueue_location_options" android:entryValues="@array/enqueue_location_values" android:key="prefEnqueueLocation" - android:title="@string/pref_enqueue_location_title" - app:useStockLayout="true"/> + android:title="@string/pref_enqueue_location_title"/> <SwitchPreference android:defaultValue="true" android:enabled="true" @@ -109,8 +105,7 @@ android:entryValues="@array/smart_mark_as_played_values" android:key="prefSmartMarkAsPlayedSecs" android:summary="@string/pref_smart_mark_as_played_sum" - android:title="@string/pref_smart_mark_as_played_title" - app:useStockLayout="true"/> + android:title="@string/pref_smart_mark_as_played_title"/> <SwitchPreference android:defaultValue="true" android:enabled="true" @@ -126,8 +121,7 @@ android:key="prefMediaPlayer" android:title="@string/media_player" android:summary="@string/pref_media_player_message" - android:entryValues="@array/media_player_values" - app:useStockLayout="true"/> + android:entryValues="@array/media_player_values"/> </PreferenceCategory> <PreferenceCategory android:title="@string/experimental_pref"> diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 3402f4ffa..20a06c4c4 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -10,8 +10,7 @@ android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" - android:defaultValue="system" - app:useStockLayout="true"/> + android:defaultValue="system"/> <Preference android:key="prefHiddenDrawerItems" android:summary="@string/pref_nav_drawer_items_sum" @@ -22,23 +21,20 @@ android:title="@string/pref_nav_drawer_feed_order_title" android:key="prefDrawerFeedOrder" android:summary="@string/pref_nav_drawer_feed_order_sum" - android:defaultValue="0" - app:useStockLayout="true"/> + android:defaultValue="0"/> <ListPreference android:entryValues="@array/nav_drawer_feed_counter_values" android:entries="@array/nav_drawer_feed_counter_options" android:title="@string/pref_nav_drawer_feed_counter_title" android:key="prefDrawerFeedIndicator" android:summary="@string/pref_nav_drawer_feed_counter_sum" - android:defaultValue="0" - app:useStockLayout="true"/> + android:defaultValue="0"/> <SwitchPreference android:title="@string/pref_episode_cover_title" android:key="prefEpisodeCover" android:summary="@string/pref_episode_cover_summary" android:defaultValue="true" - android:enabled="true" - app:useStockLayout="true"/> + android:enabled="true"/> </PreferenceCategory> <PreferenceCategory android:title="@string/external_elements"> <SwitchPreference @@ -71,7 +67,6 @@ android:key="prefBackButtonBehavior" android:title="@string/pref_back_button_behavior_title" android:summary="@string/pref_back_button_behavior_sum" - android:defaultValue="default" - app:useStockLayout="true"/> + android:defaultValue="default"/> </PreferenceCategory> </PreferenceScreen> |