WIP pure Follow system

This commit is contained in:
h4h13 2019-12-01 16:58:57 +05:30
parent 4da1f68617
commit bb72a16b84
73 changed files with 1135 additions and 1246 deletions

View file

@ -114,7 +114,6 @@
android:gravity="center"
android:paddingTop="8dp"
android:text="@string/last_added"
android:textColor="?colorOnSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/v2"
@ -152,7 +151,6 @@
android:gravity="center"
android:paddingTop="8dp"
android:text="@string/my_top_tracks"
android:textColor="?colorOnSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/v3"
@ -190,7 +188,6 @@
android:gravity="center"
android:paddingTop="8dp"
android:text="@string/shuffle"
android:textColor="?colorOnSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/v4"

View file

@ -8,7 +8,6 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
app:liftOnScroll="true">
<com.google.android.material.appbar.MaterialToolbar

View file

@ -20,6 +20,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:background="?attr/colorPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:liftOnScroll="true">
@ -32,6 +33,7 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="?attr/colorPrimary"
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />

View file

@ -240,8 +240,7 @@
android:text="@string/save"
app:cornerRadius="25dp"
app:icon="@drawable/ic_save_white_24dp"
app:iconGravity="textStart"
tools:backgroundTint="@color/md_red_400" />
app:iconGravity="textStart" />
<ProgressBar
android:id="@+id/progressBar"

View file

@ -13,7 +13,7 @@
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -24,7 +24,7 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -35,7 +35,7 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -46,7 +46,7 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -57,7 +57,7 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -68,7 +68,7 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
<com.google.android.material.textview.MaterialTextView
@ -80,7 +80,7 @@
android:paddingEnd="16dp"
android:paddingBottom="16dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
</LinearLayout>

View file

@ -145,6 +145,12 @@
</RelativeLayout>
<include layout="@layout/volume_controls" />
<FrameLayout
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp" />
</LinearLayout>

View file

@ -15,11 +15,48 @@
android:orientation="vertical"
tools:ignore="MissingPrefix">
<include layout="@layout/volume_controls" />
<FrameLayout
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp" />
<include layout="@layout/media_button" />
<include layout="@layout/player_time" />
<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="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextViewOverline"
android:textStyle="bold"
tools:text="22.00" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextViewOverline"
android:textStyle="bold"
tools:text="22.00" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/progressSlider"

View file

@ -93,5 +93,11 @@
<include layout="@layout/media_button" />
<include layout="@layout/volume_controls" />
<FrameLayout
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp" />
</LinearLayout>

View file

@ -37,7 +37,7 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:background="@android:color/transparent"
app:liftOnScroll="true">
<com.google.android.material.card.MaterialCardView
@ -48,7 +48,6 @@
android:layout_marginTop="@dimen/toolbar_margin_vertical"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:layout_marginBottom="@dimen/toolbar_margin_vertical"
app:cardBackgroundColor="?colorSurface"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true"
app:layout_scrollFlags="scroll|enterAlways">

View file

@ -40,7 +40,7 @@
android:layout_gravity="center"
android:text="@string/empty"
android:textAppearance="@style/TextViewHeadline5"
android:textColor="?colorOnSecondary"
android:textColor="?attr/colorOnSecondary"
tools:visibility="visible" />
</LinearLayout>
</FrameLayout>

View file

@ -5,7 +5,7 @@
android:id="@+id/miniPlayerContent"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="?colorSecondary"
android:background="?attr/colorSurface"
android:clickable="true"
android:focusable="true"
tools:ignore="UnusedAttribute">
@ -26,9 +26,8 @@
android:layout_margin="16dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
app:tint="?colorOnSecondary"
tools:ignore="ContentDescription"
tools:tint="?colorOnSurface" />
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/miniPlayerTitle"
@ -45,23 +44,13 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnSurface"
android:textColor="?android:attr/textColorPrimary"
tools:text="@tools:sample/lorem/random" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPrevious"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_skip_previous_white_24dp"
app:tint="?colorOnSecondary" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/miniPlayerPlayPauseButton"
@ -71,7 +60,7 @@
android:background="?roundSelector"
android:scaleType="center"
app:srcCompat="@drawable/ic_pause_white_24dp"
app:tint="?colorOnSecondary"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
<ProgressBar
@ -79,26 +68,13 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="44dp"
android:layout_height="44dp"
android:rotation="270"
android:layout_gravity="center"
android:progressTint="?colorAccent"
android:indeterminate="false"
android:progressDrawable="@drawable/circle_progress"
android:rotation="270"
tools:progress="80" />
</FrameLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionNext"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_skip_next_white_24dp"
app:tint="?colorOnSecondary"
tools:tint="?colorOnSecondary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPlayingQueue"
android:layout_width="40dp"
@ -107,10 +83,7 @@
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_playlist_play_white_24dp"
app:tint="?colorOnSecondary"
tools:tint="?colorOnSecondary" />
app:tint="?attr/colorControlNormal" />
</LinearLayout>
</FrameLayout>

