curiosite/Biblib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean shadow

Browse source
This commit is contained in:
Thomas Andres Gomez 2022-07-19 11:26:08 +02:00
parent 138c25e5b5
commit d65d0bc3d5
5 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/pixelized/biblib/ui/composable/SystemThemeColor.kt
View file

@ -7,13 +7,14 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import com.google.accompanist.systemuicontroller.SystemUiController import com.google.accompanist.systemuicontroller.SystemUiController
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.pixelized.biblib.ui.theme.color.ShadowPalette
val LocalSystemUiController = compositionLocalOf<SystemUiController> { error("") } val LocalSystemUiController = compositionLocalOf<SystemUiController> { error("") }
@Composable @Composable
fun SystemThemeColor( fun SystemThemeColor(
systemUiController: SystemUiController = rememberSystemUiController(), systemUiController: SystemUiController = rememberSystemUiController(),
color: Color = Color.Black.copy(alpha = 0.3f), color: Color = ShadowPalette.system,
statusDarkIcons: Boolean = false, statusDarkIcons: Boolean = false,
navigationDarkIcons: Boolean = false, navigationDarkIcons: Boolean = false,
content: @Composable () -> Unit, content: @Composable () -> Unit,

3
app/src/main/java/com/pixelized/biblib/ui/scaffold/DetailBottomSheet.kt
View file

@ -17,6 +17,7 @@ import com.pixelized.biblib.ui.composable.StateUio
import com.pixelized.biblib.ui.screen.home.detail.BookDetailViewModel import com.pixelized.biblib.ui.screen.home.detail.BookDetailViewModel
import com.pixelized.biblib.ui.screen.home.detail.DetailScreen import com.pixelized.biblib.ui.screen.home.detail.DetailScreen
import com.pixelized.biblib.ui.screen.home.detail.BookDetailUio import com.pixelized.biblib.ui.screen.home.detail.BookDetailUio
import com.pixelized.biblib.ui.theme.color.ShadowPalette
import com.pixelized.biblib.utils.extention.showToast import com.pixelized.biblib.utils.extention.showToast
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -35,7 +36,7 @@ fun DetailBottomSheet(
LocalDetailBottomSheetState provides bottomDetailState LocalDetailBottomSheetState provides bottomDetailState
) { ) {
ModalBottomSheetLayout( ModalBottomSheetLayout(
scrimColor = Color.Black.copy(alpha = 0.37f), scrimColor = ShadowPalette.scrim,
sheetState = bottomDetailState.bottomSheetState, sheetState = bottomDetailState.bottomSheetState,
sheetContent = { sheetContent = {
DetailScreen(detail = bottomDetailState.bookDetail) DetailScreen(detail = bottomDetailState.bookDetail)

3
app/src/main/java/com/pixelized/biblib/ui/scaffold/SearchBottomSheet.kt
View file

@ -17,6 +17,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.pixelized.biblib.R import com.pixelized.biblib.R
import com.pixelized.biblib.ui.screen.home.page.search.CategorySearchPage import com.pixelized.biblib.ui.screen.home.page.search.CategorySearchPage
import com.pixelized.biblib.ui.screen.home.page.search.SearchViewModel import com.pixelized.biblib.ui.screen.home.page.search.SearchViewModel
import com.pixelized.biblib.ui.theme.color.ShadowPalette
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.Serializable import java.io.Serializable
@ -41,7 +42,7 @@ fun SearchBottomSheet(
) { ) {
ModalBottomSheetLayout( ModalBottomSheetLayout(
modifier = Modifier.statusBarsPadding(), modifier = Modifier.statusBarsPadding(),
scrimColor = Color.Black.copy(alpha = 0.37f), scrimColor = ShadowPalette.scrim,
sheetState = state.bottomSheetState, sheetState = state.bottomSheetState,
sheetContent = { sheetContent = {
CategorySearchPage( CategorySearchPage(

3
app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreen.kt
View file

@ -40,6 +40,7 @@ import com.pixelized.biblib.ui.scaffold.LocalDetailBottomSheetState
import com.pixelized.biblib.ui.screen.home.page.profile.ProfileViewModel import com.pixelized.biblib.ui.screen.home.page.profile.ProfileViewModel
import com.pixelized.biblib.ui.screen.home.page.profile.UserUio import com.pixelized.biblib.ui.screen.home.page.profile.UserUio
import com.pixelized.biblib.ui.theme.BibLibTheme import com.pixelized.biblib.ui.theme.BibLibTheme
import com.pixelized.biblib.ui.theme.color.ShadowPalette
import com.pixelized.biblib.utils.extention.bibLib import com.pixelized.biblib.utils.extention.bibLib
import com.pixelized.biblib.utils.extention.default import com.pixelized.biblib.utils.extention.default
import com.skydoves.landscapist.CircularReveal import com.skydoves.landscapist.CircularReveal
@ -75,7 +76,7 @@ fun DetailScreen(
ModalBottomSheetLayout( ModalBottomSheetLayout(
sheetState = sheet, sheetState = sheet,
scrimColor = Color.Black.copy(alpha = 0.37f), scrimColor = ShadowPalette.scrim,
sheetContent = { sheetContent = {
Box( Box(
modifier = Modifier modifier = Modifier

5
app/src/main/java/com/pixelized/biblib/ui/theme/color/BibLibColorPalette.kt
View file

@ -43,6 +43,11 @@ object BibLibColorPalette {
val VeryLightGrey: Color = Color(0xFFF9F9F9) val VeryLightGrey: Color = Color(0xFFF9F9F9)
} }
object ShadowPalette {
val system: Color = Color.Black.copy(alpha = 0.37f)
val scrim: Color = Color.Black.copy(alpha = 0.37f)
}
@Immutable @Immutable
object GoogleColorPalette { object GoogleColorPalette {
val blue: Color = Color(0xFF4285F4) val blue: Color = Color(0xFF4285F4)