diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts index 42440934dd..c66a4fd0e6 100644 --- a/features/home/impl/build.gradle.kts +++ b/features/home/impl/build.gradle.kts @@ -58,8 +58,6 @@ dependencies { implementation(projects.features.rageshake.api) implementation(projects.services.analytics.api) implementation(libs.androidx.datastore.preferences) - implementation(libs.haze) - implementation(libs.haze.materials) implementation(projects.features.preferences.impl) implementation(projects.features.reportroom.api) implementation(projects.features.rolesandpermissions.api) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt index 024d013871..1df5496ef5 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt @@ -6,8 +6,6 @@ * Please see LICENSE files in the repository root for full details. */ -@file:OptIn(ExperimentalHazeMaterialsApi::class) - package io.element.android.features.home.impl import androidx.activity.compose.BackHandler @@ -40,11 +38,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import dev.chrisbanes.haze.hazeEffect -import dev.chrisbanes.haze.hazeSource -import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi -import dev.chrisbanes.haze.materials.HazeMaterials -import dev.chrisbanes.haze.rememberHazeState import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.features.home.impl.components.HomeTopBar @@ -190,7 +183,6 @@ private fun HomeScaffold( } } - val hazeState = rememberHazeState() val roomsLazyListState = rememberLazyListState() val spacesLazyListState = rememberLazyListState() @@ -223,10 +215,6 @@ private fun HomeScaffold( filtersState = roomListState.filtersState, spaceFiltersState = roomListState.spaceFiltersState, canReportBug = state.canReportBug, - modifier = Modifier.hazeEffect( - state = hazeState, - style = HazeMaterials.thick(), - ) ) }, floatingActionButton = { @@ -297,7 +285,6 @@ private fun HomeScaffold( modifier = Modifier .padding(outerPadding) .consumeWindowInsets(outerPadding) - .hazeSource(state = hazeState) ) SpaceFiltersView(roomListState.spaceFiltersState) } @@ -306,8 +293,7 @@ private fun HomeScaffold( modifier = Modifier .fillMaxSize() .padding(outerPadding) - .consumeWindowInsets(outerPadding) - .hazeSource(state = hazeState), + .consumeWindowInsets(outerPadding), contentPadding = lazyColumnContentPadding + contentPadding, state = state.homeSpacesState, lazyListState = spacesLazyListState, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c014f67c31..df68876536 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,7 +45,6 @@ appyx = "1.7.1" sqldelight = "2.3.2" wysiwyg = "2.42.1" telephoto = "0.19.0" -haze = "1.7.2" maplibre-compose = "0.15.0" # Dependency analysis @@ -219,8 +218,6 @@ zxing_cpp = "io.github.zxing-cpp:android:3.1.1" google_zxing = "com.google.zxing:core:3.5.4" google_guava = "com.google.guava:guava:33.7.1-android" -haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" } -haze_materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref = "haze" } color_picker = "io.mhssn:colorpicker:1.0.0" # Analytics