View file

@ -91,7 +91,7 @@
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextViewBody2"
android:textColor="?colorOnSecondary"
android:textColor="?attr/colorOnSecondary"
app:layout_constraintBottom_toBottomOf="@+id/imageContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageContainer"

View file

@ -19,7 +19,7 @@
android:background="?roundSelector"
android:padding="8dp"
app:srcCompat="@drawable/ic_volume_down_white_24dp"
app:tint="?colorOnBackground" />
app:tint="?attr/colorControlNormal" />
<androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/volumeSeekBar"
@ -31,7 +31,7 @@
android:maxHeight="2dp"
android:progressDrawable="@drawable/color_progress_seek"
tools:progress="20"
tools:progressTint="?colorControlNormal" />
tools:progressTint="?attr/colorControlNormal" />
<androidx.appcompat.widget.AppCompatImageView
@ -42,5 +42,5 @@
android:background="?roundSelector"
android:padding="8dp"
app:srcCompat="@drawable/ic_volume_up_white_24dp"
app:tint="?colorOnBackground" />
app:tint="?attr/colorControlNormal" />
</LinearLayout>

View file

@ -33,7 +33,7 @@
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />
</LinearLayout>

View file

@ -28,6 +28,6 @@
android:gravity="center"
android:maxLines="1"
android:paddingTop="12dp"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
tools:text="Name" />
</LinearLayout>

View file

@ -33,7 +33,6 @@
android:maxLines="1"
android:padding="8dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
tools:text="@string/home" />
</FrameLayout>
</LinearLayout>

View file

@ -52,6 +52,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
tools:text="@string/bug_report_summary" />
@ -61,7 +62,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:singleLine="true"
android:textAppearance="@style/TextViewBody2"
android:textColor="?android:attr/textColorSecondary"
tools:text="@string/bug_report_summary" />
</LinearLayout>

View file

@ -19,7 +19,7 @@
android:layout_gravity="center_vertical|start"
android:visibility="gone"
app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
app:tint="?colorOnBackground"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription"
tools:visibility="visible" />
@ -80,7 +80,7 @@
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="?colorOnPrimary"
android:textColor="?android:attr/textColorPrimary"
tools:text="Song name" />
<com.google.android.material.textview.MaterialTextView
@ -89,7 +89,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?colorOnBackground"
android:textColor="?android:attr/textColorSecondary"
tools:text="Song artist name " />
</LinearLayout>
@ -98,6 +98,6 @@
style="@style/OverFlowButton"
android:layout_gravity="center_vertical"
android:layout_weight="0"
app:tint="?colorOnBackground" />
app:tint="?attr/colorControlNormal" />
</LinearLayout>

View file

@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="14dp"
app:tint="?colorOnBackground"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_folder_white_24dp" />
<com.google.android.material.textview.MaterialTextView
@ -41,6 +41,6 @@
android:layout_weight="1"
android:text="@string/folders"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?attr/colorOnPrimary"
android:textSize="16sp" />
</LinearLayout>

View file

@ -85,7 +85,7 @@
style="@style/OverFlowButton"
android:layout_gravity="center_vertical"
android:layout_weight="0"
app:tint="?colorOnBackground" />
app:tint="?attr/colorControlNormal" />
</LinearLayout>
</FrameLayout>

View file

