diff options
Diffstat (limited to 'app/src/main/res')
21 files changed, 322 insertions, 355 deletions
diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml index 3abb70961..25f38a63f 100644 --- a/app/src/main/res/layout/audio_controls.xml +++ b/app/src/main/res/layout/audio_controls.xml @@ -19,19 +19,6 @@ android:visibility="gone" android:layout_marginBottom="8dp" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:text="@string/audio_effects" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" /> - - <CheckBox - android:id="@+id/skipSilence" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/pref_skip_silence_title" /> - </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index 974823668..c3ca87a5a 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -81,12 +81,13 @@ <TextView android:id="@+id/txtvUrl" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:maxLines="4" android:paddingTop="4dp" android:paddingBottom="4dp" + android:drawablePadding="4dp" tools:background="@android:color/holo_green_dark" tools:text="http://www.example.com/feed" /> diff --git a/app/src/main/res/layout/filter_dialog.xml b/app/src/main/res/layout/filter_dialog.xml index d700f0365..e22ea4ffe 100644 --- a/app/src/main/res/layout/filter_dialog.xml +++ b/app/src/main/res/layout/filter_dialog.xml @@ -1,15 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout - android:id="@+id/filter_rows" + android:id="@+id/filter_rows" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="24dp" + android:paddingTop="24dp" + android:paddingRight="24dp" + android:paddingBottom="8dp"> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="24dp" - android:paddingRight="24dp" - android:paddingBottom="8dp"> + android:layout_height="match_parent" + android:orientation="horizontal"> + + <com.google.android.material.button.MaterialButton + android:id="@+id/resetFiltermenu" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/reset" + style="@style/Widget.MaterialComponents.Button.TextButton" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/confirmFiltermenu" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/confirm_label" + style="@style/Widget.MaterialComponents.Button.TextButton" /> + + </LinearLayout> + </LinearLayout> + </ScrollView> diff --git a/app/src/main/res/layout/home_section.xml b/app/src/main/res/layout/home_section.xml index 82f5c0b5c..c1bac5e91 100644 --- a/app/src/main/res/layout/home_section.xml +++ b/app/src/main/res/layout/home_section.xml @@ -56,6 +56,7 @@ android:layout_marginStart="8dp" android:background="@drawable/bg_pill" android:paddingHorizontal="8dp" + android:paddingBottom="1sp" android:textAlignment="center" android:textColor="?attr/colorPrimary" android:textSize="16sp" diff --git a/app/src/main/res/layout/nextcloud_auth_dialog.xml b/app/src/main/res/layout/nextcloud_auth_dialog.xml index c08c5b969..0f25a271f 100644 --- a/app/src/main/res/layout/nextcloud_auth_dialog.xml +++ b/app/src/main/res/layout/nextcloud_auth_dialog.xml @@ -1,69 +1,75 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical" - android:clipToPadding="false"> + android:layout_height="wrap_content"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:text="@string/synchronization_host_explanation" /> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/serverUrlTextInput" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"> + android:padding="16dp" + android:orientation="vertical" + android:clipToPadding="false"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:text="@string/synchronization_host_explanation" /> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/serverUrlText" + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/serverUrlTextInput" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/synchronization_host_label" - android:inputType="textNoSuggestions" - android:lines="1" - android:imeOptions="actionNext|flagNoFullscreen" /> + android:layout_marginBottom="16dp" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/serverUrlText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/synchronization_host_label" + android:inputType="textNoSuggestions" + android:lines="1" + android:imeOptions="actionNext|flagNoFullscreen" /> - <LinearLayout - android:id="@+id/loginProgressContainer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> + </com.google.android.material.textfield.TextInputLayout> - <ProgressBar - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/loginProgressContainer" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" /> + android:visibility="gone" + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + <ProgressBar + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginRight="8dp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/synchronization_nextcloud_authenticate_browser" /> + + </LinearLayout> <TextView + android:id="@+id/errorText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/synchronization_nextcloud_authenticate_browser" /> + android:visibility="gone" + android:textColor="?attr/icon_red" + android:layout_marginBottom="16dp" /> - </LinearLayout> - - <TextView - android:id="@+id/errorText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:textColor="?attr/icon_red" - android:layout_marginBottom="16dp" /> + <Button + android:id="@+id/chooseHostButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/proceed_to_login_butLabel" /> - <Button - android:id="@+id/chooseHostButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/proceed_to_login_butLabel" /> + </LinearLayout> -</LinearLayout> +</ScrollView> diff --git a/app/src/main/res/layout/sort_dialog.xml b/app/src/main/res/layout/sort_dialog.xml new file mode 100644 index 000000000..88eb61df5 --- /dev/null +++ b/app/src/main/res/layout/sort_dialog.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + 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:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="16dp"> + + <androidx.gridlayout.widget.GridLayout + android:id="@+id/gridLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:columnCount="2" + app:rowOrderPreserved="false" + app:useDefaultMargins="true" + app:alignmentMode="alignBounds" /> + + <CheckBox + android:id="@+id/keepSortedCheckbox" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:text="@string/keep_sorted" + tools:visibility="visible" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/sort_dialog_item.xml b/app/src/main/res/layout/sort_dialog_item.xml new file mode 100644 index 000000000..570a66d26 --- /dev/null +++ b/app/src/main/res/layout/sort_dialog_item.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Button + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/button" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal|center_vertical" + app:layout_columnWeight="1" + style="@style/Widget.Material3.Button.OutlinedButton" /> diff --git a/app/src/main/res/layout/sort_dialog_item_active.xml b/app/src/main/res/layout/sort_dialog_item_active.xml new file mode 100644 index 000000000..829ccdee2 --- /dev/null +++ b/app/src/main/res/layout/sort_dialog_item_active.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Button + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/button" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal|center_vertical" + app:layout_columnWeight="1" + style="@style/Widget.Material3.Button.TonalButton" /> diff --git a/app/src/main/res/layout/speed_select_dialog.xml b/app/src/main/res/layout/speed_select_dialog.xml index e4d78c3fa..0b9e422a8 100644 --- a/app/src/main/res/layout/speed_select_dialog.xml +++ b/app/src/main/res/layout/speed_select_dialog.xml @@ -1,45 +1,51 @@ <?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:padding="16dp" - android:orientation="vertical"> + 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"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="wrap_content"> <TextView - android:text="@string/playback_speed" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/> + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/playback_speed" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" /> <com.google.android.material.chip.Chip - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/add_current_speed_chip"/> + android:id="@+id/add_current_speed_chip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout> <de.danoeh.antennapod.view.PlaybackSpeedSeekBar - android:id="@+id/speed_seek_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp"> - </de.danoeh.antennapod.view.PlaybackSpeedSeekBar> + android:id="@+id/speed_seek_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" /> <TextView - android:text="@string/speed_presets" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" - android:layout_marginBottom="8dp"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:text="@string/speed_presets" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" /> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/selected_speeds_grid" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:id="@+id/selected_speeds_grid" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <CheckBox + android:id="@+id/skipSilence" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/pref_skip_silence_title" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml index 263ac0c9c..2b5ae0985 100644 --- a/app/src/main/res/layout/time_dialog.xml +++ b/app/src/main/res/layout/time_dialog.xml @@ -1,164 +1,170 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center" - android:padding="16dp"> + android:layout_height="wrap_content"> <LinearLayout - android:id="@+id/timeSetup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:gravity="center" + android:padding="16dp"> <LinearLayout + android:id="@+id/timeSetup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="vertical"> - <EditText - android:id="@+id/etxtTime" - android:layout_width="0dp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:selectAllOnFocus="true" - android:layout_margin="8dp" - android:ems="2" - android:inputType="number" - android:maxLength="3" /> + android:orientation="horizontal"> + + <EditText + android:id="@+id/etxtTime" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:selectAllOnFocus="true" + android:layout_margin="8dp" + android:ems="2" + android:inputType="number" + android:maxLength="3" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/time_minutes" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" /> + + </LinearLayout> - <TextView - android:layout_width="wrap_content" + <Button + android:id="@+id/setSleeptimerButton" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/time_minutes" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" /> + android:text="@string/set_sleeptimer_label" /> </LinearLayout> - <Button - android:id="@+id/setSleeptimerButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/set_sleeptimer_label" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/timeDisplay" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="visible"> - - <TextView - android:id="@+id/time" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="00:00:00" - android:layout_gravity="center" - android:gravity="center" - android:textSize="32sp" - android:textColor="?android:attr/textColorPrimary" /> - - <Button - android:id="@+id/disableSleeptimerButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/disable_sleeptimer_label" /> - <LinearLayout + android:id="@+id/timeDisplay" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="center_vertical"> + android:orientation="vertical" + android:visibility="visible"> - <Button - android:id="@+id/extendSleepFiveMinutesButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginEnd="4dp" - android:layout_marginRight="4dp" - android:paddingHorizontal="2dp" - android:paddingVertical="4dp" - android:layout_weight="1" - style="?attr/materialButtonOutlinedStyle" - tools:text="+5 min" /> + <TextView + android:id="@+id/time" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="00:00:00" + android:layout_gravity="center" + android:gravity="center" + android:textSize="32sp" + android:textColor="?android:attr/textColorPrimary" /> <Button - android:id="@+id/extendSleepTenMinutesButton" - android:layout_width="0dp" + android:id="@+id/disableSleeptimerButton" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:layout_marginEnd="4dp" - android:paddingHorizontal="2dp" - android:paddingVertical="4dp" - android:layout_weight="1" - style="?attr/materialButtonOutlinedStyle" - tools:text="+10 min" /> + android:text="@string/disable_sleeptimer_label" /> - <Button - android:id="@+id/extendSleepTwentyMinutesButton" - android:layout_width="0dp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:layout_marginRight="4dp" - android:layout_marginLeft="4dp" - android:paddingHorizontal="2dp" - android:paddingVertical="4dp" - android:layout_weight="1" - style="?attr/materialButtonOutlinedStyle" - tools:text="+20 min" /> + android:orientation="horizontal" + android:gravity="center_vertical"> + + <Button + android:id="@+id/extendSleepFiveMinutesButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="4dp" + android:layout_marginRight="4dp" + android:paddingHorizontal="2dp" + android:paddingVertical="4dp" + android:layout_weight="1" + style="?attr/materialButtonOutlinedStyle" + tools:text="+5 min" /> + + <Button + android:id="@+id/extendSleepTenMinutesButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:paddingHorizontal="2dp" + android:paddingVertical="4dp" + android:layout_weight="1" + style="?attr/materialButtonOutlinedStyle" + tools:text="+10 min" /> + + <Button + android:id="@+id/extendSleepTwentyMinutesButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="4dp" + android:layout_marginRight="4dp" + android:layout_marginLeft="4dp" + android:paddingHorizontal="2dp" + android:paddingVertical="4dp" + android:layout_weight="1" + style="?attr/materialButtonOutlinedStyle" + tools:text="+20 min" /> + + </LinearLayout> </LinearLayout> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_marginTop="8dp"> - - <CheckBox - android:id="@+id/cbShakeToReset" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/shake_to_reset_label" /> - - <CheckBox - android:id="@+id/cbVibrate" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/timer_vibration_label" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:weightSum="1"> + android:orientation="vertical" + android:layout_marginTop="8dp"> <CheckBox - android:id="@+id/chAutoEnable" - android:layout_width="0dp" + android:id="@+id/cbShakeToReset" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/auto_enable_label" /> + android:text="@string/shake_to_reset_label" /> - <ImageView - android:id="@+id/changeTimesButton" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:contentDescription="@string/auto_enable_change_times" - android:background="?attr/selectableItemBackgroundBorderless" - app:srcCompat="@drawable/ic_settings" /> + <CheckBox + android:id="@+id/cbVibrate" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/timer_vibration_label" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:weightSum="1"> + + <CheckBox + android:id="@+id/chAutoEnable" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/auto_enable_label" /> + + <ImageView + android:id="@+id/changeTimesButton" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:contentDescription="@string/auto_enable_change_times" + android:background="?attr/selectableItemBackgroundBorderless" + app:srcCompat="@drawable/ic_settings" /> + + </LinearLayout> </LinearLayout> </LinearLayout> -</LinearLayout> +</ScrollView> diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml index 08179de58..a7753d080 100644 --- a/app/src/main/res/menu/downloads_completed.xml +++ b/app/src/main/res/menu/downloads_completed.xml @@ -20,12 +20,8 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - android:icon="@drawable/ic_refresh" - app:showAsAction="always" /> + app:showAsAction="never" /> <item android:id="@+id/downloads_sort" - android:title="@string/sort"> - <menu></menu> - </item> - + android:title="@string/sort" /> </menu> diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml index 358573c93..4c8e0dbb3 100644 --- a/app/src/main/res/menu/episodes.xml +++ b/app/src/main/res/menu/episodes.xml @@ -13,8 +13,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="always" - android:icon="@drawable/ic_refresh"/> + custom:showAsAction="never" /> <item android:id="@+id/filter_items" @@ -33,8 +32,6 @@ <item android:id="@+id/episodes_sort" android:title="@string/sort" - custom:showAsAction="never"> - <menu /> - </item> + custom:showAsAction="never" /> </menu> diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 2086ff547..0baf434f1 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -10,10 +10,9 @@ </item> <item android:id="@+id/refresh_item" - android:icon="@drawable/ic_refresh" android:menuCategory="container" android:title="@string/refresh_label" - custom:showAsAction="always"> + custom:showAsAction="never"> </item> <item android:id="@+id/refresh_complete_item" diff --git a/app/src/main/res/menu/home.xml b/app/src/main/res/menu/home.xml index f80218c0c..a0bca6d50 100644 --- a/app/src/main/res/menu/home.xml +++ b/app/src/main/res/menu/home.xml @@ -12,8 +12,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="always" - android:icon="@drawable/ic_refresh"/> + custom:showAsAction="never" /> <item android:id="@+id/homesettings_items" diff --git a/app/src/main/res/menu/inbox.xml b/app/src/main/res/menu/inbox.xml index fba8eefdb..725d6e90e 100644 --- a/app/src/main/res/menu/inbox.xml +++ b/app/src/main/res/menu/inbox.xml @@ -12,14 +12,11 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="always" - android:icon="@drawable/ic_refresh"/> + custom:showAsAction="never" /> <item android:id="@+id/inbox_sort" - android:title="@string/sort"> - <menu></menu> - </item> + android:title="@string/sort" /> <item android:id="@+id/remove_all_inbox_item" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 5f60fe6f5..a99151ac8 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -30,9 +30,9 @@ <item android:id="@+id/audio_controls" - android:icon="@drawable/ic_sliders" android:title="@string/audio_controls" - custom:showAsAction="always"> + android:visible="false" + custom:showAsAction="never"> </item> <item @@ -74,8 +74,9 @@ <item android:id="@+id/share_item" + android:icon="@drawable/ic_share" android:menuCategory="container" - custom:showAsAction="never" + custom:showAsAction="always" android:title="@string/share_label"> </item> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml index e4bb63808..5f34d0a96 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -12,8 +12,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="always" - android:icon="@drawable/ic_refresh"/> + custom:showAsAction="never" /> <item android:id="@+id/queue_lock" @@ -23,9 +22,7 @@ <item android:id="@+id/queue_sort" - android:title="@string/sort"> - <menu></menu> - </item> + android:title="@string/sort" /> <item android:id="@+id/clear_queue" diff --git a/app/src/main/res/menu/sort_menu.xml b/app/src/main/res/menu/sort_menu.xml deleted file mode 100644 index 96ad4b9f6..000000000 --- a/app/src/main/res/menu/sort_menu.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/sort_date" - android:title="@string/date"> - - <menu> - <item - android:id="@+id/sort_date_asc" - android:title="@string/sort_old_new"/> - <item - android:id="@+id/sort_date_desc" - android:title="@string/sort_new_old"/> - </menu> - </item> - - <item - android:id="@+id/sort_duration" - android:title="@string/duration"> - - <menu> - <item - android:id="@+id/sort_duration_asc" - android:title="@string/sort_short_long"/> - <item - android:id="@+id/sort_duration_desc" - android:title="@string/sort_long_short"/> - </menu> - </item> - - <item - android:id="@+id/sort_episode_title" - android:title="@string/episode_title"> - - <menu> - <item - android:id="@+id/sort_episode_title_asc" - android:title="@string/sort_a_z"/> - <item - android:id="@+id/sort_episode_title_desc" - android:title="@string/sort_z_a"/> - </menu> - </item> - - <item - android:id="@+id/sort_feed_title" - android:title="@string/feed_title"> - - <menu> - <item - android:id="@+id/sort_feed_title_asc" - android:title="@string/sort_a_z"/> - <item - android:id="@+id/sort_feed_title_desc" - android:title="@string/sort_z_a"/> - </menu> - </item> - - <item - android:id="@+id/sort_random" - android:title="@string/random"> - </item> - - <item - android:id="@+id/sort_smart_shuffle" - android:title="@string/smart_shuffle"> - - <menu> - <item - android:id="@+id/sort_smart_shuffle_asc" - android:title="@string/sort_old_new"/> - <item - android:id="@+id/sort_smart_shuffle_desc" - android:title="@string/sort_new_old"/> - </menu> - </item> - - <item - android:id="@+id/sort_size" - android:title="@string/size" - android:visible="false"> - - <menu> - <item - android:id="@+id/sort_size_small_large" - android:title="@string/sort_small_large"/> - <item - android:id="@+id/sort_size_large_small" - android:title="@string/sort_large_small"/> - </menu> - </item> - - <item - android:id="@+id/keep_sorted" - android:title="@string/keep_sorted" - android:checkable="true" /> - -</menu> diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index 845ee92a2..3a2614149 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -15,8 +15,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="always" - android:icon="@drawable/ic_refresh"/> + custom:showAsAction="never" /> <item android:id="@+id/subscriptions_filter" android:title="@string/filter" diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 03da6c669..dab3a062c 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -2,6 +2,5 @@ <resources> <integer name="subscriptions_default_num_of_columns">3</integer> <integer name="nav_drawer_screen_size_percent">80</integer> - <integer name="swipe_to_refresh_duration_in_ms">750</integer> <integer name="swipe_refresh_distance">300</integer> </resources>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 733649ce1..5cd25d59f 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -70,9 +70,9 @@ android:summary="@string/pref_persistNotify_sum" android:title="@string/pref_persistNotify_title"/> <Preference - android:key="prefCompactNotificationButtons" - android:summary="@string/pref_compact_notification_buttons_sum" - android:title="@string/pref_compact_notification_buttons_title"/> + android:key="prefFullNotificationButtons" + android:summary="@string/pref_full_notification_buttons_sum" + android:title="@string/pref_full_notification_buttons_title"/> </PreferenceCategory> <PreferenceCategory android:title="@string/behavior"> <de.danoeh.antennapod.preferences.MaterialListPreference |