From ea4a54d4046174a8e59817461c216afa9c701aaf Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Sun, 16 Jan 2022 17:57:31 +0530
Subject: [PATCH] Code Cleanup

---
 app/src/main/AndroidManifest.xml                     | 12 ++++++++++++
 .../activities/base/AbsSlidingMusicPanelActivity.kt  |  4 +---
 .../preferences/AlbumCoverStylePreferenceDialog.kt   |  3 +--
 .../preferences/NowPlayingScreenPreferenceDialog.kt  |  5 ++---
 .../name/monkey/retromusic/views/HomeImageLayout.kt  |  6 ++----
 .../name/monkey/retromusic/views/ListItemView.kt     |  3 +--
 .../name/monkey/retromusic/views/PermissionItem.kt   |  3 +--
 .../monkey/retromusic/views/SettingListItemView.kt   |  6 ++----
 app/src/main/res/values/styles.xml                   |  3 ---
 build.gradle                                         |  2 +-
 10 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3fc3c60d0..7c217f99e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -292,6 +292,18 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/app_widget_md3_info" />
         </receiver>
+        <receiver
+            android:name=".appwidgets.AppWidgetCircle"
+            android:exported="true"
+            android:label="@string/app_widget_circle_name">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_circle_info" />
+        </receiver>
 
         <service
             android:name=".service.MusicService"
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 9cd5339d3..938eae011 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
@@ -395,12 +395,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             bottomSheetBehavior.peekHeight = -windowInsets.safeGetBottomInsets()
             bottomSheetBehavior.state = STATE_COLLAPSED
             libraryViewModel.setFabMargin(if (isBottomNavVisible) dip(R.dimen.bottom_nav_height) else 0)
-            binding.slidingPanel.elevation = 0F
-            binding.bottomNavigationView.elevation = 10F
         } else {
             if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
                 binding.slidingPanel.elevation = 0F
-                binding.bottomNavigationView.elevation = 10F
+                binding.bottomNavigationView.elevation = 5F
                 if (isBottomNavVisible) {
                     println("List")
                     if (animate) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
index 8f4d3b288..85dc63596 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
@@ -109,8 +109,7 @@ class AlbumCoverStylePreferenceDialog : DialogFragment(),
             val albumCoverStyle = values()[position]
 
             val inflater = LayoutInflater.from(context)
-            val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, false)
-            collection.addView(binding.root)
+            val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, true)
 
             Glide.with(context).load(albumCoverStyle.drawableResId).into(binding.image)
             binding.title.setText(albumCoverStyle.titleRes)
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
index 8c9ddca21..64b95d87e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
@@ -115,14 +115,13 @@ private class NowPlayingScreenAdapter(private val context: Context) : PagerAdapt
         val nowPlayingScreen = values()[position]
 
         val inflater = LayoutInflater.from(context)
-        val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, false )
-        collection.addView(binding.root)
+        val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, true)
         Glide.with(context).load(nowPlayingScreen.drawableResId).into(binding.image)
         binding.title.setText(nowPlayingScreen.titleRes)
         if (isNowPlayingThemes(nowPlayingScreen)) {
             binding.proText.show()
             binding.proText.setText(R.string.pro)
-        }else{
+        } else {
             binding.proText.hide()
         }
         return binding.root
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
index 79c55b040..1a84dc8e5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
@@ -21,11 +21,9 @@ class HomeImageLayout @JvmOverloads constructor(
 
     init {
         if (PreferenceUtil.isHomeBanner) {
-            bannerImageBinding = BannerImageLayoutBinding.inflate(LayoutInflater.from(context))
-            addView(bannerImageBinding!!.root)
+            bannerImageBinding = BannerImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
         } else {
-            userImageBinding = UserImageLayoutBinding.inflate(LayoutInflater.from(context))
-            addView(userImageBinding!!.root)
+            userImageBinding = UserImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
index a034eaf66..752b88b8a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
@@ -47,8 +47,7 @@ class ListItemView : FrameLayout {
     }
 
     private fun init(context: Context, attrs: AttributeSet?) {
-        binding = ListItemViewNoCardBinding.inflate(LayoutInflater.from(context))
-        addView(binding.root)
+        binding = ListItemViewNoCardBinding.inflate(LayoutInflater.from(context), this, true)
 
         val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ListItemView)
         if (typedArray.hasValue(R.styleable.ListItemView_listItemIcon)) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt b/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
index dfe1d0158..51e9cbe25 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
@@ -22,8 +22,7 @@ class PermissionItem @JvmOverloads constructor(
 
     init {
         val attributes = context.obtainStyledAttributes(attrs, R.styleable.PermissionItem, 0, 0)
-        binding = ItemPermissionBinding.inflate(LayoutInflater.from(context))
-        addView(binding.root)
+        binding = ItemPermissionBinding.inflate(LayoutInflater.from(context), this, true)
 
         binding.title.text = attributes.getText(R.styleable.PermissionItem_permissionTitle)
         binding.summary.text =
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt b/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
index b72ee20f6..e07e78450 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
@@ -30,11 +30,9 @@ class SettingListItemView @JvmOverloads constructor(
     defStyleAttr: Int = -1,
     defStyleRes: Int = -1
 ) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
-    private var binding: ListSettingItemViewBinding =
-        ListSettingItemViewBinding.inflate(LayoutInflater.from(context))
-
     init {
-        addView(binding.root)
+        val binding: ListSettingItemViewBinding =
+            ListSettingItemViewBinding.inflate(LayoutInflater.from(context), this, true)
         val typedArray =
             context.obtainStyledAttributes(attrs, R.styleable.SettingListItemView)
         binding.icon
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9eafe31ad..b808b37cc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -183,9 +183,6 @@
 
     <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
         <item name="android:maxWidth">@empty</item>
-        <item name="paddingBottomSystemWindowInsets">false</item>
-        <item name="marginLeftSystemWindowInsets">false</item>
-        <item name="marginRightSystemWindowInsets">false</item>
     </style>
 
     <style name="MaterialCardViewStroke">
diff --git a/build.gradle b/build.gradle
index cfc15a141..943652c2f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext {
         kotlin_version = '1.6.10'
         navigation_version = '2.4.0-rc01'
-        mdc_version = '1.6.0-alpha01'
+        mdc_version = '1.5.0'
         preference_version = '1.2.0-rc01'
         appcompat_version = '1.4.1'
     }