diff --git a/app/src/main/java/com/example/appwithwin/MainActivity.kt b/app/src/main/java/com/example/appwithwin/MainActivity.kt index 0b4bdfe..28c3096 100644 --- a/app/src/main/java/com/example/appwithwin/MainActivity.kt +++ b/app/src/main/java/com/example/appwithwin/MainActivity.kt @@ -7,10 +7,15 @@ import androidx.activity.enableEdgeToEdge import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.example.appwithwin.ui.screen.signIn.RegisterAccount -import com.example.appwithwin.ui.screen.signIn.SignInScreen import com.example.appwithwin.ui.theme.MatuleTheme import androidx.compose.runtime.Composable +import com.example.appwithwin.ui.screen.welcome.welcome1 +import com.example.appwithwin.ui.screen.welcome.welcome2 +import com.example.appwithwin.ui.screen.welcome.welcome3 +import com.example.appwithwin.ui.screen.welcome.welcome4 +import com.example.appwithwin.ui.screen.signIn.SignInScreen +import com.example.appwithwin.ui.screen.signIn.RegisterAccount + class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -29,8 +34,36 @@ fun AppNavigation() { val navController = rememberNavController() NavHost( navController = navController, - startDestination = Screen.SignIn.route + startDestination = Screen.welcome1.route ) { + composable(Screen.welcome1.route) { + welcome1( + onClick = { + navController.navigate(Screen.welcome2.route) + } + ) + } + composable(Screen.welcome2.route) { + welcome2( + onClick = { + navController.navigate(Screen.welcome3.route) + } + ) + } + composable(Screen.welcome3.route) { + welcome3( + onClick = { + navController.navigate(Screen.welcome4.route) + } + ) + } + composable(Screen.welcome4.route) { + welcome4( + onClick = { + navController.navigate(Screen.SignIn.route) + } + ) + } composable(Screen.SignIn.route) { SignInScreen( onSignInClick = { }, @@ -52,4 +85,8 @@ fun AppNavigation() { sealed class Screen(val route: String) { object SignIn : Screen("signIn") object Register : Screen("register") + object welcome1 : Screen("welcome1") + object welcome2 : Screen("welcome2") + object welcome3 : Screen("welcome3") + object welcome4 : Screen("welcome2") } \ No newline at end of file diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/signIn/RegisterAccount.kt b/app/src/main/java/com/example/appwithwin/ui/screen/signIn/RegisterAccount.kt index d90e36f..56162f1 100644 --- a/app/src/main/java/com/example/appwithwin/ui/screen/signIn/RegisterAccount.kt +++ b/app/src/main/java/com/example/appwithwin/ui/screen/signIn/RegisterAccount.kt @@ -116,8 +116,6 @@ fun RegisterInContent(paddingValues: PaddingValues) { Spacer(modifier = Modifier.height(16.dp)) - - Spacer(modifier = Modifier.height(16.dp)) CommonButton( diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/signIn/Splash.kt b/app/src/main/java/com/example/appwithwin/ui/screen/signIn/Splash.kt deleted file mode 100644 index 0f9b3ae..0000000 --- a/app/src/main/java/com/example/appwithwin/ui/screen/signIn/Splash.kt +++ /dev/null @@ -1,2 +0,0 @@ -package com.example.appwithwin.ui.screen.signIn - diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome1.kt b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome1.kt new file mode 100644 index 0000000..641eac0 --- /dev/null +++ b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome1.kt @@ -0,0 +1,67 @@ +package com.example.appwithwin.ui.screen.welcome + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.material3.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.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import kotlinx.coroutines.delay + +@Composable +fun welcome1( + onClick: () -> Unit +) { + LaunchedEffect(Unit) { + delay(2000) + onClick() + } + Scaffold { paddingValues -> win1(paddingValues,onClick) } +} +@Composable +fun win1(paddingValues: PaddingValues, onClick: () -> Unit, ) { + Column( + modifier = Modifier + .fillMaxSize() + //.padding(paddingValues) + .background(Color(0xFF48B2E7)), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .background(Color(0xFF48B2E7)), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + Text( + "MATULE", + fontSize = 64.sp, + color = Color.White, + fontWeight = FontWeight.Bold, + ) + Text( + "ME", + fontSize = 32.sp, + color = Color.White + ) + } + } + } +} diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome2.kt b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome2.kt new file mode 100644 index 0000000..e1ceccc --- /dev/null +++ b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome2.kt @@ -0,0 +1,97 @@ +package com.example.appwithwin.ui.screen.welcome + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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 com.example.appwithwin.R + + +@Composable +fun welcome2( + onClick: () -> Unit +) { + Scaffold{ + paddingValues -> win2(paddingValues,onClick) + } +} + +@Composable +fun win2(paddingValues: PaddingValues, onStart1Click: () -> Unit, ){ + Column( + modifier = Modifier + .fillMaxSize() + //.padding(paddingValues) + .background(Color(0xFF48B2E7)), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("Добро пожаловать", + fontSize = 50.sp, + color = Color.White, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .padding(top = 32.dp) + //.padding(bottom = 16.dp) + ) + Image( + painter = painterResource(id = R.drawable.img), + contentDescription = "Boot", + modifier = Modifier + .size(100.dp) + //.padding(bottom = 16.dp) + ) + Box{ + Image( + painter = painterResource(id = R.drawable.boot), + contentDescription = "Boot image", + modifier = Modifier + .size(500.dp) + //.padding(bottom = 32.dp) // Отступ снизу + ) + Image( + painter = painterResource(id = R.drawable.back), + contentDescription = "Boot image", + modifier = Modifier + .size(600.dp) + //.padding(bottom = 32.dp) // Отступ снизу + ) + } + Button( + onClick = onStart1Click, + modifier = Modifier + .padding(top = 50.dp) + .background(Color.White, RoundedCornerShape(8.dp)) + .border(1.dp, Color.Gray, RoundedCornerShape(8.dp)) + .width(400.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.White + ) + ) { + Text( + text = "Начать", + color = Color.Black + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome3.kt b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome3.kt new file mode 100644 index 0000000..274e912 --- /dev/null +++ b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome3.kt @@ -0,0 +1,104 @@ +package com.example.appwithwin.ui.screen.welcome + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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 com.example.appwithwin.R + + +@Composable +fun welcome3( + onClick: () -> Unit +) { + Scaffold{ paddingValues -> win3(paddingValues,onClick) } +} + +@Composable +fun win3(paddingValues: PaddingValues, onClick: () -> Unit){ + Column( + modifier = Modifier + .fillMaxSize() + //.padding(paddingValues) + .background(Color(0xFF48B2E7)), + horizontalAlignment = Alignment.CenterHorizontally + ){ + Box{ + Image( + painter = painterResource(id = R.drawable.boot2), + contentDescription = "Boot image", + modifier = Modifier + .size(500.dp) + ) + Image( + painter = painterResource(id = R.drawable.smiley), + contentDescription = "Boot image", + modifier = Modifier + .size(100.dp) + .align(Alignment.TopEnd) + .padding(top = 50.dp, end = 32.dp) + ) + Image( + painter = painterResource(id = R.drawable.drawing1), + contentDescription = "Boot image", + modifier = Modifier + .size(200.dp) + //.align(Alignment.TopEnd) + .padding(top = 100.dp) + ) + } + Text("Начнем путешествие", + fontSize = 50.sp, + color = Color.White, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .padding(top = 32.dp) + ) + Text("Умная, великолепная и модная коллекция Изучите сейчас", + fontSize = 25.sp, + color = Color.White, + //fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .padding(top = 32.dp) + ) + Button( + onClick = onClick, + modifier = Modifier + .padding(top = 50.dp) + .background(Color.White, RoundedCornerShape(8.dp)) + .border(1.dp, Color.Gray, RoundedCornerShape(8.dp)) + .width(400.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.White + ) + ) { + Text( + text = "Далее", + color = Color.Black + ) + } + } +} diff --git a/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome4.kt b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome4.kt new file mode 100644 index 0000000..1a32a75 --- /dev/null +++ b/app/src/main/java/com/example/appwithwin/ui/screen/welcome/welcome4.kt @@ -0,0 +1,94 @@ +package com.example.appwithwin.ui.screen.welcome + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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 com.example.appwithwin.R + + +@Composable +fun welcome4( + onClick: () -> Unit +) { + Scaffold{ paddingValues -> win4(paddingValues,onClick) } +} + +@Composable +fun win4(paddingValues: PaddingValues, onClick: () -> Unit) { + Column( + modifier = Modifier + .fillMaxSize() + .background(Color(0xFF48B2E7)), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box{ + Image( + painter = painterResource(id = R.drawable.boot3), + contentDescription = "Boot image", + modifier = Modifier + .size(500.dp) + ) + Image( + painter = painterResource(id = R.drawable.smiley), + contentDescription = "Boot image", + modifier = Modifier + .size(150.dp) + .align(Alignment.TopStart) + .padding(top = 50.dp) + ) + } + Text("У вас есть сила, чтобы", + fontSize = 50.sp, + color = Color.White, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .padding(top = 32.dp) + ) + Text("В вашей комнате много красивых и привлекательных растений", + fontSize = 25.sp, + color = Color.White, + //fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .padding(top = 32.dp) + ) + Button( + onClick = onClick, + modifier = Modifier + .padding(top = 50.dp) + .background(Color.White, RoundedCornerShape(8.dp)) + .border(1.dp, Color.Gray, RoundedCornerShape(8.dp)) + .width(400.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.White + ) + ) { + Text( + text = "Далее", + color = Color.Black + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/back.png b/app/src/main/res/drawable/back.png new file mode 100644 index 0000000..da88779 Binary files /dev/null and b/app/src/main/res/drawable/back.png differ diff --git a/app/src/main/res/drawable/boot.png b/app/src/main/res/drawable/boot.png new file mode 100644 index 0000000..2426c4a Binary files /dev/null and b/app/src/main/res/drawable/boot.png differ diff --git a/app/src/main/res/drawable/boot2.png b/app/src/main/res/drawable/boot2.png new file mode 100644 index 0000000..f101b44 Binary files /dev/null and b/app/src/main/res/drawable/boot2.png differ diff --git a/app/src/main/res/drawable/boot3.png b/app/src/main/res/drawable/boot3.png new file mode 100644 index 0000000..d255942 Binary files /dev/null and b/app/src/main/res/drawable/boot3.png differ diff --git a/app/src/main/res/drawable/drawing1.png b/app/src/main/res/drawable/drawing1.png new file mode 100644 index 0000000..29cc9d3 Binary files /dev/null and b/app/src/main/res/drawable/drawing1.png differ diff --git a/app/src/main/res/drawable/img.png b/app/src/main/res/drawable/img.png new file mode 100644 index 0000000..5093204 Binary files /dev/null and b/app/src/main/res/drawable/img.png differ diff --git a/app/src/main/res/drawable/shadow.png b/app/src/main/res/drawable/shadow.png new file mode 100644 index 0000000..8c5d6aa Binary files /dev/null and b/app/src/main/res/drawable/shadow.png differ diff --git a/app/src/main/res/drawable/smiley.png b/app/src/main/res/drawable/smiley.png new file mode 100644 index 0000000..deef2fc Binary files /dev/null and b/app/src/main/res/drawable/smiley.png differ