Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ android-material3 = "1.14.0-alpha04"
androidGradlePlugin = "8.13.0"
androidx-activity-compose = "1.11.0"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2025.09.00"
androidx-compose-bom = "2025.09.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.0.1"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.9.4"
androidx-lifecycle-runtime-compose = "2.9.4"
androidx-navigation = "2.9.4"
androidx-navigation = "2.9.5"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-ext-junit = "1.3.0"
androidx-test-ext-truth = "1.7.0"
androidx-tv-foundation = "1.0.0-alpha12"
androidx-tv-material = "1.0.1"
androidx-wear-compose = "1.5.1"
androidx-window = "1.4.0"
androidx-wear-compose = "1.5.2"
androidx-window = "1.5.0"
androidxHiltNavigationCompose = "1.3.0"
androix-test-uiautomator = "2.3.0"
coil = "2.7.0"
# @keep
compileSdk = "36"
coroutines = "1.10.2"
google-maps = "19.2.0"
gradle-versions = "0.52.0"
gradle-versions = "0.53.0"
hilt = "2.57.1"
hiltExt = "1.3.0"
horologist = "0.7.15"
Expand All @@ -39,17 +39,17 @@ kotlin = "2.2.20"
kotlinx-serialization-json = "1.9.0"
kotlinx_immutable = "0.4.0"
ksp = "2.2.20-2.0.3"
maps-compose = "6.10.0"
maps-compose = "6.11.0"
# @keep
minSdk = "21"
minSdk = "23"
okhttp = "5.1.0"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.50.0"
rome = "2.1.0"
room = "2.8.0"
room = "2.8.1"
secrets = "2.0.1"
spotless = "7.2.1"
spotless = "8.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for Spotless (from 7.x to 8.x), which can introduce breaking changes in configuration or formatting rules. It's important to verify that the current Spotless configuration is still valid and to run spotlessApply to check for and apply any new formatting changes. This will help prevent unexpected formatting issues or build failures in future pull requests. Please check the Spotless v8.0.0 release notes for migration details.

# @keep
targetSdk = "33"
version-catalog-update = "1.0.0"
Expand Down
18 changes: 9 additions & 9 deletions JetNews/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ android-material3 = "1.14.0-alpha04"
androidGradlePlugin = "8.13.0"
androidx-activity-compose = "1.11.0"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2025.09.00"
androidx-compose-bom = "2025.09.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.0.1"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.9.4"
androidx-lifecycle-runtime-compose = "2.9.4"
androidx-navigation = "2.9.4"
androidx-navigation = "2.9.5"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-ext-junit = "1.3.0"
androidx-test-ext-truth = "1.7.0"
androidx-tv-foundation = "1.0.0-alpha12"
androidx-tv-material = "1.0.1"
androidx-wear-compose = "1.5.1"
androidx-window = "1.4.0"
androidx-wear-compose = "1.5.2"
androidx-window = "1.5.0"
androidxHiltNavigationCompose = "1.3.0"
androix-test-uiautomator = "2.3.0"
coil = "2.7.0"
# @keep
compileSdk = "36"
coroutines = "1.10.2"
google-maps = "19.2.0"
gradle-versions = "0.52.0"
gradle-versions = "0.53.0"
hilt = "2.57.1"
hiltExt = "1.3.0"
horologist = "0.7.15"
Expand All @@ -43,17 +43,17 @@ kotlin = "2.2.20"
kotlinx-serialization-json = "1.9.0"
kotlinx_immutable = "0.4.0"
ksp = "2.2.20-2.0.3"
maps-compose = "6.10.0"
maps-compose = "6.11.0"
# @keep
minSdk = "21"
minSdk = "23"
okhttp = "5.1.0"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.50.0"
rome = "2.1.0"
room = "2.8.0"
room = "2.8.1"
secrets = "2.0.1"
spotless = "7.2.1"
spotless = "8.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for Spotless (from 7.x to 8.x), which can introduce breaking changes in configuration or formatting rules. It's important to verify that the current Spotless configuration is still valid and to run spotlessApply to check for and apply any new formatting changes. This will help prevent unexpected formatting issues or build failures in future pull requests. Please check the Spotless v8.0.0 release notes for migration details.

# @keep
targetSdk = "33"
version-catalog-update = "1.0.0"
Expand Down
18 changes: 9 additions & 9 deletions Jetchat/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ android-material3 = "1.14.0-alpha04"
androidGradlePlugin = "8.13.0"
androidx-activity-compose = "1.11.0"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2025.09.00"
androidx-compose-bom = "2025.09.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.0.1"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.9.4"
androidx-lifecycle-runtime-compose = "2.9.4"
androidx-navigation = "2.9.4"
androidx-navigation = "2.9.5"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-ext-junit = "1.3.0"
androidx-test-ext-truth = "1.7.0"
androidx-tv-foundation = "1.0.0-alpha12"
androidx-tv-material = "1.0.1"
androidx-wear-compose = "1.5.1"
androidx-window = "1.4.0"
androidx-wear-compose = "1.5.2"
androidx-window = "1.5.0"
androidxHiltNavigationCompose = "1.3.0"
androix-test-uiautomator = "2.3.0"
coil = "2.7.0"
# @keep
compileSdk = "36"
coroutines = "1.10.2"
google-maps = "19.2.0"
gradle-versions = "0.52.0"
gradle-versions = "0.53.0"
hilt = "2.57.1"
hiltExt = "1.3.0"
horologist = "0.7.15"
Expand All @@ -43,17 +43,17 @@ kotlin = "2.2.20"
kotlinx-serialization-json = "1.9.0"
kotlinx_immutable = "0.4.0"
ksp = "2.2.20-2.0.3"
maps-compose = "6.10.0"
maps-compose = "6.11.0"
# @keep
minSdk = "21"
minSdk = "23"
okhttp = "5.1.0"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.50.0"
rome = "2.1.0"
room = "2.8.0"
room = "2.8.1"
secrets = "2.0.1"
spotless = "7.2.1"
spotless = "8.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for Spotless (from 7.x to 8.x), which can introduce breaking changes in configuration or formatting rules. It's important to verify that the current Spotless configuration is still valid and to run spotlessApply to check for and apply any new formatting changes. This will help prevent unexpected formatting issues or build failures in future pull requests. Please check the Spotless v8.0.0 release notes for migration details.

