diff options
| author | Raghul Jagannathan <raghul@redmart.com> | 2016-01-27 20:16:24 +0800 |
|---|---|---|
| committer | Raghul Jagannathan <raghul@redmart.com> | 2016-01-27 20:16:24 +0800 |
| commit | 5cc6f12acb0213dbca37e02c019ee27c28f4a0bb (patch) | |
| tree | 432b483c14db8ec143407f3a4fba4072bb0dce9c /app/src/main/res | |
| parent | b4a363cecebdb15d885ab98cc48f5cc88142cfa1 (diff) | |
| parent | c1819864fe4e46945c42584a571cabc96c338644 (diff) | |
| download | AntennaPod-5cc6f12acb0213dbca37e02c019ee27c28f4a0bb.zip | |
Merge: Updated subscriptionview and synced develop
Diffstat (limited to 'app/src/main/res')
50 files changed, 1776 insertions, 927 deletions
diff --git a/app/src/main/res/drawable/shadow.xml b/app/src/main/res/drawable/shadow.xml new file mode 100644 index 000000000..fc5110e0b --- /dev/null +++ b/app/src/main/res/drawable/shadow.xml @@ -0,0 +1,7 @@ +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <gradient + android:startColor="@android:color/transparent" + android:endColor="#40000000" + android:angle="90" /> +</shape> diff --git a/app/src/main/res/layout-v14/authentication_dialog.xml b/app/src/main/res/layout-v14/authentication_dialog.xml index ed05dab1c..00e74c9e1 100644 --- a/app/src/main/res/layout-v14/authentication_dialog.xml +++ b/app/src/main/res/layout-v14/authentication_dialog.xml @@ -15,7 +15,10 @@ android:layout_height="0dp" android:layout_weight="1" android:layout_margin="16dp" - android:hint="@string/username_label"/> + android:hint="@string/username_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -24,7 +27,10 @@ android:layout_weight="1" android:layout_margin="16dp" android:inputType="textPassword" - android:hint="@string/password_label"/> + android:hint="@string/password_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <CheckBox android:id="@+id/chkSaveUsernamePassword" diff --git a/app/src/main/res/layout-v14/directory_chooser.xml b/app/src/main/res/layout-v14/directory_chooser.xml index 8f9c4ee93..14e2f6a38 100644 --- a/app/src/main/res/layout-v14/directory_chooser.xml +++ b/app/src/main/res/layout-v14/directory_chooser.xml @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@id/butNavUp" - android:background="@color/bright_blue" /> + android:background="@color/holo_blue_light" /> </RelativeLayout> <ListView diff --git a/app/src/main/res/layout-v14/download_authentication_activity.xml b/app/src/main/res/layout-v14/download_authentication_activity.xml index c1fe55ceb..f6925dc3a 100644 --- a/app/src/main/res/layout-v14/download_authentication_activity.xml +++ b/app/src/main/res/layout-v14/download_authentication_activity.xml @@ -12,7 +12,7 @@ android:layout_alignParentTop="true" android:textSize="@dimen/text_size_large" android:layout_margin="16dp" - android:textColor="@color/bright_blue" + android:textColor="@color/holo_blue_light" android:textStyle="italic"/> <TextView @@ -31,7 +31,10 @@ android:layout_margin="16dp" android:id="@+id/etxtUsername" android:hint="@string/username_label" - android:layout_below="@id/txtvDescription"/> + android:layout_below="@id/txtvDescription" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:layout_width="match_parent" @@ -40,7 +43,10 @@ android:id="@+id/etxtPassword" android:hint="@string/password_label" android:inputType="textPassword" - android:layout_below="@id/etxtUsername"/> + android:layout_below="@id/etxtUsername" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <RelativeLayout android:id="@+id/footer" diff --git a/app/src/main/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml index 7fd4309d5..06c2cce14 100644 --- a/app/src/main/res/layout-v14/time_dialog.xml +++ b/app/src/main/res/layout-v14/time_dialog.xml @@ -1,21 +1,22 @@ <?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:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" > <EditText android:id="@+id/etxtTime" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:layout_margin="8dp" - android:ems="7" + android:ems="2" android:hint="@string/enter_time_here_label" android:inputType="number" android:maxLength="2" > @@ -25,54 +26,34 @@ <Spinner android:id="@+id/spTimeUnit" - android:layout_width="180dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_marginTop="8dp" /> </LinearLayout> - <RelativeLayout - android:id="@+id/footer" - android:layout_width="fill_parent" - android:layout_height="48dp" > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:layout_alignParentTop="true" - android:background="?android:attr/dividerVertical" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:textSize="16sp" + android:text="@string/timer_about_to_expire_label"/> - <View - android:id="@+id/horizontal_divider" - android:layout_width="1dip" - android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - android:background="?android:attr/dividerVertical" /> + <CheckBox android:id="@+id/cbShakeToReset" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/shake_to_reset_label"/> - <Button - android:id="@+id/butCancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@id/horizontal_divider" - android:background="?android:attr/selectableItemBackground" - android:text="@string/cancel_label" /> + <CheckBox android:id="@+id/cbVibrate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/timer_vibration_label"/> - <Button - android:id="@+id/butConfirm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/horizontal_divider" - android:background="?android:attr/selectableItemBackground" - android:text="@string/confirm_label" /> - </RelativeLayout> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index b7babbafa..dff24c650 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -15,26 +15,33 @@ android:orientation="vertical"> <TextView - android:id="@+id/txtvFeedurl" + android:id="@+id/txtvPodcastDirectories" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AntennaPod.TextView.Heading" - android:text="@string/txtvfeedurl_label"/> + android:text="@string/podcastdirectories_label"/> - <EditText - android:id="@+id/etxtFeedurl" + <TextView + android:id="@+id/txtvPodcastDirectoriesDescr" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:hint="@string/etxtFeedurlHint" - android:inputType="textUri"/> + android:text="@string/podcastdirectories_descr" + android:textSize="@dimen/text_size_medium" + android:layout_marginTop="4dp"/> <Button - android:id="@+id/butConfirm" + android:id="@+id/butSearchItunes" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/confirm_label"/> + android:text="@string/search_itunes_label"/> + + <Button + android:id="@+id/butBrowseGpoddernet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/browse_gpoddernet_label"/> <View android:id="@+id/divider1" @@ -44,34 +51,30 @@ android:background="?android:attr/listDivider"/> <TextView - android:id="@+id/txtvPodcastDirectories" + android:id="@+id/txtvFeedurl" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/divider1" style="@style/AntennaPod.TextView.Heading" - android:text="@string/podcastdirectories_label"/> - - <TextView - android:id="@+id/txtvPodcastDirectoriesDescr" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/podcastdirectories_descr" - android:textSize="@dimen/text_size_medium" - android:layout_marginTop="4dp"/> + android:text="@string/txtvfeedurl_label"/> - <Button - android:id="@+id/butBrowseGpoddernet" + <EditText + android:id="@+id/etxtFeedurl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/browse_gpoddernet_label"/> + android:layout_marginTop="4dp" + android:hint="@string/etxtFeedurlHint" + android:inputType="textUri" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <Button - android:id="@+id/butSearchItunes" + android:id="@+id/butConfirm" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/search_itunes_label"/> + android:text="@string/confirm_label"/> <View android:id="@+id/divider2" diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 19db02f1d..5336fb8ce 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -1,41 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:dslv="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"> - <com.mobeta.android.dslv.DragSortListView - android:id="@android:id/list" - android:scrollbarStyle="outsideOverlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="@dimen/list_vertical_padding" - android:paddingBottom="@dimen/list_vertical_padding" - android:clipToPadding="false" - dslv:collapsed_height="2dp" - dslv:drag_enabled="false" - dslv:drag_scroll_start="0.33" - dslv:float_alpha="0.6" - dslv:max_drag_scroll_speed="0.5" - dslv:remove_enabled="true" - dslv:remove_mode="flingRemove" - dslv:slide_shuffle_speed="0.3" - dslv:sort_enabled="false" - dslv:track_drag_sort="false" - dslv:float_background_color="?attr/dragview_float_background" - dslv:use_default_controller="true" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@id/android:empty" + <android.support.v7.widget.RecyclerView + android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/no_items_label"/> + android:scrollbarStyle="outsideOverlay" + android:paddingTop="@dimen/list_vertical_padding" + android:paddingBottom="@dimen/list_vertical_padding" + android:clipToPadding="false"/> <ProgressBar android:id="@+id/progLoading" diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml new file mode 100644 index 000000000..7532722dd --- /dev/null +++ b/app/src/main/res/layout/audio_controls.xml @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:layout_marginLeft="24dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:text="@string/playback_speed" + android:textStyle="bold"/> + + <TextView + android:id="@+id/txtvPlaybackSpeed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:text="1.00x"/> + + </LinearLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-12dp" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp"> + + <Button + android:id="@+id/butDecSpeed" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_alignParentLeft="true" + android:gravity="center" + android:text="-" + android:textStyle="bold" + android:textColor="@color/status_progress" + android:textSize="24sp" + android:background="@drawable/borderless_button_dark"/> + + <Button + android:id="@+id/butIncSpeed" + android:layout_width="32dp" + android:layout_height="32dp" + android:minWidth="0dp" + android:layout_alignParentRight="true" + android:gravity="center" + android:text="+" + android:textStyle="bold" + android:textColor="@color/status_progress" + android:textSize="24sp" + android:background="@drawable/borderless_button_dark"/> + + <SeekBar + android:id="@+id/playback_speed" + android:layout_width="match_parent" + android:layout_height="32dp" + android:layout_toRightOf="@id/butDecSpeed" + android:layout_toLeftOf="@id/butIncSpeed" + android:layout_centerVertical="true" + android:max="40"/> + + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="24dp" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:text="@string/volume" + android:textStyle="bold"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-12dp" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:orientation="horizontal" + android:gravity="center"> + + <TextView + android:id="@+id/txtvLeft" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/left_short" /> + + <SeekBar + android:id="@+id/volume_left" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:max="100" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:orientation="horizontal" + android:gravity="center"> + + <TextView + android:id="@+id/txtvRight" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/right_short" /> + + <SeekBar + android:id="@+id/volume_right" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:max="100"/> + + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:layout_marginLeft="24dp" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:text="@string/audio_effects" + android:textStyle="bold"/> + + <CheckBox + android:id="@+id/stereo_to_mono" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="-12dp" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:text="@string/stereo_to_mono" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml index 827e06e00..fb4f995a2 100644 --- a/app/src/main/res/layout/audioplayer_activity.xml +++ b/app/src/main/res/layout/audioplayer_activity.xml @@ -1,221 +1,219 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout + 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:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" tools:background="@android:color/holo_red_dark"> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> + + <android.support.design.widget.AppBarLayout + android:id="@+id/appBar" + android:layout_width="match_parent" + android:layout_height="wrap_content"> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:background="?attr/colorPrimary" android:minHeight="?attr/actionBarSize" - tools:background="@android:color/darker_gray"> + tools:background="@android:color/darker_gray"/> - <LinearLayout + <com.viewpagerindicator.CirclePageIndicator + android:id="@+id/page_indicator" + android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:paddingLeft="8dp" - android:paddingRight="8dp"> - - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:ellipsize="end" - android:gravity="left" - android:maxLines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="16sp" - tools:text="Audio title" - tools:background="@android:color/holo_green_dark" /> - - <ImageButton - android:id="@+id/butCover" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" - android:background="?attr/selectableItemBackground" - android:contentDescription="@string/show_cover_label" - android:gravity="right" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> - - - </LinearLayout> - </android.support.v7.widget.Toolbar> - - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content" + android:layout_marginTop="-12dp" + android:layout_marginBottom="4dp" + android:background="@android:color/transparent" + app:fillColor="?android:attr/textColorSecondary" + app:strokeColor="?android:attr/textColorSecondary" + app:radius="4dp" /> + + </android.support.design.widget.AppBarLayout> + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/playtime_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/non_transparent_background" - android:foreground="?android:windowContentOverlay" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:layout_alignParentBottom="true" + android:background="?attr/overlay_drawable" android:orientation="vertical"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/txtvPosition" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_marginLeft="8dp" + android:text="@string/position_default_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_micro" + tools:background="@android:color/holo_green_dark" /> + + <TextView + android:id="@+id/txtvLength" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginRight="8dp" + android:text="@string/position_default_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_micro" + tools:background="@android:color/holo_green_dark" /> + + <SeekBar + android:id="@+id/sbPosition" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/txtvLength" + android:layout_toRightOf="@id/txtvPosition" + android:max="500" + tools:background="@android:color/holo_green_dark" /> + + </RelativeLayout> + <RelativeLayout android:id="@+id/player_control" android:layout_width="match_parent" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_alignParentBottom="true" + android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingBottom="8dp" android:background="?attr/overlay_background" tools:background="@android:color/holo_purple"> <ImageButton android:id="@+id/butPlay" android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="match_parent" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:layout_centerHorizontal="true" android:background="?attr/selectableItemBackground" android:contentDescription="@string/pause_label" android:src="?attr/av_pause" + android:scaleType="fitCenter" tools:src="@drawable/ic_pause_white_36dp" tools:background="@android:color/holo_green_dark" /> <ImageButton android:id="@+id/butRev" android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="match_parent" + android:layout_height="@dimen/audioplayer_playercontrols_length" android:layout_toLeftOf="@id/butPlay" + android:layout_marginLeft="16dp" android:background="?attr/selectableItemBackground" android:contentDescription="@string/rewind_label" android:src="?attr/av_rew_big" + android:scaleType="fitCenter" tools:src="@drawable/ic_fast_rewind_white_36dp" tools:background="@android:color/holo_blue_dark" /> <TextView android:id="@+id/txtvRev" android:layout_width="wrap_content" - android:layout_height="32dp" - android:layout_alignTop="@id/butRev" + android:layout_height="wrap_content" + android:layout_below="@id/butRev" android:layout_alignLeft="@id/butRev" android:layout_alignRight="@id/butRev" + android:layout_marginTop="-8dp" android:gravity="center" android:text="30" - android:textSize="8dp" + android:textSize="10sp" + android:textColor="?android:attr/textColorSecondary" android:clickable="false"/> + <Button + android:id="@+id/butPlaybackSpeed" + android:layout_width="@dimen/audioplayer_playercontrols_length" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_toLeftOf="@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" + tools:background="@android:color/holo_green_dark" /> + <ImageButton android:id="@+id/butFF" android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="match_parent" + android:layout_height="@dimen/audioplayer_playercontrols_length" android:layout_toRightOf="@id/butPlay" + android:layout_marginRight="16dp" android:background="?attr/selectableItemBackground" android:contentDescription="@string/fast_forward_label" android:src="?attr/av_ff_big" + android:scaleType="fitCenter" tools:src="@drawable/ic_fast_forward_white_36dp" tools:background="@android:color/holo_blue_dark" /> <TextView android:id="@+id/txtvFF" android:layout_width="wrap_content" - android:layout_height="32dp" - android:layout_alignTop="@id/butFF" + android:layout_height="wrap_content" + android:layout_below="@id/butFF" android:layout_alignLeft="@id/butFF" android:layout_alignRight="@id/butFF" + android:layout_marginTop="-8dp" android:gravity="center" android:text="30" - android:textSize="8dp" + android:textSize="10sp" + android:textColor="?android:attr/textColorSecondary" android:clickable="false"/> - <Button - android:id="@+id/butPlaybackSpeed" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="match_parent" - android:layout_toRightOf="@id/butFF" - android:background="?attr/selectableItemBackground" - android:contentDescription="@string/set_playback_speed_label" - android:src="?attr/av_fast_forward" - android:textColor="@color/gray" - android:textSize="@dimen/text_size_medium" - android:visibility="gone" - tools:background="@android:color/holo_green_dark" /> - <ImageButton - android:id="@+id/butNavChaptersShownotes" + android:id="@+id/butSkip" android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/butRev" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_toRightOf="@id/butFF" android:background="?attr/selectableItemBackground" - android:scaleType="centerInside" - android:src="@drawable/ic_toc_white_36dp" + android:scaleType="fitCenter" + android:src="?attr/av_skip_big" + android:contentDescription="@string/skip_episode_label" + tools:src="@drawable/ic_skip_white_36dp" tools:background="@android:color/holo_green_dark" /> </RelativeLayout> - <RelativeLayout - android:id="@+id/playtime_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_above="@id/player_control" - android:layout_alignParentLeft="true" - android:background="?attr/overlay_drawable"> + </LinearLayout> - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_marginLeft="8dp" - android:layout_marginTop="16dp" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" - tools:background="@android:color/holo_green_dark" /> - - <TextView - android:id="@+id/txtvLength" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_centerVertical="true" - android:layout_marginRight="8dp" - android:layout_marginTop="16dp" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" - tools:background="@android:color/holo_green_dark" /> - - <SeekBar - android:id="@+id/sbPosition" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="16dp" - android:layout_toLeftOf="@id/txtvLength" - android:layout_toRightOf="@id/txtvPosition" - android:max="500" - tools:background="@android:color/holo_green_dark" /> - </RelativeLayout> - - <FrameLayout - android:id="@+id/contentView" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_above="@id/playtime_layout" - android:layout_alignParentTop="true" - android:foreground="?android:windowContentOverlay" - tools:background="@android:color/holo_orange_light" /> - - </RelativeLayout> + <android.support.v4.view.ViewPager + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_above="@id/playtime_layout" + android:layout_below="@id/appBar" + android:foreground="?android:windowContentOverlay" + tools:background="@android:color/holo_orange_light" /> + <View + android:id="@+id/shadow" + android:layout_width="match_parent" + android:layout_height="4dp" + android:layout_below="@id/appBar" + android:background="@drawable/shadow" /> - </LinearLayout> + </RelativeLayout> <include layout="@layout/nav_list" /> diff --git a/app/src/main/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml index 82260eb43..e18ab42eb 100644 --- a/app/src/main/res/layout/authentication_dialog.xml +++ b/app/src/main/res/layout/authentication_dialog.xml @@ -16,7 +16,10 @@ android:layout_height="0dp" android:layout_weight="1" android:layout_margin="16dp" - android:hint="@string/username_label"/> + android:hint="@string/username_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -25,7 +28,10 @@ android:layout_weight="1" android:layout_margin="16dp" android:inputType="textPassword" - android:hint="@string/password_label"/> + android:hint="@string/password_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <CheckBox android:id="@+id/chkSaveUsernamePassword" diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 18540aa1f..9ad1ff9c6 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -1,19 +1,67 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + +<android.support.percent.PercentRelativeLayout + 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:id="@+id/cover_fragment_root" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent"> <ImageView android:id="@+id/imgvCover" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_centerInParent="true" android:contentDescription="@string/cover_label" + android:scaleType="fitCenter" + app:layout_aspectRatio="100%" + app:layout_widthPercent="82%" + tools:src="@android:drawable/sym_def_app_icon" /> + + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:scaleType="centerInside" - tools:src="@android:drawable/sym_def_app_icon" /> + android:gravity="center" + android:orientation="vertical" + android:layout_above="@id/imgvCover"> + + <TextView + android:id="@+id/txtvPodcastTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:gravity="center" + android:maxLines="2" + android:ellipsize="end" + android:text="Podcast" + android:textColor="?android:attr/textColorSecondary" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:layout_below="@id/imgvCover"> + + <TextView + android:id="@+id/txtvEpisodeTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:gravity="center" + android:maxLines="2" + android:ellipsize="end" + android:text="Episode" + android:textColor="?android:attr/textColorPrimary" /> + + </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</android.support.percent.PercentRelativeLayout> diff --git a/app/src/main/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml index 93cd1c0d3..635a73cf4 100644 --- a/app/src/main/res/layout/directory_chooser.xml +++ b/app/src/main/res/layout/directory_chooser.xml @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@id/butNavUp" - android:background="@color/bright_blue" /> + android:background="@color/holo_blue_light" /> </RelativeLayout> <ListView diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml index 69106c9b3..27604973a 100644 --- a/app/src/main/res/layout/download_authentication_activity.xml +++ b/app/src/main/res/layout/download_authentication_activity.xml @@ -12,7 +12,7 @@ android:layout_alignParentTop="true" android:textSize="@dimen/text_size_large" android:layout_margin="16dp" - android:textColor="@color/bright_blue" + android:textColor="@color/holo_blue_light" android:textStyle="italic"/> <TextView @@ -31,7 +31,10 @@ android:layout_margin="16dp" android:id="@+id/etxtUsername" android:hint="@string/username_label" - android:layout_below="@id/txtvDescription"/> + android:layout_below="@id/txtvDescription" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:layout_width="match_parent" @@ -40,7 +43,10 @@ android:id="@+id/etxtPassword" android:hint="@string/password_label" android:inputType="textPassword" - android:layout_below="@id/etxtUsername"/> + android:layout_below="@id/etxtUsername" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <LinearLayout android:id="@+id/footer" diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml index c6a34a517..20d879933 100644 --- a/app/src/main/res/layout/downloadlog_item.xml +++ b/app/src/main/res/layout/downloadlog_item.xml @@ -20,7 +20,7 @@ tools:text="[Icon]" android:gravity="center" /> - <Button + <com.joanzapata.iconify.widget.IconButton android:id="@+id/btnRetry" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -28,6 +28,7 @@ android:layout_alignLeft="@id/txtvIcon" android:layout_alignRight="@id/txtvIcon" android:layout_marginTop="8dp" + android:text="{fa-repeat}" tools:text="↻" /> <TextView diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml new file mode 100644 index 000000000..d63088662 --- /dev/null +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -0,0 +1,120 @@ +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <LinearLayout + android:id="@+id/bottomBar" + android:layout_width="wrap_content" + android:layout_height="68dp" + android:layout_alignParentBottom="true" + android:orientation="horizontal" + android:gravity="center_vertical" + android:padding="4dp"> + + <Button + android:id="@+id/btnAddToQueue" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/content_new" + android:text="@string/add_to_queue_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnMarkAsPlayed" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/navigation_accept" + android:text="@string/mark_read_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnMarkAsUnplayed" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/navigation_cancel" + android:text="@string/mark_unread_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnDownload" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/av_download" + android:text="@string/download_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnDelete" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/content_discard" + android:text="@string/remove_episode_lable" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + </LinearLayout> + + <View + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + android:paddingBottom="4dp" + android:layout_above="@id/bottomBar" + tools:background="@android:color/holo_red_dark" /> + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/divider"> + + </ListView> + + +</RelativeLayout> diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml index f9608fafc..b928b6233 100644 --- a/app/src/main/res/layout/external_player_fragment.xml +++ b/app/src/main/res/layout/external_player_fragment.xml @@ -1,69 +1,89 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/fragmentLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone" - android:background="?attr/colorPrimary" - tools:visibility="visible" - tools:background="@android:color/darker_gray"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/fragmentLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> - <View + <RelativeLayout android:layout_width="match_parent" - android:layout_height="2dp" - android:background="@color/bright_blue"/> + android:layout_height="@dimen/external_player_height"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <ImageView + android:id="@+id/imgvCover" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/external_player_height" + android:layout_height="@dimen/external_player_height" + android:adjustViewBounds="true" + android:cropToPadding="true" + android:scaleType="fitXY" + tools:src="@drawable/ic_drag_vertical_white_48dp" + tools:background="@android:color/holo_green_dark" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"/> - <RelativeLayout - android:id="@+id/layoutInfo" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="?attr/selectableItemBackground"> + <ProgressBar + android:id="@+id/episodeProgress" + android:layout_width="match_parent" + android:layout_height="4dp" + android:layout_toRightOf="@id/imgvCover" + android:layout_toEndOf="@id/imgvCover" + android:layout_alignParentTop="true" + style="?attr/progressBarTheme" + android:indeterminate="false" + tools:progress="100"/> - <ImageView - android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/external_player_height" - android:layout_height="@dimen/external_player_height" - android:layout_alignParentLeft="true" - android:padding="4dp" - android:adjustViewBounds="true" - android:cropToPadding="true" - android:scaleType="fitXY" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginBottom="26dp" + android:layout_toRightOf="@id/imgvCover" + android:layout_toEndOf="@id/imgvCover" + android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" + android:layout_toLeftOf="@id/butPlay" + android:layout_toStartOf="@id/butPlay" + style="@style/Base.TextAppearance.AppCompat.Body1" + android:ellipsize="end" + android:maxLines="1" + tools:text="Episode title that is too long and will cause the text to wrap"/> - <TextView - android:id="@+id/txtvTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="8dp" - android:layout_toRightOf="@id/imgvCover" - android:ellipsize="end" - android:maxLines="2" - android:textSize="18sp" - android:fontFamily="sans-serif-light" - tools:text="Playback item title" - tools:background="@android:color/holo_green_dark"/> - </RelativeLayout> + <TextView + android:id="@+id/txtvAuthor" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/episodeProgress" + android:layout_marginTop="26dp" + android:layout_toRightOf="@id/imgvCover" + android:layout_toEndOf="@id/imgvCover" + android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" + android:layout_toLeftOf="@id/butPlay" + android:layout_toStartOf="@id/butPlay" + style="@style/TextAppearance.AppCompat.Body1" + android:textColor="?android:attr/textColorSecondary" + android:ellipsize="end" + android:maxLines="1" + tools:text="Episode author that is too long and will cause the text to wrap"/> <ImageButton android:id="@+id/butPlay" - android:contentDescription="@string/pause_label" - android:layout_width="@dimen/external_player_height" - android:layout_height="@dimen/external_player_height" - android:background="?attr/selectableItemBackground" - tools:src="@drawable/ic_play_arrow_white_36dp" - tools:background="@android:color/holo_green_dark"/> - </LinearLayout> + android:layout_width="52dp" + android:layout_height="52dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_below="@id/episodeProgress" + android:layout_centerVertical="true" + android:contentDescription="@string/pause_label" + android:background="?attr/selectableItemBackground" + tools:src="@drawable/ic_play_arrow_white_36dp"/> + + </RelativeLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index db897865c..4b545e3cc 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -20,8 +20,8 @@ <ImageView android:id="@+id/imgvCover" android:contentDescription="@string/cover_label" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="80dp" + android:layout_height="80dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" tools:src="@drawable/ic_stat_antenna_default" @@ -33,7 +33,9 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginLeft="8dp" + android:layout_alignTop="@id/imgvCover" android:layout_toRightOf="@id/imgvCover" + android:layout_alignBottom="@id/imgvCover" style="@style/AntennaPod.TextView.Heading" tools:text="Feed title" tools:background="@android:color/holo_green_dark"/> @@ -44,7 +46,7 @@ android:layout_height="1dp" android:layout_below="@id/imgvCover" android:layout_marginTop="8dp" - android:background="@color/bright_blue"/> + android:background="@color/holo_blue_light"/> </RelativeLayout> <ScrollView @@ -52,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:scrollbarStyle="outsideInset" + android:scrollbarStyle="outsideOverlay" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp"> @@ -119,7 +121,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" app:layout_row="2" app:layout_column="0" android:lines="1" @@ -129,10 +130,13 @@ <TextView android:id="@+id/txtvUrl" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingBottom="4dp" app:layout_row="2" app:layout_column="1" + app:layout_gravity="fill" + android:maxLines="4" tools:text="http://www.example.com/feed" tools:background="@android:color/holo_green_dark"/> @@ -146,16 +150,47 @@ android:text="@string/podcast_settings_label" android:layout_marginTop="8dp"/> + <android.support.v7.widget.GridLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="1"> + + <TextView + android:id="@+id/txtvFeedAutoDelete" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/auto_delete_label" + app:layout_row="0" + app:layout_column="0" + app:layout_gravity="center_vertical" + android:layout_marginRight="10dp" /> + + <Spinner + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/spnAutoDelete" + android:entries="@array/spnAutoDeleteItems" + android:layout_marginTop="8dp" + app:layout_row="0" + app:layout_column="1" + android:spinnerMode="dropdown" + app:layout_gravity="center" + android:dropDownWidth="wrap_content" + android:clickable="true" /> + </android.support.v7.widget.GridLayout> + <CheckBox - android:id="@+id/cbxAutoDownload" + android:id="@+id/cbxKeepUpdated" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/auto_download_label" - android:enabled="false" + android:text="@string/keep_updated" + android:enabled="true" android:textColor="?android:attr/textColorPrimary" tools:background="@android:color/holo_red_light" - android:checked="false"/> + android:checked="true" /> <TextView android:id="@+id/txtvAuthentication" @@ -200,7 +235,10 @@ android:layout_height="wrap_content" app:layout_row="0" app:layout_column="1" - android:hint="@string/username_label"/> + android:hint="@string/username_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <TextView android:id="@+id/txtvPassword" @@ -211,7 +249,10 @@ app:layout_row="1" app:layout_column="0" android:text="@string/password_label" - android:textColor="?android:attr/textColorPrimary"/> + android:textColor="?android:attr/textColorPrimary" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -225,6 +266,77 @@ </android.support.v7.widget.GridLayout> <TextView + android:id="@+id/txtvAutoDownloadSettings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/auto_download_settings_label" + android:textSize="@dimen/text_size_medium" + android:textColor="?android:attr/textColorPrimary"/> + + <CheckBox + android:id="@+id/cbxAutoDownload" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/auto_download_label" + android:enabled="false" + android:textColor="?android:attr/textColorPrimary" + tools:background="@android:color/holo_red_light" + android:checked="false" /> + + <TextView + android:id="@+id/txtvEpisodeFilters" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/episode_filters_label" + android:textSize="@dimen/text_size_medium" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/txtvEpisodeFiltersDescription" + android:text="@string/episode_filters_description" + android:textSize="@dimen/text_size_small" + android:textColor="?android:attr/textColorPrimary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp"/> + + <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/radio_filter_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:orientation="horizontal"> + <RadioButton android:id="@+id/radio_filter_include" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/episode_filters_include" + android:onClick="onRadioButtonClicked"/> + <RadioButton android:id="@+id/radio_filter_exclude" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/episode_filters_exclude" + android:onClick="onRadioButtonClicked"/> + </RadioGroup> + + <EditText + android:id="@+id/etxtEpisodeFilterText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:lines="8" + android:minLines="1" + android:maxLines="20" + android:scrollbars="vertical" + android:hint="@string/episode_filters_hint" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> + + <TextView style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index 5e1b580d2..c18e5fd6c 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -1,13 +1,141 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/content_root" android:layout_width="match_parent" android:layout_height="match_parent"> + <LinearLayout + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:background="?attr/colorPrimary" + android:gravity="center_horizontal" + android:orientation="vertical" + tools:background="@android:color/darker_gray"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp"> + + <ImageView + android:id="@+id/imgvCover" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_width="50dp" + android:layout_height="50dp" + android:contentDescription="@string/cover_label" + android:gravity="center_vertical" + tools:src="@drawable/ic_stat_antenna_default" + tools:background="@android:color/holo_green_dark" /> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:layout_alignTop="@id/imgvCover" + android:layout_toRightOf="@id/imgvCover" + android:includeFontPadding="false" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary" + android:ellipsize="end" + android:maxLines="5" + tools:text="Podcast title" + tools:background="@android:color/holo_green_dark" /> + + <TextView + android:id="@+id/txtvDuration" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/imgvCover" + android:layout_below="@id/txtvTitle" + android:layout_marginLeft="16dp" + tools:text="00:42:23" + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/txtvTitle" + android:layout_marginLeft="8dp" + tools:text="Jan\n23" + tools:background="@android:color/holo_green_dark" /> + + </RelativeLayout> + + <ProgressBar + android:id="@+id/progbarDownload" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:visibility="gone" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:orientation="horizontal" + tools:background="@android:color/holo_blue_bright"> + + <com.joanzapata.iconify.widget.IconButton + android:id="@+id/butAction1" + android:layout_width="0dp" + android:layout_height="48dp" + android:layout_gravity="center_vertical" + android:layout_marginRight="8dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:ellipsize="end" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small" + tools:text="Button 1" + tools:background="@android:color/holo_red_light" /> + + <com.joanzapata.iconify.widget.IconButton + android:id="@+id/butAction2" + android:layout_width="0dp" + android:layout_height="48dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="8dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:ellipsize="end" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small" + tools:text="Button 2" + tools:background="@android:color/holo_orange_dark" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:background="@color/light_gray"/> + + </LinearLayout> <WebView android:id="@+id/webvDescription" android:layout_width="match_parent" + android:layout_below="@id/header" android:layout_height="match_parent" android:foreground="?android:windowContentOverlay" /> @@ -22,4 +150,4 @@ android:layout_gravity="center" android:indeterminate="true" /> </FrameLayout> -</FrameLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditem_fragment_header.xml b/app/src/main/res/layout/feeditem_fragment_header.xml deleted file mode 100644 index a21488306..000000000 --- a/app/src/main/res/layout/feeditem_fragment_header.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:background="?attr/colorPrimary" - android:gravity="center_horizontal" - android:orientation="vertical" - tools:background="@android:color/darker_gray"> - - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:orientation="horizontal" - android:paddingBottom="0dp"> - - <ImageView - android:id="@+id/imgvCover" - android:layout_width="50dp" - android:layout_height="50dp" - android:layout_gravity="center_vertical" - android:layout_marginBottom="8dp" - android:layout_marginTop="16dp" - android:contentDescription="@string/cover_label" - android:gravity="center_vertical" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> - - - <ImageButton - android:id="@+id/butMoreActions" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:background="?attr/selectableItemBackground" - android:contentDescription="@string/butAction_label" - android:paddingTop="4dp" - android:src="?attr/ic_action_overflow" - tools:src="@drawable/ic_info_white_24dp" - tools:background="@android:color/holo_green_dark" /> - - <TextView - android:id="@+id/txtvTitle" - style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginBottom="8dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="8dp" - android:layout_marginTop="16dp" - android:layout_toLeftOf="@id/butMoreActions" - android:layout_toRightOf="@id/imgvCover" - android:maxLines="5" - tools:text="Podcast title" - tools:background="@android:color/holo_green_dark" /> - - <TextView - android:id="@+id/txtvDuration" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/imgvCover" - android:layout_below="@id/txtvTitle" - android:layout_marginLeft="16dp" - tools:text="00:42:23" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@+id/txtvPublished" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/butMoreActions" - android:layout_marginRight="8dp" - tools:text="Jan 23" - tools:background="@android:color/holo_green_dark" - android:layout_below="@+id/txtvTitle"/> - - </RelativeLayout> - - <ProgressBar - android:id="@+id/progbarDownload" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:visibility="gone" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:layout_marginRight="8dp" - android:orientation="horizontal" - tools:background="@android:color/holo_blue_bright"> - - <Button - android:id="@+id/butAction1" - android:layout_width="0dp" - android:layout_height="48dp" - android:layout_gravity="center_vertical" - android:layout_marginRight="8dp" - android:layout_weight="1" - android:background="?attr/selectableItemBackground" - android:ellipsize="end" - android:paddingTop="4dp" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" - tools:text="Button 1" - tools:background="@android:color/holo_red_light" /> - - <Button - android:id="@+id/butAction2" - android:layout_width="0dp" - android:layout_height="48dp" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" - android:layout_weight="1" - android:background="?attr/selectableItemBackground" - android:ellipsize="end" - android:paddingTop="4dp" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" - tools:text="Button 2" - tools:background="@android:color/holo_orange_dark" /> - - </LinearLayout> - - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 667f777af..361b583c9 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -78,7 +78,7 @@ tools:text="Podcast author" tools:background="@android:color/holo_green_dark" /> - <IconTextView + <com.joanzapata.iconify.widget.IconTextView android:id="@+id/txtvFailure" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 6b7c45978..d2b85e7df 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" android:layout_width="match_parent" android:layout_height="@dimen/listitem_threeline_height" android:orientation="horizontal" tools:background="@android:color/darker_gray"> <RelativeLayout - android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" @@ -103,12 +104,10 @@ android:indeterminate="false" /> - - </RelativeLayout> <include layout="@layout/vertical_list_divider"/> <include layout="@layout/secondary_action"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 17ffe349b..0cc13f74c 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -1,26 +1,64 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" -xmlns:tools="http://schemas.android.com/tools" -android:layout_width="match_parent" -android:layout_height="match_parent" -tools:context="de.danoeh.antennapod.activity.ITunesSearchActivity"> -<android.support.v7.widget.SearchView - android:id="@+id/itunes_search_view" - android:layout_height="wrap_content" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - /> -<GridView - android:id="@+id/gridView" - android:layout_below="@id/itunes_search_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:columnWidth="200dp" - android:gravity="center" - android:horizontalSpacing="8dp" - android:numColumns="auto_fit" - android:paddingBottom="@dimen/list_vertical_padding" - android:paddingTop="@dimen/list_vertical_padding" - android:stretchMode="columnWidth" - android:verticalSpacing="8dp" - tools:listitem="@layout/gpodnet_podcast_listitem" /> + android:layout_height="match_parent"> + + <GridView + android:id="@+id/gridView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:columnWidth="400dp" + android:gravity="center" + android:horizontalSpacing="8dp" + android:numColumns="auto_fit" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:stretchMode="columnWidth" + android:verticalSpacing="8dp" + tools:listitem="@layout/gpodnet_podcast_listitem" /> + + <TextView + android:id="@id/android:empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerInParent="true" + android:gravity="center" + android:visibility="gone" + android:text="@string/search_status_no_results" /> + + <ProgressBar + android:id="@+id/progressBar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:indeterminateOnly="true" + android:visibility="gone"/> + + <TextView + android:id="@+id/txtvError" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_margin="16dp" + android:textAlignment="center" + android:textSize="@dimen/text_size_small" + android:visibility="gone" + tools:visibility="visible" + tools:text="Error message" + tools:background="@android:color/holo_red_light" /> + + <Button + android:id="@+id/butRetry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/txtvError" + android:layout_centerHorizontal="true" + android:layout_margin="16dp" + android:text="@string/retry_label" + android:visibility="gone" + tools:visibility="visible" + tools:background="@android:color/holo_red_light" /> + </RelativeLayout> diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml index 05df70f31..d8b06e4f7 100644 --- a/app/src/main/res/layout/gpodnet_podcast_list.xml +++ b/app/src/main/res/layout/gpodnet_podcast_list.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:columnWidth="200dp" + android:columnWidth="400dp" android:gravity="center" android:horizontalSpacing="8dp" android:numColumns="auto_fit" diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 84c6c280e..bbe8e65d6 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -3,7 +3,11 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/listitem_threeline_height" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" tools:background="@android:color/darker_gray"> <ImageView @@ -11,11 +15,8 @@ android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_alignParentTop="true" android:layout_marginRight="8dp" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:adjustViewBounds="true" android:contentDescription="@string/cover_label" android:cropToPadding="true" @@ -29,7 +30,6 @@ android:layout_height="wrap_content" android:layout_alignTop="@id/txtvTitle" android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:orientation="horizontal"> <ImageView @@ -52,15 +52,14 @@ <TextView android:id="@+id/txtvTitle" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/list_vertical_padding" - android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:layout_toRightOf="@id/imgvCover" android:layout_toLeftOf="@id/subscribers_container" android:layout_alignTop="@id/imgvCover" - android:lines="1" + android:maxLines="2" + android:includeFontPadding="false" tools:text="Title" tools:background="@android:color/holo_green_dark" /> @@ -69,7 +68,6 @@ style="android:style/TextAppearance.Small" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:layout_toRightOf="@id/imgvCover" android:layout_below="@id/txtvTitle" android:textSize="14sp" diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index 8436570fc..13c5977f8 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -30,7 +30,10 @@ android:layout_height="wrap_content" android:hint="@string/username_label" android:layout_below="@id/txtvDescription" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -39,7 +42,10 @@ android:hint="@string/password_label" android:layout_below="@id/etxtUsername" android:inputType="textPassword" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <Button android:id="@+id/butLogin" diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml index 41b1f495f..1e6e5a836 100644 --- a/app/src/main/res/layout/itunes_podcast_listitem.xml +++ b/app/src/main/res/layout/itunes_podcast_listitem.xml @@ -1,38 +1,58 @@ <?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:layout_width="match_parent" -android:layout_height="@dimen/listitem_threeline_height" -tools:background="@android:color/darker_gray"> - -<ImageView - android:id="@+id/imgvCover" - android:layout_width="@dimen/thumbnail_length_itemlist" - android:layout_height="@dimen/thumbnail_length_itemlist" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" - android:layout_marginRight="8dp" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:adjustViewBounds="true" - android:contentDescription="@string/cover_label" - android:cropToPadding="true" - android:scaleType="fitXY" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> - -<TextView - android:id="@+id/txtvTitle" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" - android:layout_toRightOf="@id/imgvCover" - android:maxLines="1" - tools:text="Podcast title" - tools:background="@android:color/holo_green_dark" /> + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" + tools:background="@android:color/darker_gray"> + + <ImageView + android:id="@+id/imgvCover" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginRight="8dp" + android:adjustViewBounds="true" + android:contentDescription="@string/cover_label" + android:cropToPadding="true" + android:scaleType="fitXY" + tools:background="@android:color/holo_green_dark" + tools:src="@drawable/ic_stat_antenna_default" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/imgvCover" + android:layout_centerVertical="true" + android:orientation="vertical"> + + <TextView + android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:maxLines="2" + tools:background="@android:color/holo_green_dark" + tools:text="Podcast title" /> + + <TextView + android:id="@+id/txtvUrl" + style="android:style/TextAppearance.Small" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary" + android:ellipsize="middle" + android:maxLines="2" + tools:text="http://www.example.com/feed" + tools:background="@android:color/holo_green_dark"/> + + </LinearLayout> + </RelativeLayout> diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 46be5bc5f..c05132b42 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout" android:layout_width="match_parent" @@ -10,7 +11,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <FrameLayout android:id="@+id/playerFragment" android:layout_width="match_parent" @@ -27,6 +27,14 @@ android:background="?attr/colorPrimary" android:minHeight="?attr/actionBarSize" tools:background="@android:color/holo_blue_dark" /> + + <View + android:id="@+id/shadow" + android:layout_width="match_parent" + android:layout_height="4dp" + android:layout_below="@id/toolbar" + android:background="@drawable/shadow" /> + <FrameLayout android:id="@+id/main_view" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index 238beff88..f0cbb56c1 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -5,6 +5,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="@dimen/listitem_iconwithtext_height" + android:paddingRight="@dimen/listitem_threeline_verticalpadding" tools:background="@android:color/darker_gray"> <ImageView @@ -24,47 +25,49 @@ tools:background="@android:color/holo_green_dark"/> <TextView - android:id="@+id/txtvTitle" - android:lines="1" - android:ellipsize="end" - android:singleLine="true" - android:layout_centerVertical="true" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_navdrawer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" - android:layout_marginRight="@dimen/listitem_icon_rightpadding" - android:layout_toRightOf="@id/imgvCover" - tools:text="Navigation feed item title" - tools:background="@android:color/holo_green_dark"/> - - <TextView android:id="@+id/txtvCount" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/list_vertical_padding" android:lines="1" android:textColor="?android:attr/textColorTertiary" android:textSize="@dimen/text_size_navdrawer" - android:layout_marginLeft="8dp" - android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_alignParentRight="true" android:layout_centerVertical="true" tools:text="23" tools:background="@android:color/holo_green_dark"/> - <IconTextView + <com.joanzapata.iconify.widget.IconTextView android:id="@+id/itxtvFailure" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/txtvCount" + android:layout_marginLeft="@dimen/list_vertical_padding" + android:layout_alignWithParentIfMissing="true" android:lines="1" android:text="{fa-exclamation-circle}" android:textColor="@color/download_failed_red" android:textSize="@dimen/text_size_navdrawer" - android:layout_marginLeft="8dp" android:layout_centerVertical="true" tools:text="!" tools:background="@android:color/holo_green_dark"/> + <TextView + android:id="@+id/txtvTitle" + android:lines="1" + android:ellipsize="end" + android:singleLine="true" + android:layout_centerVertical="true" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_navdrawer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_toRightOf="@id/imgvCover" + android:layout_toLeftOf="@id/itxtvFailure" + android:layout_alignWithParentIfMissing="true" + tools:text="Navigation feed item title" + tools:background="@android:color/holo_green_dark"/> + + </RelativeLayout> diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml deleted file mode 100644 index e90171630..000000000 --- a/app/src/main/res/layout/new_episodes_fragment.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:dslv="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"> - - <com.mobeta.android.dslv.DragSortListView - android:id="@android:id/list" - android:scrollbarStyle="outsideOverlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="@dimen/list_vertical_padding" - android:paddingBottom="@dimen/list_vertical_padding" - android:clipToPadding="false" - dslv:collapsed_height="2dp" - dslv:drag_enabled="true" - dslv:drag_handle_id="@id/drag_handle" - dslv:drag_scroll_start="0.33" - dslv:float_alpha="0.6" - dslv:max_drag_scroll_speed="0.5" - dslv:remove_enabled="true" - dslv:remove_mode="flingRemove" - dslv:slide_shuffle_speed="0.3" - dslv:sort_enabled="false" - dslv:track_drag_sort="false" - dslv:float_background_color="?attr/dragview_float_background" - dslv:use_default_controller="true" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@id/android:empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/no_items_label"/> - - <ProgressBar - android:id="@+id/progLoading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:indeterminateOnly="true" - android:visibility="gone" - tools:visibility="visible" - tools:layout_width="match_parent" - tools:layout_height="64dp" - tools:background="@android:color/holo_red_light"/> - - <LinearLayout - android:id="@+id/undobar" - style="@style/UndoBar"> - - <TextView - android:id="@+id/undobar_message" - style="@style/UndoBarMessage"/> - - <Button - android:id="@+id/undobar_button" - style="@style/UndoBarButton"/> - - </LinearLayout> - -</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index b738cf836..0f1e873f3 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -1,24 +1,49 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout + android:id="@+id/container" + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:layout_height="wrap_content"> + +<LinearLayout + android:layout_width="match_parent" android:layout_height="@dimen/listitem_threeline_height" + android:background="?attr/selectableItemBackground" android:orientation="horizontal" tools:background="@android:color/darker_gray"> - <ImageView - android:id="@+id/imgvImage" - android:layout_width="@dimen/thumbnail_length_itemlist" - android:layout_height="@dimen/thumbnail_length_itemlist" - android:layout_gravity="center_vertical" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:contentDescription="@string/cover_label" - android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/txtvPlaceholder" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_gravity="center_vertical" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:background="@color/light_gray" + android:ellipsize="end" + android:maxLines="3" + android:gravity="center"/> + + <ImageView + android:id="@+id/imgvCover" + android:layout_height="64dp" + android:layout_width="64dp" + android:layout_alignLeft="@id/txtvPlaceholder" + android:layout_alignTop="@id/txtvPlaceholder" + android:layout_alignRight="@id/txtvPlaceholder" + android:layout_alignBottom="@id/txtvPlaceholder" + android:contentDescription="@string/cover_label" + tools:src="@drawable/ic_stat_antenna_default" + tools:background="@android:color/holo_green_dark" /> + + </RelativeLayout> <RelativeLayout android:layout_width="0dp" @@ -43,7 +68,7 @@ <TextView android:id="@+id/txtvTitle" style="@style/AntennaPod.TextView.ListItemPrimaryTitle" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" @@ -55,10 +80,10 @@ android:id="@+id/bottom_bar" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_below="@id/txtvTitle" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_marginTop="16dp" tools:background="@android:color/holo_red_light" > <TextView @@ -93,14 +118,12 @@ tools:background="@android:color/holo_green_dark" /> <ProgressBar - android:id="@+id/pbar_download_progress" + android:id="@+id/pbar_progress" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_toLeftOf="@id/txtvPublished" - android:layout_toRightOf="@id/txtvDuration" + android:layout_below="@id/txtvDuration" + android:layout_marginTop="-2dp" android:max="100" /> </RelativeLayout> @@ -110,4 +133,6 @@ <include layout="@layout/secondary_action" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> + +</FrameLayout> diff --git a/app/src/main/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml index 5ece4f09f..2a67e7ee1 100644 --- a/app/src/main/res/layout/opml_import.xml +++ b/app/src/main/res/layout/opml_import.xml @@ -1,92 +1,96 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingTop="8dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingBottom="8dp" - tools:background="@android:color/darker_gray"> - - <TextView - android:id="@+id/txtvHeadingExplanation1" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.Heading" - android:text="@string/txtvfeedurl_label"/> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" + tools:background="@android:color/darker_gray"> - <TextView - android:id="@+id/txtvExplanation1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/opml_import_explanation_1" - android:textSize="@dimen/text_size_medium" - android:layout_marginTop="4dp" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvHeadingExplanation1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/AntennaPod.TextView.Heading" + android:text="@string/txtvfeedurl_label"/> - <Button - android:id="@+id/butChooseFileFromFilesystem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="8dp" - android:text="@string/choose_file_from_filesystem" /> + <TextView + android:id="@+id/txtvExplanation1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/opml_import_explanation_1" + android:textSize="@dimen/text_size_medium" + android:layout_marginTop="4dp" + tools:background="@android:color/holo_green_dark" /> - <View - android:id="@+id/divider1" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_margin="16dp" - android:background="?android:attr/listDivider"/> + <Button + android:id="@+id/butChooseFileFromFilesystem" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="8dp" + android:text="@string/choose_file_from_filesystem" /> - <TextView - android:id="@+id/txtvHeadingExplanation2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.Heading" - android:text="@string/txtvfeedurl_label"/> + <View + android:id="@+id/divider1" + android:layout_width="fill_parent" + android:layout_height="1dp" + android:layout_margin="16dp" + android:background="?android:attr/listDivider"/> - <TextView - android:id="@+id/txtvExplanation2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/opml_import_explanation_2" - android:textSize="@dimen/text_size_medium" - android:layout_marginTop="4dp" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvHeadingExplanation2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/AntennaPod.TextView.Heading" + android:text="@string/txtvfeedurl_label"/> - <Button - android:id="@+id/butChooseFileFromExternal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="8dp" - android:text="@string/choose_file_from_external_application" /> + <TextView + android:id="@+id/txtvExplanation2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/opml_import_explanation_2" + android:textSize="@dimen/text_size_medium" + android:layout_marginTop="4dp" + tools:background="@android:color/holo_green_dark" /> - <View - android:id="@+id/divider2" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_margin="16dp" - android:background="?android:attr/listDivider"/> + <Button + android:id="@+id/butChooseFileFromExternal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="8dp" + android:text="@string/choose_file_from_external_application" /> - <TextView - android:id="@+id/txtvHeadingExplanation3" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.Heading" - android:text="@string/txtvfeedurl_label"/> + <View + android:id="@+id/divider2" + android:layout_width="fill_parent" + android:layout_height="1dp" + android:layout_margin="16dp" + android:background="?android:attr/listDivider"/> - <TextView - android:id="@+id/txtvExplanation3" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/opml_import_explanation_3" - android:textSize="@dimen/text_size_medium" - android:layout_marginTop="4dp" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvHeadingExplanation3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/AntennaPod.TextView.Heading" + android:text="@string/txtvfeedurl_label"/> + + <TextView + android:id="@+id/txtvExplanation3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/opml_import_explanation_3" + android:textSize="@dimen/text_size_medium" + android:layout_marginTop="4dp" + tools:background="@android:color/holo_green_dark" /> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</ScrollView> diff --git a/app/src/main/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml index ed639a2db..54b711b1c 100644 --- a/app/src/main/res/layout/pager_fragment.xml +++ b/app/src/main/res/layout/pager_fragment.xml @@ -1,18 +1,22 @@ <?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" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - <android.support.v4.view.ViewPager - android:id="@+id/pager" + + <android.support.design.widget.TabLayout + android:id="@+id/sliding_tabs" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + app:tabGravity="fill" + app:tabMode="fixed" /> - <android.support.v4.view.PagerTabStrip - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" /> - </android.support.v4.view.ViewPager> + <android.support.v4.view.ViewPager + android:id="@+id/viewpager" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/preference_switch_layout.xml b/app/src/main/res/layout/preference_switch_layout.xml new file mode 100644 index 000000000..54fa74061 --- /dev/null +++ b/app/src/main/res/layout/preference_switch_layout.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v7.widget.SwitchCompat + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@null" + android:clickable="false" + android:focusable="false" />
\ No newline at end of file diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 307d95a8d..901ac49fc 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:dslv="http://schemas.android.com/apk/res-auto" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <com.mobeta.android.dslv.DragSortListView - android:id="@android:id/list" + <TextView + android:id="@+id/info_bar" android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:paddingBottom="@dimen/list_vertical_padding" - android:paddingTop="@dimen/list_vertical_padding" - android:scrollbarStyle="outsideOverlay" - dslv:collapsed_height="2dp" - dslv:drag_enabled="true" - dslv:drag_handle_id="@id/drag_handle" - dslv:drag_scroll_start="0.33" - dslv:float_alpha="0.6" - dslv:float_background_color="?attr/dragview_float_background" - dslv:max_drag_scroll_speed="0.5" - dslv:remove_enabled="true" - dslv:remove_mode="flingRemove" - dslv:slide_shuffle_speed="0.3" - dslv:sort_enabled="true" - dslv:track_drag_sort="true" - dslv:use_default_controller="true" /> + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:gravity="center" + android:textSize="12sp" + android:text=""/> + + <View + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_below="@id/info_bar" + android:background="?android:attr/listDivider"/> + + <android.support.v7.widget.RecyclerView + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/divider" + android:scrollbars="vertical"/> <TextView android:id="@id/android:empty" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" + android:layout_centerInParent="true" android:gravity="center" android:text="@string/no_items_label" /> @@ -39,22 +39,8 @@ android:id="@+id/progLoading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_centerInParent="true" android:indeterminateOnly="true" android:visibility="gone" /> - <LinearLayout - android:id="@+id/undobar" - style="@style/UndoBar"> - - <TextView - android:id="@+id/undobar_message" - style="@style/UndoBarMessage"/> - - <Button - android:id="@+id/undobar_button" - style="@style/UndoBarButton"/> - - </LinearLayout> - -</FrameLayout> +</RelativeLayout> diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 39e9c72a5..8de80e355 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -1,37 +1,59 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<FrameLayout + android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:layout_height="wrap_content"> + +<LinearLayout + android:layout_width="match_parent" android:layout_height="@dimen/listitem_threeline_height" + android:background="?attr/selectableItemBackground" android:orientation="horizontal" - android:paddingLeft="16dp" + android:gravity="center_vertical" + android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" tools:background="@android:color/darker_gray" > <ImageView android:id="@+id/drag_handle" - android:layout_width="100dp" - android:layout_height="match_parent" - android:layout_marginLeft="-8dp" - android:layout_marginRight="-64dp" + android:layout_width="104dp" + android:layout_height="64dp" + android:layout_marginLeft="-16dp" + android:layout_marginStart="-16dp" + android:layout_marginRight="-72dp" + android:layout_marginEnd="-72dp" android:contentDescription="@string/drag_handle_content_description" android:scaleType="fitXY" android:src="?attr/dragview_background" - tools:src="@drawable/ic_drag_handle" + tools:src="@drawable/ic_drag_vertical_grey600_48dp" tools:background="@android:color/holo_green_dark" /> - <ImageView - android:id="@+id/imgvImage" - android:layout_width="@dimen/thumbnail_length_queue_item" - android:layout_height="@dimen/thumbnail_length_queue_item" - android:layout_gravity="center_vertical" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:contentDescription="@string/cover_label" - android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginStart="8dp"> + <TextView + android:id="@+id/txtvPlaceholder" + android:layout_width="@dimen/thumbnail_length_queue_item" + android:layout_height="@dimen/thumbnail_length_queue_item" + android:layout_centerVertical="true" + android:gravity="center" + android:background="@color/light_gray" + android:maxLines="3" + android:ellipsize="end"/> + <ImageView + android:id="@+id/imgvCover" + android:layout_width="@dimen/thumbnail_length_queue_item" + 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:background="@android:color/holo_green_dark"/> + </RelativeLayout> <RelativeLayout android:layout_width="0dp" @@ -53,7 +75,7 @@ android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginLeft="8dp" - android:gravity="right|bottom" + android:gravity="right|top" android:text="Feb\n12" tools:background="@android:color/holo_blue_light" /> @@ -116,4 +138,6 @@ <include layout="@layout/secondary_action"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> + +</FrameLayout> diff --git a/app/src/main/res/layout/subscription_view.xml b/app/src/main/res/layout/subscription_view.xml index 4bb3093a8..6eb6ba094 100644 --- a/app/src/main/res/layout/subscription_view.xml +++ b/app/src/main/res/layout/subscription_view.xml @@ -23,9 +23,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:layout_margin="@dimen/minimum_text_margin" + android:layout_margin="@dimen/widget_margin" android:ellipsize="end" - android:textColor="@color/overlay_dark" + android:padding="@dimen/widget_margin" + style="@style/AntennaPod.TextView.Heading" android:textSize="15sp" android:textStyle="bold" tools:text="@string/app_name" /> @@ -39,7 +40,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_margin="@dimen/minimum_text_margin" + android:layout_margin="@dimen/widget_margin" android:ellipsize="end" android:maxLines="1" android:textColor="@color/white" @@ -51,6 +52,7 @@ android:layout_height="18dp" android:layout_alignParentBottom="true" android:layout_margin="5dp" + android:visibility="gone" android:background="@drawable/unread_circle"> <TextView diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml index a42f87781..b270e82f7 100644 --- a/app/src/main/res/layout/time_dialog.xml +++ b/app/src/main/res/layout/time_dialog.xml @@ -1,57 +1,58 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal"> <EditText android:id="@+id/etxtTime" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:layout_margin="8dp" - android:ems="7" + android:ems="2" android:hint="@string/enter_time_here_label" - android:inputType="number" - android:maxLength="2" > - - </EditText> + android:inputType="number" + android:maxLength="2" /> <Spinner android:id="@+id/spTimeUnit" - android:layout_width="180dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_marginTop="8dp" /> + </LinearLayout> <LinearLayout - style="@android:style/ButtonBar" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="vertical"> - <Button - android:id="@+id/butConfirm" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:layout_weight="1" - tools:text="Confirm" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:textSize="16sp" + android:text="@string/timer_about_to_expire_label"/> + + <CheckBox android:id="@+id/cbShakeToReset" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/shake_to_reset_label"/> + + <CheckBox android:id="@+id/cbVibrate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/timer_vibration_label"/> - <Button - android:id="@+id/butCancel" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - tools:text="Cancel" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml index 766cd6e04..2e1097fb8 100644 --- a/app/src/main/res/layout/videoplayer_activity.xml +++ b/app/src/main/res/layout/videoplayer_activity.xml @@ -19,14 +19,41 @@ android:indeterminateOnly="true" android:visibility="invisible" /> - <ImageButton - android:id="@+id/butPlay" + <LinearLayout + android:id="@+id/controls" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/overlay_button_circle_background" - android:contentDescription="@string/pause_label" - android:src="@drawable/ic_av_pause_circle_outline_80dp" /> + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/butRev" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/overlay_button_circle_background" + android:contentDescription="@string/pause_label" + android:src="@drawable/ic_av_rewind_80dp" /> + + <ImageButton + android:id="@+id/butPlay" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/overlay_button_circle_background" + android:contentDescription="@string/pause_label" + android:src="@drawable/ic_av_pause_circle_outline_80dp" /> + + <ImageButton + android:id="@+id/butFF" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/overlay_button_circle_background" + android:contentDescription="@string/pause_label" + android:src="@drawable/ic_av_fast_forward_80dp" /> + + </LinearLayout> <LinearLayout android:id="@+id/overlay" @@ -77,7 +104,9 @@ android:layout_toLeftOf="@+id/txtvLength" android:layout_toRightOf="@+id/txtvPosition" android:max="500" /> + </RelativeLayout> + </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml index f89ad5065..c5356535c 100644 --- a/app/src/main/res/menu/allepisodes_context.xml +++ b/app/src/main/res/menu/allepisodes_context.xml @@ -24,7 +24,14 @@ 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" @@ -40,13 +47,32 @@ android:title="@string/deactivate_auto_download" /> <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <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" /> + </menu> + </item> <item android:id="@+id/support_item" diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml new file mode 100644 index 000000000..90cba0966 --- /dev/null +++ b/app/src/main/res/menu/episodes_apply_action_options.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/sort" + android:icon="?attr/ic_sort" + android:title="@string/sort" + app:showAsAction="always"> + <menu> + <item android:id="@+id/sort_title_a_z" + android:title="@string/sort_title_a_z"/> + <item android:id="@+id/sort_title_z_a" + android:title="@string/sort_title_z_a"/> + <item android:id="@+id/sort_date_new_old" + android:title="@string/sort_date_new_old"/> + <item android:id="@+id/sort_date_old_new" + android:title="@string/sort_date_old_new"/> + <item android:id="@+id/sort_duration_short_long" + android:title="@string/sort_duration_short_long"/> + <item android:id="@+id/sort_duration_long_short" + android:title="@string/sort_duration_long_short"/> + </menu> + </item> + + <item + android:id="@+id/select_options" + android:icon="?attr/ic_filter" + android:title="@string/filter" + app:showAsAction="always"> + + <menu> + <item android:id="@+id/check_all" + android:title="@string/all_label"/> + <item android:id="@+id/check_none" + android:title="@string/none_label"/> + <item android:id="@+id/check_played" + android:title="@string/played_label"/> + <item android:id="@+id/check_unplayed" + android:title="@string/unplayed_label"/> + <item android:id="@+id/check_downloaded" + android:title="@string/downloaded_label"/> + <item android:id="@+id/check_not_downloaded" + android:title="@string/not_downloaded_label"/> + </menu> + </item> + + <item + android:id="@+id/select_toggle" + android:title="@string/select_all_label" + app:showAsAction="always"/> +</menu> diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml index be50cb87d..9fdd56b6c 100644 --- a/app/src/main/res/menu/feedinfo.xml +++ b/app/src/main/res/menu/feedinfo.xml @@ -20,9 +20,9 @@ android:title="@string/share_link_label"> </item> <item - android:id="@+id/share_source_item" + android:id="@+id/share_download_url_item" custom:showAsAction="collapseActionView" - android:title="@string/share_source_label"> + android:title="@string/share_feed_url_label"> </item> -</menu>
\ No newline at end of file +</menu> diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index f8e9b9c75..898081486 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -31,6 +31,16 @@ </item> <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" custom:showAsAction="collapseActionView" android:title="@string/reset_position"> @@ -48,17 +58,36 @@ </item> <item - android:id="@+id/share_link_item" - custom:showAsAction="collapseActionView" - android:title="@string/share_link_label"> - </item> - <item android:id="@+id/visit_website_item" android:icon="?attr/location_web_site" custom:showAsAction="ifRoom|collapseActionView" android:title="@string/visit_website_label"> </item> <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" /> + </menu> + </item> + + <item android:id="@+id/support_item" custom:showAsAction="collapseActionView" android:title="@string/support_label"> diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml index f89ad5065..271cb96a7 100644 --- a/app/src/main/res/menu/feeditemlist_context.xml +++ b/app/src/main/res/menu/feeditemlist_context.xml @@ -26,6 +26,15 @@ 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" /> @@ -40,13 +49,33 @@ android:title="@string/deactivate_auto_download" /> <item - android:id="@+id/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <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" /> + </menu> + </item> + <item android:id="@+id/support_item" diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index e0da72667..ed03c08d6 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -3,10 +3,16 @@ xmlns:custom="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/hide_items" + android:id="@+id/filter_items" android:icon="?attr/ic_filter" android:menuCategory="container" - android:title="@string/hide_episodes_title" + android:title="@string/filter" + custom:showAsAction="always"> + </item> + <item + android:id="@+id/episode_actions" + android:menuCategory="container" + android:title="@string/episode_actions" custom:showAsAction="always"> </item> <item @@ -31,18 +37,34 @@ android:title="@string/search_label"/> <item - android:id="@+id/mark_all_read_item" - android:menuCategory="container" - android:title="@string/mark_all_read_label" - custom:showAsAction="collapseActionView"> - </item> - <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" + custom:showAsAction="collapseActionView" + android:title="@string/visit_website_label" + android:visible="true"> + </item> + <item + android:id="@+id/share_link_item" + android:menuCategory="container" + custom:showAsAction="collapseActionView" + android:title="@string/share_link_label"> + </item> + <item + android:id="@+id/share_download_url_item" + android:menuCategory="container" + custom:showAsAction="collapseActionView" + android:title="@string/share_feed_url_label"> + </item> + <item android:id="@+id/remove_item" android:icon="?attr/content_discard" diff --git a/app/src/main/res/menu/itunes_search.xml b/app/src/main/res/menu/itunes_search.xml new file mode 100644 index 000000000..88fa36a4a --- /dev/null +++ b/app/src/main/res/menu/itunes_search.xml @@ -0,0 +1,13 @@ +<?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/action_search" + android:icon="?attr/action_search" + custom:showAsAction="collapseActionView|ifRoom" + custom:actionViewClass="android.support.v7.widget.SearchView" + android:title="@string/search_label"/> + +</menu> diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 288e44401..c4086bf5e 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -3,21 +3,37 @@ xmlns:custom="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/add_to_favorites_item" + android:icon="?attr/ic_fav" + android:title="@string/add_to_favorite_label" + custom:showAsAction="always"> + </item> + <item + android:id="@+id/remove_from_favorites_item" + android:icon="?attr/ic_unfav" + android:title="@string/remove_from_favorite_label" + custom:showAsAction="always"> + </item> + + <item android:id="@+id/disable_sleeptimer_item" - android:icon="?attr/device_access_time" + android:icon="?attr/ic_sleep_off" custom:showAsAction="always" android:title="@string/sleep_timer_label"> </item> <item android:id="@+id/set_sleeptimer_item" - custom:showAsAction="collapseActionView" + android:icon="?attr/ic_sleep" + custom:showAsAction="always" android:title="@string/set_sleeptimer_label"> </item> + <item - android:id="@+id/share_link_item" - custom:showAsAction="collapseActionView" - android:title="@string/share_link_label"> + android:id="@+id/audio_controls" + android:title="@string/audio_controls" + custom:showAsAction="always"> </item> + <item android:id="@+id/visit_website_item" android:icon="?attr/location_web_site" @@ -26,15 +42,35 @@ android:visible="false"> </item> <item + android:id="@+id/share_item" + android:icon="?attr/social_share" + android:menuCategory="container" + custom:showAsAction="ifRoom" + 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" /> + </menu> + </item> + <item android:id="@+id/support_item" custom:showAsAction="collapseActionView" android:title="@string/support_label" android:visible="false"> </item> - <item - android:id="@id/skip_episode_item" - custom:showAsAction="collapseActionView" - android:title="@string/skip_episode_label" - android:visible="true"/> </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 new file mode 100644 index 000000000..4bf067d25 --- /dev/null +++ b/app/src/main/res/menu/nav_feed_context.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/mark_all_seen_item" + android:menuCategory="container" + android:title="@string/mark_all_seen_label" /> + + <item + android:id="@+id/mark_all_read_item" + android:menuCategory="container" + android:title="@string/mark_all_read_label" /> + + <item + android:id="@+id/remove_item" + android:menuCategory="container" + android:title="@string/remove_feed_label" /> + +</menu> diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml index 6ab2daabf..3eb1d9d5e 100644 --- a/app/src/main/res/menu/queue_context.xml +++ b/app/src/main/res/menu/queue_context.xml @@ -28,6 +28,14 @@ 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" /> @@ -36,21 +44,38 @@ 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/share_link_item" - android:menuCategory="container" - android:title="@string/share_link_label" /> - <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" /> + </menu> + </item> <item android:id="@+id/support_item" android:menuCategory="container" diff --git a/app/src/main/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml index 831f6daf0..1dbfabcd6 100644 --- a/app/src/main/res/xml/player_widget_info.xml +++ b/app/src/main/res/xml/player_widget_info.xml @@ -1,4 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:resizeMode="none" android:initialLayout="@layout/player_widget" android:minHeight="40dp" android:minWidth="250dp"> +<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" + android:resizeMode="horizontal" + android:initialLayout="@layout/player_widget" + android:updatePeriodMillis="86400000" + android:previewImage="@drawable/ic_widget_preview" + android:minHeight="40dp" + android:minWidth="250dp" + android:minResizeWidth="40dp"> </appwidget-provider>
\ 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 e848915cf..3ecd79b1e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,34 +1,70 @@ <?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceCategory android:title="@string/user_interface_label"> - <ListPreference + <com.afollestad.materialdialogs.prefs.MaterialListPreference android:entryValues="@array/theme_values" android:entries="@array/theme_options" android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" - android:defaultValue="0"/> - <Preference - android:key="prefHiddenDrawerItems" - android:summary="@string/pref_nav_drawer_items_sum" - android:title="@string/pref_nav_drawer_items_title" /> - <CheckBoxPreference + android:defaultValue="0" + app:useStockLayout="true"/> + <PreferenceScreen + android:key="prefDrawerSettings" + android:summary="@string/pref_nav_drawer_sum" + android:title="@string/pref_nav_drawer_title"> + <Preference + android:key="prefHiddenDrawerItems" + android:summary="@string/pref_nav_drawer_items_sum" + android:title="@string/pref_nav_drawer_items_title" /> + <com.afollestad.materialdialogs.prefs.MaterialListPreference + android:entryValues="@array/nav_drawer_feed_order_values" + android:entries="@array/nav_drawer_feed_order_options" + 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"/> + <com.afollestad.materialdialogs.prefs.MaterialListPreference + 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"/> + </PreferenceScreen> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefExpandNotify" android:summary="@string/pref_expandNotify_sum" android:title="@string/pref_expandNotify_title"/> - <CheckBoxPreference - android:defaultValue="false" + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" android:enabled="true" android:key="prefPersistNotify" android:summary="@string/pref_persistNotify_sum" android:title="@string/pref_persistNotify_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" + android:key="prefLockscreenBackground" + android:summary="@string/pref_lockscreen_background_sum" + android:title="@string/pref_lockscreen_background_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" + android:key="prefShowDownloadReport" + android:summary="@string/pref_showDownloadReport_sum" + android:title="@string/pref_showDownloadReport_title"/> </PreferenceCategory> <PreferenceCategory android:title="@string/queue_label"> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefQueueAddToFront" @@ -38,50 +74,76 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/playback_pref"> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="false" + android:key="prefSonic" + android:summary="@string/pref_sonic_message" + android:title="@string/pref_sonic_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="true" android:enabled="true" android:key="prefPauseOnHeadsetDisconnect" - android:summary="@string/pref_pauseOnHeadsetDisconnect_sum" + android:summary="@string/pref_pauseOnDisconnect_sum" android:title="@string/pref_pauseOnHeadsetDisconnect_title"/> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="true" android:enabled="true" android:dependency="prefPauseOnHeadsetDisconnect" android:key="prefUnpauseOnHeadsetReconnect" android:summary="@string/pref_unpauseOnHeadsetReconnect_sum" android:title="@string/pref_unpauseOnHeadsetReconnect_title"/> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="false" + android:enabled="true" + android:dependency="prefPauseOnHeadsetDisconnect" + android:key="prefUnpauseOnBluetoothReconnect" + android:summary="@string/pref_unpauseOnBluetoothReconnect_sum" + android:title="@string/pref_unpauseOnBluetoothReconnect_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" + android:key="prefHardwareForwardButtonSkips" + android:summary="@string/pref_hardwareForwardButtonSkips_sum" + android:title="@string/pref_hardwareForwardButtonSkips_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" android:key="prefFollowQueue" android:summary="@string/pref_followQueue_sum" android:title="@string/pref_followQueue_title"/> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" + android:key="prefSkipKeepsEpisode" + android:summary="@string/pref_skip_keeps_episodes_sum" + android:title="@string/pref_skip_keeps_episodes_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefAutoDelete" android:summary="@string/pref_auto_delete_sum" android:title="@string/pref_auto_delete_title"/> - <ListPreference + <com.afollestad.materialdialogs.prefs.MaterialListPreference android:defaultValue="30" android:entries="@array/smart_mark_as_played_values" 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"/> + android:title="@string/pref_smart_mark_as_played_title" + app:useStockLayout="true"/> <Preference android:key="prefPlaybackSpeedLauncher" android:summary="@string/pref_playback_speed_sum" android:title="@string/pref_playback_speed_title" /> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefPauseForFocusLoss" android:summary="@string/pref_pausePlaybackForFocusLoss_sum" android:title="@string/pref_pausePlaybackForFocusLoss_title" /> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="true" android:enabled="true" android:key="prefResumeAfterCall" @@ -90,44 +152,51 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/network_pref"> - <ListPreference - android:defaultValue="0" - android:entries="@array/update_intervall_values" - android:entryValues="@array/update_intervall_values" + <Preference android:key="prefAutoUpdateIntervall" - android:summary="@string/pref_autoUpdateIntervall_sum" - android:title="@string/pref_autoUpdateIntervall_title"/> - <CheckBoxPreference + android:summary="@string/pref_autoUpdateIntervallOrTime_sum" + android:title="@string/pref_autoUpdateIntervallOrTime_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefMobileUpdate" android:summary="@string/pref_mobileUpdate_sum" android:title="@string/pref_mobileUpdate_title"/> - <de.danoeh.antennapod.preferences.CustomEditTextPreference - android:defaultValue="6" + <com.afollestad.materialdialogs.prefs.MaterialListPreference + 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"/> + <com.afollestad.materialdialogs.prefs.MaterialEditTextPreference + android:defaultValue="4" android:inputType="number" android:key="prefParallelDownloads" - android:title="@string/pref_parallel_downloads_title"/> - <ListPreference - android:defaultValue="20" - android:entries="@array/episode_cache_size_entries" - android:key="prefEpisodeCacheSize" - android:title="@string/pref_episode_cache_title" - android:entryValues="@array/episode_cache_size_values"/> + android:title="@string/pref_parallel_downloads_title" + app:useStockLayout="true"/> <PreferenceScreen android:summary="@string/pref_automatic_download_sum" android:key="prefAutoDownloadSettings" android:title="@string/pref_automatic_download_title"> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:key="prefEnableAutoDl" android:title="@string/pref_automatic_download_title" android:defaultValue="false"/> - <CheckBoxPreference + <com.afollestad.materialdialogs.prefs.MaterialListPreference + android:defaultValue="20" + android:entries="@array/episode_cache_size_entries" + android:key="prefEpisodeCacheSize" + android:title="@string/pref_episode_cache_title" + android:entryValues="@array/episode_cache_size_values" + app:useStockLayout="true"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:key="prefEnableAutoDownloadOnBattery" android:title="@string/pref_automatic_download_on_battery_title" android:summary="@string/pref_automatic_download_on_battery_sum" android:defaultValue="true"/> - <CheckBoxPreference + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/> @@ -182,19 +251,23 @@ <Preference android:title="@string/choose_data_directory" android:key="prefChooseDataDir"/> - <Preference - android:key="prefFlattrThisApp" - android:summary="@string/pref_flattr_this_app_sum" - android:title="@string/pref_flattr_this_app_title"> - </Preference> + <ListPreference + android:entryValues="@array/image_cache_size_values" + android:entries="@array/image_cache_size_options" + android:title="@string/pref_image_cache_size_title" + android:key="prefImageCacheSize" + android:summary="@string/pref_image_cache_size_sum" + android:defaultValue="100"/> <Preference android:key="prefOpmlExport" android:title="@string/opml_export_label"/> <Preference android:key="prefAbout" android:title="@string/about_pref"/> - - + <Preference + android:key="prefSendCrashReport" + android:title="@string/crash_report_title" + android:summary="@string/crash_report_sum"/> </PreferenceCategory> - + </PreferenceScreen> |