Skip to content

Commit a603f5b

Browse files
Merge pull request #43 from raheemadamboev/1.2.1
1.2.1
2 parents 56eb899 + b9382a7 commit a603f5b

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.idea/deploymentTargetSelector.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ android {
1818
applicationId = "xyz.teamgravity.todo"
1919
minSdk = libs.versions.sdk.min.get().toInt()
2020
targetSdk = libs.versions.sdk.target.get().toInt()
21-
versionCode = 11
22-
versionName = "1.2.0"
21+
versionCode = 12
22+
versionName = "1.2.1"
2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424

2525
vectorDrawables {

app/src/main/java/xyz/teamgravity/todo/data/local/preferences/AppPreferences.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ class AppPreferences(
3131
// Get
3232
///////////////////////////////////////////////////////////////////////////
3333

34-
fun getSorting(): Flow<TodoSort> = preferences.getString(AppPreferencesKey.Sorting).map { TodoSort.fromName(it) }
34+
fun getSorting(): Flow<TodoSort> {
35+
return preferences.getString(AppPreferencesKey.Sorting).map { TodoSort.fromName(it) }
36+
}
3537

36-
fun getHideCompleted(): Flow<Boolean> =
37-
preferences.getBoolean(AppPreferencesKey.HideCompleted).map { it ?: AppPreferencesKey.HideCompleted.default as Boolean }
38+
fun getHideCompleted(): Flow<Boolean> {
39+
return preferences.getBoolean(AppPreferencesKey.HideCompleted).map { it ?: AppPreferencesKey.HideCompleted.default as Boolean }
40+
}
3841
}

app/src/main/java/xyz/teamgravity/todo/data/local/preferences/AppPreferencesKey.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ enum class AppPreferencesKey(
99
override val encrypted: Boolean
1010
) : PreferencesKey {
1111
Sorting(
12-
key = "sorting",
12+
key = "xyz.teamgravity.todo.Sorting",
1313
default = TodoSort.Date.name,
1414
encrypted = false
1515
),
1616
HideCompleted(
17-
key = "hide_completed",
17+
key = "xyz.teamgravity.todo.HideCompleted",
1818
default = false,
1919
encrypted = false
2020
);

app/src/main/java/xyz/teamgravity/todo/presentation/screen/support/SupportPortraitScreen.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package xyz.teamgravity.todo.presentation.screen.support
33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
55
import androidx.compose.foundation.layout.Arrangement
6-
import androidx.compose.foundation.layout.Box
76
import androidx.compose.foundation.layout.Column
87
import androidx.compose.foundation.layout.Row
98
import androidx.compose.foundation.layout.Spacer
@@ -52,10 +51,8 @@ fun SupportPortraitScreen(
5251
.fillMaxWidth()
5352
.background(MaterialTheme.colorScheme.primary)
5453
) {
55-
Box(
56-
modifier = Modifier
57-
.fillMaxWidth()
58-
.windowInsetsTopHeight(WindowInsets.statusBars)
54+
Spacer(
55+
modifier = Modifier.windowInsetsTopHeight(WindowInsets.statusBars)
5956
)
6057
Row(
6158
verticalAlignment = Alignment.CenterVertically,

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ coroutines = "1.10.2"
1414
room = "2.7.1"
1515
destinations = "2.2.0"
1616
timber = "5.0.1"
17-
gravity-core = "1.0.15"
18-
gravity-core-compose = "1.0.12"
17+
gravity-core = "1.0.16"
18+
gravity-core-compose = "1.0.13"
1919

2020
android = "8.10.0"
2121
kotlin = "2.1.20"

0 commit comments

Comments
 (0)