Skip to content

Commit f234163

Browse files
committed
Merge remote-tracking branch 'origin/develop' into BOOK-487-chore/#248
# Conflicts: # gradle/libs.versions.toml
2 parents 52dd7bd + 56e75fd commit f234163

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

feature/screens/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616
libs.kotlinx.collections.immutable,
1717

1818
libs.circuit.foundation,
19-
libs.compose.shadow,
2019
)
2120
api(libs.circuit.runtime)
2221
}

feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/component/MainBottomBar.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ import androidx.compose.runtime.remember
2121
import androidx.compose.ui.Alignment
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.draw.clip
24+
import androidx.compose.ui.draw.dropShadow
2425
import androidx.compose.ui.graphics.Color
26+
import androidx.compose.ui.graphics.shadow.Shadow
2527
import androidx.compose.ui.graphics.vector.ImageVector
2628
import androidx.compose.ui.res.stringResource
2729
import androidx.compose.ui.res.vectorResource
30+
import androidx.compose.ui.unit.DpOffset
2831
import androidx.compose.ui.unit.dp
29-
import com.adamglin.composeshadow.dropShadow
3032
import com.ninecraft.booket.core.designsystem.ComponentPreview
3133
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
3234
import com.ninecraft.booket.core.designsystem.theme.White
@@ -47,9 +49,12 @@ fun MainBottomBar(
4749
topStart = ReedTheme.spacing.spacing3,
4850
topEnd = ReedTheme.spacing.spacing3,
4951
),
50-
color = ReedTheme.colors.borderPrimary.copy(alpha = 0.05f),
51-
offsetY = (-4).dp,
52-
blur = 20.dp,
52+
shadow = Shadow(
53+
radius = 20.dp,
54+
spread = 0.dp,
55+
offset = DpOffset(x = 0.dp, (-4).dp),
56+
color = ReedTheme.colors.borderPrimary.copy(alpha = 0.05f),
57+
),
5358
)
5459
.clip(
5560
RoundedCornerShape(

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ androidx-compose-bom = "2026.01.00"
2323
androidx-compose-material3 = "1.4.0"
2424
compose-stable-marker = "1.0.7"
2525
compose-effects = "0.1.4"
26-
compose-shadow = "2.0.4"
2726
compose-stability-analyzer = "0.6.6"
2827

2928
## Kotlin Symbol Processing
@@ -108,7 +107,6 @@ compose-stable-marker = { group = "com.github.skydoves", name = "compose-stable-
108107
compose-effects = { group = "com.github.skydoves", name = "compose-effects", version.ref = "compose-effects" }
109108
compose-system-ui-controller = { group = "tech.thdev", name = "extensions-compose-system-ui-controller", version.ref = "compose-extensions" }
110109
compose-keyboard-state = { group = "tech.thdev", name = "extensions-compose-keyboard-state", version.ref = "compose-extensions" }
111-
compose-shadow = { group = "com.adamglin", name = "compose-shadow", version.ref = "compose-shadow" }
112110

113111
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
114112
retrofit-kotlinx-serialization-converter = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }

0 commit comments

Comments
 (0)