diff options
Diffstat (limited to 'res')
59 files changed, 1519 insertions, 779 deletions
diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png Binary files differnew file mode 100644 index 000000000..002fc4bfb --- /dev/null +++ b/res/drawable-hdpi/ic_action_overflow.png diff --git a/res/drawable-hdpi/ic_action_overflow_dark.png b/res/drawable-hdpi/ic_action_overflow_dark.png Binary files differnew file mode 100644 index 000000000..c8792cbe2 --- /dev/null +++ b/res/drawable-hdpi/ic_action_overflow_dark.png diff --git a/res/drawable-hdpi/ic_drag_handle.png b/res/drawable-hdpi/ic_drag_handle.png Binary files differnew file mode 100755 index 000000000..38ec201de --- /dev/null +++ b/res/drawable-hdpi/ic_drag_handle.png diff --git a/res/drawable-hdpi/ic_drag_handle_dark.png b/res/drawable-hdpi/ic_drag_handle_dark.png Binary files differnew file mode 100755 index 000000000..e96d23252 --- /dev/null +++ b/res/drawable-hdpi/ic_drag_handle_dark.png diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..c59f601ca --- /dev/null +++ b/res/drawable-hdpi/ic_drawer.png diff --git a/res/drawable-hdpi/ic_drawer_dark.png b/res/drawable-hdpi/ic_drawer_dark.png Binary files differnew file mode 100644 index 000000000..6614ea4f4 --- /dev/null +++ b/res/drawable-hdpi/ic_drawer_dark.png diff --git a/res/drawable-mdpi/ic_action_overflow.png b/res/drawable-mdpi/ic_action_overflow.png Binary files differnew file mode 100644 index 000000000..6f0fb23f4 --- /dev/null +++ b/res/drawable-mdpi/ic_action_overflow.png diff --git a/res/drawable-mdpi/ic_action_overflow_dark.png b/res/drawable-mdpi/ic_action_overflow_dark.png Binary files differnew file mode 100644 index 000000000..b4a4a221f --- /dev/null +++ b/res/drawable-mdpi/ic_action_overflow_dark.png diff --git a/res/drawable-mdpi/ic_drag_handle.png b/res/drawable-mdpi/ic_drag_handle.png Binary files differnew file mode 100755 index 000000000..4afbdc67d --- /dev/null +++ b/res/drawable-mdpi/ic_drag_handle.png diff --git a/res/drawable-mdpi/ic_drag_handle_dark.png b/res/drawable-mdpi/ic_drag_handle_dark.png Binary files differnew file mode 100755 index 000000000..2b25c4101 --- /dev/null +++ b/res/drawable-mdpi/ic_drag_handle_dark.png diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..1ed2c56ee --- /dev/null +++ b/res/drawable-mdpi/ic_drawer.png diff --git a/res/drawable-mdpi/ic_drawer_dark.png b/res/drawable-mdpi/ic_drawer_dark.png Binary files differnew file mode 100644 index 000000000..b05c026c1 --- /dev/null +++ b/res/drawable-mdpi/ic_drawer_dark.png diff --git a/res/drawable-xhdpi/ic_action_overflow.png b/res/drawable-xhdpi/ic_action_overflow.png Binary files differnew file mode 100644 index 000000000..7ba4e10ea --- /dev/null +++ b/res/drawable-xhdpi/ic_action_overflow.png diff --git a/res/drawable-xhdpi/ic_action_overflow_dark.png b/res/drawable-xhdpi/ic_action_overflow_dark.png Binary files differnew file mode 100644 index 000000000..5d8af5d63 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_overflow_dark.png diff --git a/res/drawable-xhdpi/ic_drag_handle.png b/res/drawable-xhdpi/ic_drag_handle.png Binary files differnew file mode 100755 index 000000000..5bdcac342 --- /dev/null +++ b/res/drawable-xhdpi/ic_drag_handle.png diff --git a/res/drawable-xhdpi/ic_drag_handle_dark.png b/res/drawable-xhdpi/ic_drag_handle_dark.png Binary files differnew file mode 100755 index 000000000..d341c7c82 --- /dev/null +++ b/res/drawable-xhdpi/ic_drag_handle_dark.png diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..a5fa74def --- /dev/null +++ b/res/drawable-xhdpi/ic_drawer.png diff --git a/res/drawable-xhdpi/ic_drawer_dark.png b/res/drawable-xhdpi/ic_drawer_dark.png Binary files differnew file mode 100644 index 000000000..bcf49dd73 --- /dev/null +++ b/res/drawable-xhdpi/ic_drawer_dark.png diff --git a/res/drawable-xxhdpi/ic_action_overflow.png b/res/drawable-xxhdpi/ic_action_overflow.png Binary files differnew file mode 100644 index 000000000..5a603b6bc --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_overflow.png diff --git a/res/drawable-xxhdpi/ic_action_overflow_dark.png b/res/drawable-xxhdpi/ic_action_overflow_dark.png Binary files differnew file mode 100644 index 000000000..e22049b1e --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_overflow_dark.png diff --git a/res/drawable-xxhdpi/ic_drag_handle.png b/res/drawable-xxhdpi/ic_drag_handle.png Binary files differnew file mode 100755 index 000000000..f834699c6 --- /dev/null +++ b/res/drawable-xxhdpi/ic_drag_handle.png diff --git a/res/drawable-xxhdpi/ic_drag_handle_dark.png b/res/drawable-xxhdpi/ic_drag_handle_dark.png Binary files differnew file mode 100755 index 000000000..a9408bc9d --- /dev/null +++ b/res/drawable-xxhdpi/ic_drag_handle_dark.png diff --git a/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..9c4685d6e --- /dev/null +++ b/res/drawable-xxhdpi/ic_drawer.png diff --git a/res/drawable-xxhdpi/ic_drawer_dark.png b/res/drawable-xxhdpi/ic_drawer_dark.png Binary files differnew file mode 100644 index 000000000..f7e3b3079 --- /dev/null +++ b/res/drawable-xxhdpi/ic_drawer_dark.png diff --git a/res/layout-land/audioplayer_activity.xml b/res/layout-land/audioplayer_activity.xml index 7900e1ced..8f8fdbee3 100644 --- a/res/layout-land/audioplayer_activity.xml +++ b/res/layout-land/audioplayer_activity.xml @@ -1,178 +1,197 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" > + android:layout_height="match_parent"> - <FrameLayout - android:id="@+id/contentView" - android:layout_width="0dp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="0.5" > - </FrameLayout> + android:orientation="horizontal"> - <RelativeLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.5" - android:background="?attr/non_transparent_background" - android:orientation="vertical" > + <FrameLayout + android:id="@+id/contentView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.5"> + </FrameLayout> <RelativeLayout - android:id="@+id/navBar" - android:layout_width="fill_parent" - android:layout_height="60dp" - android:layout_alignParentTop="true" > - - <ImageButton - android:id="@+id/butNavLeft" - android:contentDescription="@string/show_shownotes_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:background="?attr/borderless_button" - android:padding="4dp" /> - - <ImageButton - android:id="@+id/butNavRight" - android:contentDescription="@string/show_chapters_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:padding="4dp" /> - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="8dp" - android:layout_toLeftOf="@id/butNavRight" - android:layout_toRightOf="@id/butNavLeft" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:maxLines="1" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_medium" - android:textStyle="bold" /> - - <TextView - android:id="@+id/txtvFeed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/txtvTitle" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_toLeftOf="@id/butNavRight" - android:layout_toRightOf="@id/butNavLeft" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small" /> - </RelativeLayout> - - <View - android:id="@+id/navBarDivider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_below="@id/navBar" - android:background="@color/bright_blue" /> - - <RelativeLayout - android:id="@+id/player_control" - android:layout_width="match_parent" - android:layout_height="80dp" - android:layout_alignParentBottom="true" - android:background="?attr/overlay_background" > - - <ImageButton - android:id="@+id/butPlay" - android:contentDescription="@string/pause_label" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:background="?attr/borderless_button" - android:src="?attr/av_pause" /> - - <ImageButton - android:id="@+id/butRev" - android:contentDescription="@string/rewind_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_rewind" /> - - <ImageButton - android:id="@+id/butFF" - android:contentDescription="@string/fast_forward_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_toRightOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward" /> - - <Button - android:id="@+id/butPlaybackSpeed" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_toRightOf="@id/butFF" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward" - android:textColor="@color/gray" - android:textSize="@dimen/text_size_medium" - android:visibility="gone" /> - </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" > - - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.5" + android:background="?attr/non_transparent_background" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/navBar" + android:layout_width="fill_parent" + android:layout_height="60dp" + android:layout_alignParentTop="true"> + + <ImageButton + android:id="@+id/butNavLeft" + android:contentDescription="@string/show_shownotes_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:background="?attr/borderless_button" + android:padding="4dp"/> + + <ImageButton + android:id="@+id/butNavRight" + android:contentDescription="@string/show_chapters_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:background="?attr/borderless_button" + android:padding="4dp"/> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginTop="8dp" + android:layout_toLeftOf="@id/butNavRight" + android:layout_toRightOf="@id/butNavLeft" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:maxLines="1" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_medium" + android:textStyle="bold"/> + + <TextView + android:id="@+id/txtvFeed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/txtvTitle" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/butNavRight" + android:layout_toRightOf="@id/butNavLeft" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:maxLines="1" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small"/> + </RelativeLayout> + + <View + android:id="@+id/navBarDivider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_below="@id/navBar" + android:background="@color/bright_blue"/> + + <RelativeLayout + android:id="@+id/player_control" + android:layout_width="match_parent" + android:layout_height="80dp" + android:layout_alignParentBottom="true" + android:background="?attr/overlay_background"> + + <ImageButton + android:id="@+id/butPlay" + android:contentDescription="@string/pause_label" + android:layout_width="80dp" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:background="?attr/borderless_button" + android:src="?attr/av_pause"/> + + <ImageButton + android:id="@+id/butRev" + android:contentDescription="@string/rewind_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_toLeftOf="@id/butPlay" + android:background="?attr/borderless_button" + android:src="?attr/av_rewind"/> + + <ImageButton + android:id="@+id/butFF" + android:contentDescription="@string/fast_forward_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_toRightOf="@id/butPlay" + android:background="?attr/borderless_button" + android:src="?attr/av_fast_forward"/> + + <Button + android:id="@+id/butPlaybackSpeed" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_toRightOf="@id/butFF" + android:background="?attr/borderless_button" + android:src="?attr/av_fast_forward" + android:textColor="@color/gray" + android:textSize="@dimen/text_size_medium" + android:visibility="gone"/> + </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: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" /> - - <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" /> - - <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" /> + android:background="?attr/overlay_drawable"> + + <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"/> + + <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"/> + + <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"/> + </RelativeLayout> </RelativeLayout> - </RelativeLayout> -</LinearLayout>
\ No newline at end of file + </LinearLayout> + + <ListView + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + android:choiceMode="singleChoice" + android:background="?attr/nav_drawer_background" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="8dp" + android:paddingRight="8dp"/> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/addfeed.xml b/res/layout/addfeed.xml index bb0842c0f..48c89f802 100644 --- a/res/layout/addfeed.xml +++ b/res/layout/addfeed.xml @@ -20,9 +20,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_margin="16dp" - android:textSize="@dimen/text_size_large" - android:textColor="@color/bright_blue" - android:textStyle="italic" + style="@style/AntennaPod.TextView.Heading" android:text="@string/txtvfeedurl_label"/> <EditText @@ -48,37 +46,34 @@ android:layout_height="wrap_content" android:layout_below="@id/butConfirm" android:layout_margin="8dp" - android:textSize="@dimen/text_size_large" - android:textColor="@color/bright_blue" - android:textStyle="italic" + style="@style/AntennaPod.TextView.Heading" android:text="@string/podcastdirectories_label"/> - <Button - android:id="@+id/butBrowseGpoddernet" + <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_below="@id/txtvPodcastDirectories" - android:layout_margin="8dp" - android:text="@string/gpodnet_main_label"/> + android:layout_margin="8dp"/> <Button - android:id="@+id/butBrowseMiroguide" + android:id="@+id/butBrowseGpoddernet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butBrowseGpoddernet" + android:layout_below="@id/txtvPodcastDirectoriesDescr" android:layout_margin="8dp" - android:text="@string/miro_guide_label"/> + android:text="@string/browse_gpoddernet_label"/> <TextView android:id="@+id/txtvOpmlImport" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butBrowseMiroguide" + android:layout_below="@id/butBrowseGpoddernet" android:layout_margin="8dp" - android:textSize="@dimen/text_size_large" - android:textColor="@color/bright_blue" - android:textStyle="italic" + style="@style/AntennaPod.TextView.Heading" android:text="@string/opml_import_label"/> <TextView @@ -87,6 +82,7 @@ android:layout_height="wrap_content" android:layout_below="@id/txtvOpmlImport" android:layout_margin="8dp" + android:textSize="@dimen/text_size_medium" android:text="@string/opml_import_txtv_button_lable"/> <Button diff --git a/res/layout/audioplayer_activity.xml b/res/layout/audioplayer_activity.xml index 9b501fbdb..a879aad55 100644 --- a/res/layout/audioplayer_activity.xml +++ b/res/layout/audioplayer_activity.xml @@ -1,173 +1,182 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/non_transparent_background" - android:orientation="vertical" > - - <RelativeLayout - android:id="@+id/navBar" - android:layout_width="fill_parent" - android:layout_height="60dp" - android:layout_alignParentTop="true" > - - <ImageButton - android:id="@+id/butNavLeft" - android:contentDescription="@string/show_shownotes_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:background="?attr/borderless_button" - android:padding="4dp" /> - - <ImageButton - android:id="@+id/butNavRight" - android:contentDescription="@string/show_chapters_label" - android:layout_width="60dp" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:padding="4dp" /> - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="8dp" - android:layout_toLeftOf="@id/butNavRight" - android:layout_toRightOf="@id/butNavLeft" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:maxLines="1" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" - android:textStyle="bold" /> - - <TextView - android:id="@+id/txtvFeed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/txtvTitle" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_toLeftOf="@id/butNavRight" - android:layout_toRightOf="@id/butNavLeft" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small" /> - </RelativeLayout> - - <View - android:id="@+id/navBarDivider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_below="@id/navBar" - android:background="@color/bright_blue" /> - - <RelativeLayout - android:id="@+id/player_control" - android:layout_width="match_parent" - android:layout_height="80dp" - android:layout_alignParentBottom="true" - android:background="?attr/overlay_background" > - - <ImageButton - android:id="@+id/butPlay" - android:contentDescription="@string/pause_label" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:background="?attr/borderless_button" - android:src="?attr/av_pause" /> - - <ImageButton - android:id="@+id/butRev" - android:contentDescription="@string/rewind_label" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_rewind" /> - - <ImageButton - android:id="@+id/butFF" - android:contentDescription="@string/fast_forward_label" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_toRightOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward" /> - - <Button - android:id="@+id/butPlaybackSpeed" - android:contentDescription="@string/set_playback_speed_label" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_toRightOf="@id/butFF" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward" - android:textColor="@color/gray" - android:textSize="@dimen/text_size_medium" - android:visibility="gone" /> - </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" > - - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/non_transparent_background" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/navBar" + android:layout_width="fill_parent" + android:layout_height="60dp" + android:layout_alignParentTop="true"> + + <ImageButton + android:id="@+id/butNavLeft" + android:contentDescription="@string/show_shownotes_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:background="?attr/borderless_button" + android:padding="4dp"/> + + <ImageButton + android:id="@+id/butNavRight" + android:contentDescription="@string/show_chapters_label" + android:layout_width="60dp" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:background="?attr/borderless_button" + android:padding="4dp"/> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginTop="8dp" + android:layout_toLeftOf="@id/butNavRight" + android:layout_toRightOf="@id/butNavLeft" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:maxLines="2" + android:textColor="?android:attr/textColorPrimary" + android:textSize="16sp" + android:fontFamily="sans-serif-light" + /> + </RelativeLayout> + + <View + android:id="@+id/navBarDivider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_below="@id/navBar" + android:background="@color/bright_blue"/> + + <RelativeLayout + android:id="@+id/player_control" + android:layout_width="match_parent" + android:layout_height="80dp" + android:layout_alignParentBottom="true" + android:background="?attr/overlay_background"> + + <ImageButton + android:id="@+id/butPlay" + android:contentDescription="@string/pause_label" + android:layout_width="80dp" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:background="?attr/borderless_button" + android:src="?attr/av_pause"/> + + <ImageButton + android:id="@+id/butRev" + android:contentDescription="@string/rewind_label" + android:layout_width="80dp" + android:layout_height="match_parent" + android:layout_toLeftOf="@id/butPlay" + android:background="?attr/borderless_button" + android:src="?attr/av_rewind"/> + + <ImageButton + android:id="@+id/butFF" + android:contentDescription="@string/fast_forward_label" + android:layout_width="80dp" + android:layout_height="match_parent" + android:layout_toRightOf="@id/butPlay" + android:background="?attr/borderless_button" + android:src="?attr/av_fast_forward"/> + + <Button + android:id="@+id/butPlaybackSpeed" + android:contentDescription="@string/set_playback_speed_label" + android:layout_width="80dp" + android:layout_height="match_parent" + android:layout_toRightOf="@id/butFF" + android:background="?attr/borderless_button" + android:src="?attr/av_fast_forward" + android:textColor="@color/gray" + android:textSize="@dimen/text_size_medium" + android:visibility="gone"/> + </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: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" /> - - <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" /> - - <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" /> - </RelativeLayout> + android:background="?attr/overlay_drawable"> + + <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:fontFamily="sans-serif-light" + android:textSize="@dimen/text_size_micro"/> + + <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:fontFamily="sans-serif-light" + android:textSize="@dimen/text_size_micro"/> + + <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"/> + </RelativeLayout> + + <FrameLayout + android:id="@+id/contentView" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_above="@id/playtime_layout" + android:layout_below="@id/navBarDivider"> + </FrameLayout> - <FrameLayout - android:id="@+id/contentView" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_above="@id/playtime_layout" - android:layout_below="@id/navBarDivider" > - </FrameLayout> + </RelativeLayout> -</RelativeLayout>
\ No newline at end of file + <ListView + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + android:choiceMode="singleChoice" + android:background="?attr/nav_drawer_background" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="8dp" + android:paddingRight="8dp"/> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/downloaded_episodeslist_item.xml b/res/layout/downloaded_episodeslist_item.xml new file mode 100644 index 000000000..35b3dbf9a --- /dev/null +++ b/res/layout/downloaded_episodeslist_item.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:orientation="horizontal" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:layout_marginRight="16dp"> + + <ImageView + android:id="@+id/imgvImage" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_alignParentLeft="true" + android:scaleType="centerCrop"/> + + <ImageView + android:id="@+id/statusPlaying" + android:contentDescription="@string/status_playing_label" + android:layout_width="@dimen/status_indicator_width" + android:layout_height="18dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="8dp" + android:background="@color/status_playing" + android:gravity="center" + android:padding="2dp" + android:src="@drawable/av_play_dark"/> + + <TextView + android:id="@+id/txtvPublished" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:maxLines="1" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_below="@id/txtvPublished" + android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" + android:layout_marginTop="2dp" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:lines="2" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small"/> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_toRightOf="@id/imgvImage" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/bottom_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/txtvSize" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentLeft="true" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + </RelativeLayout> + </LinearLayout> + </RelativeLayout> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@drawable/vertical_divider" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> + + <ImageButton + android:id="@+id/butSecondaryAction" + android:contentDescription="@string/remove_episode_lable" + android:focusable="false" + android:clickable="false" + android:focusableInTouchMode="false" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/borderless_button" + android:src="?attr/content_discard" + /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/downloadlist_item.xml b/res/layout/downloadlist_item.xml index 688a64876..a0a589175 100644 --- a/res/layout/downloadlist_item.xml +++ b/res/layout/downloadlist_item.xml @@ -1,46 +1,73 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginTop="8dp" - android:textStyle="bold" /> - - <TextView - android:id="@+id/txtvMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" /> - - <ProgressBar - android:id="@+id/progProgress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="match_parent" - android:layout_height="16dp" - android:layout_margin="8dp" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" > + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="match_parent" + android:orientation="vertical"> <TextView - android:id="@+id/txtvDownloaded" - android:layout_width="wrap_content" + android:id="@+id/txtvTitle" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" /> + android:layout_marginLeft="8dp" + android:layout_marginTop="8dp" + android:textStyle="bold"/> <TextView - android:id="@+id/txtvPercent" - android:layout_width="wrap_content" + android:id="@+id/txtvMessage" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp"/> + + <ProgressBar + android:id="@+id/progProgress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="16dp" + android:layout_margin="8dp"/> + + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentRight="true" /> - </RelativeLayout> + android:layout_margin="8dp"> + + <TextView + android:id="@+id/txtvDownloaded" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true"/> + + <TextView + android:id="@+id/txtvPercent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true"/> + </RelativeLayout> + + </LinearLayout> + + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@drawable/vertical_divider" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> + <ImageButton + android:id="@+id/butSecondaryAction" + android:contentDescription="@string/cancel_download_label" + android:focusable="false" + android:clickable="false" + android:focusableInTouchMode="false" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/borderless_button" + android:src="?attr/navigation_cancel" + /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/external_player_fragment.xml b/res/layout/external_player_fragment.xml index d619d7a77..f084ccac1 100644 --- a/res/layout/external_player_fragment.xml +++ b/res/layout/external_player_fragment.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fragmentLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone" > + android:id="@+id/fragmentLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> <View android:layout_width="match_parent" - android:layout_height="1.5dp" - android:background="#AAAAAA" /> + android:layout_height="2dp" + android:background="@color/bright_blue"/> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content"> <RelativeLayout android:id="@+id/layoutInfo" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="?attr/borderless_button" > + android:background="?attr/borderless_button"> <ImageView android:id="@+id/imgvCover" @@ -28,9 +28,10 @@ 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" /> + android:scaleType="fitXY"/> <TextView android:id="@+id/txtvTitle" @@ -42,37 +43,9 @@ android:layout_marginTop="8dp" android:layout_toRightOf="@id/imgvCover" android:ellipsize="end" - android:maxLines="1" - android:textStyle="bold" /> - - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/txtvTitle" - android:layout_marginBottom="8dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" - android:layout_toRightOf="@id/imgvCover" - android:maxLines="1" - android:textSize="@dimen/text_size_micro" /> - - <TextView - android:id="@+id/txtvStatus" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/txtvTitle" - android:layout_marginBottom="8dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" - android:layout_toRightOf="@id/txtvPosition" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> + android:maxLines="2" + android:textSize="18sp" + android:fontFamily="sans-serif-light"/> </RelativeLayout> <ImageButton @@ -80,7 +53,7 @@ android:contentDescription="@string/pause_label" android:layout_width="@dimen/external_player_height" android:layout_height="@dimen/external_player_height" - android:background="?attr/borderless_button" /> + android:background="?attr/borderless_button"/> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/feedinfo.xml b/res/layout/feedinfo.xml index d975ef549..8c907c132 100644 --- a/res/layout/feedinfo.xml +++ b/res/layout/feedinfo.xml @@ -26,9 +26,7 @@ android:layout_centerVertical="true" android:layout_margin="4dp" android:layout_toRightOf="@id/imgvCover" - android:textSize="@dimen/text_size_large" - android:textStyle="bold" - android:textColor="?android:attr/textColorPrimary"/> + style="@style/AntennaPod.TextView.Heading"/> <View android:id="@+id/divider" @@ -99,12 +97,11 @@ <TextView android:id="@+id/txtvSettings" + style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/podcast_settings_label" - android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorPrimary" android:layout_marginLeft="8dp" android:layout_marginBottom="8dp" android:layout_marginTop="24dp"/> @@ -119,13 +116,12 @@ android:textColor="?android:attr/textColorPrimary"/> <TextView + style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginBottom="8dp" android:layout_marginTop="24dp" - android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorPrimary" android:text="@string/description_label"/> <TextView diff --git a/res/layout/feeditem_dialog.xml b/res/layout/feeditem_dialog.xml new file mode 100644 index 000000000..4241ef9c8 --- /dev/null +++ b/res/layout/feeditem_dialog.xml @@ -0,0 +1,55 @@ +<?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="match_parent"> + + <LinearLayout + android:id="@+id/header" + android:orientation="horizontal" + android:layout_alignParentTop="true" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageButton + android:layout_width="0dp" + android:layout_height="48dp" + android:layout_weight="1" + android:id="@+id/butAction1" + android:background="?attr/borderless_button" + tools:ignore="ContentDescription"/> + + <ImageButton + android:layout_width="0dp" + android:layout_height="48dp" + android:layout_weight="1" + android:id="@+id/butAction2" + android:background="?attr/borderless_button" + tools:ignore="ContentDescription"/> + + <ImageButton + android:layout_width="0dp" + android:layout_height="48dp" + android:layout_weight="1" + android:id="@+id/butMoreActions" + android:background="?attr/borderless_button" + android:src="?attr/ic_action_overflow" + android:contentDescription="@string/butAction_label"/> + </LinearLayout> + + <View + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="3dp" + android:layout_below="@id/header" + android:background="@color/bright_blue"/> + + <WebView + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_below="@id/divider" + android:layout_alignParentBottom="true" + android:id="@+id/webview"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/feeditemlist_header.xml b/res/layout/feeditemlist_header.xml index 560013abd..d2ce7556f 100644 --- a/res/layout/feeditemlist_header.xml +++ b/res/layout/feeditemlist_header.xml @@ -1,56 +1,53 @@ <?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:background="?attr/borderless_button" - android:orientation="vertical" > - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" > +<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.MainActivity"> + + <ImageView + android:id="@+id/imgvCover" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/thumbnail_length_onlinefeedview" + android:layout_height="@dimen/thumbnail_length_onlinefeedview" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_margin="4dp"/> - <TextView - android:id="@+id/txtvHeaderTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_marginBottom="32dp" - android:layout_marginLeft="28dp" - android:layout_marginRight="16dp" - android:layout_marginTop="32dp" - android:paddingLeft="8dp" - android:textAllCaps="true" - android:textColor="@color/dark_blue" - android:textSize="@dimen/text_size_large" - android:typeface="sans" /> + <TextView + android:id="@+id/txtvTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:ellipsize="end" + android:gravity="center_vertical" + android:layout_alignTop="@id/imgvCover" + android:layout_toRightOf="@id/imgvCover" + android:layout_alignParentRight="true" + android:lines="1" + style="@style/AntennaPod.TextView.Heading" + android:layout_margin="4dp"/> - <ImageButton - android:id="@+id/butAction" - android:contentDescription="@string/butAction_label" - android:layout_width="48dp" - android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:clickable="false" - android:focusable="false" - android:focusableInTouchMode="false" - android:paddingLeft="24dp" - android:paddingRight="8dp" - android:paddingTop="16dp" - android:scaleType="fitEnd" - android:src="?attr/spinner_button" /> + <TextView + android:id="@+id/txtvAuthor" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:layout_below="@id/txtvTitle" + android:layout_toRightOf="@id/imgvCover" + android:lines="1" + android:ellipsize="end" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small"/> - <TextView - android:id="@+id/txtvNumItems" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_centerVertical="true" - android:layout_toLeftOf="@id/butAction" - android:textColor="@color/dark_blue" - android:textSize="@dimen/text_size_large" - android:textStyle="normal" /> - </RelativeLayout> + <TextView + android:id="@+id/txtvLink" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:lines="1" + android:ellipsize="end" + android:layout_below="@id/txtvAuthor" + android:layout_toRightOf="@id/imgvCover" + android:textSize="@dimen/text_size_small"/> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml index e2898b601..c887d3a4f 100644 --- a/res/layout/feeditemlist_item.xml +++ b/res/layout/feeditemlist_item.xml @@ -1,155 +1,133 @@ <?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="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:paddingLeft="4dp" > - <TextView - android:id="@+id/txtvItemname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginRight="4dp" - android:layout_marginTop="4dp" - android:layout_toLeftOf="@+id/butAction" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_medium" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:orientation="horizontal" + android:layout_height="match_parent"> - <TextView - android:id="@+id/txtvFeedname" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/txtvItemname" - android:layout_marginBottom="4dp" - android:layout_toLeftOf="@id/butAction" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" - android:visibility="gone" /> + <RelativeLayout + android:layout_margin="8dp" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingLeft="4dp"> - <TextView - android:id="@+id/txtvPublished" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/txtvFeedname" - android:layout_marginBottom="4dp" - android:layout_toLeftOf="@id/butAction" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> + <TextView + android:id="@+id/txtvPublished" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginBottom="4dp" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> - <ImageView - android:id="@+id/imgvType" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_below="@id/txtvPublished" - android:layout_toLeftOf="@+id/imgvInPlaylist" - android:padding="2dp" - tools:ignore="ContentDescription"/> + <TextView + android:id="@+id/txtvItemname" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/txtvPublished" + android:layout_marginBottom="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" + android:ellipsize="end" + android:lines="2" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_medium"/> - <ImageView - android:id="@id/imgvInPlaylist" - android:contentDescription="@string/in_queue_label" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_below="@id/txtvPublished" - android:layout_toLeftOf="@+id/imgvDownloaded" - android:padding="2dp" - android:src="?attr/stat_playlist" - android:visibility="visible" /> - <ImageView - android:id="@id/imgvDownloaded" - android:contentDescription="@string/status_downloaded_label" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_below="@id/txtvPublished" - android:layout_toLeftOf="@+id/imgvDownloading" - android:padding="2dp" - android:src="?attr/av_download" - android:visibility="visible" /> + <ImageView + android:id="@+id/imgvInPlaylist" + android:contentDescription="@string/in_queue_label" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:padding="2dp" + android:src="?attr/stat_playlist" + android:visibility="visible"/> - <ImageView - android:id="@id/imgvDownloading" - android:contentDescription="@string/downloading_label" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_below="@id/txtvPublished" - android:layout_toLeftOf="@id/butAction" - android:padding="2dp" - android:src="?attr/navigation_refresh" - android:visibility="visible" /> + <ImageView + android:id="@+id/imgvType" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_alignParentBottom="true" + android:layout_toLeftOf="@+id/imgvInPlaylist" + android:padding="2dp" + tools:ignore="ContentDescription"/> - <TextView - android:id="@+id/txtvLenSize" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@id/txtvPublished" - android:maxLines="2" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> + <TextView + android:id="@+id/txtvLenSize" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/txtvItemname" + android:maxLines="2" + android:layout_marginBottom="2dp" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> - <ProgressBar - android:id="@+id/pbar_episode_progress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" - android:layout_marginBottom="4dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginTop="2dp" - android:layout_toLeftOf="@id/imgvType" - android:layout_toRightOf="@id/txtvLenSize" /> + <ProgressBar + android:id="@+id/pbar_episode_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_below="@id/txtvItemname" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="2dp" + android:layout_toLeftOf="@id/imgvType" + android:layout_toRightOf="@id/txtvLenSize"/> - <ImageButton - android:id="@id/butAction" - android:contentDescription="@string/butAction_label" - android:layout_width="48dp" + <TextView + android:id="@+id/statusUnread" + android:contentDescription="@string/status_unread_label" + android:layout_width="wrap_content" + android:layout_height="18dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + android:background="@color/status_unread" + android:gravity="center" + android:minWidth="@dimen/status_indicator_width" + android:text="@string/new_label" + android:textAlignment="center" + android:textColor="@color/white" + android:textSize="@dimen/text_size_micro" + android:textStyle="bold"/> + + <ImageView + android:id="@+id/statusPlaying" + android:contentDescription="@string/status_playing_label" + android:layout_width="@dimen/status_indicator_width" + android:layout_height="18dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + android:background="@color/status_playing" + android:gravity="center" + android:padding="2dp" + android:src="@drawable/av_play_dark"/> + + </RelativeLayout> + + <View + android:layout_width="1dp" android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:clickable="false" + android:background="@drawable/vertical_divider" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> + + <ImageButton + android:id="@+id/butSecondaryAction" android:focusable="false" + android:clickable="false" android:focusableInTouchMode="false" - android:paddingLeft="24dp" - android:paddingRight="8dp" - android:paddingTop="16dp" - android:scaleType="fitEnd" - android:src="?attr/spinner_button" /> - - <TextView - android:id="@+id/statusUnread" - android:contentDescription="@string/status_unread_label" - android:layout_width="wrap_content" - android:layout_height="18dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="8dp" - android:background="@color/status_unread" - android:gravity="center" - android:minWidth="@dimen/status_indicator_width" - android:text="@string/new_label" - android:textAlignment="center" - android:textColor="@color/white" - android:textSize="@dimen/text_size_micro" - android:textStyle="bold" /> - - <ImageView - android:id="@+id/statusPlaying" - android:contentDescription="@string/status_playing_label" - android:layout_width="@dimen/status_indicator_width" - android:layout_height="18dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="8dp" - android:background="@color/status_playing" - android:gravity="center" - android:padding="2dp" - android:src="@drawable/av_play_dark" /> + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/borderless_button" + tools:ignore="ContentDescription"/> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml index b66fc9414..3e3c4e54f 100644 --- a/res/layout/gpodnetauth_credentials.xml +++ b/res/layout/gpodnetauth_credentials.xml @@ -10,10 +10,8 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_login_title" android:layout_alignParentTop="true" - android:textSize="@dimen/text_size_large" android:layout_margin="16dp" - android:textColor="@color/bright_blue" - android:textStyle="italic"/> + style="@style/AntennaPod.TextView.Heading"/> <TextView android:id="@id/txtvDescription" diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml index e7bfdc425..33d3d2718 100644 --- a/res/layout/gpodnetauth_device.xml +++ b/res/layout/gpodnetauth_device.xml @@ -10,10 +10,8 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_device_title" android:layout_alignParentTop="true" - android:textSize="@dimen/text_size_large" android:layout_margin="16dp" - android:textColor="@color/bright_blue" - android:textStyle="italic"/> + style="@style/AntennaPod.TextView.Heading"/> <TextView android:id="@+id/txtvDescription" diff --git a/res/layout/gpodnetauth_finish.xml b/res/layout/gpodnetauth_finish.xml index 3b0b10d04..71873201a 100644 --- a/res/layout/gpodnetauth_finish.xml +++ b/res/layout/gpodnetauth_finish.xml @@ -10,10 +10,8 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_finish_title" android:layout_alignParentTop="true" - android:textSize="@dimen/text_size_large" android:layout_margin="16dp" - android:textColor="@color/bright_blue" - android:textStyle="italic"/> + style="@style/AntennaPod.TextView.Heading"/> <TextView android:id="@+id/txtvDescription" diff --git a/res/layout/main.xml b/res/layout/main.xml index 2917db164..cfd59b87c 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,21 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_view" +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - <FrameLayout - android:id="@+id/playerFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" /> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <android.support.v4.view.ViewPager - android:id="@+id/viewpager" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_above="@id/playerFragment" - android:layout_alignParentTop="true" > - </android.support.v4.view.ViewPager> -</RelativeLayout>
\ No newline at end of file + <FrameLayout + android:id="@+id/playerFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"/> + + <FrameLayout + android:id="@+id/main_view" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_alignParentTop="true" + android:layout_above="@id/playerFragment"/> + + </RelativeLayout> + + <ListView + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + android:choiceMode="singleChoice" + android:background="?attr/nav_drawer_background" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="8dp" + android:paddingRight="8dp"/> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/nav_feedlistitem.xml b/res/layout/nav_feedlistitem.xml new file mode 100644 index 000000000..e01087077 --- /dev/null +++ b/res/layout/nav_feedlistitem.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <ImageView + android:id="@+id/imgvCover" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/thumbnail_length_navlist" + android:layout_height="@dimen/thumbnail_length_navlist" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:adjustViewBounds="true" + android:cropToPadding="true" + android:scaleType="fitXY" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp"/> + + + <TextView + android:id="@+id/txtvTitle" + android:lines="1" + android:ellipsize="end" + 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="12dp" + android:layout_marginTop="14dp" + android:layout_marginBottom="14dp" + android:layout_marginRight="48dp" + android:layout_toRightOf="@id/imgvCover" + /> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/nav_listitem.xml b/res/layout/nav_listitem.xml new file mode 100644 index 000000000..f1b585189 --- /dev/null +++ b/res/layout/nav_listitem.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/txtvTitle" + android:lines="1" + android:ellipsize="end" + android:layout_centerVertical="true" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_navdrawer" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_marginTop="28dp" + android:layout_marginBottom="28dp"/> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/nav_section_item.xml b/res/layout/nav_section_item.xml new file mode 100644 index 000000000..1f2fc7e3e --- /dev/null +++ b/res/layout/nav_section_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent"> + + <TextView + android:id="@+id/txtvTitle" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_small" + android:typeface="sans" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_alignParentBottom="true" + android:layout_marginTop="16dp" + android:paddingBottom="4dp"/> + + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:layout_alignParentBottom="true" + android:background="@color/gray"/> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/new_episodes_fragment.xml b/res/layout/new_episodes_fragment.xml new file mode 100644 index 000000000..460fe73d0 --- /dev/null +++ b/res/layout/new_episodes_fragment.xml @@ -0,0 +1,45 @@ +<?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" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.mobeta.android.dslv.DragSortListView + android:id="@android:id/list" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:scrollbarStyle="outsideOverlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + 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"/> + + <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"/> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/new_episodes_listdivider.xml b/res/layout/new_episodes_listdivider.xml new file mode 100644 index 000000000..6b4f55d61 --- /dev/null +++ b/res/layout/new_episodes_listdivider.xml @@ -0,0 +1,16 @@ +<?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="match_parent"> + + <TextView + android:padding="12dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAllCaps="true" + style="@style/AntennaPod.TextView.Heading" + android:text="@string/recently_published_episodes_label"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/new_episodes_listitem.xml b/res/layout/new_episodes_listitem.xml new file mode 100644 index 000000000..721b88071 --- /dev/null +++ b/res/layout/new_episodes_listitem.xml @@ -0,0 +1,130 @@ +<?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:orientation="horizontal" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:layout_marginRight="16dp"> + + <ImageView + android:id="@+id/imgvImage" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_alignParentLeft="true" + android:scaleType="centerCrop"/> + + <ImageView + android:id="@+id/statusPlaying" + android:contentDescription="@string/status_playing_label" + android:layout_width="@dimen/status_indicator_width" + android:layout_height="18dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="8dp" + android:background="@color/status_playing" + android:gravity="center" + android:padding="2dp" + android:src="@drawable/av_play_dark"/> + + <TextView + android:id="@+id/txtvPublished" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:maxLines="1" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_below="@id/txtvPublished" + android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" + android:layout_marginTop="2dp" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:lines="2" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small"/> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_toRightOf="@id/imgvImage" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/bottom_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@id/imgvInPlaylist" + android:contentDescription="@string/in_queue_label" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_alignParentRight="true" + android:src="?attr/stat_playlist"/> + + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:max="100" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentLeft="true"/> + + <TextView + android:id="@+id/txtvDuration" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentLeft="true" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + </RelativeLayout> + </LinearLayout> + </RelativeLayout> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@drawable/vertical_divider" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> + + <ImageButton + android:id="@+id/butSecondaryAction" + android:focusable="false" + android:clickable="false" + android:focusableInTouchMode="false" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/borderless_button" + tools:ignore="ContentDescription"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/onlinefeedview_header.xml b/res/layout/onlinefeedview_header.xml index 441df6174..6cec28e92 100644 --- a/res/layout/onlinefeedview_header.xml +++ b/res/layout/onlinefeedview_header.xml @@ -23,8 +23,7 @@ android:layout_toRightOf="@id/imgvCover" android:layout_alignParentRight="true" android:lines="1" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_medium" + style="@style/AntennaPod.TextView.Heading" android:layout_margin="4dp"/> <TextView diff --git a/res/layout/pager_fragment.xml b/res/layout/pager_fragment.xml new file mode 100644 index 000000000..cb7ae0151 --- /dev/null +++ b/res/layout/pager_fragment.xml @@ -0,0 +1,12 @@ +<?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="match_parent"> + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/queue_fragment.xml b/res/layout/queue_fragment.xml new file mode 100644 index 000000000..1c48768a2 --- /dev/null +++ b/res/layout/queue_fragment.xml @@ -0,0 +1,58 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.mobeta.android.dslv.DragSortListView + android:id="@android:id/list" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:scrollbarStyle="outsideOverlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + 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="true" + dslv:track_drag_sort="true" + dslv:float_background_color="?attr/dragview_float_background" + dslv:use_default_controller="true"/> + + <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"/> + + <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/res/layout/queue_listitem.xml b/res/layout/queue_listitem.xml new file mode 100644 index 000000000..5bac726f3 --- /dev/null +++ b/res/layout/queue_listitem.xml @@ -0,0 +1,130 @@ +<?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:orientation="horizontal" + android:layout_height="match_parent"> + + <ImageView + android:layout_width="24dp" + android:layout_height="match_parent" + android:id="@+id/drag_handle" + android:src="?attr/dragview_background" + android:scaleType="center" + android:layout_margin="8dp" + android:contentDescription="@string/drag_handle_content_description"/> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:layout_marginRight="16dp"> + + <ImageView + android:id="@+id/imgvImage" + android:contentDescription="@string/cover_label" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_alignParentLeft="true" + android:scaleType="centerCrop"/> + + <ImageView + android:id="@+id/statusPlaying" + android:contentDescription="@string/status_playing_label" + android:layout_width="@dimen/status_indicator_width" + android:layout_height="18dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="@color/status_playing" + android:gravity="center" + android:padding="2dp" + android:src="@drawable/av_play_dark"/> + + <TextView + android:id="@+id/txtvPublished" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:maxLines="1" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + + <TextView + android:id="@+id/txtvTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_below="@id/txtvPublished" + android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" + android:layout_marginTop="2dp" + android:layout_toRightOf="@id/imgvImage" + android:layout_toLeftOf="@id/statusPlaying" + android:ellipsize="end" + android:lines="2" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small"/> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_toRightOf="@id/imgvImage" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/bottom_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:max="100" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentLeft="true"/> + + <TextView + android:id="@+id/txtvDuration" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_micro"/> + </RelativeLayout> + </LinearLayout> + </RelativeLayout> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@drawable/vertical_divider" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> + + <ImageButton + android:id="@+id/butSecondaryAction" + android:focusable="false" + android:clickable="false" + android:focusableInTouchMode="false" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/borderless_button" + tools:ignore="ContentDescription"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/searchlist_item.xml b/res/layout/searchlist_item.xml index 889f40eef..c83f34482 100644 --- a/res/layout/searchlist_item.xml +++ b/res/layout/searchlist_item.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="8dp" > + android:layout_width="match_parent" + android:layout_height="match_parent"> <ImageView android:id="@+id/imgvFeedimage" android:contentDescription="@string/cover_label" - android:layout_width="55dip" - android:layout_height="55dip" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_marginLeft="1dip" - android:layout_marginRight="4dip" - android:cropToPadding="true" /> + android:scaleType="centerCrop"/> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" @@ -21,20 +18,27 @@ android:layout_height="match_parent" android:layout_centerVertical="true" android:layout_toRightOf="@id/imgvFeedimage" - android:orientation="vertical" > + android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:maxLines="2" - android:textStyle="bold" /> + android:layout_margin="4dp" + android:lines="2" + android:ellipsize="end" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small"/> <TextView android:id="@+id/txtvSubtitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?android:attr/textColorSecondary" /> + android:layout_margin="4dp" + android:lines="1" + android:ellipsize="end" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_small"/> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/res/menu/feeditem_dialog.xml b/res/menu/feeditem_dialog.xml new file mode 100644 index 000000000..f33b7502a --- /dev/null +++ b/res/menu/feeditem_dialog.xml @@ -0,0 +1,48 @@ +<?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/skip_episode_item" + android:title="@string/skip_episode_label" + custom:showAsAction="collapseActionView"> + </item> + + <item + android:id="@+id/mark_read_item" + custom:showAsAction="collapseActionView" + android:title="@string/mark_read_label"> + </item> + <item + android:id="@+id/mark_unread_item" + custom:showAsAction="collapseActionView" + android:title="@string/mark_unread_label"> + </item> + <item + android:id="@+id/add_to_queue_item" + custom:showAsAction="collapseActionView" + android:title="@string/add_to_queue_label"> + </item> + <item + android:id="@+id/remove_from_queue_item" + custom:showAsAction="collapseActionView" + android:title="@string/remove_from_queue_label"> + </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/support_item" + custom:showAsAction="collapseActionView" + android:title="@string/support_label"> + </item> + +</menu>
\ No newline at end of file diff --git a/res/menu/feedlist.xml b/res/menu/feedlist.xml index 74f4fc923..28df69f2d 100644 --- a/res/menu/feedlist.xml +++ b/res/menu/feedlist.xml @@ -5,39 +5,37 @@ <item android:id="@+id/refresh_item" android:icon="?attr/navigation_refresh" + android:menuCategory="container" custom:showAsAction="ifRoom|collapseActionView" android:title="@string/refresh_label"> </item> <item android:id="@+id/mark_all_read_item" + android:menuCategory="container" custom:showAsAction="collapseActionView" android:title="@string/mark_all_read_label"> </item> <item android:id="@+id/show_info_item" + android:menuCategory="container" android:icon="?attr/action_about" custom:showAsAction="collapseActionView" android:title="@string/show_info_label"> </item> <item - android:id="@+id/remove_item" - android:icon="?attr/content_discard" + android:id="@+id/support_item" + android:menuCategory="container" custom:showAsAction="collapseActionView" - android:title="@string/remove_feed_label" - android:visible="true"> + android:title="@string/support_label" + android:visible="false"> </item> <item - android:id="@+id/visit_website_item" - android:icon="?attr/location_web_site" + android:id="@+id/remove_item" + android:menuCategory="container" + android:icon="?attr/content_discard" custom:showAsAction="collapseActionView" - android:title="@string/visit_website_label" + android:title="@string/remove_feed_label" android:visible="true"> </item> - <item - android:id="@+id/support_item" - custom:showAsAction="collapseActionView" - android:title="@string/support_label" - android:visible="false"> - </item> </menu>
\ No newline at end of file diff --git a/res/menu/main.xml b/res/menu/main.xml index 45047fc46..c5b069b40 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -1,42 +1,11 @@ <?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/all_feed_refresh" - android:title="@string/refresh_label" - android:icon="?attr/navigation_refresh" - custom:showAsAction="ifRoom|collapseActionView"> - </item> - <item - android:id="@+id/add_feed" - android:title="@string/add_feed_label" - android:icon="?attr/content_new" - custom:showAsAction="ifRoom|collapseActionView"> - </item> - <item - android:id="@id/search_item" - android:icon="?attr/action_search" - android:title="@string/search_label" - custom:showAsAction="ifRoom|collapseActionView" - android:actionViewClass="android.support.v7.widget.SearchView"/> - <item - android:id="@+id/show_player" - android:title="@string/show_player_label" - android:icon="@drawable/av_play" - custom:showAsAction="collapseActionView"/> - <item - android:id="@+id/show_playback_history" - android:title="@string/playback_history_label" - custom:showAsAction="collapseActionView"/> - <item - android:id="@+id/show_downloads" - android:title="@string/downloads_label" - android:icon="@drawable/av_download" - custom:showAsAction="collapseActionView"> - </item> + <item android:id="@+id/show_preferences" android:title="@string/settings_label" + android:menuCategory="system" android:icon="?attr/action_settings" custom:showAsAction="collapseActionView"/> diff --git a/res/menu/new_episodes.xml b/res/menu/new_episodes.xml new file mode 100644 index 000000000..00ff3bc5a --- /dev/null +++ b/res/menu/new_episodes.xml @@ -0,0 +1,20 @@ +<?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/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + custom:showAsAction="ifRoom|collapseActionView" + android:icon="?attr/navigation_refresh"/> + + <item + android:id="@+id/mark_all_read_item" + android:title="@string/mark_all_read_label" + android:menuCategory="container" + custom:showAsAction="ifRoom|collapseActionView" + android:icon="?attr/navigation_accept"/> + +</menu>
\ No newline at end of file diff --git a/res/values-v16/styles.xml b/res/values-v16/styles.xml new file mode 100644 index 000000000..947e43f38 --- /dev/null +++ b/res/values-v16/styles.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium"> + <item name="android:textSize">@dimen/text_size_large</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:fontFamily">sans-serif-light</item> + </style> +</resources>
\ No newline at end of file diff --git a/res/values-v19/colors.xml b/res/values-v19/colors.xml new file mode 100644 index 000000000..16c065d75 --- /dev/null +++ b/res/values-v19/colors.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="selection_background_color_dark">#484B4D</color> + <color name="selection_background_color_light">#E3E3E3</color> +</resources>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index e8334cd60..751134a50 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,39 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="action_about" format="reference" /> - <attr name="action_search" format="reference" /> - <attr name="action_settings" format="reference" /> - <attr name="action_stream" format="reference" /> - <attr name="av_download" format="reference" /> - <attr name="av_fast_forward" format="reference" /> - <attr name="av_pause" format="reference" /> - <attr name="av_play" format="reference" /> - <attr name="av_rewind" format="reference" /> - <attr name="content_discard" format="reference" /> - <attr name="content_new" format="reference" /> - <attr name="default_cover" format="reference" /> - <attr name="device_access_time" format="reference" /> - <attr name="location_web_site" format="reference" /> - <attr name="navigation_accept" format="reference" /> - <attr name="navigation_cancel" format="reference" /> - <attr name="navigation_expand" format="reference" /> - <attr name="navigation_collapse" format="reference" /> - <attr name="navigation_refresh" format="reference" /> - <attr name="navigation_up" format="reference" /> - <attr name="navigation_shownotes" format="reference" /> - <attr name="navigation_chapters" format="reference" /> - <attr name="social_share" format="reference" /> - <attr name="stat_playlist" format="reference" /> - <attr name="type_audio" format="reference" /> - <attr name="type_video" format="reference" /> - <attr name="borderless_button" format="reference" /> - <attr name="spinner_button" format="reference" /> - <attr name="overlay_drawable" format="reference" /> - <attr name="dragview_background" format="reference" /> - <attr name="dragview_float_background" format="reference" /> + <attr name="action_about" format="reference"/> + <attr name="action_search" format="reference"/> + <attr name="action_settings" format="reference"/> + <attr name="action_stream" format="reference"/> + <attr name="av_download" format="reference"/> + <attr name="av_fast_forward" format="reference"/> + <attr name="av_pause" format="reference"/> + <attr name="av_play" format="reference"/> + <attr name="av_rewind" format="reference"/> + <attr name="content_discard" format="reference"/> + <attr name="content_new" format="reference"/> + <attr name="default_cover" format="reference"/> + <attr name="device_access_time" format="reference"/> + <attr name="location_web_site" format="reference"/> + <attr name="navigation_accept" format="reference"/> + <attr name="navigation_cancel" format="reference"/> + <attr name="navigation_expand" format="reference"/> + <attr name="navigation_collapse" format="reference"/> + <attr name="navigation_refresh" format="reference"/> + <attr name="navigation_up" format="reference"/> + <attr name="navigation_shownotes" format="reference"/> + <attr name="navigation_chapters" format="reference"/> + <attr name="social_share" format="reference"/> + <attr name="stat_playlist" format="reference"/> + <attr name="type_audio" format="reference"/> + <attr name="type_video" format="reference"/> + <attr name="borderless_button" format="reference"/> + <attr name="spinner_button" format="reference"/> + <attr name="overlay_drawable" format="reference"/> + <attr name="dragview_background" format="reference"/> + <attr name="dragview_float_background" format="reference"/> + <attr name="ic_action_overflow" format="reference"/> <!-- Used in itemdescription --> - <attr name="non_transparent_background" format="reference" /> - <attr name="overlay_background" format="color" /> + <attr name="non_transparent_background" format="reference"/> + <attr name="overlay_background" format="color"/> + <attr name="nav_drawer_background" format="color"/> + <attr name="nav_drawer_toggle" format="reference"/> </resources>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8dea65a5b..f90b25a3a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -4,13 +4,17 @@ <dimen name="widget_margin">8dp</dimen> <dimen name="thumbnail_length">70dp</dimen> <dimen name="dragview_length">54dp</dimen> - <dimen name="external_player_height">55dp</dimen> + <dimen name="external_player_height">70dp</dimen> <dimen name="enc_icons_size">20dp</dimen> <dimen name="text_size_micro">12sp</dimen> <dimen name="text_size_small">14sp</dimen> + <dimen name="text_size_navdrawer">16sp</dimen> <dimen name="text_size_medium">18sp</dimen> <dimen name="text_size_large">22sp</dimen> <dimen name="status_indicator_width">36dp</dimen> <dimen name="thumbnail_length_itemlist">80dp</dimen> <dimen name="thumbnail_length_onlinefeedview">110dp</dimen> + <dimen name="thumbnail_length_navlist">42dp</dimen> + <dimen name="listview_secondary_button_width">48dp</dimen> + <dimen name="drawer_width">280dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 6d36a5c07..cf3b02148 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4,22 +4,33 @@ tools:ignore="MissingTranslation" > - <!-- Activitiy titles --> + <!-- Activitiy and fragment titles --> <string name="app_name">AntennaPod</string> <string name="feeds_label">Feeds</string> <string name="podcasts_label">PODCASTS</string> <string name="episodes_label">EPISODES</string> + <string name="new_episodes_label">New episodes</string> <string name="new_label">New</string> <string name="waiting_list_label">Waiting list</string> <string name="settings_label">Settings</string> <string name="add_new_feed_label">Add podcast</string> <string name="downloads_label">Downloads</string> + <string name="downloads_running_label">Running</string> + <string name="downloads_completed_label">Completed</string> + <string name="downloads_log_label">Log</string> <string name="cancel_download_label">Cancel Download</string> <string name="download_log_label">Download log</string> <string name="playback_history_label">Playback history</string> <string name="gpodnet_main_label">gpodder.net</string> <string name="gpodnet_auth_label">gpodder.net login</string> + <!-- New episodes fragment --> + <string name="recently_published_episodes_label">Recently published</string> + + <!-- Main activity --> + <string name="drawer_open">Open menu</string> + <string name="drawer_close">Close menu</string> + <!-- Webview actions --> <string name="open_in_browser_label">Open in browser</string> <string name="copy_url_label">Copy URL</string> @@ -59,12 +70,15 @@ <!-- 'Add Feed' Activity labels --> <string name="feedurl_label">Feed URL</string> <string name="txtvfeedurl_label">Add Podcast by URL</string> - <string name="podcastdirectories_label">Podcast directories</string> + <string name="podcastdirectories_label">Find podcast in directory</string> + <string name="podcastdirectories_descr">You can search for new podcasts by name, category or popularity in the gpodder.net directory.</string> + <string name="browse_gpoddernet_label">Browse gpodder.net</string> <!-- Actions on feeds --> <string name="mark_all_read_label">Mark all as read</string> + <string name="mark_all_read_msg">Marked all episodes as read</string> <string name="show_info_label">Show information</string> - <string name="remove_feed_label">Remove Feed</string> + <string name="remove_feed_label">Remove podcast</string> <string name="share_link_label">Share website link</string> <string name="share_source_label">Share feed link</string> <string name="feed_delete_confirmation_msg">Please confirm that you want to delete this feed and ALL episodes of this feed that you have downloaded.</string> @@ -76,6 +90,7 @@ <string name="pause_label">Pause</string> <string name="stream_label">Stream</string> <string name="remove_label">Remove</string> + <string name="remove_episode_lable">Remove episode</string> <string name="mark_read_label">Mark as read</string> <string name="mark_unread_label">Mark as unread</string> <string name="add_to_queue_label">Add to Queue</string> @@ -349,10 +364,12 @@ <string name="status_playing_label">Episode is being played</string> <string name="status_downloading_label">Episode is being downloaded</string> <string name="status_downloaded_label">Episode is downloaded</string> + <string name="status_not_downloaded_label">Episode has not been downloaded yet</string> <string name="status_unread_label">Item is new</string> <string name="in_queue_label">Episode is in the queue</string> <string name="new_episodes_count_label">Number of new episodes</string> <string name="in_progress_episodes_count_label">Number of episodes you have started listening to</string> + <string name="drag_handle_content_description">Drag to change the position of this item</string> <!-- OPML backup --> <string name="backup_restored">"Restored feed subscriptions from backup"</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index d08b8060f..d6dccb426 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -33,8 +33,11 @@ <item name="attr/overlay_background">@color/overlay_light</item> <item name="attr/spinner_button">@drawable/spinner_button</item> <item name="attr/overlay_drawable">@drawable/overlay_drawable</item> - <item name="attr/dragview_background">@drawable/dragview_background</item> + <item name="attr/dragview_background">@drawable/ic_drag_handle</item> <item name="attr/dragview_float_background">@color/white</item> + <item name="attr/nav_drawer_background">@color/white</item> + <item name="attr/nav_drawer_toggle">@drawable/ic_drawer</item> + <item name="attr/ic_action_overflow">@drawable/ic_action_overflow</item> </style> <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat"> @@ -69,43 +72,55 @@ <item name="attr/overlay_background">@color/overlay_dark</item> <item name="attr/spinner_button">@drawable/spinner_button_dark</item> <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item> - <item name="attr/dragview_background">@drawable/dragview_background_dark</item> + <item name="attr/dragview_background">@drawable/ic_drag_handle_dark</item> <item name="attr/dragview_float_background">@color/black</item> + <item name="attr/nav_drawer_background">#3B3B3B</item> + <item name="attr/nav_drawer_toggle">@drawable/ic_drawer_dark</item> + <item name="attr/ic_action_overflow">@drawable/ic_action_overflow_dark</item> + </style> <style name="UndoBar"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">48dp</item> - <item name="android:layout_gravity">bottom</item> - <item name="android:layout_marginLeft">8dp</item> - <item name="android:layout_marginRight">8dp</item> - <item name="android:layout_marginBottom">16dp</item> - <item name="android:orientation">horizontal</item> - <item name="android:background">@drawable/undobar</item> - <item name="android:clickable">true</item> - <item name="android:divider">@drawable/undobar_divider</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">48dp</item> + <item name="android:layout_gravity">bottom</item> + <item name="android:layout_marginLeft">8dp</item> + <item name="android:layout_marginRight">8dp</item> + <item name="android:layout_marginBottom">16dp</item> + <item name="android:orientation">horizontal</item> + <item name="android:background">@drawable/undobar</item> + <item name="android:clickable">true</item> + <item name="android:divider">@drawable/undobar_divider</item> </style> + <style name="UndoBarMessage"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_weight">1</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginLeft">16dp</item> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:layout_marginRight">16dp</item> - <item name="android:textAppearance">?android:textAppearanceMedium</item> - <item name="android:textColor">#fff</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_weight">1</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginLeft">16dp</item> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:layout_marginRight">16dp</item> + <item name="android:textAppearance">?android:textAppearanceMedium</item> + <item name="android:textColor">#fff</item> </style> + <style name="UndoBarButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">match_parent</item> - <item name="android:paddingLeft">16dp</item> - <item name="android:paddingRight">16dp</item> - <item name="android:background">@drawable/undobar_button</item> - <item name="android:drawableLeft">@drawable/ic_undobar_undo</item> - <item name="android:drawablePadding">12dp</item> - <item name="android:textAppearance">?android:textAppearanceSmall</item> - <item name="android:textStyle">bold</item> - <item name="android:textColor">#fff</item> - <item name="android:text">@string/undo</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">match_parent</item> + <item name="android:paddingLeft">16dp</item> + <item name="android:paddingRight">16dp</item> + <item name="android:background">@drawable/undobar_button</item> + <item name="android:drawableLeft">@drawable/ic_undobar_undo</item> + <item name="android:drawablePadding">12dp</item> + <item name="android:textAppearance">?android:textAppearanceSmall</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">#fff</item> + <item name="android:text">@string/undo</item> + </style> + + <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium"> + <item name="android:textSize">@dimen/text_size_large</item> + <item name="android:textStyle">italic</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> </style> </resources> |
