nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MD3] Added more rounded-ness to all Cards, dialogs, etc.

main
Prathamesh More 2021-11-12 17:04:33 +05:30
parent 3fe882c79c
commit 38a8c6a87a
36 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
View File

@ -61,7 +61,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.model.CategoryInfo import code.name.monkey.retromusic.model.CategoryInfo
import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.RetroUtil
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.bottomsheet.BottomSheetBehavior.* import com.google.android.material.bottomsheet.BottomSheetBehavior.*
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel

2
app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
View File

@ -14,7 +14,6 @@
*/ */
package code.name.monkey.retromusic.dialogs package code.name.monkey.retromusic.dialogs
import android.annotation.SuppressLint
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -42,7 +41,6 @@ import java.io.IOException
class SongDetailDialog : DialogFragment() { class SongDetailDialog : DialogFragment() {
@SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val context: Context = requireContext() val context: Context = requireContext()
val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_file_details, null) val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_file_details, null)

1
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
View File

@ -84,7 +84,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
onShuffleClicked() onShuffleClicked()
} }
accentColor() accentColor()
hide()
} }
} else { } else {
binding.shuffleButton.isVisible = false binding.shuffleButton.isVisible = false

1
app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
View File

@ -53,7 +53,6 @@ import com.bumptech.glide.request.target.Target
import com.github.dhaval2404.imagepicker.ImagePicker import com.github.dhaval2404.imagepicker.ImagePicker
import com.github.dhaval2404.imagepicker.constant.ImageProvider import com.github.dhaval2404.imagepicker.constant.ImageProvider
import com.google.android.material.transition.MaterialContainerTransform import com.google.android.material.transition.MaterialContainerTransform
import com.google.android.material.transition.MaterialSharedAxis
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

4
app/src/main/res/drawable-v31/rect_selector.xml
View File

@ -17,7 +17,7 @@
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape> <shape>
<corners android:radius="8dp" /> <corners android:radius="@dimen/m3_card_corner_radius" />
<solid android:color="@color/md_green_500" /> <solid android:color="@color/md_green_500" />
</shape> </shape>
</item> </item>
@ -25,7 +25,7 @@
<selector> <selector>
<item android:state_activated="true"> <item android:state_activated="true">
<shape> <shape>
<corners android:radius="8dp" /> <corners android:radius="@dimen/m3_card_corner_radius" />
<solid android:color="@android:color/system_neutral1_300" /> <solid android:color="@android:color/system_neutral1_300" />
</shape> </shape>
</item> </item>

4
app/src/main/res/drawable/rect_selector.xml
View File

@ -17,7 +17,7 @@
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape> <shape>
<corners android:radius="8dp" /> <corners android:radius="@dimen/m3_card_corner_radius" />
<solid android:color="@color/md_green_500" /> <solid android:color="@color/md_green_500" />
</shape> </shape>
</item> </item>
@ -25,7 +25,7 @@
<selector> <selector>
<item android:state_activated="true"> <item android:state_activated="true">
<shape> <shape>
<corners android:radius="8dp" /> <corners android:radius="@dimen/m3_card_corner_radius" />
<solid android:color="?android:attr/colorControlHighlight" /> <solid android:color="?android:attr/colorControlHighlight" />
</shape> </shape>
</item> </item>

5
app/src/main/res/layout-land/fragment_album_details.xml
View File

@ -8,7 +8,8 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:orientation="vertical" android:orientation="vertical"
android:transitionName="@string/transition_album_art" android:transitionName="@string/transition_album_art"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute"
android:transitionGroup="true">
<FrameLayout <FrameLayout
android:id="@+id/toolbar_container" android:id="@+id/toolbar_container"
@ -31,7 +32,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="@dimen/mini_player_height" android:layout_marginBottom="@dimen/mini_player_height"
app:cardCornerRadius="24dp" app:cardCornerRadius="@dimen/m3_card_large_radius"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout-land/fragment_artist_details.xml
View File

@ -32,7 +32,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="@dimen/mini_player_height" android:layout_marginBottom="@dimen/mini_player_height"
android:transitionName="@string/transition_artist_image" android:transitionName="@string/transition_artist_image"
app:cardCornerRadius="24dp" app:cardCornerRadius="@dimen/m3_card_large_radius"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/activity_album_tag_editor.xml
View File

@ -40,7 +40,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
android:transitionName="@string/transition_album_art" android:transitionName="@string/transition_album_art"
app:cardCornerRadius="24dp" app:cardCornerRadius="@dimen/m3_card_large_radius"
app:cardElevation="8dp" app:cardElevation="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/fragment_album_card_cover.xml
View File

@ -12,7 +12,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:cardCornerRadius="12dp" app:cardCornerRadius="@dimen/m3_card_medium_radius"
app:cardElevation="4dp" app:cardElevation="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/layout/fragment_album_circle_cover.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:padding="@dimen/padding_album_cover">
<code.name.monkey.retromusic.views.CircularImageView <code.name.monkey.retromusic.views.CircularImageView
android:id="@+id/player_image" android:id="@+id/player_image"

2
app/src/main/res/layout/fragment_album_cover.xml
View File

@ -8,7 +8,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardElevation="8dp" app:cardElevation="8dp"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

5
app/src/main/res/layout/fragment_album_details.xml
View File

@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true"
android:transitionGroup="true">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout" android:id="@+id/appBarLayout"
@ -47,7 +48,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardCornerRadius="24dp" app:cardCornerRadius="@dimen/m3_card_large_radius"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

3
app/src/main/res/layout/fragment_album_flat_cover.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:padding="@dimen/padding_album_cover">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/player_image" android:id="@+id/player_image"

2
app/src/main/res/layout/fragment_album_full_card_cover.xml
View File

@ -9,7 +9,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="16dp" android:layout_margin="16dp"
app:cardCornerRadius="16dp" app:cardCornerRadius="@dimen/m3_card_medium_radius"
app:cardElevation="8dp" app:cardElevation="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_album_material_cover.xml
View File

@ -9,7 +9,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="16dp" android:layout_margin="16dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_artist_details.xml
View File

@ -46,7 +46,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardCornerRadius="24dp" app:cardCornerRadius="@dimen/m3_card_large_radius"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/item_album_card.xml
View File

@ -9,7 +9,7 @@
android:background="?attr/rectSelector" android:background="?attr/rectSelector"
android:orientation="vertical" android:orientation="vertical"
android:padding="4dp" android:padding="4dp"
app:cardCornerRadius="12dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:layout_constraintDimensionRatio="3:4" app:layout_constraintDimensionRatio="3:4"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/item_artist_card.xml
View File

@ -17,7 +17,7 @@
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:layout_margin="4dp" android:layout_margin="4dp"
app:cardCornerRadius="16dp"> app:cardCornerRadius="@dimen/m3_card_corner_radius">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/paletteColorContainer" android:id="@+id/paletteColorContainer"

2
app/src/main/res/layout/item_artist_square.xml
View File

@ -7,7 +7,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:background="?attr/rectSelector" android:background="?attr/rectSelector"
app:cardCornerRadius="8dp"> app:cardCornerRadius="@dimen/m3_card_corner_radius">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
app/src/main/res/layout/item_card.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
tools:ignore="MissingPrefix"> tools:ignore="MissingPrefix">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

2
app/src/main/res/layout/item_card_color.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
tools:ignore="MissingPrefix"> tools:ignore="MissingPrefix">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

2
app/src/main/res/layout/item_genre.xml
View File

@ -14,7 +14,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="@dimen/m3_card_corner_radius">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/item_grid.xml
View File

@ -17,7 +17,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:cardBackgroundColor="@color/transparent" app:cardBackgroundColor="@color/transparent"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/item_image.xml
View File

@ -14,7 +14,7 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:orientation="vertical" android:orientation="vertical"
app:cardBackgroundColor="@color/transparent" app:cardBackgroundColor="@color/transparent"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardPreventCornerOverlap="true" app:cardPreventCornerOverlap="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/item_image_gradient.xml
View File

@ -15,7 +15,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="4dp" android:layout_margin="4dp"
android:orientation="vertical" android:orientation="vertical"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

9
app/src/main/res/layout/item_list.xml
View File

@ -6,8 +6,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="1dp" android:layout_marginStart="1dp"
android:layout_marginEnd="1dp" android:layout_marginEnd="1dp"
android:layout_marginBottom="1dp"
android:background="?rectSelector" android:background="?rectSelector"
android:layout_marginVertical="2dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:minHeight="?attr/listPreferredItemHeight" android:minHeight="?attr/listPreferredItemHeight"
@ -35,15 +35,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
app:cardCornerRadius="6dp" app:cardCornerRadius="10dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/drag_view" app:layout_constraintStart_toEndOf="@id/drag_view"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image" android:id="@+id/image"
android:layout_width="40dp" android:layout_width="45dp"
android:layout_height="40dp" android:layout_height="45dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical" android:gravity="center_vertical"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@ -63,7 +63,6 @@
tools:visibility="visible" /> tools:visibility="visible" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:layout_width="0dp"

18
app/src/main/res/layout/item_suggestions.xml
View File

@ -24,7 +24,7 @@
android:id="@+id/card1" android:id="@+id/card1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card2" app:layout_constraintEnd_toStartOf="@id/card2"
@ -44,7 +44,7 @@
android:id="@+id/card2" android:id="@+id/card2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card3" app:layout_constraintEnd_toStartOf="@id/card3"
@ -64,7 +64,7 @@
android:id="@+id/card3" android:id="@+id/card3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card4" app:layout_constraintEnd_toStartOf="@id/card4"
@ -84,7 +84,7 @@
android:id="@+id/card4" android:id="@+id/card4"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card5" app:layout_constraintEnd_toStartOf="@id/card5"
@ -104,7 +104,7 @@
android:id="@+id/card5" android:id="@+id/card5"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -127,7 +127,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
app:cardBackgroundColor="?attr/colorSurface" app:cardBackgroundColor="?attr/colorSurface"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardElevation="0dp" app:cardElevation="0dp"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
@ -155,7 +155,7 @@
android:id="@+id/card7" android:id="@+id/card7"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card8" app:layout_constraintEnd_toStartOf="@id/card8"
@ -175,7 +175,7 @@
android:id="@+id/card8" android:id="@+id/card8"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -194,7 +194,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:cardCornerRadius="8dp" app:cardCornerRadius="@dimen/m3_card_corner_radius"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:layout_constraintDimensionRatio="1,1" app:layout_constraintDimensionRatio="1,1"
app:layout_constraintEnd_toStartOf="@id/card8" app:layout_constraintEnd_toStartOf="@id/card8"

1
app/src/main/res/values-night-v27/styles.xml
View File

@ -35,5 +35,6 @@
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
</resources> </resources>

3
app/src/main/res/values-night/styles.xml
View File

@ -12,7 +12,7 @@
~ See the GNU General Public License for more details. ~ See the GNU General Public License for more details.
--> -->
<resources xmlns:tools="http://schemas.android.com/tools"> <resources>
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
<item name="md_background_color">?attr/colorSurface</item> <item name="md_background_color">?attr/colorSurface</item>
@ -33,5 +33,6 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
</resources> </resources>

3
app/src/main/res/values-v27/styles_parents.xml
View File

@ -33,6 +33,7 @@
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@ -59,6 +60,7 @@
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar"> <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@ -82,5 +84,6 @@
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values-v31/styles.xml
View File

@ -8,6 +8,7 @@
<item name="android:statusBarColor">@color/transparent</item> <item name="android:statusBarColor">@color/transparent</item>
<item name="android:navigationBarColor">@color/transparent</item> <item name="android:navigationBarColor">@color/transparent</item>
<item name="android:enforceNavigationBarContrast">false</item> <item name="android:enforceNavigationBarContrast">false</item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet"> <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">

2
app/src/main/res/values-xlarge/dimens.xml
View File

@ -1,7 +1,7 @@
<resources> <resources>
<dimen name="toolbar_margin_horizontal">64dp</dimen> <dimen name="toolbar_margin_horizontal">64dp</dimen>
<dimen name="toolbar_height">64dp</dimen> <dimen name="toolbar_height">64dp</dimen>
<dimen name="item_song_height">64dp</dimen> <dimen name="item_song_height">72dp</dimen>
<dimen name="button_padding_vertical">16dp</dimen> <dimen name="button_padding_vertical">16dp</dimen>
<dimen name="pref_title_padding">80dp</dimen> <dimen name="pref_title_padding">80dp</dimen>
</resources> </resources>

7
app/src/main/res/values/dimens.xml
View File

@ -42,7 +42,7 @@
<dimen name="icon_notification_dimen">32dp</dimen> <dimen name="icon_notification_dimen">32dp</dimen>
<dimen name="toolbar_margin_horizontal">8dp</dimen> <dimen name="toolbar_margin_horizontal">8dp</dimen>
<dimen name="toolbar_height">48dp</dimen> <dimen name="toolbar_height">48dp</dimen>
<dimen name="item_song_height">52dp</dimen> <dimen name="item_song_height">60dp</dimen>
<dimen name="button_padding_vertical">10dp</dimen> <dimen name="button_padding_vertical">10dp</dimen>
<dimen name="list_pref_guideline_begin">56dp</dimen> <dimen name="list_pref_guideline_begin">56dp</dimen>
<dimen name="pref_title_padding">72dp</dimen> <dimen name="pref_title_padding">72dp</dimen>
@ -56,4 +56,9 @@
<dimen name="lyrics_text_size">18sp</dimen> <dimen name="lyrics_text_size">18sp</dimen>
<dimen name="indicator_radius">10dp</dimen> <dimen name="indicator_radius">10dp</dimen>
<dimen name="lyrics_dialog_radius">20dp</dimen> <dimen name="lyrics_dialog_radius">20dp</dimen>
<dimen name="m3_card_corner_radius">16dp</dimen>
<dimen name="m3_card_medium_radius">24dp</dimen>
<dimen name="m3_card_large_radius">40dp</dimen>
<dimen name="padding_album_cover">16dp</dimen>
</resources> </resources>

11
app/src/main/res/values/styles.xml
View File

@ -137,12 +137,11 @@
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
</style> </style>
<style name="MaterialPopupMenuStyle" parent="Widget.MaterialComponents.PopupMenu"> <style name="MaterialPopupMenuStyle" parent="Widget.Material3.PopupMenu">
<item name="android:popupBackground">@drawable/popup_background</item> <item name="android:popupBackground">@drawable/popup_background</item>
</style> </style>
<style name="MaterialAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog"> <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="android:dialogCornerRadius" tools:targetApi="p">12dp</item>
<item name="materialAlertDialogBodyTextStyle"> <item name="materialAlertDialogBodyTextStyle">
@style/AppTextAppearance.MaterialAlertDialog.Body @style/AppTextAppearance.MaterialAlertDialog.Body
</item> </item>
@ -166,17 +165,17 @@
<item name="android:padding">0dp</item> <item name="android:padding">0dp</item>
</style> </style>
<style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.MaterialComponents.Body.Text"> <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.Material3.Body.Text">
<item name="android:textAppearance">@style/TextViewBody1</item> <item name="android:textAppearance">@style/TextViewBody1</item>
<item name="android:paddingTop">16dp</item> <item name="android:paddingTop">16dp</item>
</style> </style>
<style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text"> <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.Material3.Title.Text">
<item name="android:textAppearance">@style/TextViewHeadline6</item> <item name="android:textAppearance">@style/TextViewHeadline6</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="MaterialButtonTheme" parent="Widget.MaterialComponents.Button"> <style name="MaterialButtonTheme" parent="Widget.Material3.Button">
<item name="cornerRadius">6dp</item> <item name="cornerRadius">6dp</item>
<item name="iconGravity">textStart</item> <item name="iconGravity">textStart</item>
<item name="iconTint">?attr/colorControlNormal</item> <item name="iconTint">?attr/colorControlNormal</item>

4
app/src/main/res/values/styles_parents.xml
View File

@ -20,6 +20,7 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@ -44,6 +45,7 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
@ -66,6 +68,7 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar"> <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@ -88,6 +91,7 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="popupMenuBackground">@drawable/popup_background</item>
</style> </style>
<style name="MusicProgressSliderParent"> <style name="MusicProgressSliderParent">