Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev

 Conflicts:

	app/build.gradle

	app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt

	app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt

	app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumAdapter.kt

	app/src/main/java/io/github/muntashirakon/music/adapter/base/MediaEntryViewHolder.java

	app/src/main/java/io/github/muntashirakon/music/adapter/song/ShuffleButtonSongAdapter.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/DetailListFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlaybackControlsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt

	app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt

	app/src/main/res/layout/item_grid_circle.xml

	app/src/main/res/layout/item_list_quick_actions.xml

	appthemehelper/build.gradle

app/src/main/java/io/github/muntashirakon/music/extensions/ColorExt.kt

@@ -38,7 +38,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
 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.progressindicator.ProgressIndicator
+import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import io.github.muntashirakon.music.App
@@ -95,13 +95,7 @@ fun SeekBar.addAccentColor() {
     thumbTintList = colorState
 }
 
-fun Button.accentTextColor() {
-    setTextColor(ThemeStore.accentColor(App.getContext()))
-}
-
-fun MaterialButton.accentTextColor() {
-    setTextColor(ThemeStore.accentColor(App.getContext()))
-}
+fun Button.accentTextColor() = setTextColor(ThemeStore.accentColor(App.getContext()))
 
 fun MaterialButton.accentBackgroundColor() {
     backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(App.getContext()))
@@ -154,9 +148,7 @@ fun MaterialButton.applyColor(color: Int) {
     iconTint = textColorColorStateList
 }
 
-fun MaterialButton.accentColor(){
-    this.applyColor(ThemeStore.accentColor(context))
-}
+fun MaterialButton.accentColor() = applyColor(ThemeStore.accentColor(context))
 
 fun MaterialButton.applyOutlineColor(color: Int) {
     val textColorColorStateList = ColorStateList.valueOf(color)
@@ -172,23 +164,18 @@ fun TextInputLayout.accentColor() {
     isHintAnimationEnabled = true
 }
 
-fun ProgressIndicator.accentColor() {
-    val accentColor = ThemeStore.accentColor(context)
-    indicatorColors = intArrayOf(accentColor)
-    trackColor = ColorUtil.withAlpha(accentColor, 0.2f)
-}
-
-fun ProgressIndicator.applyColor(color: Int) {
-    indicatorColors = intArrayOf(color)
+fun CircularProgressIndicator.accentColor() {
+    val color = ThemeStore.accentColor(context)
+    setIndicatorColor(color)
     trackColor = ColorUtil.withAlpha(color, 0.2f)
 }
 
-fun TextInputEditText.accentColor() {
+fun CircularProgressIndicator.applyColor(color: Int) {
+    setIndicatorColor(color)
+    trackColor = ColorUtil.withAlpha(color, 0.2f)
 }
 
-fun AppCompatImageView.accentColor(): Int {
-    return ThemeStore.accentColor(context)
-}
+fun AppCompatImageView.accentColor(): Int = ThemeStore.accentColor(context)
 
 @CheckResult
 fun Drawable.tint(@ColorInt color: Int): Drawable {
@@ -198,9 +185,8 @@ fun Drawable.tint(@ColorInt color: Int): Drawable {
 }
 
 @CheckResult
-fun Drawable.tint(context: Context, @ColorRes color: Int): Drawable {
-    return tint(context.getColorCompat(color))
-}
+fun Drawable.tint(context: Context, @ColorRes color: Int): Drawable =
+    tint(context.getColorCompat(color))
 
 @ColorInt
 fun Context.getColorCompat(@ColorRes colorRes: Int): Int {

app/src/main/java/io/github/muntashirakon/music/extensions/DrawableExt.kt

@@ -48,15 +48,4 @@ fun Drawable.getBitmapDrawable(): Bitmap {
     val canvas = Canvas(bmp)
     draw(canvas)
     return bmp
-}
-
-fun getAdaptiveIconDrawable(context: Context): Drawable {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        AdaptiveIconDrawable(
-            ContextCompat.getDrawable(context, R.drawable.ic_launcher_background),
-            ContextCompat.getDrawable(context, R.drawable.ic_launcher_background)
-        )
-    } else {
-        ContextCompat.getDrawable(context, R.drawable.color_circle_gradient)!!
-    }
-}
+}

app/src/main/java/io/github/muntashirakon/music/extensions/ViewExtensions.kt

@@ -27,6 +27,8 @@ import androidx.core.animation.doOnStart
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.TintHelper
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.ShapeAppearanceModel
 
 @Suppress("UNCHECKED_CAST")
 fun <T : View> ViewGroup.inflate(@LayoutRes layout: Int): T {
@@ -112,4 +114,11 @@ fun View.focusAndShowKeyboard() {
                 }
             })
     }
-} 
+}
+
+fun ShapeableImageView.setCircleShape(boolean: Boolean) {
+    addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+        val radius = width / 2f
+        shapeAppearanceModel = ShapeAppearanceModel().withCornerSize(radius)
+    }
+}