diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/dialog_switch_preference.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_subscriptions.xml | 102 | ||||
| -rw-r--r-- | app/src/main/res/layout/subscription_item.xml | 24 |
3 files changed, 87 insertions, 54 deletions
diff --git a/app/src/main/res/layout/dialog_switch_preference.xml b/app/src/main/res/layout/dialog_switch_preference.xml new file mode 100644 index 000000000..87f321c86 --- /dev/null +++ b/app/src/main/res/layout/dialog_switch_preference.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="24dp"> + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/dialogSwitch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:text="Switch" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 61d33f534..6dd112eed 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -1,33 +1,34 @@ <?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:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<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" + android:orientation="vertical"> <androidx.appcompat.widget.Toolbar - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" - app:title="@string/subscriptions_label" - app:navigationIcon="?homeAsUpIndicator" - android:id="@+id/toolbar"/> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + android:layout_alignParentTop="true" + app:title="@string/subscriptions_label" + app:navigationIcon="?homeAsUpIndicator" /> <TextView - android:id="@+id/feeds_filtered_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - android:background="?android:attr/selectableItemBackground" - android:gravity="start" - android:paddingStart="8dp" - android:paddingTop="4dp" - android:paddingEnd="8dp" - android:paddingBottom="8dp" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small" /> + android:id="@+id/feeds_filtered_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/toolbar" + android:background="?android:attr/selectableItemBackground" + android:gravity="start" + android:paddingStart="8dp" + android:paddingTop="4dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small" /> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeRefresh" @@ -35,35 +36,36 @@ android:layout_height="match_parent" android:layout_below="@id/feeds_filtered_message"> - <GridView - android:id="@+id/subscriptions_grid" - android:layout_width="match_parent" - android:numColumns="3" - android:horizontalSpacing="2dp" - android:verticalSpacing="2dp" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal" - android:paddingBottom="88dp" - android:clipToPadding="false"/> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/subscriptions_grid" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:paddingBottom="88dp" + android:clipToPadding="false" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <ProgressBar - android:id="@+id/progLoading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:indeterminateOnly="true" - android:visibility="visible"/> + android:id="@+id/progLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:indeterminateOnly="true" + android:visibility="visible" /> <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/subscriptions_add" - android:layout_width="56dp" - android:layout_height="56dp" - android:layout_margin="16dp" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/add_feed_label" - app:srcCompat="@drawable/ic_add"/> + android:id="@+id/subscriptions_add" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_margin="16dp" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/add_feed_label" + app:srcCompat="@drawable/ic_add" /> + + <include + layout="@layout/multi_select_speed_dial" /> + </RelativeLayout> diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index ec918fdac..66628740f 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -1,11 +1,11 @@ -<?xml version='1.0' encoding='utf-8'?> +<?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:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:foreground="?attr/selectableItemBackground"> <de.danoeh.antennapod.ui.common.SquareImageView @@ -15,7 +15,7 @@ android:background="@color/non_square_icon_background" android:scaleType="fitCenter" squareImageView:direction="width" - tools:src="@mipmap/ic_launcher_round" /> + tools:src="@tools:sample/avatars" /> <com.joanzapata.iconify.widget.IconTextView android:id="@+id/txtvTitle" @@ -46,4 +46,20 @@ app:primaryTextColor="?attr/colorOnSecondary" app:primaryTextSize="12sp" /> + <FrameLayout + android:id="@+id/selectView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/ic_checkbox_background"> + + <CheckBox + android:id="@+id/selectCheckBox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:minHeight="0dp" + android:layout_margin="8dp" /> + + </FrameLayout> + </RelativeLayout> |