Remove Haze, we are not using it now that we have the floating toolbar.

This commit is contained in:
Benoit Marty
2026-09-24 10:51:12 +02:00
parent e5c078c01a
commit 30e518d0a5
3 changed files with 1 additions and 20 deletions
-2
View File
@@ -58,8 +58,6 @@ dependencies {
implementation(projects.features.rageshake.api) implementation(projects.features.rageshake.api)
implementation(projects.services.analytics.api) implementation(projects.services.analytics.api)
implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.datastore.preferences)
implementation(libs.haze)
implementation(libs.haze.materials)
implementation(projects.features.preferences.impl) implementation(projects.features.preferences.impl)
implementation(projects.features.reportroom.api) implementation(projects.features.reportroom.api)
implementation(projects.features.rolesandpermissions.api) implementation(projects.features.rolesandpermissions.api)
@@ -6,8 +6,6 @@
* Please see LICENSE files in the repository root for full details. * Please see LICENSE files in the repository root for full details.
*/ */
@file:OptIn(ExperimentalHazeMaterialsApi::class)
package io.element.android.features.home.impl package io.element.android.features.home.impl
import androidx.activity.compose.BackHandler 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.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex 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.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.features.home.impl.components.HomeTopBar import io.element.android.features.home.impl.components.HomeTopBar
@@ -190,7 +183,6 @@ private fun HomeScaffold(
} }
} }
val hazeState = rememberHazeState()
val roomsLazyListState = rememberLazyListState() val roomsLazyListState = rememberLazyListState()
val spacesLazyListState = rememberLazyListState() val spacesLazyListState = rememberLazyListState()
@@ -223,10 +215,6 @@ private fun HomeScaffold(
filtersState = roomListState.filtersState, filtersState = roomListState.filtersState,
spaceFiltersState = roomListState.spaceFiltersState, spaceFiltersState = roomListState.spaceFiltersState,
canReportBug = state.canReportBug, canReportBug = state.canReportBug,
modifier = Modifier.hazeEffect(
state = hazeState,
style = HazeMaterials.thick(),
)
) )
}, },
floatingActionButton = { floatingActionButton = {
@@ -297,7 +285,6 @@ private fun HomeScaffold(
modifier = Modifier modifier = Modifier
.padding(outerPadding) .padding(outerPadding)
.consumeWindowInsets(outerPadding) .consumeWindowInsets(outerPadding)
.hazeSource(state = hazeState)
) )
SpaceFiltersView(roomListState.spaceFiltersState) SpaceFiltersView(roomListState.spaceFiltersState)
} }
@@ -306,8 +293,7 @@ private fun HomeScaffold(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(outerPadding) .padding(outerPadding)
.consumeWindowInsets(outerPadding) .consumeWindowInsets(outerPadding),
.hazeSource(state = hazeState),
contentPadding = lazyColumnContentPadding + contentPadding, contentPadding = lazyColumnContentPadding + contentPadding,
state = state.homeSpacesState, state = state.homeSpacesState,
lazyListState = spacesLazyListState, lazyListState = spacesLazyListState,
-3
View File
@@ -45,7 +45,6 @@ appyx = "1.7.1"
sqldelight = "2.3.2" sqldelight = "2.3.2"
wysiwyg = "2.42.1" wysiwyg = "2.42.1"
telephoto = "0.19.0" telephoto = "0.19.0"
haze = "1.7.2"
maplibre-compose = "0.15.0" maplibre-compose = "0.15.0"
# Dependency analysis # 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_zxing = "com.google.zxing:core:3.5.4"
google_guava = "com.google.guava:guava:33.7.1-android" 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" color_picker = "io.mhssn:colorpicker:1.0.0"
# Analytics # Analytics