diff --git a/app/build.gradle b/app/build.gradle index f3d7f91..b64167b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.mikepenz.aboutlibraries.plugin' @@ -44,8 +43,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { jvmTarget = '11' @@ -59,28 +58,26 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation platform('com.google.firebase:firebase-bom:30.0.1') + implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version" + implementation "com.mikepenz:aboutlibraries:$about_libraries_version" + implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.core:core-ktx:1.6.0' - implementation "androidx.multidex:multidex:2.0.1" - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.2' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" + 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.amitshekhar.android:android-networking:1.0.2' - implementation 'com.github.cyb3rko:about-icons:1.4.0' implementation 'com.github.GrenderG:Toasty:1.5.0' - implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0" + implementation 'com.github.cyb3rko:about-icons:1.5.0' + implementation 'com.github.parse-community.Parse-SDK-Android:parse:1.26.0' implementation 'com.google.android.material:material:1.6.1' - implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1' + implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning implementation 'com.itextpdf:itextpdf:5.5.13.2' - implementation "com.mikepenz:aboutlibraries:$about_libraries_version" - implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version" implementation 'io.github.medyo:android-about-page:2.0.0' - implementation 'me.ibrahimyilmaz:kiel:1.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(':installer') } diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ManageTechnikerFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ManageTechnikerFragment.kt index c2642de..31b9a10 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ManageTechnikerFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ManageTechnikerFragment.kt @@ -24,7 +24,6 @@ import com.google.android.material.textfield.TextInputEditText import com.parse.ParseObject import com.parse.ParseQuery import es.dmoral.toasty.Toasty -import kotlinx.android.synthetic.main.techniker_dialog.view.* class ManageTechnikerFragment : Fragment() { private var _binding: FragmentManageTechnikerBinding? = null @@ -57,8 +56,8 @@ class ManageTechnikerFragment : Fragment() { customView(R.layout.techniker_dialog, horizontalPadding = true) positiveButton(text = "Hinzufügen") { val view = it.view - val newName = view.name.text.toString() - val newAdmin = view.admin.isChecked + val newName = view.findViewById(R.id.name).text.toString() + val newAdmin = view.findViewById(R.id.admin).isChecked ParseObject.create(CLASS_TECHNIKER).apply { put(COLUMN_TECHNIKER_NAME, newName) put(COLUMN_TECHNIKER_ADMIN, newAdmin) @@ -121,8 +120,8 @@ class ManageTechnikerFragment : Fragment() { customView(0, dialogView, horizontalPadding = true) onDismiss { val view = it.view - val newName = view.name.text.toString() - val newAdmin = view.admin.isChecked + val newName = view.findViewById(R.id.name).text.toString() + val newAdmin = view.findViewById(R.id.admin).isChecked val parseObject = techniker[index] if (newName != parseObject.getString(COLUMN_TECHNIKER_NAME) || newAdmin != parseObject.getBoolean(COLUMN_TECHNIKER_ADMIN) diff --git a/build.gradle b/build.gradle index 204b56a..06466a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.about_libraries_version = "8.3.0" - ext.kotlin_version = "1.5.20" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' - classpath 'com.google.gms:google-services:4.3.8' + 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.12' classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" + 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b01f57..a779203 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-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/installer/build.gradle b/installer/build.gradle index 778c516..67abf1b 100644 --- a/installer/build.gradle +++ b/installer/build.gradle @@ -10,8 +10,6 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 31 - versionCode 2 - versionName "1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -38,7 +36,7 @@ android { dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.20" implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.4.0'