Aktualisiere internen Code und Dependencies

master
Niko Diamadis 5 years ago
parent 9b9993f2ad
commit f0e7ee13b7

@ -18,13 +18,13 @@ android {
keyPassword properties.getProperty("signing.key.password") keyPassword properties.getProperty("signing.key.password")
} }
} }
compileSdkVersion 30 compileSdkVersion 31
buildToolsVersion "29.0.3" buildToolsVersion "30.0.3"
defaultConfig { defaultConfig {
applicationId "com.cyb3rko.techniklogger" applicationId "com.cyb3rko.techniklogger"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 31
versionCode 8 versionCode 8
versionName "1.5.1" versionName "1.5.1"
multiDexEnabled true multiDexEnabled true
@ -48,7 +48,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '11'
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true
@ -60,7 +60,7 @@ android {
dependencies { dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.core:core-ktx:1.6.0'
implementation "androidx.multidex:multidex:2.0.1" implementation "androidx.multidex:multidex:2.0.1"
@ -76,7 +76,7 @@ dependencies {
implementation 'com.github.GrenderG:Toasty:1.5.0' implementation 'com.github.GrenderG:Toasty:1.5.0'
implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0" implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0"
implementation 'com.google.android.material:material:1.3.0-alpha03' implementation 'com.google.android.material:material:1.3.0-alpha03'
implementation 'com.google.firebase:firebase-crashlytics-ktx:18.1.0' implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1'
implementation 'com.itextpdf:itextpdf:5.5.13.2' implementation 'com.itextpdf:itextpdf:5.5.13.2'
implementation "com.mikepenz:aboutlibraries:$about_libraries_version" implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version" implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"

@ -17,6 +17,7 @@
tools:ignore="AllowBackup" tools:ignore="AllowBackup"
android:name=".App"> android:name=".App">
<activity android:name="com.cyb3rko.techniklogger.MainActivity" <activity android:name="com.cyb3rko.techniklogger.MainActivity"
android:exported="true"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

@ -11,8 +11,6 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.input.getInputField
import com.afollestad.materialdialogs.input.input
import com.afollestad.materialdialogs.list.isItemChecked import com.afollestad.materialdialogs.list.isItemChecked
import com.afollestad.materialdialogs.list.listItemsMultiChoice import com.afollestad.materialdialogs.list.listItemsMultiChoice
import com.afollestad.materialdialogs.list.uncheckItems import com.afollestad.materialdialogs.list.uncheckItems
@ -25,7 +23,6 @@ import com.google.android.material.timepicker.TimeFormat
import com.parse.ParseObject import com.parse.ParseObject
import com.parse.ParseQuery import com.parse.ParseQuery
import es.dmoral.toasty.Toasty import es.dmoral.toasty.Toasty
import java.lang.IndexOutOfBoundsException
import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter.Companion.adapterOf import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter.Companion.adapterOf
import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter
import me.ibrahimyilmaz.kiel.core.RecyclerViewHolder import me.ibrahimyilmaz.kiel.core.RecyclerViewHolder
@ -436,27 +433,4 @@ class ProjectFragment : Fragment() {
binding.divider.visibility = View.GONE binding.divider.visibility = View.GONE
} }
} }
private fun showNameDialog() {
val currentName = myContext.getSharedPreferences("Safe", 0).getString("name", "")
MaterialDialog(myContext)
.cancelable(false)
.title(0, "Bitte gebe deinen Namen ein")
.show {
input(hint = "Dein Name", prefill = currentName, waitForPositiveButton = false) { dialog, inputName ->
try {
if (!inputName[0].isUpperCase()) {
dialog.getInputField().error = "Der Anfangsbuchstabe sollte groß sein"
}
} catch (ignored: IndexOutOfBoundsException) {
}
positiveButton {
myContext.getSharedPreferences("Safe", 0).edit().putString("name", inputName.toString()).apply()
}
}
positiveButton(0, "Speichern")
}
}
} }

@ -7,8 +7,8 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.2.2' classpath 'com.android.tools.build:gradle:7.0.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
classpath 'com.google.gms:google-services:4.3.8' classpath 'com.google.gms:google-services:4.3.8'
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

@ -4,12 +4,12 @@ plugins {
} }
android { android {
compileSdkVersion 30 compileSdkVersion 31
buildToolsVersion "30.0.3" buildToolsVersion "30.0.3"
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 31
versionCode 2 versionCode 2
versionName "1.1" versionName "1.1"
@ -18,10 +18,14 @@ android {
} }
buildTypes { buildTypes {
release { debug {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
@ -35,10 +39,7 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.android.material:material:1.4.0'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
} }
Loading…
Cancel
Save