diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/addfeed.xml | 274 | ||||
| -rw-r--r-- | app/src/main/res/layout/quick_feed_discovery.xml | 109 | ||||
| -rw-r--r-- | app/src/main/res/menu/advanced_search.xml | 14 |
3 files changed, 168 insertions, 229 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 8b26332ed..3b9c0ffb4 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -13,6 +13,50 @@ app:title="@string/add_feed_label" android:id="@+id/toolbar"/> + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:cardCornerRadius="4dp" + app:cardElevation="4dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:layout_width="40dp" + android:layout_height="match_parent" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:contentDescription="@string/search_podcast_hint" + app:srcCompat="?attr/action_search" + android:id="@+id/search_icon" + android:scaleType="center"/> + + <EditText + android:id="@+id/combinedFeedSearchBox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="text" + android:imeOptions="actionSearch" + android:importantForAutofill="no" + android:layout_marginStart="0dp" + android:layout_marginLeft="0dp" + android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:hint="@string/search_podcast_hint" + android:background="@null"/> + + </LinearLayout> + </androidx.cardview.widget.CardView> + <ScrollView android:layout_width="match_parent" android:layout_height="0dp" @@ -24,170 +68,92 @@ android:layout_height="wrap_content" android:orientation="vertical" android:focusableInTouchMode="true" - android:padding="8dp"> - - <androidx.cardview.widget.CardView - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:cardCornerRadius="4dp" - android:elevation="16dp" - android:layout_margin="8dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:layout_width="40dp" - android:layout_height="match_parent" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:contentDescription="@string/search_podcast_hint" - app:srcCompat="?attr/action_search" - android:id="@+id/search_icon" - android:scaleType="center"/> - - <EditText - android:id="@+id/combinedFeedSearchBox" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="text" - android:imeOptions="actionSearch" - android:importantForAutofill="no" - android:layout_marginStart="0dp" - android:layout_marginLeft="0dp" - android:layout_marginRight="8dp" - android:layout_marginEnd="8dp" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:hint="@string/search_podcast_hint" - android:background="@null"/> - - </LinearLayout> - - </androidx.cardview.widget.CardView> + android:padding="16dp"> <fragment android:id="@+id/quickFeedDiscovery" android:name="de.danoeh.antennapod.fragment.QuickFeedDiscoveryFragment" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp"/> + android:layout_height="wrap_content"/> - <androidx.cardview.widget.CardView + <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardCornerRadius="4dp" - android:elevation="8dp" - android:layout_margin="8dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical"> - - <TextView - android:id="@+id/txtvFeedurl" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/txtvfeedurl_label" - android:textSize="18sp" - android:layout_marginBottom="8dp" - android:layout_marginLeft="4dp" - android:layout_marginStart="4dp" - android:textColor="?android:attr/textColorPrimary"/> - - <EditText - android:id="@+id/etxtFeedurl" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:cursorVisible="true" - android:focusable="true" - android:focusableInTouchMode="true" - android:hint="@string/etxtFeedurlHint" - android:inputType="textUri"/> - - <Button - android:id="@+id/butConfirm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end" - style="?android:attr/buttonBarButtonStyle" - android:text="@string/confirm_label"/> - - </LinearLayout> - - </androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView + android:text="@string/advanced" + android:textSize="18sp" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/btn_add_via_url" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardCornerRadius="4dp" - android:elevation="8dp" - android:layout_margin="8dp"> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:layout_gravity="center_horizontal" - android:orientation="horizontal"> - - <LinearLayout - android:id="@+id/advanced_search" - android:layout_width="120dp" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal" - android:padding="8dp" - android:background="?android:attr/selectableItemBackground"> - - <ImageView - android:layout_width="40dp" - android:layout_height="match_parent" - android:contentDescription="@string/advanced_search" - app:srcCompat="?attr/action_search" - android:scaleType="center" - android:layout_marginBottom="4dp"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/advanced_search" - android:textAlignment="center" - android:textColor="?android:attr/textColorPrimary"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/btn_opml_import" - android:layout_width="120dp" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal" - android:padding="8dp" - android:background="?android:attr/selectableItemBackground"> - - <ImageView - android:layout_width="40dp" - android:layout_height="match_parent" - android:contentDescription="@string/opml_import_label" - app:srcCompat="?attr/av_download" - android:scaleType="center" - android:layout_marginBottom="4dp"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/opml_import_label" - android:textAlignment="center" - android:textColor="?android:attr/textColorPrimary"/> - </LinearLayout> - - </LinearLayout> - </androidx.cardview.widget.CardView> + android:drawablePadding="8dp" + app:drawableStartCompat="?attr/content_new" + app:drawableLeftCompat="?attr/content_new" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="?android:attr/selectableItemBackground" + android:textColor="?android:attr/textColorPrimary" + android:clickable="true" + android:text="@string/add_podcast_by_url"/> + + <TextView + android:id="@+id/btn_search_itunes" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawablePadding="8dp" + app:drawableStartCompat="?attr/action_search" + app:drawableLeftCompat="?attr/action_search" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="?android:attr/selectableItemBackground" + android:textColor="?android:attr/textColorPrimary" + android:clickable="true" + android:text="@string/search_itunes_label"/> + + <TextView + android:id="@+id/btn_search_fyyd" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawablePadding="8dp" + app:drawableStartCompat="?attr/action_search" + app:drawableLeftCompat="?attr/action_search" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="?android:attr/selectableItemBackground" + android:textColor="?android:attr/textColorPrimary" + android:clickable="true" + android:text="@string/search_fyyd_label"/> + + <TextView + android:id="@+id/btn_search_gpodder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawablePadding="8dp" + app:drawableStartCompat="?attr/action_search" + app:drawableLeftCompat="?attr/action_search" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="?android:attr/selectableItemBackground" + android:textColor="?android:attr/textColorPrimary" + android:clickable="true" + android:text="@string/browse_gpoddernet_label"/> + + <TextView + android:id="@+id/btn_opml_import" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawablePadding="8dp" + app:drawableStartCompat="?attr/av_download" + app:drawableLeftCompat="?attr/av_download" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="?android:attr/selectableItemBackground" + android:textColor="?android:attr/textColorPrimary" + android:clickable="true" + android:text="@string/opml_import_label"/> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml index 75a35a130..78a59c7eb 100644 --- a/app/src/main/res/layout/quick_feed_discovery.xml +++ b/app/src/main/res/layout/quick_feed_discovery.xml @@ -1,78 +1,65 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.cardview.widget.CardView +<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="wrap_content" - app:cardCornerRadius="4dp" - android:elevation="16dp"> + android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical"> + android:orientation="horizontal"> + <TextView + android:layout_width="0dip" + android:layout_height="wrap_content" + android:text="@string/discover" + android:textSize="18sp" + android:layout_marginBottom="8dp" + android:layout_weight="1" + android:textColor="?android:attr/textColorPrimary"/> - <LinearLayout - android:layout_width="match_parent" + <Button + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:text="@string/discover" - android:textSize="18sp" - android:layout_marginBottom="8dp" - android:layout_weight="1" - android:layout_marginLeft="4dp" - android:layout_marginStart="4dp" - android:textColor="?android:attr/textColorPrimary"/> + android:minHeight="0dp" + android:minWidth="0dp" + android:text="@string/discover_more" + android:id="@+id/discover_more" + style="?android:attr/buttonBarButtonStyle"/> + </LinearLayout> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="0dp" - android:minWidth="0dp" - android:text="@string/discover_more" - android:id="@+id/discover_more" - style="?android:attr/buttonBarButtonStyle"/> - </LinearLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <RelativeLayout + <de.danoeh.antennapod.view.WrappingGridView + android:id="@+id/discover_grid" android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <de.danoeh.antennapod.view.WrappingGridView - android:id="@+id/discover_grid" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:numColumns="4" - app:layout_columnWeight="1" - app:layout_rowWeight="1" - android:scrollbars="none" - android:layout_marginTop="8dp" - android:layout_centerInParent="true" - android:layout_gravity="center_horizontal"/> - - <ProgressBar - android:id="@+id/discover_progress_bar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_centerInParent="true" - android:layout_marginTop="30dp"/> - - <TextView - android:id="@+id/discover_error" - android:textColor="@color/download_failed_red" - android:layout_width="match_parent" - android:layout_centerInParent="true" - android:layout_height="wrap_content" /> - - </RelativeLayout> + android:layout_height="wrap_content" + android:numColumns="4" + app:layout_columnWeight="1" + app:layout_rowWeight="1" + android:scrollbars="none" + android:layout_marginTop="8dp" + android:layout_centerInParent="true" + android:layout_gravity="center_horizontal"/> - </LinearLayout> + <ProgressBar + android:id="@+id/discover_progress_bar" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_centerInParent="true" + android:layout_marginTop="30dp"/> -</androidx.cardview.widget.CardView> + <TextView + android:id="@+id/discover_error" + android:textColor="@color/download_failed_red" + android:layout_width="match_parent" + android:layout_centerInParent="true" + android:layout_height="wrap_content"/> + </RelativeLayout> +</LinearLayout> diff --git a/app/src/main/res/menu/advanced_search.xml b/app/src/main/res/menu/advanced_search.xml deleted file mode 100644 index 297ebfce8..000000000 --- a/app/src/main/res/menu/advanced_search.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/search_itunes" - android:title="@string/search_itunes_label" /> - <item - android:id="@+id/search_gpodder" - android:title="@string/browse_gpoddernet_label" /> - <item - android:id="@+id/search_fyyd" - android:title="@string/search_fyyd_label" /> - -</menu> |