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

feat: Cải thiện giao diện màn splash #23

Merged
merged 6 commits into from
Oct 2, 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 @@ -4,5 +4,4 @@ package com.pwhs.quickmem.presentation.app.library
sealed class LibraryUiEvent() {
data class Error(val message: String) : LibraryUiEvent()
data object Loading : LibraryUiEvent()

}
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
package com.pwhs.quickmem.presentation.splash

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
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.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import com.pwhs.quickmem.util.gradientBackground
import com.pwhs.quickmem.R
import com.pwhs.quickmem.ui.theme.Abrilfatface_Font
import com.pwhs.quickmem.util.splashBackground
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.annotation.RootGraph
import com.ramcosta.composedestinations.generated.destinations.HomeScreenDestination
Expand Down Expand Up @@ -64,8 +86,56 @@ fun SplashScreen(
}

Scaffold(
modifier = modifier.gradientBackground()
modifier = modifier.splashBackground(),
containerColor = Color.Transparent
) { innerPadding ->
Column(
modifier = modifier
.padding(innerPadding)
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
AnimatedText(modifier = Modifier)
}
}
}

@Composable
fun AnimatedText(modifier: Modifier = Modifier) {
var isVisible by remember { mutableStateOf(false) }

LaunchedEffect(Unit) {
delay(500)
isVisible = true
}

AnimatedVisibility(
visible = isVisible,
enter = fadeIn(animationSpec = tween(2000)),
exit = fadeOut(animationSpec = tween(2000))
) {
Column(modifier = Modifier.padding(it)) { }
Row(
modifier = modifier,
verticalAlignment = Alignment.CenterVertically
) {
Image(
painter = painterResource(id = R.drawable.ic_bear),
contentDescription = "Quick Mem Logo",
modifier = modifier
.size(48.dp)
.padding(end = 8.dp)
)
Text(
text = "QUICK MEM",
fontSize = 32.sp,
color = Color.White,
fontWeight = FontWeight.Bold,
fontFamily = Abrilfatface_Font,
textAlign = TextAlign.Center,
modifier = modifier
)
}
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.pwhs.quickmem.core.datastore.AppManager
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
Expand All @@ -27,6 +28,7 @@ class SplashViewModel @Inject constructor(
private fun checkAuth() {
Timber.d("Checking auth")
viewModelScope.launch {
delay(1500)
appManager.isLoggedIn.collect { isLoggedIn ->
if (isLoggedIn) {
_uiState.value = SplashUiState.IsLoggedIn
Expand All @@ -41,6 +43,7 @@ class SplashViewModel @Inject constructor(
private fun checkFirstRun() {
Timber.d("Checking first run")
viewModelScope.launch {
delay(1500)
appManager.isFirstRun.collect { isFirstRun ->
if (isFirstRun) {
_uiState.value = SplashUiState.FirstRun
Expand All @@ -53,6 +56,7 @@ class SplashViewModel @Inject constructor(

fun saveIsFirstRun(isFirstRun: Boolean) {
viewModelScope.launch {
delay(1500)
appManager.saveIsFirstRun(isFirstRun)
}
}
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/pwhs/quickmem/ui/theme/Type.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.pwhs.quickmem.ui.theme

import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import com.pwhs.quickmem.R
import androidx.compose.ui.text.googlefonts.GoogleFont
Expand All @@ -12,6 +13,13 @@ val provider = GoogleFont.Provider(
certificates = R.array.com_google_android_gms_fonts_certs
)

val Abrilfatface_Font = FontFamily(
androidx.compose.ui.text.font.Font(R.font.firasans_extrabold)
)
val FontAbrilfatface = TextStyle(
fontFamily = Abrilfatface_Font
)

val bodyFontFamily = FontFamily(
Font(
googleFont = GoogleFont("Open Sans"),
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/pwhs/quickmem/util/ModifierExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ fun Modifier.gradientBackground(): Modifier {
)
}

fun Modifier.splashBackground(): Modifier {
return this.background(
brush = Brush.verticalGradient(
colors = listOf(
Color(0xFF2CB2CF),
Color(0xFF2CB2CF)
),
tileMode = TileMode.Mirror
)
)
}

fun Modifier.bottomBorder(strokeWidth: Dp, color: Color) = composed(
factory = {
val density = LocalDensity.current
Expand Down
Binary file added app/src/main/res/font/abrilfatface_regular.ttf
Binary file not shown.
Binary file added app/src/main/res/font/firasans_extrabold.ttf
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions app/src/main/res/raw/animation.json

Large diffs are not rendered by default.