diff --git a/README.md b/README.md
index fd6e3edb7..f745eed01 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,12 @@ ___
## 📱 Screenshots
### App Themes
-|
|
|
|
+|
|
|
|
|:---:|:---:|:---:|
|Clearly white| Kinda dark | Just black|
### Player screen
-|
|
|
|
|
|
+|
|
|
|
|
|
|:---:|:---:|:---:|:---:|:---:|
| Home | Songs | Albums | Artists | Settings |
@@ -58,7 +58,7 @@ ___
| Synced Replace Cover light | Synced Replace Cover dark | Synced Replace Cover black |
### 10+ Now playing themes
-|
|
|
|
|
|
+|
|
|
|
|
|
|:-----: |:-----: |:-----: |:-----: |:-----: |
| Normal | Fit | Flat | Color | Material |
diff --git a/app/build.gradle b/app/build.gradle
index f92862ea9..12cd27799 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
- versionCode 10592
- versionName '6.0.1-beta'
+ versionCode 10596
+ versionName '6.0.2-beta'
buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"")
}
@@ -41,6 +41,15 @@ android {
versionNameSuffix ' DEBUG'
}
}
+ flavorDimensions "version"
+ productFlavors {
+ normal {
+ dimension "version"
+ }
+ fdroid {
+ dimension "version"
+ }
+ }
buildFeatures{
viewBinding true
@@ -88,18 +97,18 @@ dependencies {
implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation "androidx.appcompat:appcompat:$appcompat_version"
- implementation 'androidx.annotation:annotation:1.3.0'
+ implementation 'androidx.annotation:annotation:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "androidx.preference:preference-ktx:$preference_version"
- implementation 'androidx.core:core-ktx:1.8.0'
+ implementation "androidx.core:core-ktx:$core_version"
implementation 'androidx.palette:palette-ktx:1.0.0'
- //Cast Dependencies
implementation 'androidx.mediarouter:mediarouter:1.3.0'
- implementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+ //Cast Dependencies
+ normalImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
//WebServer by NanoHttpd
- implementation "org.nanohttpd:nanohttpd:2.3.1"
+ normalImplementation "org.nanohttpd:nanohttpd:2.3.1"
implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
@@ -110,22 +119,21 @@ dependencies {
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"
- def lifecycle_version = "2.5.0-rc01"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
implementation "androidx.core:core-splashscreen:1.0.0-rc01"
- implementation 'com.google.android.play:feature-delivery:2.0.0'
- implementation 'com.google.android.play:review:2.0.0'
+ normalImplementation 'com.google.android.play:feature-delivery:2.0.0'
+ normalImplementation 'com.google.android.play:review:2.0.0'
implementation "com.google.android.material:material:$mdc_version"
def retrofit_version = '2.9.0'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
- implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.8'
+ implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9'
def material_dialog_version = "3.3.0"
implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
@@ -160,7 +168,7 @@ dependencies {
implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
implementation 'com.github.Adonai:jaudiotagger:2.3.15'
- implementation 'com.anjlab.android.iab.v3:library:2.0.3'
+ normalImplementation 'com.anjlab.android.iab.v3:library:2.0.3'
implementation 'com.r0adkll:slidableactivity:2.1.0'
implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
implementation 'com.github.dhaval2404:imagepicker:2.1'
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt b/app/src/fdroid/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
new file mode 100644
index 000000000..def9a7050
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
@@ -0,0 +1,5 @@
+package code.name.monkey.retromusic.activities.base
+
+
+abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
+}
\ No newline at end of file
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/billing/BillingManager.kt b/app/src/fdroid/java/code/name/monkey/retromusic/billing/BillingManager.kt
new file mode 100644
index 000000000..51c350adc
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/billing/BillingManager.kt
@@ -0,0 +1,12 @@
+package code.name.monkey.retromusic.billing
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+class BillingManager(context: Context) {
+
+ fun release() {}
+
+ val isProVersion: Boolean
+ get() = true
+}
\ No newline at end of file
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/cast/RetroWebServer.kt b/app/src/fdroid/java/code/name/monkey/retromusic/cast/RetroWebServer.kt
new file mode 100644
index 000000000..03103dfb7
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/cast/RetroWebServer.kt
@@ -0,0 +1,6 @@
+package code.name.monkey.retromusic.cast
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+class RetroWebServer(context: Context)
\ No newline at end of file
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt b/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt
new file mode 100644
index 000000000..3d93f388c
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt
@@ -0,0 +1,15 @@
+@file:Suppress("UNUSED_PARAMETER", "unused")
+
+package code.name.monkey.retromusic.extensions
+
+import android.content.Context
+import android.view.Menu
+import androidx.fragment.app.FragmentActivity
+
+fun Context.setUpMediaRouteButton(menu: Menu) {}
+
+fun FragmentActivity.installLanguageAndRecreate(code: String) {}
+
+fun Context.goToProVersion() {}
+
+fun Context.installSplitCompat() {}
\ No newline at end of file
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/service/CastPlayer.kt b/app/src/fdroid/java/code/name/monkey/retromusic/service/CastPlayer.kt
new file mode 100644
index 000000000..3a0eaca28
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/service/CastPlayer.kt
@@ -0,0 +1,47 @@
+package code.name.monkey.retromusic.service
+
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.service.playback.Playback
+
+// Empty CastPlayer implementation
+class CastPlayer : Playback {
+ override val isInitialized: Boolean
+ get() = true
+ override val isPlaying: Boolean
+ get() = true
+ override val audioSessionId: Int
+ get() = 0
+
+ override fun setDataSource(
+ song: Song,
+ force: Boolean,
+ completion: (success: Boolean) -> Unit,
+ ) {
+ }
+
+ override fun setNextDataSource(path: String?) {}
+
+ override var callbacks: Playback.PlaybackCallbacks? = null
+
+ override fun start() = true
+
+ override fun stop() {}
+
+ override fun release() {}
+
+ override fun pause(): Boolean = true
+
+ override fun duration() = 0
+
+ override fun position() = 0
+
+ override fun seek(whereto: Int) = whereto
+
+ override fun setVolume(vol: Float) = true
+
+ override fun setAudioSessionId(sessionId: Int) = true
+
+ override fun setCrossFadeDuration(duration: Int) {}
+
+ override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {}
+}
\ No newline at end of file
diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/util/AppRater.kt b/app/src/fdroid/java/code/name/monkey/retromusic/util/AppRater.kt
new file mode 100644
index 000000000..2691d70b2
--- /dev/null
+++ b/app/src/fdroid/java/code/name/monkey/retromusic/util/AppRater.kt
@@ -0,0 +1,8 @@
+package code.name.monkey.retromusic.util
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+object AppRater {
+ fun appLaunched(context: Context) {}
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efbc081f6..987f89181 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />
-
-
@@ -315,10 +313,6 @@
android:name="com.lge.support.SPLIT_WINDOW"
android:value="true" />
-
-
-
-
-
+
+
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
rename to app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
index accf2f880..b23e1d62d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
+++ b/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@@ -1,17 +1,3 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
package code.name.monkey.retromusic.activities
import android.content.res.ColorStateList
@@ -22,7 +8,7 @@ import android.view.MenuItem
import code.name.monkey.appthemehelper.util.MaterialUtil
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID
+import code.name.monkey.retromusic.Constants
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.base.AbsThemeActivity
import code.name.monkey.retromusic.databinding.ActivityProVersionBinding
@@ -58,7 +44,7 @@ class PurchaseActivity : AbsThemeActivity(), BillingProcessor.IBillingHandler {
restorePurchase()
}
binding.purchaseButton.setOnClickListener {
- billingProcessor.purchase(this@PurchaseActivity, PRO_VERSION_PRODUCT_ID)
+ billingProcessor.purchase(this@PurchaseActivity, Constants.PRO_VERSION_PRODUCT_ID)
}
binding.bannerContainer.backgroundTintList =
ColorStateList.valueOf(accentColor())
@@ -116,4 +102,4 @@ class PurchaseActivity : AbsThemeActivity(), BillingProcessor.IBillingHandler {
companion object {
private const val TAG: String = "PurchaseActivity"
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt b/app/src/normal/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
rename to app/src/normal/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
index 23d668a53..4a2f3aaea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
+++ b/app/src/normal/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt
@@ -3,6 +3,7 @@ package code.name.monkey.retromusic.activities.base
import code.name.monkey.retromusic.cast.RetroSessionManagerListener
import code.name.monkey.retromusic.cast.RetroWebServer
import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.service.CastPlayer
import com.google.android.gms.cast.framework.CastContext
import com.google.android.gms.cast.framework.CastSession
import com.google.android.gms.common.ConnectionResult
@@ -37,7 +38,7 @@ abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
override fun onSessionStarted(castSession: CastSession, p1: String) {
invalidateOptionsMenu()
mCastSession = castSession
- MusicPlayerRemote.switchToRemotePlayback(castSession)
+ MusicPlayerRemote.switchToRemotePlayback(CastPlayer(castSession))
}
override fun onSessionEnded(castSession: CastSession, p1: Int) {
@@ -53,7 +54,7 @@ abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
invalidateOptionsMenu()
mCastSession = castSession
webServer.start()
- MusicPlayerRemote.switchToRemotePlayback(castSession)
+ MusicPlayerRemote.switchToRemotePlayback(CastPlayer(castSession))
}
override fun onSessionSuspended(castSession: CastSession, p1: Int) {
diff --git a/app/src/normal/java/code/name/monkey/retromusic/billing/BillingManager.kt b/app/src/normal/java/code/name/monkey/retromusic/billing/BillingManager.kt
new file mode 100644
index 000000000..445044e73
--- /dev/null
+++ b/app/src/normal/java/code/name/monkey/retromusic/billing/BillingManager.kt
@@ -0,0 +1,37 @@
+package code.name.monkey.retromusic.billing
+
+import android.content.Context
+import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.Constants
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.showToast
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.PurchaseInfo
+
+class BillingManager(context: Context) {
+ private val billingProcessor: BillingProcessor
+
+ init {
+ // automatically restores purchases
+ billingProcessor = BillingProcessor(
+ context, BuildConfig.GOOGLE_PLAY_LICENSING_KEY,
+ object : BillingProcessor.IBillingHandler {
+ override fun onProductPurchased(productId: String, details: PurchaseInfo?) {}
+
+ override fun onPurchaseHistoryRestored() {
+ context.showToast(R.string.restored_previous_purchase_please_restart)
+ }
+
+ override fun onBillingError(errorCode: Int, error: Throwable?) {}
+
+ override fun onBillingInitialized() {}
+ })
+ }
+
+ fun release() {
+ billingProcessor.release()
+ }
+
+ val isProVersion: Boolean
+ get() = billingProcessor.isPurchased(Constants.PRO_VERSION_PRODUCT_ID)
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.kt b/app/src/normal/java/code/name/monkey/retromusic/cast/CastHelper.kt
similarity index 100%
rename from app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.kt
rename to app/src/normal/java/code/name/monkey/retromusic/cast/CastHelper.kt
diff --git a/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt b/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt
new file mode 100644
index 000000000..6ebc71010
--- /dev/null
+++ b/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt
@@ -0,0 +1,25 @@
+@file:Suppress("unused")
+
+package code.name.monkey.retromusic.cast
+
+import android.content.Context
+import com.google.android.gms.cast.CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID
+import com.google.android.gms.cast.framework.CastOptions
+import com.google.android.gms.cast.framework.OptionsProvider
+import com.google.android.gms.cast.framework.SessionProvider
+import com.google.android.gms.cast.framework.media.CastMediaOptions
+
+
+class CastOptionsProvider : OptionsProvider {
+ override fun getCastOptions(context: Context): CastOptions {
+ val mediaOptions = CastMediaOptions.Builder().setNotificationOptions(null).build()
+ return CastOptions.Builder()
+ .setReceiverApplicationId(DEFAULT_MEDIA_RECEIVER_APPLICATION_ID)
+ .setCastMediaOptions(mediaOptions)
+ .build()
+ }
+
+ override fun getAdditionalSessionProviders(context: Context): MutableList? {
+ return null
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/RetroSessionManagerListener.kt b/app/src/normal/java/code/name/monkey/retromusic/cast/RetroSessionManagerListener.kt
similarity index 100%
rename from app/src/main/java/code/name/monkey/retromusic/cast/RetroSessionManagerListener.kt
rename to app/src/normal/java/code/name/monkey/retromusic/cast/RetroSessionManagerListener.kt
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/RetroWebServer.kt b/app/src/normal/java/code/name/monkey/retromusic/cast/RetroWebServer.kt
similarity index 100%
rename from app/src/main/java/code/name/monkey/retromusic/cast/RetroWebServer.kt
rename to app/src/normal/java/code/name/monkey/retromusic/cast/RetroWebServer.kt
diff --git a/app/src/normal/java/code/name/monkey/retromusic/extensions/extensions.kt b/app/src/normal/java/code/name/monkey/retromusic/extensions/extensions.kt
new file mode 100644
index 000000000..59d05fb74
--- /dev/null
+++ b/app/src/normal/java/code/name/monkey/retromusic/extensions/extensions.kt
@@ -0,0 +1,59 @@
+package code.name.monkey.retromusic.extensions
+
+import android.content.Context
+import android.content.Intent
+import android.view.Menu
+import androidx.fragment.app.FragmentActivity
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.PurchaseActivity
+import com.google.android.gms.cast.framework.CastButtonFactory
+import com.google.android.play.core.splitcompat.SplitCompat
+import com.google.android.play.core.splitinstall.SplitInstallManagerFactory
+import com.google.android.play.core.splitinstall.SplitInstallRequest
+import com.google.android.play.core.splitinstall.SplitInstallSessionState
+import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
+import java.util.*
+
+fun Context.setUpMediaRouteButton(menu: Menu) {
+ CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.action_cast)
+}
+
+fun FragmentActivity.installLanguageAndRecreate(code: String) {
+ var mySessionId = 0
+
+ val manager = SplitInstallManagerFactory.create(this)
+ val listener = object: SplitInstallStateUpdatedListener{
+ override fun onStateUpdate(state: SplitInstallSessionState) {
+ if (state.sessionId() == mySessionId) {
+ recreate()
+ manager.unregisterListener(this)
+ }
+ }
+ }
+ manager.registerListener(listener)
+
+ if (code != "auto") {
+ // Try to download language resources
+ val request =
+ SplitInstallRequest.newBuilder().addLanguage(Locale.forLanguageTag(code))
+ .build()
+ manager.startInstall(request)
+ // Recreate the activity on download complete
+ .addOnSuccessListener {
+ mySessionId = it
+ }
+ .addOnFailureListener {
+ showToast("Language download failed.")
+ }
+ } else {
+ recreate()
+ }
+}
+
+fun Context.goToProVersion() {
+ startActivity(Intent(this, PurchaseActivity::class.java))
+}
+
+fun Context.installSplitCompat() {
+ SplitCompat.install(this)
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/CastPlayer.kt b/app/src/normal/java/code/name/monkey/retromusic/service/CastPlayer.kt
similarity index 100%
rename from app/src/main/java/code/name/monkey/retromusic/service/CastPlayer.kt
rename to app/src/normal/java/code/name/monkey/retromusic/service/CastPlayer.kt
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt b/app/src/normal/java/code/name/monkey/retromusic/util/AppRater.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
rename to app/src/normal/java/code/name/monkey/retromusic/util/AppRater.kt
index d6d47270e..1e3423478 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
+++ b/app/src/normal/java/code/name/monkey/retromusic/util/AppRater.kt
@@ -28,7 +28,6 @@ object AppRater {
private const val DAYS_UNTIL_PROMPT = 3//Min number of days
private const val LAUNCHES_UNTIL_PROMPT = 5//Min number of launches
- @JvmStatic
fun appLaunched(context: Activity) {
val prefs = context.getSharedPreferences(APP_RATING, 0)
if (prefs.getBoolean(DO_NOT_SHOW_AGAIN, false)) {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
deleted file mode 100644
index ae29dd81c..000000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package code.name.monkey.appthemehelper.util
-
-import android.content.res.ColorStateList
-import androidx.annotation.ColorInt
-import code.name.monkey.appthemehelper.ThemeStore
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.navigation.NavigationView
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-object NavigationViewUtil {
-
- fun setItemIconColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
- val iconSl = ColorStateList(
- arrayOf(
- intArrayOf(-android.R.attr.state_checked),
- intArrayOf(android.R.attr.state_checked)
- ), intArrayOf(normalColor, selectedColor)
- )
- navigationView.itemIconTintList = iconSl
- val drawable = navigationView.itemBackground
- navigationView.itemBackground = TintHelper.createTintedDrawable(
- drawable,
- ColorUtil.withAlpha(ThemeStore.accentColor(navigationView.context), 0.2f)
- )
- }
-
- fun setItemTextColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
- val textSl = ColorStateList(
- arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
- intArrayOf(normalColor, selectedColor)
- )
- navigationView.itemTextColor = textSl
- }
-
- fun setItemIconColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
- val iconSl = ColorStateList(
- arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
- intArrayOf(normalColor, selectedColor)
- )
- bottomNavigationView.itemIconTintList = iconSl
- }
-
- fun setItemTextColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
- val textSl = ColorStateList(
- arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
- intArrayOf(normalColor, selectedColor)
- )
- bottomNavigationView.itemTextColor = textSl
- }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 431658a9a..47d09a145 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,12 @@
buildscript {
ext {
kotlin_version = '1.7.0'
- navigation_version = '2.5.0-rc01'
+ lifecycle_version='2.5.0-rc02'
+ navigation_version = '2.5.0-rc02'
mdc_version = '1.7.0-alpha02'
preference_version = '1.2.0'
appcompat_version = '1.4.2'
+ core_version='1.8.0'
}
repositories {
diff --git a/fastlane/metadata/android/en-US/changelogs/10596.txt b/fastlane/metadata/android/en-US/changelogs/10596.txt
new file mode 100644
index 000000000..d2297558d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/10596.txt
@@ -0,0 +1 @@
+Added lyrics downloading
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 000000000..a39bbf5e4
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,20 @@
+Retro Music Player 🎵
+
+📦 Included Features
+
+ - Base 3 themes (Clearly White, Kinda Dark and Just Black)
+ - Material You support on Android 12+
+ - Gapless playback
+ - Crossfade playback
+ - Choose from 10+ now playing themes
+ - Android auto support
+ - Wallpaper accent picker on Android 8.1+
+ - Home screen widgets
+ - Lock screen playback controls
+ - Sleep timer
+ - Easy drag to sort playlist & play queue
+ - Tag editor
+ - Create, edit and import playlists
+ - Browse and play your music by songs, albums, artists, playlists and genre
+ - Smart Auto Playlists - Recently played, most played and history
+
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/logo.png b/fastlane/metadata/android/en-US/images/logo.png
new file mode 100644
index 000000000..11a780e31
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/logo.png differ
diff --git a/screenshots/normal.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
similarity index 100%
rename from screenshots/normal.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
diff --git a/screenshots/home_light.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
similarity index 100%
rename from screenshots/home_light.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
diff --git a/screenshots/home_dark.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
similarity index 100%
rename from screenshots/home_dark.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
diff --git a/screenshots/home_black.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
similarity index 100%
rename from screenshots/home_black.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
diff --git a/screenshots/songs.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg
similarity index 100%
rename from screenshots/songs.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg
diff --git a/screenshots/albums.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg
similarity index 100%
rename from screenshots/albums.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg
diff --git a/screenshots/artists.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg
similarity index 100%
rename from screenshots/artists.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg
diff --git a/screenshots/settings.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg
similarity index 100%
rename from screenshots/settings.jpg
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 000000000..d0978749e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Material You Design Music player for Android
\ No newline at end of file