Skip to content
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.

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

Toast message #50

Merged
merged 2 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@ object CommonAtoms {
typography = FotoTypography.button,
fontFamily = null,
)

val toastOverlay: SimpleTextAtom = SimpleTextAtom(
textColor = FotoColors.primaryText,
typography = FotoTypography.body,
fontFamily = null,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.kevinschildhorn.fotopresenter.ui.atoms.FotoColors
fun Overlay(
z: Float,
visible: Boolean,
shadow:Boolean = true,
modifier: Modifier = Modifier,
onDismiss: () -> Unit,
enter: EnterTransition = fadeIn(),
Expand All @@ -32,7 +33,7 @@ fun Overlay(
) {
OverlayShadow(
z - 1,
visible,
visible && shadow,
onDismiss = onDismiss
)
AnimatedVisibility(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package com.kevinschildhorn.fotopresenter.ui.screens.common.composables

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import com.kevinschildhorn.atomik.atomic.atoms.textStyle
import com.kevinschildhorn.atomik.color.base.composeColor
import com.kevinschildhorn.fotopresenter.ui.atoms.FotoColors
import com.kevinschildhorn.fotopresenter.ui.atoms.Padding
import com.kevinschildhorn.fotopresenter.ui.screens.common.CommonAtoms
import kotlinx.coroutines.delay

@Composable
fun ToastOverlay(
text: String,
visible: Boolean,
onClose: () -> Unit,
) {
LaunchedEffect(key1 = visible) {
delay(5000)
onClose()
}

AnimatedVisibility(
visible = visible,
enter = slideInVertically { -25 } + fadeIn(initialAlpha = 0.3f),
exit = slideOutVertically { -25 } + fadeOut()
) {
Overlay(
z = 8f,
visible = visible,
shadow = false,
onDismiss = {},
) {
Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.SpaceBetween,
horizontalAlignment = Alignment.CenterHorizontally
) {
Spacer(Modifier)
Column(modifier = Modifier.padding(horizontal = Padding.STANDARD.dp)) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(25.dp))
.background(FotoColors.secondary.composeColor),
) {
Text(
text,
modifier = Modifier
.padding(
horizontal = Padding.STANDARD.dp,
vertical = Padding.MEDIUM.dp
),
color = CommonAtoms.toastOverlay.textColor.composeColor,
style = CommonAtoms.toastOverlay.textStyle,
)
}
Spacer(Modifier.height(25.dp))
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import androidx.compose.foundation.text.ClickableText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.text.TextStyle
Expand All @@ -15,6 +18,7 @@ import androidx.compose.ui.text.style.TextAlign
import com.kevinschildhorn.fotopresenter.ui.UiState
import com.kevinschildhorn.fotopresenter.ui.atoms.Padding
import com.kevinschildhorn.fotopresenter.ui.screens.common.composables.TitleView
import com.kevinschildhorn.fotopresenter.ui.screens.common.composables.ToastOverlay
import com.kevinschildhorn.fotopresenter.ui.screens.login.composables.LoginScreenForm

@Composable
Expand All @@ -32,11 +36,11 @@ fun LoginScreen(
TitleView(
"Foto",
modifier =
Modifier.padding(
top = Padding.SMALL.dp,
start = Padding.STANDARD.dp,
bottom = Padding.LARGE.dp,
),
Modifier.padding(
top = Padding.SMALL.dp,
start = Padding.STANDARD.dp,
bottom = Padding.LARGE.dp,
),
)
LoginScreenForm(
uiState = uiState,
Expand Down