Skip to content

chore(deps): bump androidx-activity from 1.9.3 to 1.10.0 #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 28, 2025
Merged

chore(deps): bump androidx-activity from 1.9.3 to 1.10.0 #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53572d7
chore(deps): bump androidx-activity from 1.9.3 to 1.10.0
dependabot[bot] Jan 16, 2025
cb47eaa
🤖 Update dependencies baseline
dependabot[bot] Jan 16, 2025
ba2be08
Replace manual `findActivity` with new `LocalActivity.current`
SimonMarquis Jan 16, 2025
fba986a
Merge branch 'main' into dependabot/gradle/androidx-activity-1.10.0
SimonMarquis Jan 16, 2025
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
accompanist = "0.36.0"
android-gradlePlugin = "8.7.3"
androidx-activity = "1.9.3"
androidx-activity = "1.10.0"
androidx-appCompat = "1.7.0"
androidx-compose-bom = "2024.12.01"
androidx-graphics = "1.0.1"
Expand Down
6 changes: 3 additions & 3 deletions spark/dependencies/releaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
androidx.activity:activity-compose:1.9.3
androidx.activity:activity-ktx:1.9.3
androidx.activity:activity:1.9.3
androidx.activity:activity-compose:1.10.0
androidx.activity:activity-ktx:1.10.0
androidx.activity:activity:1.10.0
androidx.annotation:annotation-experimental:1.4.1
androidx.annotation:annotation-jvm:1.8.1
androidx.annotation:annotation:1.8.1
Expand Down
13 changes: 2 additions & 11 deletions spark/src/main/kotlin/com/adevinta/spark/tokens/WindowSizeClass.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@
*/
package com.adevinta.spark.tokens

import android.app.Activity
import android.content.Context
import android.content.ContextWrapper
import androidx.activity.compose.LocalActivity
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.toComposeRect
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.unit.DpSize
Expand All @@ -54,16 +51,10 @@ internal fun calculateWindowSizeClass(): WindowSizeClass {
val config = LocalConfiguration.current
return WindowSizeClass.calculateFromSize(DpSize(config.screenWidthDp.dp, config.screenHeightDp.dp))
}
val activity = LocalContext.current.findActivity()
val activity = requireNotNull(LocalActivity.current) { "Could not find activity in Context chain." }
LocalConfiguration.current
val density = LocalDensity.current
val metrics = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(activity)
val size = with(density) { metrics.bounds.toComposeRect().size.toDpSize() }
return WindowSizeClass.calculateFromSize(size)
}

private tailrec fun Context.findActivity(): Activity = when (this) {
is Activity -> this
is ContextWrapper -> this.baseContext.findActivity()
else -> error("Could not find activity in Context chain.")
}
Loading