diff --git a/app/build.gradle b/app/build.gradle index d5173d3..6fff959 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'com.google.firebase.crashlytics' -apply plugin: 'com.google.gms.google-services' -apply plugin: "androidx.navigation.safeargs.kotlin" +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'com.google.firebase.crashlytics' + id 'com.google.gms.google-services' + id 'androidx.navigation.safeargs.kotlin' +} android { signingConfigs { @@ -16,12 +18,12 @@ android { keyPassword properties.getProperty("signing.key.password") } } - compileSdk 31 + compileSdk 33 defaultConfig { applicationId "com.cyb3rko.techniklogger" minSdk 19 - targetSdk 31 + targetSdk 33 versionCode 13 versionName "2.1.1" } @@ -53,15 +55,15 @@ android { dependencies { implementation platform('com.google.firebase:firebase-bom:30.0.1') - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.2' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.2' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' - implementation 'com.airbnb.android:lottie:3.7.0' + implementation 'com.airbnb.android:lottie:4.0.0' implementation 'com.amitshekhar.android:android-networking:1.0.2' implementation 'com.github.GrenderG:Toasty:1.5.0' implementation 'com.github.parse-community.Parse-SDK-Android:parse:1.26.0' diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt index 4d0f0df..5519fa1 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt @@ -258,9 +258,9 @@ class ListingFragment : Fragment() { binding.fabLayout2.animate().translationY(0f) binding.fabLayout3.animate().translationY(0f) binding.fabLayout3.animate().translationY(0f).setListener(object: Animator.AnimatorListener { - override fun onAnimationStart(animation: Animator?) {} + override fun onAnimationStart(animation: Animator) {} - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationEnd(animation: Animator) { if (!isFABOpen) { binding.fabLayout1.visibility = View.GONE binding.fabLayout2.visibility = View.GONE @@ -268,9 +268,9 @@ class ListingFragment : Fragment() { } } - override fun onAnimationCancel(animation: Animator?) {} + override fun onAnimationCancel(animation: Animator) {} - override fun onAnimationRepeat(animation: Animator?) {} + override fun onAnimationRepeat(animation: Animator) {} }) } diff --git a/build.gradle b/build.gradle index 1ba59a7..965ab10 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,17 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - google() - jcenter() - } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0' - classpath 'com.google.gms:google-services:4.3.10' - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' + classpath 'com.google.gms:google-services:4.3.14' + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2" } } -allprojects { - repositories { - google() - jcenter() - maven { url "https://jitpack.io" } - } +plugins { + id 'com.android.application' version '7.2.2' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d0cfe52..cf5f519 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Nov 06 23:24:33 CET 2020 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 7edb7b7..5267aa4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,18 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + jcenter() + } +} rootProject.name = "Technik-Logger" -include ':app' \ No newline at end of file +include ':app'