diff --git a/app/build.gradle b/app/build.gradle index cb07087..b51523b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,14 +10,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "com.artemchep.pocketmode" minSdkVersion 28 - targetSdkVersion 29 + targetSdkVersion 30 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" def versionTag = System.getenv("POCKET_MODE_RELEASE_TAG") @@ -101,7 +99,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion "1.0.0-alpha06" + kotlinCompilerExtensionVersion "1.0.0-alpha11" } lintOptions { disable 'MissingTranslation' @@ -111,26 +109,26 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' implementation 'com.artemchep.config:config:2.2.0' implementation 'com.afollestad.material-dialogs:core:3.1.0' - implementation 'com.google.android.material:material:1.3.0-alpha03' + implementation 'com.google.android.material:material:1.3.0' implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" implementation 'com.eightbitlab:blurview:1.6.5' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.browser:browser:1.2.0' + implementation 'androidx.browser:browser:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation "androidx.work:work-runtime-ktx:2.4.0" + implementation "androidx.work:work-runtime-ktx:2.5.0" implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'com.mikepenz:fastadapter:3.3.1' implementation 'org.solovyev.android:checkout:1.2.2' - implementation 'androidx.compose.ui:ui:1.0.0-alpha06' - implementation 'androidx.compose.material:material:1.0.0-alpha06' - implementation 'androidx.ui:ui-tooling:1.0.0-alpha06' - playstoreImplementation 'com.google.firebase:firebase-crashlytics:17.2.2' - playstoreImplementation 'com.google.firebase:firebase-analytics:18.0.0' + implementation 'androidx.compose.ui:ui:1.0.0-alpha11' + implementation 'androidx.compose.material:material:1.0.0-alpha11' + implementation 'androidx.ui:ui-tooling:1.0.0-alpha07' + playstoreImplementation 'com.google.firebase:firebase-crashlytics:17.3.1' + playstoreImplementation 'com.google.firebase:firebase-analytics:18.0.2' testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/java/com/artemchep/pocketmode/Heart.kt b/app/src/main/java/com/artemchep/pocketmode/Heart.kt index e62f180..bf59774 100644 --- a/app/src/main/java/com/artemchep/pocketmode/Heart.kt +++ b/app/src/main/java/com/artemchep/pocketmode/Heart.kt @@ -52,25 +52,25 @@ class Heart : Application() { Cfg.observe(cfgObserver) registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks { - override fun onActivityPaused(activity: Activity?) { + override fun onActivityPaused(activity: Activity) { } - override fun onActivityResumed(activity: Activity?) { + override fun onActivityResumed(activity: Activity) { } - override fun onActivityStarted(activity: Activity?) { + override fun onActivityStarted(activity: Activity) { } - override fun onActivityDestroyed(activity: Activity?) { + override fun onActivityDestroyed(activity: Activity) { } - override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) { + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { } - override fun onActivityStopped(activity: Activity?) { + override fun onActivityStopped(activity: Activity) { } - override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { if (activity is AnalyticsHolder) { activity.analytics = analytics } diff --git a/app/src/main/java/com/artemchep/pocketmode/ui/activities/compose/MainScreen.kt b/app/src/main/java/com/artemchep/pocketmode/ui/activities/compose/MainScreen.kt index fc88012..c81443f 100644 --- a/app/src/main/java/com/artemchep/pocketmode/ui/activities/compose/MainScreen.kt +++ b/app/src/main/java/com/artemchep/pocketmode/ui/activities/compose/MainScreen.kt @@ -1,8 +1,6 @@ package com.artemchep.pocketmode.ui.activities.compose -import androidx.compose.foundation.Icon import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.material.* @@ -130,7 +128,8 @@ fun TroubleshootingCardContent(ui: MainScreen.Troubleshooting) = ConstraintLayou bottom.linkTo(proximityText.bottom) end.linkTo(parent.end, 16.dp) }, - asset = if (ui.proximityIsClose) Icons.Outlined.Edit else Icons.Outlined.Edit + imageVector = if (ui.proximityIsClose) Icons.Outlined.Edit else Icons.Outlined.Edit, + contentDescription = null, ) Text( modifier = Modifier @@ -179,7 +178,8 @@ fun TroubleshootingCardContent(ui: MainScreen.Troubleshooting) = ConstraintLayou ), icon = { Icon( - asset = Icons.Outlined.Place + imageVector = Icons.Outlined.Place, + contentDescription = null, ) }, text = { @@ -397,7 +397,8 @@ fun SettingsCardContent(ui: MainScreen.Settings) = ConstraintLayout( }, icon = { Icon( - asset = Icons.Outlined.ShoppingCart + imageVector = Icons.Outlined.ShoppingCart, + contentDescription = null, ) }, text = { @@ -416,7 +417,8 @@ fun SettingsCardContent(ui: MainScreen.Settings) = ConstraintLayout( }, icon = { Icon( - asset = Icons.Outlined.Build + imageVector = Icons.Outlined.Build, + contentDescription = null, ) }, text = { diff --git a/build.gradle b/build.gradle index 4bbdc43..acbf86c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,17 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.21-2' ext.lifecycle_version = "2.2.0" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-alpha15' + classpath 'com.android.tools.build:gradle:7.0.0-alpha05' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' + classpath 'com.google.gms:google-services:4.3.5' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c488b9e..ce6bae8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip