diff --git a/app/build.gradle b/app/build.gradle index ce7b2dd1..72e8e8c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,8 +148,8 @@ dependencies { // Language cores implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "androidx.multidex:multidex:2.0.1" - implementation files('libs/navlib-debug.aar') - implementation files('libs/navlib-font-debug.aar') +// implementation files('libs/navlib-debug.aar') +// implementation files('libs/navlib-font-debug.aar') coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" // Android Jetpack @@ -185,17 +185,18 @@ dependencies { implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2" // Szkolny.eu libraries/forks + implementation "com.github.santoni0:NavLib:323288f" implementation "eu.szkolny:android-snowfall:1ca9ea2da3" - // implementation "eu.szkolny:agendacalendarview:1.0.4" + implementation "eu.szkolny:agendacalendarview:1.0.4" implementation "eu.szkolny:cafebar:5bf0c618de" implementation "eu.szkolny.fslogin:lib:2.0.0" - // implementation "eu.szkolny:material-about-library:1d5ebaf47c" + implementation "eu.szkolny:material-about-library:1d5ebaf47c" implementation "eu.szkolny:mhttp:af4b62e6e9" implementation "eu.szkolny:nachos:0e5dfcaceb" implementation "eu.szkolny.selective-dao:annotation:27f8f3f194" officialImplementation "eu.szkolny:ssl-provider:1.0.0" unofficialImplementation "eu.szkolny:ssl-provider:1.0.0" - // implementation "pl.szczodrzynski:navlib:0.8.0" + implementation "pl.szczodrzynski:numberslidingpicker:2921225f76" implementation "pl.szczodrzynski:recyclertablayout:700f980584" implementation "pl.szczodrzynski:tachyon:551943a6b5" diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt index 84252fff..779d3d02 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt @@ -44,7 +44,6 @@ class SettingsUtil( .title(titleRes ?: 0) .cardColor(backgroundColor ?: 0) .theme(theme ?: 0) - .outline(false) .build() card.items.addAll(items) diff --git a/build.gradle b/build.gradle index 811df234..52603168 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.9.10' + kotlin_version = '1.9.24' release = [ versionName: "4.13.6", @@ -11,7 +11,7 @@ buildscript { setup = [ compileSdk: 34, - minSdk : 16, + minSdk : 21, targetSdk : 34 ] } @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.14' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffc5f341..4168db90 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 17 14:04:38 CET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME