From c81d0c17fbefbd13a138626a7e497d3b7abf919c Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Fri, 21 Aug 2020 10:31:53 +0530 Subject: [PATCH] Code refactor --- app/release/output-metadata.json | 20 ----------------- app/src/debug/res/values/styles.xml | 22 +++++++++++++++++++ .../base/AbsSlidingMusicPanelActivity.kt | 7 ------ .../monkey/retromusic/extensions/ColorExt.kt | 10 +++++++++ .../fragments/library/LibraryFragment.kt | 8 +++++-- .../res/layout/fragment_album_details.xml | 7 +++--- .../res/layout/fragment_artist_details.xml | 5 ++--- app/src/main/res/layout/fragment_library.xml | 11 +++++----- .../fragment_main_activity_recycler_view.xml | 1 + app/src/main/res/layout/item_artist.xml | 10 ++++----- app/src/main/res/layout/item_image.xml | 7 +++--- .../res/layout/sliding_music_panel_layout.xml | 7 ------ app/src/main/res/values/styles.xml | 1 + 13 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 app/release/output-metadata.json diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index b45c7e16..00000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "code.name.monkey.retromusic", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "properties": [], - "versionCode": 10438, - "versionName": "3.5.650_0812", - "enabled": true, - "outputFile": "app-release.apk" - } - ] -} \ No newline at end of file diff --git a/app/src/debug/res/values/styles.xml b/app/src/debug/res/values/styles.xml index 8409642c..7f4fe30c 100644 --- a/app/src/debug/res/values/styles.xml +++ b/app/src/debug/res/values/styles.xml @@ -10,6 +10,11 @@ @font/sans + + @@ -54,4 +59,21 @@ @font/sans + + + + + + \ No newline at end of file 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 d0dbdb34..2d6283cf 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 @@ -15,7 +15,6 @@ import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.retromusic.R import code.name.monkey.retromusic.RetroBottomSheetBehavior import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.MiniPlayerFragment @@ -51,8 +50,6 @@ abstract class AbsSlidingMusicPanelActivity() : AbsMusicServiceActivity() { override fun onSlide(bottomSheet: View, slideOffset: Float) { setMiniPlayerAlphaProgress(slideOffset) - dimBackground.show() - dimBackground.alpha = slideOffset } override fun onStateChanged(bottomSheet: View, newState: Int) { @@ -62,7 +59,6 @@ abstract class AbsSlidingMusicPanelActivity() : AbsMusicServiceActivity() { } BottomSheetBehavior.STATE_COLLAPSED -> { onPanelCollapsed() - dimBackground.hide() } else -> { @@ -81,9 +77,6 @@ abstract class AbsSlidingMusicPanelActivity() : AbsMusicServiceActivity() { setupBottomSheet() - val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY) - dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f)) - libraryViewModel.paletteColorLiveData.observe(this, Observer { this.paletteColor = it onPaletteColorChanged() diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt index cee067c2..f4e02de3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt @@ -33,6 +33,7 @@ import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import com.google.android.material.button.MaterialButton import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton +import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout @@ -107,6 +108,15 @@ fun ExtendedFloatingActionButton.accentColor() { iconTint = textColorStateList } +fun FloatingActionButton.accentColor() { + val color = ThemeStore.accentColor(context) + val textColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(color)) + val colorStateList = ColorStateList.valueOf(color) + val textColorStateList = ColorStateList.valueOf(textColor) + backgroundTintList = colorStateList + imageTintList = textColorStateList +} + fun MaterialButton.applyColor(color: Int) { val backgroundColorStateList = ColorStateList.valueOf(color) val textColorColorStateList = ColorStateList.valueOf( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt index 6a4b9f0d..d7d8cad3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt @@ -10,6 +10,7 @@ import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackg import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.dialogs.CreateRetroPlaylist +import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.findNavController import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment import kotlinx.android.synthetic.main.fragment_library.* @@ -29,8 +30,11 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) { navOptions ) } - addPlaylist.setOnClickListener { - CreateRetroPlaylist().show(childFragmentManager, "ShowCreatePlaylistDialog") + addPlaylist.apply { + accentColor() + setOnClickListener { + CreateRetroPlaylist().show(childFragmentManager, "ShowCreatePlaylistDialog") + } } setupNavigationController() } diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml index b81d1c65..fdf856db 100644 --- a/app/src/main/res/layout/fragment_album_details.xml +++ b/app/src/main/res/layout/fragment_album_details.xml @@ -69,7 +69,7 @@ android:layout_width="52dp" android:layout_height="52dp" android:layout_marginStart="16dp" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:scaleType="centerCrop" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/albumCoverContainer" @@ -83,7 +83,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:maxLines="3" - android:textAppearance="@style/TextViewHeadline5" + android:textAppearance="@style/TextViewHeadline4.Compress" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -98,10 +98,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="4dp" android:layout_marginEnd="16dp" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle2" + android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorSecondary" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml index 817c0003..ff56c67f 100644 --- a/app/src/main/res/layout/fragment_artist_details.xml +++ b/app/src/main/res/layout/fragment_artist_details.xml @@ -71,7 +71,7 @@ android:layout_marginTop="24dp" android:layout_marginEnd="16dp" android:maxLines="2" - android:textAppearance="@style/TextViewHeadline5" + android:textAppearance="@style/TextViewHeadline4.Compress" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -85,9 +85,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="4dp" android:layout_marginEnd="16dp" - android:textAppearance="@style/TextViewSubtitle2" + android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 6f2b92c2..36953b29 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -44,17 +44,16 @@ + app:layout_dodgeInsetEdges="all" + app:useCompatPadding="true" /> + tools:text="@tools:sample/full_names" /> \ No newline at end of file diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index b5348fae..95f8457d 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -11,13 +11,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - 16sp + bold