cmclark00/RetroMusicPlayer
1
0
Fork 0
mirror of https://github.com/cmclark00/RetroMusicPlayer.git synced 2025-05-17 23:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1672 from tomaThomas/target-sdk-34

Browse source 
Update target sdk to 34
This commit is contained in:
Hemanth Savarala 2024-10-16 17:01:04 +05:30 • committed by GitHub
commit 2bcce6977d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle
View file

@ -5,12 +5,12 @@ apply plugin: 'kotlin-parcelize'
apply plugin: 'com.google.devtools.ksp' apply plugin: 'com.google.devtools.ksp'
android { android {
compileSdk 33 compileSdk 34
namespace "code.name.monkey.retromusic" namespace "code.name.monkey.retromusic"
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 33 targetSdk 34
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@ -68,11 +68,11 @@ android {
warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation' warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation'
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "17"
} }
dependenciesInfo { dependenciesInfo {
includeInApk = false includeInApk = false

1
app/src/main/AndroidManifest.xml
View file

@ -21,6 +21,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" /> <uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<uses-permission <uses-permission
android:name="android.permission.WRITE_SETTINGS" android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" /> tools:ignore="ProtectedPermissions" />

2
app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
View file

@ -153,7 +153,7 @@ class SleepTimerDialog : DialogFragment() {
timerDisplay.text = "$seekArcProgress min" timerDisplay.text = "$seekArcProgress min"
} }
private fun makeTimerPendingIntent(flag: Int): PendingIntent? { private fun makeTimerPendingIntent(flag: Int): PendingIntent {
return PendingIntent.getService( return PendingIntent.getService(
requireActivity(), 0, makeTimerIntent(), flag or if (VersionUtils.hasMarshmallow()) requireActivity(), 0, makeTimerIntent(), flag or if (VersionUtils.hasMarshmallow())
PendingIntent.FLAG_IMMUTABLE PendingIntent.FLAG_IMMUTABLE

4
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
View file

@ -369,10 +369,10 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
context, context,
object : GestureDetector.SimpleOnGestureListener() { object : GestureDetector.SimpleOnGestureListener() {
override fun onScroll( override fun onScroll(
e1: MotionEvent, e1: MotionEvent?,
e2: MotionEvent, e2: MotionEvent,
distanceX: Float, distanceX: Float,
distanceY: Float, distanceY: Float
): Boolean { ): Boolean {
return when { return when {
abs(distanceX) > abs(distanceY) -> { abs(distanceX) > abs(distanceY) -> {

2
app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt
View file

@ -164,7 +164,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
private var flingPlayBackController = GestureDetector(context, private var flingPlayBackController = GestureDetector(context,
object : GestureDetector.SimpleOnGestureListener() { object : GestureDetector.SimpleOnGestureListener() {
override fun onFling( override fun onFling(
e1: MotionEvent, e1: MotionEvent?,
e2: MotionEvent, e2: MotionEvent,
velocityX: Float, velocityX: Float,
velocityY: Float velocityY: Float

2
app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
View file

@ -220,7 +220,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
} }
override fun onFling( override fun onFling(
e1: MotionEvent, e1: MotionEvent?,
e2: MotionEvent, e2: MotionEvent,
velocityX: Float, velocityX: Float,
velocityY: Float velocityY: Float

2
app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
View file

@ -72,7 +72,7 @@ class NowPlayingSettingsFragment : AbsSettingsFragment(),
PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this) PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
} }
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
when (key) { when (key) {
NOW_PLAYING_SCREEN_ID -> updateNowPlayingScreenSummary() NOW_PLAYING_SCREEN_ID -> updateNowPlayingScreenSummary()
ALBUM_COVER_STYLE -> updateAlbumCoverStyleSummary() ALBUM_COVER_STYLE -> updateAlbumCoverStyleSummary()

4
app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt
View file

@ -104,7 +104,7 @@ class CoverLrcView @JvmOverloads constructor(
} }
override fun onScroll( override fun onScroll(
e1: MotionEvent, e1: MotionEvent?,
e2: MotionEvent, e2: MotionEvent,
distanceX: Float, distanceX: Float,
distanceY: Float, distanceY: Float,
@ -124,7 +124,7 @@ class CoverLrcView @JvmOverloads constructor(
} }
override fun onFling( override fun onFling(
e1: MotionEvent, e1: MotionEvent?,
e2: MotionEvent, e2: MotionEvent,
velocityX: Float, velocityX: Float,
velocityY: Float, velocityY: Float,

4
app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
View file

@ -628,9 +628,7 @@ class MusicService : MediaBrowserServiceCompat(),
} }
} }
override fun onSharedPreferenceChanged( override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
sharedPreferences: SharedPreferences, key: String,
) {
when (key) { when (key) {
PLAYBACK_SPEED, PLAYBACK_PITCH -> { PLAYBACK_SPEED, PLAYBACK_PITCH -> {
updateMediaSessionPlaybackState() updateMediaSessionPlaybackState()

8
appthemehelper/build.gradle
View file

@ -1,12 +1,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
android { android {
compileSdk 33 compileSdk 34
namespace "code.name.monkey.appthemehelper" namespace "code.name.monkey.appthemehelper"
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 33 targetSdk 34
} }
buildTypes { buildTypes {
release { release {
@ -18,8 +18,8 @@ android {
abortOnError false abortOnError false
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
} }

4
gradle.properties
View file

@ -11,4 +11,6 @@ android.nonTransitiveRClass=true
# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/ # https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
kotlin.incremental.useClasspathSnapshot=true kotlin.incremental.useClasspathSnapshot=true
# https://docs.gradle.org/7.5/userguide/configuration_cache.html # https://docs.gradle.org/7.5/userguide/configuration_cache.html
org.gradle.unsafe.configuration-cache=true org.gradle.unsafe.configuration-cache=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false

4
gradle/libs.versions.toml
View file

@ -8,8 +8,8 @@ afollestad_dialog_version = "3.3.0"
coreSplashscreen = "1.0.0" coreSplashscreen = "1.0.0"
customactivityoncrash = "2.4.0" customactivityoncrash = "2.4.0"
fadingedgelayout = "1.0.0" fadingedgelayout = "1.0.0"
google_featureDelivery_version = "2.0.1" google_featureDelivery_version = "2.1.0"
gradle = "7.4.2" gradle = "8.5.1"
dhaval2404_imagepicker_version = "2.1" dhaval2404_imagepicker_version = "2.1"
chrisbanes_insetter_version = "0.6.1" chrisbanes_insetter_version = "0.6.1"
jaudiotagger = "2.3.15" jaudiotagger = "2.3.15"

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Mar 06 21:09:43 IST 2023 #Mon Mar 06 21:09:43 IST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists