From 8265b21d25d1dc6a467cc9709aa164617e8ce943 Mon Sep 17 00:00:00 2001 From: Akshat Tiwari <51470769+akshaaatt@users.noreply.github.com> Date: Thu, 5 Oct 2023 18:33:11 +0200 Subject: [PATCH] Cleanup --- app/build.gradle | 63 ++++++++++--------- .../ui/screens/settings/SettingsActivity.kt | 10 --- .../org/metabrainz/android/ui/theme/Theme.kt | 2 - app/src/main/res/values/strings.xml | 2 - build.gradle | 6 +- 5 files changed, 36 insertions(+), 47 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3cfcc48c..1a61376b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ def keystorePropertiesFile = rootProject.file("keystore.properties") android { namespace 'org.metabrainz.android' - compileSdk 33 + compileSdk 34 signingConfigs { release { if (keystorePropertiesFile.exists()) { @@ -25,7 +25,7 @@ android { defaultConfig { applicationId 'org.metabrainz.android' minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 56 versionName "7.0.0" @@ -76,19 +76,22 @@ android { kotlinOptions { jvmTarget = '17' } + lint { + abortOnError false + } } dependencies { //AndroidX implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.browser:browser:1.5.0' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.browser:browser:1.6.0' + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.core:core-splashscreen:1.0.1' //Web Service Setup @@ -97,25 +100,25 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11' - implementation 'androidx.paging:paging-runtime-ktx:3.1.1' + implementation 'androidx.paging:paging-runtime-ktx:3.2.1' //Image downloading and Caching library - implementation 'com.github.bumptech.glide:glide:4.15.1' - kapt 'com.github.bumptech.glide:compiler:4.15.1' + implementation 'com.github.bumptech.glide:glide:4.16.0' + kapt 'com.github.bumptech.glide:compiler:4.16.0' //Fragment Setup For Kotlin implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2' //Tagger & Metadata Setup implementation 'info.debatty:java-string-similarity:2.0.0' //Design Setup - implementation 'com.google.android.material:material:1.8.0' - implementation 'com.airbnb.android:lottie:6.0.0' - implementation 'com.github.akshaaatt:Onboarding:1.0.5' + implementation 'com.google.android.material:material:1.9.0' + implementation 'com.airbnb.android:lottie:6.1.0' + implementation 'com.github.akshaaatt:Onboarding:1.1.2' implementation 'com.github.akshaaatt:Share-Android:1.0.0' //Barcode Scan @@ -124,34 +127,34 @@ dependencies { //Dagger-Hilt implementation("com.google.dagger:hilt-android:$hilt_version") kapt("com.google.dagger:hilt-android-compiler:$hilt_version") - implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-ktx', version: '2.6.1' + implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-ktx', version: '2.6.2' kapt("androidx.hilt:hilt-compiler:1.0.0") //Jetpack Compose implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui-tooling:$compose_version" implementation "androidx.compose.ui:ui-util:$compose_version" - implementation 'androidx.compose.material:material:1.4.2' - implementation 'androidx.compose.material:material-icons-extended:1.4.2' - implementation 'androidx.compose.material3:material3:1.1.0-rc01' - implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-rc01' + implementation 'androidx.compose.material:material:1.5.2' + implementation 'androidx.compose.material:material-icons-extended:1.5.2' + implementation 'androidx.compose.material3:material3:1.2.0-alpha08' + implementation 'androidx.compose.material3:material3-window-size-class:1.2.0-alpha08' implementation "androidx.compose.animation:animation:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1' - implementation 'androidx.navigation:navigation-compose:2.6.0-beta01' - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' + implementation 'androidx.navigation:navigation-compose:2.7.3' + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2' implementation 'androidx.hilt:hilt-navigation-compose:1.0.0' - implementation 'io.coil-kt:coil-compose:2.3.0' - implementation 'com.airbnb.android:lottie-compose:6.0.0' - implementation 'androidx.navigation:navigation-compose:2.6.0-beta01' + implementation 'io.coil-kt:coil-compose:2.4.0' + implementation 'com.airbnb.android:lottie-compose:6.1.0' + implementation 'androidx.navigation:navigation-compose:2.7.3' //Test Setup testImplementation 'junit:junit:4.13.2' testImplementation 'com.squareup.okhttp3:mockwebserver:5.0.0-alpha.7' testImplementation 'androidx.arch.core:core-testing:2.2.0' testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' - testImplementation 'androidx.room:room-testing:2.5.1' + testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3' + testImplementation 'androidx.room:room-testing:2.5.2' androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' @@ -161,10 +164,10 @@ dependencies { androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" //Room db - implementation 'androidx.room:room-runtime:2.5.1' - kapt 'androidx.room:room-compiler:2.5.1' - implementation 'androidx.room:room-ktx:2.5.1' + implementation 'androidx.room:room-runtime:2.5.2' + kapt 'androidx.room:room-compiler:2.5.2' + implementation 'androidx.room:room-ktx:2.5.2' // Jetpack Compose accompanists (https://github.com/google/accompanist) - implementation 'com.google.accompanist:accompanist-systemuicontroller:0.30.0' + implementation 'com.google.accompanist:accompanist-systemuicontroller:0.32.0' } \ No newline at end of file diff --git a/app/src/main/java/org/metabrainz/android/ui/screens/settings/SettingsActivity.kt b/app/src/main/java/org/metabrainz/android/ui/screens/settings/SettingsActivity.kt index 977b3ff6..c79ff361 100644 --- a/app/src/main/java/org/metabrainz/android/ui/screens/settings/SettingsActivity.kt +++ b/app/src/main/java/org/metabrainz/android/ui/screens/settings/SettingsActivity.kt @@ -1,9 +1,7 @@ package org.metabrainz.android.ui.screens.settings import android.graphics.drawable.ColorDrawable -import android.os.Build import android.os.Bundle -import android.provider.Settings import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate @@ -36,10 +34,6 @@ class SettingsActivity : AppCompatActivity() { } } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1){ - ACTION_NOTIFICATION_LISTENER_SETTINGS = Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS - } - preferenceChangeListener = Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any -> // Explicit Ui Mode functionality. if (preference.key == PREFERENCE_SYSTEM_THEME){ @@ -72,8 +66,4 @@ class SettingsActivity : AppCompatActivity() { else -> super.onOptionsItemSelected(item) } } - - companion object { - private var ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" - } } \ No newline at end of file diff --git a/app/src/main/java/org/metabrainz/android/ui/theme/Theme.kt b/app/src/main/java/org/metabrainz/android/ui/theme/Theme.kt index d2354c87..b2017809 100644 --- a/app/src/main/java/org/metabrainz/android/ui/theme/Theme.kt +++ b/app/src/main/java/org/metabrainz/android/ui/theme/Theme.kt @@ -2,7 +2,6 @@ package org.metabrainz.android.ui.theme import android.app.Activity import android.content.Context -import android.view.Window import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.* import androidx.compose.runtime.* @@ -10,7 +9,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat import androidx.preference.PreferenceManager import com.google.accompanist.systemuicontroller.SystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 47e289ee..3e8c6ffc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -226,6 +226,4 @@ Current Track Image size Scale type - BrainzPlayer Now Playing - Currently Playing Song Controls diff --git a/build.gradle b/build.gradle index 5abd65bb..7b03ba8f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ buildscript { ext { kotlin_version = '1.8.20' - navigationVersion = '2.5.3' - hilt_version = '2.45' - compose_version = '1.4.2' + navigationVersion = '2.7.3' + hilt_version = '2.48' + compose_version = '1.5.2' } repositories { google()