Skip to content

Commit

Permalink
[chore] #4 apply redesign login view
Browse files Browse the repository at this point in the history
  • Loading branch information
cacaocoffee committed Jul 11, 2024
1 parent 7c9bba2 commit 39adf17
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 72 deletions.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 11 additions & 8 deletions feature/login/src/main/java/com/record/login/LoginScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,18 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.record.designsystem.R
import com.record.designsystem.theme.Kakao
import com.record.designsystem.theme.RecordyTheme
import com.record.login.singup.SignUpRoute
import dagger.hilt.android.EntryPointAccessors
import kakaoLogo
import kotlinx.coroutines.flow.collectLatest

@Composable
Expand Down Expand Up @@ -73,11 +75,12 @@ fun LoginRoute(
}
}
}
LoginScreen(
padding = padding,
modifier = modifier,
onLogInClick = { viewModel.startKakaoLogin() },
)
SignUpRoute()
// LoginScreen(
// padding = padding,
// modifier = modifier,
// onLogInClick = { viewModel.startKakaoLogin() },
// )
}

@Composable
Expand Down Expand Up @@ -112,7 +115,7 @@ fun LoginScreen(
horizontalAlignment = Alignment.CenterHorizontally,
) {
Image(
kakaoLogo(),
painterResource(id = R.drawable.ic_kakao_16),
null,
modifier = Modifier
.fillMaxWidth(0.3f)
Expand Down Expand Up @@ -140,7 +143,7 @@ fun LoginScreen(
colors = ButtonDefaults.buttonColors(containerColor = Kakao),
shape = RoundedCornerShape(10.dp),
) {
Image(kakaoLogo(), null, modifier = Modifier.padding(end = 8.dp))
Image(painterResource(id = com.record.designsystem.R.drawable.ic_kakao_16), null, modifier = Modifier.padding(end = 8.dp))
Text("카카오로 시작하기", style = RecordyTheme.typography.button2.copy(color = RecordyTheme.colors.black))
}

Expand Down
49 changes: 0 additions & 49 deletions feature/login/src/main/java/com/record/login/logo/KakaoLogo.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import com.record.designsystem.component.progressbar.RecordyProgressBar
import com.record.designsystem.theme.RecordyTheme
import com.record.login.singup.screen.NamingScreen
import com.record.login.singup.screen.PolicyScreen
import com.record.login.singup.screen.SignUpSucessScreen
import com.record.login.singup.screen.SignUpSuccessScreen
import kotlinx.coroutines.launch

@OptIn(ExperimentalFoundationApi::class)
Expand Down Expand Up @@ -79,8 +79,8 @@ fun SignUpRoute(
.background(
brush = Brush.verticalGradient(
listOf(Color(0x339babfb), Color(0x00000000)),
startY = columnSize.height.toFloat() * 0.1f,
endY = columnSize.height.toFloat() * 0.6f,
startY = columnSize.height.toFloat() * 0f,
endY = columnSize.height.toFloat() * 0.3f,
),
),
) {
Expand Down Expand Up @@ -118,7 +118,7 @@ fun SignUpRoute(
)

SignUpScreen.Naming -> NamingScreen(uiState = uiState, onTextChangeEvent = viewModel::updateNickName)
SignUpScreen.Success -> SignUpSucessScreen()
SignUpScreen.Success -> SignUpSuccessScreen()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.record.designsystem.R.drawable.ic_check_16
import com.record.designsystem.R.drawable.ic_check_24
import com.record.designsystem.R.drawable.ic_signup
import com.record.designsystem.R
import com.record.designsystem.theme.RecordyTheme
import com.record.login.singup.SignUpState

Expand All @@ -47,12 +46,13 @@ fun PolicyScreen(
Column(modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Top) {
Spacer(modifier = Modifier.height(33.dp))
Image(
painter = painterResource(id = ic_signup),
painter = painterResource(id = R.drawable.img_onboarding),
null,
modifier = Modifier
.width(84.dp)
.padding(start = 12.dp)
.aspectRatio(1f),
contentScale = ContentScale.Crop,
)
Spacer(modifier = Modifier.height(9.dp))
Text(
Expand Down Expand Up @@ -110,7 +110,7 @@ fun RecordyCheckAllBox(contentText: String = "", padding: PaddingValues, checked
modifier = Modifier.fillMaxWidth(),
) {
Icon(
ImageVector.vectorResource(id = ic_check_24),
ImageVector.vectorResource(id = R.drawable.ic_check_24),
contentDescription = null,
modifier = Modifier
.height(24.dp)
Expand Down Expand Up @@ -146,7 +146,7 @@ fun RecordyCheckBox(contentText: String = "", padding: PaddingValues, checked: B
modifier = Modifier.fillMaxWidth(),
) {
Icon(
ImageVector.vectorResource(id = ic_check_16),
ImageVector.vectorResource(id = R.drawable.ic_check_16),
contentDescription = null,
modifier = Modifier
.animateContentSize { initialValue, targetValue -> }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,24 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.record.designsystem.R.drawable.ic_signup
import com.record.designsystem.R
import com.record.designsystem.theme.RecordyTheme

@Composable
fun SignUpSucessScreen() {
fun SignUpSuccessScreen() {
Column(modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally) {
Spacer(modifier = Modifier.height(174.dp))
Image(
painter = painterResource(id = ic_signup),
painter = painterResource(id = R.drawable.img_bubble_checked),
contentDescription = null,
modifier = Modifier
.fillMaxWidth(0.3f)
.aspectRatio(1f),
contentScale = ContentScale.Crop,
)
Spacer(modifier = Modifier.height(36.dp))
Text(
Expand All @@ -45,8 +47,8 @@ fun SignUpSucessScreen() {

@Preview
@Composable
fun PreviewSignUpSucessScreen() {
fun PreviewSignUpSuccessScreen() {
RecordyTheme {
SignUpSucessScreen()
SignUpSuccessScreen()
}
}

0 comments on commit 39adf17

Please sign in to comment.