diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/addfeed.xml | 301 | ||||
| -rw-r--r-- | app/src/main/res/layout/episodes_apply_action_fragment.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/feed_item_list_fragment.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/layout/feedinfo.xml | 163 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditem_fragment.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditem_pager_fragment.xml | 26 | ||||
| -rw-r--r-- | app/src/main/res/layout/feedsettings.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_itunes_search.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_subscriptions.xml | 51 | ||||
| -rw-r--r-- | app/src/main/res/layout/main.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/layout/pager_fragment.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/queue_fragment.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/layout/search_fragment.xml | 37 | ||||
| -rw-r--r-- | app/src/main/res/layout/simple_list_fragment.xml | 28 |
14 files changed, 453 insertions, 305 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 9e57e0743..8b26332ed 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -1,182 +1,193 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView +<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:scrollbars="vertical"> + android:layout_height="match_parent" android:layout_width="match_parent" + android:orientation="vertical"> - <LinearLayout + <androidx.appcompat.widget.Toolbar android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:focusableInTouchMode="true" - android:padding="8dp"> + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + 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" - 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> - - <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"/> + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:scrollbars="vertical"> - <androidx.cardview.widget.CardView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardCornerRadius="4dp" - android:elevation="8dp" - android:layout_margin="8dp"> + android:orientation="vertical" + android:focusableInTouchMode="true" + android:padding="8dp"> - <LinearLayout + <androidx.cardview.widget.CardView 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: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"> + app:cardCornerRadius="4dp" + android:elevation="16dp" + android:layout_margin="8dp"> <LinearLayout - android:id="@+id/advanced_search" - android:layout_width="120dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal" - android:padding="8dp" - android:background="?android:attr/selectableItemBackground"> + android:orientation="horizontal"> <ImageView android:layout_width="40dp" android:layout_height="match_parent" - android:contentDescription="@string/advanced_search" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:contentDescription="@string/search_podcast_hint" app:srcCompat="?attr/action_search" - android:scaleType="center" - android:layout_marginBottom="4dp"/> + android:id="@+id/search_icon" + android:scaleType="center"/> - <TextView - android:layout_width="match_parent" + <EditText + android:id="@+id/combinedFeedSearchBox" + android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/advanced_search" - android:textAlignment="center" - android:textColor="?android:attr/textColorPrimary"/> + 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> + + <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"/> + + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:cardCornerRadius="4dp" + android:elevation="8dp" + android:layout_margin="8dp"> + <LinearLayout - android:id="@+id/btn_opml_import" - android:layout_width="120dp" + android:layout_width="match_parent" 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"/> + android:padding="16dp" + android:orientation="vertical"> <TextView + android:id="@+id/txtvFeedurl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/opml_import_label" - android:textAlignment="center" + 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> - </LinearLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:cardCornerRadius="4dp" + android:elevation="8dp" + android:layout_margin="8dp"> - </androidx.cardview.widget.CardView> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_gravity="center_horizontal" + android:orientation="horizontal"> - </LinearLayout> + <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> -</ScrollView>
\ No newline at end of file + </LinearLayout> + </androidx.cardview.widget.CardView> + </LinearLayout> + </ScrollView> +</LinearLayout> diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml index ad453afbe..0baa2061a 100644 --- a/app/src/main/res/layout/episodes_apply_action_fragment.xml +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -4,17 +4,27 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <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:navigationIcon="?homeAsUpIndicator" + android:id="@+id/toolbar"/> + <ListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" + android:layout_below="@id/toolbar" android:layout_marginTop="0dp" /> <com.leinardi.android.speeddial.SpeedDialOverlayLayout android:id="@+id/fabSDOverlay" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:layout_below="@id/toolbar" /> <!-- The FAB SpeedDial 1. MUST be placed at the bottom of the layout xml to ensure it is at the front, clickable on Pre-Lollipop devices (that do not support elevation). diff --git a/app/src/main/res/layout/feed_item_list_fragment.xml b/app/src/main/res/layout/feed_item_list_fragment.xml new file mode 100644 index 000000000..d87cddf5c --- /dev/null +++ b/app/src/main/res/layout/feed_item_list_fragment.xml @@ -0,0 +1,27 @@ +<?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"> + + <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" + android:id="@+id/toolbar"/> + + <ListView android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/toolbar" + android:id="@android:id/list"/> + + <ProgressBar + android:id="@+id/progLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:indeterminateOnly="true" + android:visibility="gone"/> + +</RelativeLayout> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index 416fc3aec..05457d61b 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -1,132 +1,143 @@ <?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:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include layout="@layout/feeditemlist_header" /> - - <ScrollView - android:id="@+id/scrollView" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingBottom="8dp" - android:clipToPadding="false"> +<androidx.coordinatorlayout.widget.CoordinatorLayout + 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="match_parent"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appBar" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <LinearLayout + <com.google.android.material.appbar.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:contentScrim="?attr/colorPrimary" + app:layout_scrollFlags="scroll|exitUntilCollapsed"> + + <ImageView + android:id="@+id/imgvBackground" + style="@style/BigBlurryBackground" + android:layout_width="match_parent" + android:layout_height="256dp" + app:layout_collapseMode="parallax" + app:layout_collapseParallaxMultiplier="0.6"/> + + <include layout="@layout/feeditemlist_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + app:layout_collapseMode="parallax" + app:layout_collapseParallaxMultiplier="0.6"/> + + <androidx.appcompat.widget.Toolbar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:navigationIcon="?homeAsUpIndicator" + android:layout_alignParentTop="true" + android:id="@+id/toolbar" + app:layout_collapseMode="pin"/> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + </com.google.android.material.appbar.AppBarLayout> + + <androidx.core.widget.NestedScrollView + android:id="@+id/scrollView" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_height="match_parent" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" + android:clipToPadding="false" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - <androidx.gridlayout.widget.GridLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - app:columnCount="2" - app:rowCount="3"> + android:orientation="vertical"> - <TextView + <TextView + style="@style/AntennaPod.TextView.Heading" android:id="@+id/lblAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginRight="8dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - app:layout_row="0" - app:layout_column="0" - android:lines="1" android:text="@string/author_label" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" android:textColor="?android:attr/textColorPrimary" tools:background="@android:color/holo_red_light"/> - <TextView + <TextView android:id="@+id/txtvDetailsAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textIsSelectable="true" - app:layout_row="0" - app:layout_column="1" tools:text="Daniel Oeh" tools:background="@android:color/holo_green_dark"/> - <TextView + <TextView + style="@style/AntennaPod.TextView.Heading" android:id="@+id/lblLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - app:layout_row="1" - app:layout_column="0" - android:lines="1" android:text="@string/language_label" android:textColor="?android:attr/textColorPrimary" tools:background="@android:color/holo_red_light"/> - <TextView + <TextView android:id="@+id/txtvLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textIsSelectable="true" - app:layout_row="1" - app:layout_column="1" tools:text="English" tools:background="@android:color/holo_green_dark"/> - <TextView + <TextView + style="@style/AntennaPod.TextView.Heading" android:id="@+id/lblUrl" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:layout_marginEnd="8dp" - app:layout_row="2" - app:layout_column="0" - android:lines="1" + android:layout_marginTop="8dp" + android:layout_marginBottom="4dp" android:text="@string/url_label" android:textColor="?android:attr/textColorPrimary" tools:background="@android:color/holo_red_light"/> - <TextView + <TextView android:id="@+id/txtvUrl" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="4dp" android:background="?attr/selectableItemBackground" - app:layout_row="2" - app:layout_column="1" - app:layout_gravity="fill" android:maxLines="4" + android:paddingTop="4dp" + android:paddingBottom="4dp" tools:text="http://www.example.com/feed" tools:background="@android:color/holo_green_dark"/> - </androidx.gridlayout.widget.GridLayout> - <TextView - style="@style/AntennaPod.TextView.Heading" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/description_label"/> + style="@style/AntennaPod.TextView.Heading" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="8dp" + android:text="@string/description_label"/> <TextView - android:id="@+id/txtvDescription" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:textIsSelectable="true" - android:text="@string/design_time_lorem_ipsum" - tools:background="@android:color/holo_green_dark"/> + android:id="@+id/txtvDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textIsSelectable="true" + android:text="@string/design_time_lorem_ipsum" + tools:background="@android:color/holo_green_dark"/> </LinearLayout> + </androidx.core.widget.NestedScrollView> - </ScrollView> - -</LinearLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index beabd20b6..bd7cb095e 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -18,7 +18,6 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:orientation="horizontal"> <ImageView diff --git a/app/src/main/res/layout/feeditem_pager_fragment.xml b/app/src/main/res/layout/feeditem_pager_fragment.xml index 8ea5bf4f9..50c490611 100644 --- a/app/src/main/res/layout/feeditem_pager_fragment.xml +++ b/app/src/main/res/layout/feeditem_pager_fragment.xml @@ -1,6 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.viewpager.widget.ViewPager - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent" /> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_height="match_parent" + android:layout_width="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" + app:navigationIcon="?homeAsUpIndicator" + android:id="@+id/toolbar"/> + + <androidx.viewpager.widget.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/app/src/main/res/layout/feedsettings.xml b/app/src/main/res/layout/feedsettings.xml index b40148b00..ec53703ab 100644 --- a/app/src/main/res/layout/feedsettings.xml +++ b/app/src/main/res/layout/feedsettings.xml @@ -1,10 +1,19 @@ <?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"> - <include layout="@layout/feeditemlist_header" /> + <androidx.appcompat.widget.Toolbar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:title="@string/feed_settings_label" + app:navigationIcon="?homeAsUpIndicator" + android:elevation="4dp" + android:id="@+id/toolbar"/> <FrameLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 211f6c9ef..0de57f62b 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -1,10 +1,21 @@ <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"> + 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" xmlns:app="http://schemas.android.com/apk/res-auto"> + + <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:navigationIcon="?homeAsUpIndicator" + app:title="@string/discover" + android:id="@+id/toolbar"/> <GridView + android:layout_below="@id/toolbar" android:id="@+id/gridView" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 69eee04ce..d16331a10 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -1,28 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <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" + android:id="@+id/toolbar"/> + + <GridView + android:layout_below="@id/toolbar" + 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"/> - <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"> - </GridView> - <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_gravity="bottom|end" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" android:contentDescription="@string/add_feed_label" - android:src="@drawable/ic_add_white_24dp" - /> -</FrameLayout> + android:src="@drawable/ic_add_white_24dp"/> +</RelativeLayout> diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index a226e482f..5c06dc027 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -19,28 +19,12 @@ tools:layout_height="64dp" tools:background="@android:color/holo_green_light" /> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:background="?attr/colorPrimary" - android:minHeight="?attr/actionBarSize" - tools:background="@android:color/holo_blue_dark" /> - - <View - android:id="@+id/shadow" - android:layout_width="match_parent" - android:layout_height="4dp" - android:layout_below="@id/toolbar" - android:background="@drawable/shadow" /> - <FrameLayout android:id="@+id/main_view" android:layout_width="match_parent" android:layout_height="0px" android:layout_above="@id/playerFragment" - android:layout_below="@id/toolbar" + android:layout_alignParentTop="true" android:foreground="?android:windowContentOverlay" tools:background="@android:color/holo_red_dark" /> diff --git a/app/src/main/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml index 492743239..03ae023d2 100644 --- a/app/src/main/res/layout/pager_fragment.xml +++ b/app/src/main/res/layout/pager_fragment.xml @@ -1,22 +1,28 @@ <?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"> -<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:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + android:id="@+id/toolbar"/> <com.google.android.material.tabs.TabLayout - android:id="@+id/sliding_tabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:tabGravity="fill" - app:tabMode="fixed" /> + android:id="@+id/sliding_tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:tabMode="fixed" + app:tabGravity="fill"/> <androidx.viewpager.widget.ViewPager - android:id="@+id/viewpager" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="1" /> -</LinearLayout>
\ No newline at end of file + android:id="@+id/viewpager" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + +</LinearLayout> diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 63da6a315..a8a81d954 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -1,17 +1,29 @@ <?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:layout_width="match_parent" + android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + <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/queue_label" + android:id="@+id/toolbar"/> <TextView + android:layout_below="@id/toolbar" android:id="@+id/info_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:gravity="center" android:textSize="12sp" - android:text=""/> + android:layout_marginTop="-8dp" + android:layout_marginLeft="72dp" + android:layout_marginStart="72dp" + android:layout_marginBottom="4dp" + tools:text="12 Episodes - Time remaining: 12 hours"/> <View android:id="@+id/divider" diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml index 489c2d392..e9e59b592 100644 --- a/app/src/main/res/layout/search_fragment.xml +++ b/app/src/main/res/layout/search_fragment.xml @@ -1,17 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent"> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <androidx.appcompat.widget.Toolbar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:navigationIcon="?homeAsUpIndicator" + app:title="@string/search_label" + android:id="@+id/toolbar"/> <ProgressBar - android:id="@+id/progressBar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> + android:layout_centerInParent="true" + android:id="@+id/progressBar" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> <ListView - android:id="@+id/listview" - android:layout_width="match_parent" - android:layout_height="match_parent" /> -</FrameLayout>
\ No newline at end of file + android:layout_below="@id/toolbar" + android:id="@+id/listview" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</RelativeLayout> diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml new file mode 100644 index 000000000..91392d0a4 --- /dev/null +++ b/app/src/main/res/layout/simple_list_fragment.xml @@ -0,0 +1,28 @@ +<?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"> + + <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" + android:id="@+id/toolbar"/> + + <ListView android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/toolbar" + android:id="@android:id/list" + android:clipToPadding="false"/> + + <ProgressBar + android:id="@+id/progLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:indeterminateOnly="true" + android:visibility="gone"/> + +</RelativeLayout> |