# @keep
targetSdk = "33"
version-catalog-update = "1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -121,7 +119,7 @@ fun SnackCollection(
modifier = Modifier.align(Alignment.CenterVertically),
) {
Icon(
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
painter = painterResource(id = R.drawable.ic_arrow_back),
tint = JetsnackTheme.colors.brand,
contentDescription = null,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Add
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
Expand Down Expand Up @@ -167,7 +165,7 @@ private fun SearchResult(snack: Snack, onSnackClick: (Long, String) -> Unit, sho
},
) {
Icon(
imageVector = Icons.Outlined.Add,
painter = painterResource(id = R.drawable.ic_add),
contentDescription = stringResource(R.string.label_add),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
import androidx.compose.material.icons.outlined.Search
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand All @@ -49,6 +46,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -192,7 +190,7 @@ private fun SearchBar(
if (searchFocused) {
IconButton(onClick = onClearQuery) {
Icon(
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
painter = painterResource(id = R.drawable.ic_arrow_back),
tint = JetsnackTheme.colors.iconPrimary,
contentDescription = stringResource(R.string.label_back),
)
Expand Down Expand Up @@ -233,7 +231,7 @@ private fun SearchHint() {
.wrapContentSize(),
) {
Icon(
imageVector = Icons.Outlined.Search,
painter = painterResource(id = R.drawable.ic_search),
tint = JetsnackTheme.colors.textHelp,
contentDescription = stringResource(R.string.label_search),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand All @@ -85,6 +83,7 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.TileMode
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.style.TextAlign
Expand Down Expand Up @@ -271,7 +270,7 @@ private fun SharedTransitionScope.Up(upPress: () -> Unit) {
),
) {
Icon(
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
painter = painterResource(id = R.drawable.ic_arrow_back),
tint = JetsnackTheme.colors.iconInteractive,
contentDescription = stringResource(R.string.label_back),
)
Expand Down
10 changes: 10 additions & 0 deletions Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FF000000">
<path
android:fillColor="@android:color/white"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
25 changes: 9 additions & 16 deletions Jetsnack/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
#####
# This file is duplicated to individual samples from the global scripts/libs.versions.toml
# Do not add a dependency to an individual sample, edit the global version instead.
#####
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha04"
androidGradlePlugin = "8.13.0"
androidx-activity-compose = "1.11.0"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2025.09.00"
androidx-compose-bom = "2025.09.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.0.1"
androidx-corektx = "1.17.0"
androidx-glance = "1.2.0-beta01"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.9.4"
androidx-lifecycle-runtime-compose = "2.9.4"
androidx-navigation = "2.9.4"
androidx-navigation = "2.9.5"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-ext-junit = "1.3.0"
androidx-test-ext-truth = "1.7.0"
androidx-tv-foundation = "1.0.0-alpha12"
androidx-tv-material = "1.0.1"
androidx-wear-compose = "1.5.1"
androidx-window = "1.4.0"
androidx-wear-compose = "1.5.2"
androidx-window = "1.5.0"
androidxHiltNavigationCompose = "1.3.0"
androix-test-uiautomator = "2.3.0"
coil = "2.7.0"
Expand All @@ -34,7 +30,7 @@ compileSdk = "36"
coroutines = "1.10.2"
glancePreview = "1.1.1"
google-maps = "19.2.0"
gradle-versions = "0.52.0"
gradle-versions = "0.53.0"
hilt = "2.57.1"
hiltExt = "1.3.0"
horologist = "0.7.15"
Expand All @@ -44,19 +40,19 @@ kotlin = "2.2.20"
kotlinx-serialization-json = "1.9.0"
kotlinx_immutable = "0.4.0"
ksp = "2.2.20-2.0.3"
maps-compose = "6.10.0"
maps-compose = "6.11.0"
# @keep
minSdk = "23"
okhttp = "5.1.0"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.50.0"
rome = "2.1.0"
room = "2.8.0"
room = "2.8.1"
secrets = "2.0.1"
spotless = "7.2.1"
spotless = "8.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This is a major version update for Spotless (from 7.x to 8.x), which can introduce breaking changes in configuration or formatting rules. It's important to verify that the current Spotless configuration is still valid and to run spotlessApply to check for and apply any new formatting changes. This will help prevent unexpected formatting issues or build failures in future pull requests. Please check the Spotless v8.0.0 release notes for migration details.

# @keep
targetSdk = "33"
targetSdk = "36"
version-catalog-update = "1.0.0"

[libraries]
Expand All @@ -70,7 +66,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
Expand Down Expand Up @@ -98,13 +93,11 @@ androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", versi
androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" }
androidx-glance-preview = { module = "androidx.glance:glance-preview", version.ref = "glancePreview" }
androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-compose" }
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle-compose" }
androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
Expand Down
Loading