@ -14,8 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -27,10 +27,10 @@
android:fontFeatureSettings="onum"
android:gravity="center"
android:maxLines="1"
tools:text="@tools:sample/date/hhmm"
android:minHeight="40dp"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnSecondary" />
android:textColor="?attr/colorOnSecondary"
tools:text="@tools:sample/date/hhmm" />
</FrameLayout>
@ -55,7 +55,7 @@
android:layout_weight="0"
android:fontFeatureSettings="onum"
android:padding="4dp"
android:textColor="?colorOnSecondary"
android:textColor="?attr/colorOnSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/menu"
app:layout_constraintTop_toTopOf="parent"
@ -72,6 +72,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSecondary"
app:tint="?attr/colorControlNormal"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -31,7 +31,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSurface"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_telegram_white" />
<com.google.android.material.textview.MaterialTextView

View file

@ -32,7 +32,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSurface"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_telegram_white" />
<com.google.android.material.textview.MaterialTextView

View file

@ -31,7 +31,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSurface"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_telegram_white" />
<com.google.android.material.textview.MaterialTextView

View file

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSurface"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_telegram_white" />
<com.google.android.material.textview.MaterialTextView

View file

@ -29,7 +29,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnSurface"
app:tint="?attr/colorControlNormal"
tools:srcCompat="@drawable/ic_telegram_white" />
<com.google.android.material.textview.MaterialTextView

View file

@ -8,8 +8,7 @@
android:layoutDirection="ltr"
android:paddingStart="4dp"
android:paddingEnd="4dp"
tools:ignore="ContentDescription,UnusedAttribute"
tools:showIn="@layout/fragment_player_playback_controls">
tools:ignore="ContentDescription,UnusedAttribute">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/previousButton"

View file

@ -7,57 +7,17 @@
android:orientation="vertical"
android:paddingBottom="12dp">
<LinearLayout
android:id="@+id/titleContainer"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
android:padding="16dp"
android:textAppearance="@style/TextViewHeadline6"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextViewHeadline6"
android:textStyle="bold"
tools:text="@tools:sample/full_names" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextViewCaption"
android:visibility="gone"
tools:text="@tools:sample/full_names" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="16dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
app:tint="?colorOnPrimary" />
</LinearLayout>
tools:text="@tools:sample/full_names" />
<code.name.monkey.retromusic.views.MetalRecyclerViewPager
android:id="@+id/recyclerView"
@ -68,6 +28,6 @@
app:itemMargin="28dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleContainer"
app:layout_constraintTop_toBottomOf="@+id/title"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="172dp"
android:layout_margin="8dp"
app:cardCornerRadius="12dp">
app:cardCornerRadius="16dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"

View file

@ -1,34 +0,0 @@
<?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="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextViewOverline"
android:textStyle="bold"
tools:text="22.00" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextViewOverline"
android:textStyle="bold"
tools:text="22.00" />
</LinearLayout>

View file

@ -19,19 +19,16 @@
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:focusable="true"
android:foreground="?attr/rectSelector"
android:minHeight="@dimen/md_listitem_height"
android:foreground="?rectSelector"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingEnd="0dp"
tools:gravity="start|center_vertical">
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
@ -51,21 +48,21 @@
android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
android:singleLine="true"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/md_listitem_textsize"
tools:text="Item" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/drag_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:clickable="false"
android:focusable="false"
android:minHeight="@dimen/md_listitem_height"
android:padding="16dp"
android:tintMode="src_in"
app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
app:tint="?colorOnSecondary"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
</LinearLayout>

View file

@ -7,57 +7,19 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/titleContainer"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
android:padding="16dp"
android:textAppearance="@style/TextViewHeadline6"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
tools:text="@tools:sample/full_names" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextViewHeadline6"
android:textStyle="bold"
tools:text="@tools:sample/full_names" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextViewCaption"
android:visibility="gone"
tools:text="@tools:sample/full_names" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="16dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
app:tint="?colorOnPrimary" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
@ -67,7 +29,7 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleContainer"
app:layout_constraintTop_toBottomOf="@+id/title"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -25,7 +25,7 @@
android:layout_height="wrap_content"
app:behavior_hideable="false"
app:behavior_peekHeight="0dp"
app:cardBackgroundColor="?colorSecondary"
app:cardBackgroundColor="?attr/colorSurface"
app:cardCornerRadius="0dp"
app:cardUseCompatPadding="false"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?colorSecondary"
android:background="?attr/colorSurface"
android:elevation="0dp"
android:visibility="gone"
app:itemBackground="@drawable/bottom_navigation_item_background"

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp" />