diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/nav_list.xml | 23 | ||||
-rw-r--r-- | app/src/main/res/layout/simplechapter_item.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/statistics_mode_select_dialog.xml | 25 | ||||
-rw-r--r-- | app/src/main/res/layout/subscription_item.xml | 19 | ||||
-rw-r--r-- | app/src/main/res/menu/allepisodes_context.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/feeditem_options.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/feeditemlist_context.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/mediaplayer.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/queue_context.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/statistics.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/xml/automotive_app_desc.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 15 |
12 files changed, 101 insertions, 27 deletions
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index 9fcf9d9fc..7e72bb39b 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,7 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version='1.0' encoding='utf-8'?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/nav_layout" android:layout_width="@dimen/drawer_width" @@ -23,8 +21,6 @@ android:id="@+id/imgvCover" android:layout_width="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" android:layout_marginBottom="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" android:layout_marginTop="4dp" @@ -34,8 +30,8 @@ android:padding="8dp" android:scaleType="centerCrop" android:src="?attr/ic_settings" - tools:src="@android:drawable/sym_def_app_icon" - tools:background="@android:color/holo_orange_dark" /> + tools:background="@android:color/holo_orange_dark" + tools:src="@android:drawable/sym_def_app_icon"></ImageView> <TextView android:layout_width="wrap_content" @@ -47,16 +43,15 @@ android:text="@string/settings_label" android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_navdrawer" - tools:background="@android:color/holo_green_light"/> - + tools:background="@android:color/holo_green_light" /> </LinearLayout> <View android:id="@+id/divider" android:layout_width="@dimen/drawer_width" android:layout_height="1dp" - android:layout_centerVertical="true" android:layout_above="@id/nav_settings" + android:layout_centerVertical="true" android:background="?android:attr/listDivider" tools:background="@android:color/holo_red_dark" /> @@ -64,7 +59,6 @@ android:id="@+id/nav_list" android:layout_width="@dimen/drawer_width" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_above="@id/divider" android:layout_alignParentTop="true" android:choiceMode="singleChoice" @@ -74,7 +68,6 @@ android:paddingBottom="@dimen/list_vertical_padding" android:paddingTop="@dimen/list_vertical_padding" android:scrollbarStyle="outsideOverlay" - tools:listitem="@layout/nav_listitem" - tools:background="@android:color/holo_purple" /> - + tools:background="@android:color/holo_purple" + tools:listitem="@layout/nav_listitem"></ListView> </RelativeLayout> diff --git a/app/src/main/res/layout/simplechapter_item.xml b/app/src/main/res/layout/simplechapter_item.xml index fae6bac8c..21bbc9545 100644 --- a/app/src/main/res/layout/simplechapter_item.xml +++ b/app/src/main/res/layout/simplechapter_item.xml @@ -53,6 +53,16 @@ tools:text="Link" tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvDuration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:focusable="false" + android:focusableInTouchMode="false" + android:maxLines="1" + tools:text="Duration" + tools:background="@android:color/holo_green_dark" /> + </LinearLayout> <include layout="@layout/vertical_list_divider" /> diff --git a/app/src/main/res/layout/statistics_mode_select_dialog.xml b/app/src/main/res/layout/statistics_mode_select_dialog.xml new file mode 100644 index 000000000..8f8e1e657 --- /dev/null +++ b/app/src/main/res/layout/statistics_mode_select_dialog.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="16dp"> + + <TextView + android:text="@string/statistics_speed_not_counted" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp"/> + + <RadioButton + android:id="@+id/statistics_mode_normal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/statistics_mode_normal"/> + + <RadioButton + android:id="@+id/statistics_mode_count_all" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/statistics_mode_count_all"/> +</RadioGroup> diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index 19b9943e4..8f0539dfa 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <FrameLayout 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" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal"> @@ -10,31 +10,28 @@ android:id="@+id/imgvCover" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" android:scaleType="centerCrop" - tools:src="@drawable/ic_launcher" /> + tools:src="@drawable/ic_launcher"> + </de.danoeh.antennapod.view.SquareImageView> <com.joanzapata.iconify.widget.IconTextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/light_gray" android:ellipsize="end" android:gravity="center" - android:background="@color/light_gray" tools:text="@string/app_name" /> <jp.shts.android.library.TriangleLabelView android:id="@+id/triangleCountView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" + android:layout_gravity="right|top" app:backgroundColor="@color/antennapod_blue" app:corner="rightTop" app:primaryText="Test" app:primaryTextColor="@color/white" - app:primaryTextSize="12sp" - android:layout_gravity="right|top"/> - + app:primaryTextSize="12sp"> + </jp.shts.android.library.TriangleLabelView> </FrameLayout> diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml index c5356535c..7398b9118 100644 --- a/app/src/main/res/menu/allepisodes_context.xml +++ b/app/src/main/res/menu/allepisodes_context.xml @@ -71,6 +71,10 @@ 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> diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index 511758c2e..7e111d816 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -84,6 +84,10 @@ 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> diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml index 271cb96a7..d3ec88bc7 100644 --- a/app/src/main/res/menu/feeditemlist_context.xml +++ b/app/src/main/res/menu/feeditemlist_context.xml @@ -73,6 +73,10 @@ 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> diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index c4086bf5e..530eb3400 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -64,6 +64,10 @@ 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> <item diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml index 3eb1d9d5e..e93d808c1 100644 --- a/app/src/main/res/menu/queue_context.xml +++ b/app/src/main/res/menu/queue_context.xml @@ -74,6 +74,10 @@ 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> <item diff --git a/app/src/main/res/menu/statistics.xml b/app/src/main/res/menu/statistics.xml new file mode 100644 index 000000000..6ecc70707 --- /dev/null +++ b/app/src/main/res/menu/statistics.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/statistics_mode" + android:icon="?attr/ic_filter" + android:title="@string/statistics_mode" + custom:showAsAction="never"> + </item> + +</menu> diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml new file mode 100644 index 000000000..8f0a7c59c --- /dev/null +++ b/app/src/main/res/xml/automotive_app_desc.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<automotiveApp xmlns:android="http://schemas.android.com/apk/res/android"> + <uses name="media"/> +</automotiveApp>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index b4c6e6068..c18838c51 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -109,6 +109,14 @@ android:key="prefHardwareForwardButtonSkips" android:summary="@string/pref_hardwareForwardButtonSkips_sum" android:title="@string/pref_hardwareForwardButtonSkips_title"/> + <Preference + android:key="prefPlaybackFastForwardDeltaLauncher" + android:summary="@string/pref_fast_forward_sum" + android:title="@string/pref_fast_forward" /> + <Preference + android:key="prefPlaybackRewindDeltaLauncher" + android:summary="@string/pref_rewind_sum" + android:title="@string/pref_rewind" /> <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" @@ -151,7 +159,6 @@ android:key="prefPlaybackSpeedLauncher" android:summary="@string/pref_playback_speed_sum" android:title="@string/pref_playback_speed_title" /> - <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" @@ -167,6 +174,12 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/network_pref"> + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" + android:key="prefEnqueueDownloaded" + android:summary="@string/pref_enqueue_downloaded_summary" + android:title="@string/pref_enqueue_downloaded_title" /> <Preference android:key="prefAutoUpdateIntervall" android:summary="@string/pref_autoUpdateIntervallOrTime_sum" |