Skip to content
Open
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
1 change: 0 additions & 1 deletion JetLagged/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.compose)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private fun SleepRoundedBar(sleepData: SleepDayData, transition: Transition<Bool
spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness =
Spring.StiffnessLow,
Spring.StiffnessLow,
)
}) { targetExpanded ->
if (targetExpanded) 100.dp else 24.dp
Expand All @@ -133,7 +133,7 @@ private fun SleepRoundedBar(sleepData: SleepDayData, transition: Transition<Bool
spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness =
Spring.StiffnessLow,
Spring.StiffnessLow,
)
}) { target ->
if (target) 1f else 0f
Expand Down
24 changes: 12 additions & 12 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha08"
androidGradlePlugin = "8.13.2"
androidx-activity-compose = "1.12.2"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.0"
androidx-activity-compose = "1.12.3"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.01.00"
androidx-compose-bom = "2026.01.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-navigation = "2.9.6"
androidx-navigation = "2.9.7"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
Expand All @@ -30,26 +30,26 @@ compileSdk = "36"
coroutines = "1.10.2"
google-maps = "20.0.0"
gradle-versions = "0.53.0"
hilt = "2.57.2"
hilt = "2.59"
Copy link
Contributor

Choose a reason for hiding this comment

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

high

The Hilt dependency has been updated from 2.57.2 to 2.59. This is a significant version jump that might introduce breaking changes or require migration steps. Please ensure that the application remains compatible with this new version and that all necessary adjustments have been made according to Hilt's release notes.

hiltExt = "1.3.0"
horologist = "0.7.15"
jdkDesugar = "2.1.5"
junit = "4.13.2"
kotlin = "2.3.0"
kotlinx-serialization-json = "1.9.0"
kotlinx-serialization-json = "1.10.0"
kotlinx_immutable = "0.4.0"
ksp = "2.3.4"
maps-compose = "7.0.0"
ksp = "2.3.5"
maps-compose = "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

The maps-compose dependency has been updated from 7.0.0 to 8.0.0. This is a major version upgrade. It's crucial to review the release notes for version 8.0.0 to identify any breaking changes or required migration steps to ensure continued functionality.

# @keep
minSdk = "23"
okhttp = "5.3.2"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.56.0"
robolectric = "4.16.1"
roborazzi = "1.57.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.1.0"
spotless = "8.2.1"
# @keep
targetSdk = "33"
version-catalog-update = "1.0.1"
Expand Down
3 changes: 2 additions & 1 deletion JetLagged/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion JetNews/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ private fun ParagraphType.getTextAndParagraphStyle(): ParagraphStyling {

when (this) {
ParagraphType.Caption -> textStyle = typography.labelMedium

ParagraphType.Title -> textStyle = typography.headlineLarge

ParagraphType.Subhead -> {
textStyle = typography.headlineSmall
trailingPadding = 16.dp
Expand All @@ -266,6 +268,7 @@ private fun ParagraphType.getTextAndParagraphStyle(): ParagraphStyling {
)

ParagraphType.Quote -> textStyle = typography.bodyLarge

ParagraphType.Bullet -> {
paragraphStyle = ParagraphStyle(textIndent = TextIndent(firstLine = 8.sp))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ fun HomeRoute(
onSearchInputChanged = onSearchInputChanged,
)
}

HomeScreenType.Feed -> {
HomeFeedScreen(
uiState = uiState,
Expand All @@ -142,6 +143,7 @@ fun HomeRoute(
onSearchInputChanged = onSearchInputChanged,
)
}

HomeScreenType.ArticleDetails -> {
// Guaranteed by above condition for home screen type
check(uiState is HomeUiState.HasPosts)
Expand Down Expand Up @@ -198,8 +200,10 @@ private fun getHomeScreenType(isExpandedScreen: Boolean, uiState: HomeUiState):
HomeScreenType.Feed
}
}

is HomeUiState.NoPosts -> HomeScreenType.Feed
}
}

true -> HomeScreenType.FeedWithArticleDetails
}
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class HomeViewModel(private val postsRepository: PostsRepository, preSelectedPos
viewModelState.update {
when (result) {
is Result.Success -> it.copy(postsFeed = result.data, isLoading = false)

is Result.Error -> {
val errorMessages = it.errorMessages + ErrorMessage(
id = UUID.randomUUID().mostSignificantBits,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ private fun InterestsTabRow(
InterestsTabRowContent(selectedTabIndex, updateSection, tabContent)
}
}

true -> {
ScrollableTabRow(
selectedTabIndex = selectedTabIndex,
Expand Down
24 changes: 12 additions & 12 deletions JetNews/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#####
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha08"
androidGradlePlugin = "8.13.2"
androidx-activity-compose = "1.12.2"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.0"
androidx-activity-compose = "1.12.3"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.01.00"
androidx-compose-bom = "2026.01.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-navigation = "2.9.6"
androidx-navigation = "2.9.7"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
Expand All @@ -34,26 +34,26 @@ compileSdk = "36"
coroutines = "1.10.2"
google-maps = "20.0.0"
gradle-versions = "0.53.0"
hilt = "2.57.2"
hilt = "2.59"
Copy link
Contributor

Choose a reason for hiding this comment

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

high

The Hilt dependency has been updated from 2.57.2 to 2.59. This is a significant version jump that might introduce breaking changes or require migration steps. Please ensure that the application remains compatible with this new version and that all necessary adjustments have been made according to Hilt's release notes.

hiltExt = "1.3.0"
horologist = "0.7.15"
jdkDesugar = "2.1.5"
junit = "4.13.2"
kotlin = "2.3.0"
kotlinx-serialization-json = "1.9.0"
kotlinx-serialization-json = "1.10.0"
kotlinx_immutable = "0.4.0"
ksp = "2.3.4"
maps-compose = "7.0.0"
ksp = "2.3.5"
maps-compose = "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

The maps-compose dependency has been updated from 7.0.0 to 8.0.0. This is a major version upgrade. It's crucial to review the release notes for version 8.0.0 to identify any breaking changes or required migration steps to ensure continued functionality.

# @keep
minSdk = "23"
okhttp = "5.3.2"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.56.0"
robolectric = "4.16.1"
roborazzi = "1.57.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.1.0"
spotless = "8.2.1"
# @keep
targetSdk = "33"
version-catalog-update = "1.0.1"
Expand Down
3 changes: 2 additions & 1 deletion JetNews/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion Jetchat/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,31 @@ private fun getSymbolAnnotation(
tag = SymbolAnnotationType.PERSON.name,
),
)

'*' -> SymbolAnnotation(
AnnotatedString(
text = matchResult.value.trim('*'),
spanStyle = SpanStyle(fontWeight = FontWeight.Bold),
),
null,
)

'_' -> SymbolAnnotation(
AnnotatedString(
text = matchResult.value.trim('_'),
spanStyle = SpanStyle(fontStyle = FontStyle.Italic),
),
null,
)

'~' -> SymbolAnnotation(
AnnotatedString(
text = matchResult.value.trim('~'),
spanStyle = SpanStyle(textDecoration = TextDecoration.LineThrough),
),
null,
)

'`' -> SymbolAnnotation(
AnnotatedString(
text = matchResult.value.trim('`'),
Expand All @@ -159,6 +163,7 @@ private fun getSymbolAnnotation(
),
null,
)

'h' -> SymbolAnnotation(
AnnotatedString(
text = matchResult.value,
Expand All @@ -173,6 +178,7 @@ private fun getSymbolAnnotation(
tag = SymbolAnnotationType.LINK.name,
),
)

else -> SymbolAnnotation(AnnotatedString(matchResult.value), null)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,15 @@ private fun SelectorExpanded(currentSelector: InputSelector, onCloseRequested: (
Surface(tonalElevation = 8.dp) {
when (currentSelector) {
InputSelector.EMOJI -> EmojiSelector(onTextAdded, focusRequester)

InputSelector.DM -> NotAvailablePopup(onCloseRequested)

InputSelector.PICTURE -> FunctionalityNotAvailablePanel()

InputSelector.MAP -> FunctionalityNotAvailablePanel()

InputSelector.PHONE -> FunctionalityNotAvailablePanel()

else -> {
throw NotImplementedError()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ fun JetchatTheme(isDarkTheme: Boolean = isSystemInDarkTheme(), isDynamicColor: B
dynamicColor && isDarkTheme -> {
dynamicDarkColorScheme(LocalContext.current)
}

dynamicColor && !isDarkTheme -> {
dynamicLightColorScheme(LocalContext.current)
}

isDarkTheme -> JetchatDarkColorScheme

else -> JetchatLightColorScheme
}

Expand Down
24 changes: 12 additions & 12 deletions Jetchat/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#####
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha08"
androidGradlePlugin = "8.13.2"
androidx-activity-compose = "1.12.2"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.0"
androidx-activity-compose = "1.12.3"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.01.00"
androidx-compose-bom = "2026.01.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-navigation = "2.9.6"
androidx-navigation = "2.9.7"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
Expand All @@ -34,26 +34,26 @@ compileSdk = "36"
coroutines = "1.10.2"
google-maps = "20.0.0"
gradle-versions = "0.53.0"
hilt = "2.57.2"
hilt = "2.59"
Copy link
Contributor

Choose a reason for hiding this comment

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

high

The Hilt dependency has been updated from 2.57.2 to 2.59. This is a significant version jump that might introduce breaking changes or require migration steps. Please ensure that the application remains compatible with this new version and that all necessary adjustments have been made according to Hilt's release notes.

hiltExt = "1.3.0"
horologist = "0.7.15"
jdkDesugar = "2.1.5"
junit = "4.13.2"
kotlin = "2.3.0"
kotlinx-serialization-json = "1.9.0"
kotlinx-serialization-json = "1.10.0"
kotlinx_immutable = "0.4.0"
ksp = "2.3.4"
maps-compose = "7.0.0"
ksp = "2.3.5"
maps-compose = "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

The maps-compose dependency has been updated from 7.0.0 to 8.0.0. This is a major version upgrade. It's crucial to review the release notes for version 8.0.0 to identify any breaking changes or required migration steps to ensure continued functionality.

# @keep
minSdk = "23"
okhttp = "5.3.2"
play-services-wearable = "19.0.0"
robolectric = "4.16"
roborazzi = "1.56.0"
robolectric = "4.16.1"
roborazzi = "1.57.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.1.0"
spotless = "8.2.1"
# @keep
targetSdk = "33"
version-catalog-update = "1.0.1"
Expand Down
3 changes: 2 additions & 1 deletion Jetchat/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion Jetsnack/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.compose)
}
Expand Down
Loading
Loading