diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/audioplayer_fragment.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/episodes_list_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/home_fragment.xml | 75 | ||||
| -rw-r--r-- | app/src/main/res/layout/home_section.xml | 91 | ||||
| -rw-r--r-- | app/src/main/res/layout/horizontal_feed_item.xml | 33 | ||||
| -rw-r--r-- | app/src/main/res/layout/horizontal_itemlist_item.xml | 123 | ||||
| -rw-r--r-- | app/src/main/res/layout/queue_fragment.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/searchlist_item_feed.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/layout/simple_list_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/menu/home.xml | 25 | ||||
| -rw-r--r-- | app/src/main/res/xml/shortcuts.xml | 2 |
11 files changed, 357 insertions, 26 deletions
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index 4e4ab389c..2008a8f33 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -14,7 +14,7 @@ android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarTheme" app:navigationContentDescription="@string/toolbar_back_button_content_description" - app:navigationIcon="?homeAsUpIndicator" /> + app:navigationIcon="@drawable/ic_arrow_down" /> <androidx.fragment.app.FragmentContainerView android:id="@+id/playerFragment" diff --git a/app/src/main/res/layout/episodes_list_fragment.xml b/app/src/main/res/layout/episodes_list_fragment.xml index 0a6c1da5f..629b7ab0e 100644 --- a/app/src/main/res/layout/episodes_list_fragment.xml +++ b/app/src/main/res/layout/episodes_list_fragment.xml @@ -2,6 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -12,7 +13,8 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" /> + android:theme="?attr/actionBarTheme" + app:navigationIcon="?homeAsUpIndicator" /> <TextView android:id="@+id/txtvInformation" diff --git a/app/src/main/res/layout/home_fragment.xml b/app/src/main/res/layout/home_fragment.xml new file mode 100644 index 000000000..040e3df34 --- /dev/null +++ b/app/src/main/res/layout/home_fragment.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:title="@string/home_label" + app:navigationIcon="?homeAsUpIndicator" /> + + <LinearLayout + android:id="@+id/welcomeContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone" + android:paddingHorizontal="32dp"> + + <ImageView + android:layout_width="80dp" + android:layout_height="80dp" + android:layout_marginBottom="8dp" + android:layout_gravity="start" + android:src="@drawable/ic_curved_arrow" /> + + <ImageView + android:id="@+id/icon" + android:layout_width="64dp" + android:layout_height="64dp" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="16dp" + android:src="@mipmap/ic_launcher" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/home_welcome_title" + android:layout_marginBottom="8dp" + android:layout_gravity="center_horizontal" + android:textAlignment="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="20sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/home_welcome_text" + android:layout_gravity="center_horizontal" + android:textAlignment="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="14sp" /> + + </LinearLayout> + + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:id="@+id/homeContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="12dp" /> + + </androidx.core.widget.NestedScrollView> + +</LinearLayout> diff --git a/app/src/main/res/layout/home_section.xml b/app/src/main/res/layout/home_section.xml new file mode 100644 index 000000000..783688f92 --- /dev/null +++ b/app/src/main/res/layout/home_section.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:gravity="center" + android:orientation="vertical" + android:paddingBottom="4dp"> + + <TextView + android:id="@+id/titleLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/moreButton" + android:layout_alignBottom="@id/moreButton" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_marginStart="16dp" + android:gravity="center" + android:textAlignment="center" + android:textColor="?android:attr/textColorPrimary" + android:textSize="18sp" + tools:text="Title" /> + + <ImageButton + android:id="@+id/shuffleButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/titleLabel" + android:layout_alignParentTop="true" + android:layout_marginVertical="8dp" + android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" + android:layout_toEndOf="@+id/titleLabel" + android:layout_toRightOf="@+id/titleLabel" + android:background="?attr/selectableItemBackgroundBorderless" + android:visibility="gone" + tools:visibility="visible" + app:srcCompat="@drawable/ic_shuffle" /> + + <TextView + android:id="@+id/numNewItemsLabel" + android:layout_width="wrap_content" + android:layout_height="20dp" + android:layout_alignBottom="@+id/titleLabel" + android:layout_alignParentTop="true" + android:layout_marginVertical="12dp" + android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" + android:layout_toEndOf="@+id/titleLabel" + android:layout_toRightOf="@+id/titleLabel" + android:background="@drawable/bg_pill" + android:gravity="center" + android:paddingHorizontal="8dp" + android:textAlignment="center" + android:textColor="?attr/colorPrimary" + android:textSize="16sp" + android:visibility="gone" + tools:visibility="visible" + tools:text="6" /> + + <Button + android:id="@+id/moreButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:paddingVertical="0dp" + android:layout_marginEnd="16dp" + tools:text="@string/discover_more" + style="@style/Widget.MaterialComponents.Button.TextButton" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/moreButton" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:clipToPadding="false" + android:clipToOutline="false" + android:clipChildren="false" + android:paddingHorizontal="16dp" /> + +</RelativeLayout> diff --git a/app/src/main/res/layout/horizontal_feed_item.xml b/app/src/main/res/layout/horizontal_feed_item.xml new file mode 100644 index 000000000..56a3b317d --- /dev/null +++ b/app/src/main/res/layout/horizontal_feed_item.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="96dp" + android:padding="4dp" + android:clipToPadding="false" + android:clipToOutline="false" + android:clipChildren="false"> + + <androidx.cardview.widget.CardView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:cardBackgroundColor="@color/non_square_icon_background" + app:cardCornerRadius="16dp" + app:cardPreventCornerOverlap="false" + app:cardElevation="2dp"> + + <de.danoeh.antennapod.ui.common.SquareImageView + android:id="@+id/discovery_cover" + android:layout_width="match_parent" + android:layout_height="96dp" + android:elevation="4dp" + android:outlineProvider="bounds" + android:foreground="?android:attr/selectableItemBackground" + android:background="?android:attr/windowBackground" + squareImageView:direction="height" /> + + </androidx.cardview.widget.CardView> + +</LinearLayout> diff --git a/app/src/main/res/layout/horizontal_itemlist_item.xml b/app/src/main/res/layout/horizontal_itemlist_item.xml new file mode 100644 index 000000000..a0e4e3d72 --- /dev/null +++ b/app/src/main/res/layout/horizontal_itemlist_item.xml @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clipToPadding="false" + android:padding="4dp"> + + <androidx.cardview.widget.CardView + android:id="@+id/card" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:foreground="?android:attr/selectableItemBackground" + android:clickable="true" + app:cardCornerRadius="12dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/background_elevated" + android:orientation="vertical"> + + <androidx.cardview.widget.CardView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:cardCornerRadius="12dp" + app:cardElevation="0dp"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="#dddddd" + android:orientation="vertical"> + + <FrameLayout + android:layout_width="128dp" + android:layout_height="128dp" + android:background="@color/image_readability_tint"> + + <de.danoeh.antennapod.ui.common.SquareImageView + android:id="@+id/cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:outlineProvider="bounds" + tools:src="@tools:sample/avatars" + squareImageView:direction="width" /> + + <ImageView + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="bottom|end" + android:layout_margin="8dp" + android:padding="3dp" + app:srcCompat="@drawable/bg_circle" /> + + <de.danoeh.antennapod.ui.common.CircularProgressBar + android:id="@+id/circularProgressBar" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_margin="8dp" + android:layout_gravity="bottom|end" + app:foregroundColor="?attr/colorOnPrimary" /> + + <ImageView + android:id="@+id/secondaryActionIcon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="bottom|end" + android:layout_margin="8dp" + android:padding="12dp" + android:clickable="true" + android:foreground="?attr/selectableItemBackgroundBorderless" + app:tintMode="src_atop" + app:tint="?attr/colorOnPrimary" + app:srcCompat="@drawable/ic_play_24dp" /> + + </FrameLayout> + + <ProgressBar + android:id="@+id/progressBar" + android:layout_width="match_parent" + android:layout_height="4dp" + android:max="100" + android:layout_gravity="bottom" + style="?attr/progressBarTheme" + tools:background="@android:color/holo_blue_light" /> + + </LinearLayout> + + </androidx.cardview.widget.CardView> + + <TextView + android:id="@+id/titleLabel" + android:layout_width="128dp" + android:layout_height="wrap_content" + android:ellipsize="end" + android:paddingHorizontal="4dp" + android:layout_marginTop="4dp" + android:lines="2" + android:singleLine="false" + android:textColor="?android:attr/textColorPrimary" + android:textSize="14sp" + tools:text="@sample/episodes.json/data/title" /> + + <TextView + android:id="@+id/dateLabel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:paddingHorizontal="4dp" + android:singleLine="true" + android:textAlignment="textStart" + android:textSize="14sp" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" /> + + </LinearLayout> + + </androidx.cardview.widget.CardView> + +</LinearLayout> diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 292b1bb45..7c8bdefbf 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -13,7 +13,8 @@ android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarTheme" android:layout_alignParentTop="true" - app:title="@string/queue_label" /> + app:title="@string/queue_label" + app:navigationIcon="?homeAsUpIndicator" /> <TextView android:id="@+id/info_bar" diff --git a/app/src/main/res/layout/searchlist_item_feed.xml b/app/src/main/res/layout/searchlist_item_feed.xml deleted file mode 100644 index c16911f99..000000000 --- a/app/src/main/res/layout/searchlist_item_feed.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" - android:layout_width="match_parent" - android:layout_height="96dp" - android:padding="4dp" - android:clipToPadding="false"> - - <de.danoeh.antennapod.ui.common.SquareImageView - android:id="@+id/discovery_cover" - android:layout_width="match_parent" - android:layout_height="96dp" - android:elevation="4dp" - android:outlineProvider="bounds" - android:foreground="?android:attr/selectableItemBackground" - android:background="?android:attr/windowBackground" - squareImageView:direction="height" /> - -</LinearLayout> - diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml index 6ea3ab54b..5019edcfd 100644 --- a/app/src/main/res/layout/simple_list_fragment.xml +++ b/app/src/main/res/layout/simple_list_fragment.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -10,7 +11,8 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" /> + android:layout_alignParentTop="true" + app:navigationIcon="?homeAsUpIndicator" /> <de.danoeh.antennapod.view.EpisodeItemListRecyclerView android:id="@+id/recyclerView" diff --git a/app/src/main/res/menu/home.xml b/app/src/main/res/menu/home.xml new file mode 100644 index 000000000..f80218c0c --- /dev/null +++ b/app/src/main/res/menu/home.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/action_search" + android:icon="@drawable/ic_search" + custom:showAsAction="always" + android:title="@string/search_label"/> + + <item + android:id="@+id/refresh_item" + android:title="@string/refresh_label" + android:menuCategory="container" + custom:showAsAction="always" + android:icon="@drawable/ic_refresh"/> + + <item + android:id="@+id/homesettings_items" + android:icon="@drawable/ic_settings" + android:menuCategory="container" + android:title="@string/configure_home" + custom:showAsAction="never"/> + +</menu> diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml index c802e2bba..7ca3b3787 100644 --- a/app/src/main/res/xml/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -32,7 +32,7 @@ <shortcut android:enabled="true" - android:icon="@drawable/ic_folder_shortcut" + android:icon="@drawable/ic_subscriptions_shortcut" android:shortcutId="subscriptions" android:shortcutShortLabel="@string/subscriptions_label"> <intent |