From 38a8c6a87a91247ed773b5eb2c3f10cda614bf2d Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Fri, 12 Nov 2021 17:04:33 +0530 Subject: [PATCH] [MD3] Added more rounded-ness to all Cards, dialogs, etc. --- .../base/AbsSlidingMusicPanelActivity.kt | 1 - .../retromusic/dialogs/SongDetailDialog.kt | 2 -- .../fragments/base/AbsRecyclerViewFragment.kt | 1 - .../fragments/other/UserInfoFragment.kt | 1 - .../main/res/drawable-v31/rect_selector.xml | 4 ++-- app/src/main/res/drawable/rect_selector.xml | 4 ++-- .../res/layout-land/fragment_album_details.xml | 5 +++-- .../layout-land/fragment_artist_details.xml | 2 +- .../res/layout/activity_album_tag_editor.xml | 2 +- .../res/layout/fragment_album_card_cover.xml | 2 +- .../res/layout/fragment_album_circle_cover.xml | 3 ++- .../main/res/layout/fragment_album_cover.xml | 2 +- .../main/res/layout/fragment_album_details.xml | 5 +++-- .../res/layout/fragment_album_flat_cover.xml | 3 ++- .../layout/fragment_album_full_card_cover.xml | 2 +- .../layout/fragment_album_material_cover.xml | 2 +- .../res/layout/fragment_artist_details.xml | 2 +- app/src/main/res/layout/item_album_card.xml | 2 +- app/src/main/res/layout/item_artist_card.xml | 2 +- app/src/main/res/layout/item_artist_square.xml | 2 +- app/src/main/res/layout/item_card.xml | 2 +- app/src/main/res/layout/item_card_color.xml | 2 +- app/src/main/res/layout/item_genre.xml | 2 +- app/src/main/res/layout/item_grid.xml | 2 +- app/src/main/res/layout/item_image.xml | 2 +- .../main/res/layout/item_image_gradient.xml | 2 +- app/src/main/res/layout/item_list.xml | 9 ++++----- app/src/main/res/layout/item_suggestions.xml | 18 +++++++++--------- app/src/main/res/values-night-v27/styles.xml | 1 + app/src/main/res/values-night/styles.xml | 3 ++- app/src/main/res/values-v27/styles_parents.xml | 3 +++ app/src/main/res/values-v31/styles.xml | 1 + app/src/main/res/values-xlarge/dimens.xml | 2 +- app/src/main/res/values/dimens.xml | 7 ++++++- app/src/main/res/values/styles.xml | 11 +++++------ app/src/main/res/values/styles_parents.xml | 4 ++++ 36 files changed, 66 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 97b93c2e..7b456a38 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -61,7 +61,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.CategoryInfo import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil -import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomsheet.BottomSheetBehavior.* import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt index c363f8b4..08ddbbe1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt @@ -14,7 +14,6 @@ */ package code.name.monkey.retromusic.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.os.Bundle @@ -42,7 +41,6 @@ import java.io.IOException class SongDetailDialog : DialogFragment() { - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context: Context = requireContext() val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_file_details, null) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt index d82b51e7..c667b2fb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt @@ -84,7 +84,6 @@ abstract class AbsRecyclerViewFragment, LM : Recycle onShuffleClicked() } accentColor() - hide() } } else { binding.shuffleButton.isVisible = false diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt index 2615b1f7..e3ebe33f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt @@ -53,7 +53,6 @@ import com.bumptech.glide.request.target.Target import com.github.dhaval2404.imagepicker.ImagePicker import com.github.dhaval2404.imagepicker.constant.ImageProvider import com.google.android.material.transition.MaterialContainerTransform -import com.google.android.material.transition.MaterialSharedAxis import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/res/drawable-v31/rect_selector.xml b/app/src/main/res/drawable-v31/rect_selector.xml index 760b218b..31422ac9 100644 --- a/app/src/main/res/drawable-v31/rect_selector.xml +++ b/app/src/main/res/drawable-v31/rect_selector.xml @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml index b4770919..35a2089f 100644 --- a/app/src/main/res/drawable/rect_selector.xml +++ b/app/src/main/res/drawable/rect_selector.xml @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml index c43b9589..4639f9b0 100644 --- a/app/src/main/res/layout-land/fragment_album_details.xml +++ b/app/src/main/res/layout-land/fragment_album_details.xml @@ -8,7 +8,8 @@ android:fitsSystemWindows="true" android:orientation="vertical" android:transitionName="@string/transition_album_art" - tools:ignore="UnusedAttribute"> + tools:ignore="UnusedAttribute" + android:transitionGroup="true"> + android:layout_height="match_parent" + android:padding="@dimen/padding_album_cover"> + android:fitsSystemWindows="true" + android:transitionGroup="true"> + android:layout_height="wrap_content" + android:padding="@dimen/padding_album_cover"> + app:cardCornerRadius="@dimen/m3_card_corner_radius"> + app:cardCornerRadius="@dimen/m3_card_corner_radius"> + app:cardCornerRadius="@dimen/m3_card_corner_radius"> - false + @drawable/popup_background \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 424eb2c9..7ab94a34 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -12,7 +12,7 @@ ~ See the GNU General Public License for more details. --> - + \ No newline at end of file diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml index 1a85dbf2..2aea8a24 100644 --- a/app/src/main/res/values-v27/styles_parents.xml +++ b/app/src/main/res/values-v27/styles_parents.xml @@ -33,6 +33,7 @@ @style/Widget.MaterialComponents.FloatingActionButton false + @drawable/popup_background \ No newline at end of file diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml index fd8619d1..f8479c49 100644 --- a/app/src/main/res/values-v31/styles.xml +++ b/app/src/main/res/values-v31/styles.xml @@ -8,6 +8,7 @@ @color/transparent @color/transparent false + @drawable/popup_background - - - - -