diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0614b31..1d8edfe 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,8 +15,8 @@ android { applicationId = "ru.tech.firenote" minSdk = 21 targetSdk = 32 - versionCode = 3 - versionName = "1.0.2" + versionCode = 4 + versionName = "1.0.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 42e52d1..2c0a2dd 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index b462bfe..1e6dff0 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 3, - "versionName": "1.0.2", + "versionCode": 4, + "versionName": "1.0.3", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/ru/tech/firenote/ui/composable/screen/navigation/NoteListScreen.kt b/app/src/main/java/ru/tech/firenote/ui/composable/screen/navigation/NoteListScreen.kt index 51076af..37eaf6d 100644 --- a/app/src/main/java/ru/tech/firenote/ui/composable/screen/navigation/NoteListScreen.kt +++ b/app/src/main/java/ru/tech/firenote/ui/composable/screen/navigation/NoteListScreen.kt @@ -68,13 +68,13 @@ fun NoteListScreen( val repoList = state.data as List var data = if (isDescendingFilter.value) { when (filterType.value) { - 1 -> repoList.sortedByDescending { (it.color ?: 0).priority } + 1 -> repoList.sortedBy { (it.color ?: 0).priority } 2 -> repoList.sortedBy { it.timestamp } else -> repoList.sortedBy { it.title } } } else { when (filterType.value) { - 1 -> repoList.sortedBy { (it.color ?: 0).priority } + 1 -> repoList.sortedByDescending { (it.color ?: 0).priority } 2 -> repoList.sortedByDescending { it.timestamp } else -> repoList.sortedByDescending { it.title } }