Support minimum API 24 (#210)

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
  buildToolsVersion = "30.0.3"
  defaultConfig {
  applicationId = "com.zionhuang.music"
- minSdk = 26
+ minSdk = 24
  targetSdk = 32
  versionCode = 11
  versionName = "0.4.0"
@@ -48,6 +48,7 @@ android {
  }
  }
  compileOptions {
+ isCoreLibraryDesugaringEnabled = true
  sourceCompatibility(JavaVersion.VERSION_1_8)
  targetCompatibility(JavaVersion.VERSION_1_8)
  }
@@ -109,7 +110,7 @@ dependencies {
  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
  // AndroidX
  implementation("androidx.core:core-ktx:1.8.0")
  implementation("androidx.appcompat:appcompat:1.5.1")
@@ -153,19 +154,21 @@ dependencies {
  // OkHttp
  implementation("com.squareup.okhttp3:okhttp:4.10.0")
  // Coil
- implementation("io.coil-kt:coil:2.2.0")
+ implementation("io.coil-kt:coil:2.2.1")
  // Fast Scroll
- implementation("me.zhanghai.android.fastscroll:library:1.1.7")
+ implementation("me.zhanghai.android.fastscroll:library:1.1.8")
  // Markdown
  implementation("org.commonmark:commonmark:0.18.2")
+ // Desugaring
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
  // Test
  testImplementation("junit:junit:4.13.2")
  androidTestImplementation("android.arch.core:core-testing:1.1.1")
  androidTestImplementation("androidx.test.ext:junit:1.1.3")
  androidTestImplementation("androidx.test:runner:1.4.0")
  androidTestImplementation("androidx.test:rules:1.4.0")
  androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
- testImplementation("org.mockito:mockito-core:4.3.1")
+ testImplementation("org.mockito:mockito-core:4.8.0")
  testImplementation("org.mockito:mockito-inline:4.3.1")
  testImplementation("org.mockito:mockito-android:4.3.1")
  testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")

app/src/main/AndroidManifest.xml

@@ -21,7 +21,8 @@
  android:label="@string/app_name"
  android:roundIcon="@mipmap/ic_launcher_round"
  android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ tools:targetApi="o">
  <uses-library
  android:name="org.apache.http.legacy"
  android:required="false" />

app/src/main/java/com/zionhuang/music/db/daos/SongDao.kt

@@ -49,6 +49,7 @@ interface SongDao {
  fun getPlaylistSongsAsFlow(playlistId: String): Flow<List<Song>>
 
  @Transaction
+ @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
  @Query("SELECT * FROM song WHERE download_state = $STATE_DOWNLOADED")
  suspend fun getDownloadedSongsAsList(): List<Song>
 

app/src/main/java/com/zionhuang/music/ui/widgets/PlayPauseButton.kt

@@ -28,9 +28,11 @@ class PlayPauseButton : AppCompatImageView {
  constructor(context: Context) : this(context, null)
  constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
- val tintResId = context
- .obtainStyledAttributes(attrs, R.styleable.PlayPauseButton)
- .getColor(R.styleable.PlayPauseButton_playPauseButtonTint, resources.getColor(R.color.colorInverted, context.theme))
+ val tintResId = context.obtainStyledAttributes(attrs, R.styleable.PlayPauseButton).let {
+ val res = it.getColor(R.styleable.PlayPauseButton_playPauseButtonTint, resources.getColor(R.color.colorInverted, context.theme))
+ it.recycle()
+ res
+ }
  playAnimation.setTint(tintResId)
  pauseAnimation.setTint(tintResId)
  playDrawable.setTint(tintResId)

app/src/main/res/drawable/ic_language.xml

@@ -1,10 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
  android:width="24dp"
  android:height="24dp"
+ android:tint="?attr/colorControlNormal"
  android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
+ android:viewportHeight="24">
+ <path
+  android:fillColor="@android:color/white"
+  android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"
+  tools:ignore="VectorPath" />
 </vector>