202210715145/ToDoApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dependencies updated, java updated to 17. Removed deprecated onBackPressed.

Browse Source
This commit is contained in:
Stevdza-San 2023-08-18 09:59:42 +02:00
parent 4aa59e2ce8
commit ad285af804
9 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="17" />
</component>
</project>

2
.idea/gradle.xml generated
View File

@ -7,7 +7,7 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="Android Studio java home" />
<option name="gradleJvm" value="#JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

2
.idea/misc.xml generated
View File

@ -7,7 +7,7 @@
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

28
app/build.gradle
View File

@ -7,11 +7,9 @@ plugins {
}
android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.example.todoapp"
compileSdk 33
minSdkVersion 26
targetSdkVersion 33
versionCode 1
@ -33,12 +31,12 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
sourceSets {
@ -49,12 +47,14 @@ android {
}
}
namespace 'com.example.todoapp'
buildToolsVersion '33.0.1'
compileSdk 33
}
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.13.2'
@ -62,14 +62,14 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
// Navigation Component
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
// Room components
implementation "androidx.room:room-runtime:2.5.0"
kapt "androidx.room:room-compiler:2.5.0"
implementation "androidx.room:room-ktx:2.5.0"
androidTestImplementation "androidx.room:room-testing:2.5.0"
implementation "androidx.room:room-runtime:2.5.2"
kapt "androidx.room:room-compiler:2.5.2"
implementation "androidx.room:room-ktx:2.5.2"
androidTestImplementation "androidx.room:room-testing:2.5.2"
// Lifecycle components
// implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"

4
app/src/main/java/com/example/todoapp/fragments/list/ListFragment.kt
View File

@ -83,7 +83,7 @@ class ListFragment : Fragment(), SearchView.OnQueryTextListener {
mToDoViewModel.sortByLowPriority.observe(viewLifecycleOwner) {
adapter.setData(it)
}
android.R.id.home -> requireActivity().onBackPressed()
android.R.id.home -> requireActivity().onBackPressedDispatcher.onBackPressed()
}
return true
}
@ -145,7 +145,7 @@ class ListFragment : Fragment(), SearchView.OnQueryTextListener {
val searchQuery = "%$query%"
mToDoViewModel.searchDatabase(searchQuery).observeOnce(viewLifecycleOwner) { list ->
list?.let {
list.let {
Log.d("ListFragment", "searchThroughDatabase")
adapter.setData(it)
}

2
app/src/main/java/com/example/todoapp/fragments/update/UpdateFragment.kt
View File

@ -53,7 +53,7 @@ class UpdateFragment : Fragment() {
when (menuItem.itemId) {
R.id.menu_save -> updateItem()
R.id.menu_delete -> confirmItemRemoval()
android.R.id.home -> requireActivity().onBackPressed()
android.R.id.home -> requireActivity().onBackPressedDispatcher.onBackPressed()
}
return true
}

8
build.gradle
View File

@ -6,10 +6,10 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.1'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -22,6 +22,6 @@ allprojects {
}
}
task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

3
gradle.properties
View File

@ -19,3 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip