Skip to content

Commit cc65b68

Browse files
HellGuy39HellGuy39
committed
Update libraries, a few small fixes
1 parent acfa6eb commit cc65b68

15 files changed

Lines changed: 30 additions & 34 deletions

File tree

‎buildSrc/build/libs/buildSrc.jar‎

-5 Bytes
Binary file not shown.

‎buildSrc/buildSrc/src/main/kotlin/Configuration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ object Configuration {
88
const val versionName = "1.2.0" // X.Y.Z; X = Major, Y = minor, Z = Patch level
99
const val applicationId = "com.hellguy39.hellnotes"
1010

11-
const val composeCompiler = "1.5.8"
11+
const val composeCompiler = "1.5.9"
1212
}

‎buildSrc/buildSrc/src/main/kotlin/Dependencies.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Dependencies {
66
const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
77
const val GradleSerializationPlugin = "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
88

9-
private const val coroutinesVersion = "1.7.3"
9+
private const val coroutinesVersion = "1.8.0"
1010
const val Coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
1111

1212
}
@@ -67,17 +67,17 @@ object Dependencies {
6767
}
6868

6969
object Room {
70-
private const val version = "2.6.0"
70+
private const val version = "2.6.1"
7171

7272
const val RoomKtx = "androidx.room:room-ktx:$version"
7373
const val RoomCompiler = "androidx.room:room-compiler:$version"
7474
}
7575

7676
object Compose {
77-
private const val composeVersion = "1.6.0"
77+
private const val composeVersion = "1.6.1"
7878
private const val lifecycleVersion = "2.7.0"
7979
private const val navigationVersion = "2.7.6"
80-
private const val material3Version = "1.2.0-rc01"
80+
private const val material3Version = "1.2.0"
8181
private const val activityVersion = "1.8.2"
8282

8383
const val Lifecycle = "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion"
@@ -86,8 +86,8 @@ object Dependencies {
8686
const val ToolingPreview = "androidx.compose.ui:ui-tooling-preview:$composeVersion"
8787
const val Material3 = "androidx.compose.material3:material3:$material3Version"
8888
const val Material3WindowSizeClass = "androidx.compose.material3:material3-window-size-class:$material3Version"
89-
const val Material3Adaptive = "androidx.compose.material3:material3-adaptive:1.0.0-alpha05"
90-
const val Material3AdaptiveNavigationSuite = "androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha02"
89+
const val Material3Adaptive = "androidx.compose.material3:material3-adaptive:1.0.0-alpha06"
90+
const val Material3AdaptiveNavigationSuite = "androidx.compose.material3:material3-adaptive-navigation-suite:1.0.0-alpha03"
9191
const val Navigation = "androidx.navigation:navigation-compose:$navigationVersion"
9292
const val LiveData = "androidx.compose.runtime:runtime-livedata:$composeVersion"
9393

@@ -97,9 +97,9 @@ object Dependencies {
9797
}
9898

9999
object Google {
100-
const val Material = "com.google.android.material:material:1.10.0"
100+
const val Material = "com.google.android.material:material:1.11.0"
101101

102-
const val GradleServicesPlugin = "com.google.gms:google-services:4.4.0"
102+
const val GradleServicesPlugin = "com.google.gms:google-services:4.4.1"
103103
}
104104

105105

@@ -114,7 +114,7 @@ object Dependencies {
114114

115115
object Hilt {
116116

117-
private const val version = "2.48.1"
117+
private const val version = "2.50"
118118
private const val navigationVersion = "1.1.0"
119119
private const val workVersion = "1.1.0"
120120
private const val androidXCompilerVersion = "1.1.0"
@@ -130,8 +130,8 @@ object Dependencies {
130130

131131
object Firebase {
132132

133-
private const val crashlyticsVersion = "18.5.1"
134-
private const val analyticsVersion = "21.5.0"
133+
private const val crashlyticsVersion = "18.6.2"
134+
private const val analyticsVersion = "21.5.1"
135135

136136
const val Crashlytics = "com.google.firebase:firebase-crashlytics-ktx:$crashlyticsVersion"
137137
const val Analytics = "com.google.firebase:firebase-analytics-ktx:$analyticsVersion"
@@ -142,7 +142,7 @@ object Dependencies {
142142

143143
object Ktor {
144144

145-
private const val version = "2.3.6"
145+
private const val version = "2.3.8"
146146

147147
const val Core = "io.ktor:ktor-client-core:$version"
148148
const val AndroidEngine = "io.ktor:ktor-client-android:$version"

‎core/ui/src/main/java/com/hellguy39/hellnotes/core/ui/components/items/NoteItems.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fun LazyListScope.noteItems(
3838
) {
3939
itemsIndexed(
4040
items = notes,
41-
key = { _, note -> note.value.note.id ?: 0 },
41+
key = { _, wrapper -> wrapper.value.note.id ?: 0 },
4242
contentType = { _, selectable -> selectable },
4343
) { index, wrapper ->
4444
val animatableAlpha = remember { Animatable(0f) }
@@ -91,6 +91,7 @@ fun LazyStaggeredGridScope.noteItems(
9191
itemsIndexed(
9292
items = notes,
9393
key = { _, wrapper -> wrapper.value.note.id ?: 0 },
94+
contentType = { _, selectable -> selectable },
9495
) { index, wrapper ->
9596
val animatableAlpha = remember { Animatable(0f) }
9697
val isVisible =

‎core/ui/src/main/java/com/hellguy39/hellnotes/core/ui/components/list/NoteGridList.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ internal fun NoteGridList(
5252
) {
5353
item(
5454
span = StaggeredGridItemSpan.FullLine,
55-
key = { Int.MIN_VALUE },
5655
) {
5756
listHeader()
5857
}

‎core/ui/src/main/java/com/hellguy39/hellnotes/core/ui/components/list/NoteList.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private fun rememberListModifier(): Modifier {
3131

3232
@OptIn(ExperimentalMaterial3Api::class)
3333
@Composable
34-
fun NoteList2(
34+
fun NoteList(
3535
innerPadding: PaddingValues = PaddingValues(0.dp),
3636
noteStyle: NoteStyle,
3737
isSwipeable: Boolean = false,
@@ -76,7 +76,7 @@ fun NoteList2(
7676

7777
@OptIn(ExperimentalMaterial3Api::class)
7878
@Composable
79-
fun NoteList2(
79+
fun NoteList(
8080
innerPadding: PaddingValues = PaddingValues(0.dp),
8181
noteStyle: NoteStyle,
8282
isSwipeable: Boolean = false,

‎feature/about-app/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ dependencies {
1919
implementation(Dependencies.AndroidX.LifecycleKtx)
2020
implementation(Dependencies.AndroidX.AppCompat)
2121

22-
implementation(Dependencies.Google.Material)
23-
2422
implementation(Dependencies.Compose.Lifecycle)
2523
implementation(Dependencies.Compose.Activity)
2624
implementation(Dependencies.Compose.Ui)

‎feature/backup/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ dependencies {
1919
implementation(Dependencies.AndroidX.LifecycleKtx)
2020
implementation(Dependencies.AndroidX.AppCompat)
2121

22-
implementation(Dependencies.Google.Material)
23-
2422
implementation(Dependencies.Compose.Lifecycle)
2523
implementation(Dependencies.Compose.Activity)
2624
implementation(Dependencies.Compose.Ui)

‎feature/home/src/main/java/com/hellguy39/hellnotes/feature/home/archive/ArchiveScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.input.nestedscroll.nestedScroll
1313
import com.hellguy39.hellnotes.core.model.repository.local.datastore.ListStyle
14-
import com.hellguy39.hellnotes.core.ui.components.list.NoteList2
14+
import com.hellguy39.hellnotes.core.ui.components.list.NoteList
1515
import com.hellguy39.hellnotes.core.ui.components.placeholer.EmptyContentPlaceholder
1616
import com.hellguy39.hellnotes.core.ui.components.snack.CustomSnackbarHost
1717
import com.hellguy39.hellnotes.core.ui.resources.AppIcons
@@ -70,7 +70,7 @@ fun ArchiveScreen(
7070
targetState = visualState.listStyle,
7171
label = "listStyle",
7272
) { listStyle ->
73-
NoteList2(
73+
NoteList(
7474
innerPadding = paddingValues,
7575
noteStyle = visualState.noteStyle,
7676
onClick = onNoteClick,

‎feature/home/src/main/java/com/hellguy39/hellnotes/feature/home/label/LabelSсreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.input.nestedscroll.nestedScroll
1414
import com.hellguy39.hellnotes.core.model.repository.local.datastore.ListStyle
15-
import com.hellguy39.hellnotes.core.ui.components.list.NoteList2
15+
import com.hellguy39.hellnotes.core.ui.components.list.NoteList
1616
import com.hellguy39.hellnotes.core.ui.components.placeholer.EmptyContentPlaceholder
1717
import com.hellguy39.hellnotes.core.ui.components.snack.CustomSnackbarHost
1818
import com.hellguy39.hellnotes.core.ui.resources.AppIcons
@@ -76,7 +76,7 @@ fun LabelScreen(
7676
targetState = visualState.listStyle,
7777
label = "listStyle",
7878
) { listStyle ->
79-
NoteList2(
79+
NoteList(
8080
innerPadding = paddingValues,
8181
noteStyle = visualState.noteStyle,
8282
onClick = onNoteClick,

0 commit comments

Comments
 (0)