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.

Sign up for GitHub

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

로그인 없이 개발자 괴롭히기 보내기 #369

Merged
merged 8 commits into from
Oct 23, 2024
Merged

로그인 없이 개발자 괴롭히기 보내기 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6ae7df
feat: SocialLoginButton 디폴트 크기 변경
JuTaK97 Oct 16, 2024
e6fa113
feat: DividerWithText 에 Modifier 파라미터 추가
JuTaK97 Oct 16, 2024
3e43829
feat: TutorialPage 디자인 스펙에 맞게 수정 (안읽어도됨)
JuTaK97 Oct 16, 2024
50db96d
feat: string resource 추가 및 수정
JuTaK97 Oct 16, 2024
4d33801
feat: 개발자 괴롭히기 이동 기능 추가
JuTaK97 Oct 16, 2024
e008e2d
lint
JuTaK97 Oct 16, 2024
e735843
feat: 색깔 변경
JuTaK97 Oct 16, 2024
52862d1
Merge branch 'develop' into jutak/logout-feedback
JuTaK97 Oct 23, 2024
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
2 changes: 2 additions & 0 deletions app/src/main/java/com/wafflestudio/snutt2/components/compose/DividerWithText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ fun DividerWithText(
color: Color,
text: String = "",
textStyle: TextStyle,
modifier: Modifier,
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier,
) {
Divider(
modifier = Modifier.weight(1f),
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/wafflestudio/snutt2/components/compose/SocialLoginButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
@Composable
fun SocialLoginButton(
painter: Painter,
size: Dp = 45.dp,
size: Dp = 44.dp,
onClick: () -> Unit,
) {
Image(
Expand Down
94 changes: 48 additions & 46 deletions app/src/main/java/com/wafflestudio/snutt2/views/logged_out/TutorialPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.app.Activity
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
Expand All @@ -28,6 +27,7 @@ import com.wafflestudio.snutt2.R
import com.wafflestudio.snutt2.components.compose.BorderButton
import com.wafflestudio.snutt2.components.compose.DividerWithText
import com.wafflestudio.snutt2.components.compose.SocialLoginButton
import com.wafflestudio.snutt2.components.compose.clicks
import com.wafflestudio.snutt2.lib.android.toast
import com.wafflestudio.snutt2.lib.facebookLogin
import com.wafflestudio.snutt2.ui.SNUTTColors
Expand Down Expand Up @@ -173,40 +173,33 @@ fun TutorialPage() {
}
}

Column(
modifier = Modifier
.fillMaxSize()
.padding(12.dp)
.background(SNUTTColors.White900),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Spacer(modifier = Modifier.weight(25f))

BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
Image(
painter = painterResource(id = R.drawable.logo),
contentDescription = stringResource(R.string.sign_in_logo_title),
modifier = Modifier.padding(top = 20.dp, bottom = 15.dp),
)
Spacer(modifier = Modifier.height([email protected] * 0.3f))

Text(
text = stringResource(R.string.sign_in_logo_title),
style = SNUTTTypography.h1,
)
}
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
Image(
painter = painterResource(id = R.drawable.logo),
contentDescription = stringResource(R.string.sign_in_logo_title),
)
Text(
text = stringResource(R.string.sign_in_logo_title),
style = SNUTTTypography.h1,
)
}

Spacer(modifier = Modifier.weight(13f))
Spacer(modifier = Modifier.height([email protected] * 0.16f))

Column(
verticalArrangement = Arrangement.Center,
) {
BorderButton(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 20.dp),
.padding(horizontal = 32.dp),
bgColor = colorResource(R.color.theme_snutt_5),
color = colorResource(R.color.theme_snutt_5),
cornerRadius = 6.dp,
Expand All @@ -215,37 +208,35 @@ fun TutorialPage() {
Text(
text = stringResource(R.string.tutorial_sign_in_button),
style = SNUTTTypography.button,
color = SNUTTColors.White900,
color = SNUTTColors.AllWhite,
)
Comment on lines 210 to 212
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오 근데 혹시 이거 이유가 있나요
다크모드 상관없이 그리기 위함인건가

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ㅇㅇ iOS 보니까 다크모드때도 하얀색이더라구

}

BorderButton(
Text(
text = stringResource(R.string.tutorial_sign_up_button),
style = SNUTTTypography.button,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 20.dp),
color = SNUTTColors.White900,
cornerRadius = 10.dp,
onClick = { navController.navigate(NavigationDestination.SignUp) },
) {
Text(
text = stringResource(R.string.tutorial_sign_up_button),
style = SNUTTTypography.button,
)
}
.padding(top = 14.dp)
.clicks {
navController.navigate(NavigationDestination.SignUp)
},
)

Spacer(modifier = Modifier.height(30.dp))
Spacer(modifier = Modifier.weight(1f))

DividerWithText(
color = SNUTTColors.Gray200,
color = SNUTTColors.VacancyGray,
textStyle = SNUTTTypography.subtitle2,
text = stringResource(R.string.continue_with_sns_account),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp),
)

Spacer(modifier = Modifier.height(20.dp))
Spacer(modifier = Modifier.height(24.dp))

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(12.dp, alignment = Alignment.CenterHorizontally),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
SocialLoginButton(
painter = painterResource(id = R.drawable.kakao_login),
Expand All @@ -266,9 +257,20 @@ fun TutorialPage() {
onClick = { handleFacebookSignIn() },
)
}
}

Spacer(modifier = Modifier.weight(11f))
Spacer(modifier = Modifier.height([email protected] * 0.06f))

Text(
color = SNUTTColors.Gray200,
style = SNUTTTypography.subtitle2,
text = stringResource(R.string.tutorial_help_button),
modifier = Modifier.clicks {
navController.navigate(NavigationDestination.AppReport)
},
)

Spacer(modifier = Modifier.height([email protected] * 0.05f))
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@
<string name="home_timetable_drawer">서랍 메뉴</string>
<string name="search_hint">검색어를 입력하세요.</string>
<string name="tutorial_sign_in_button">로그인</string>
<string name="tutorial_sign_up_button">가입하기</string>
<string name="tutorial_sign_up_button">회원가입</string>
<string name="tutorial_help_button">로그인/회원가입에 문제가 생겼나요?</string>
<string name="settings_app_report_title">개발자 괴롭히기</string>
<string name="settings_app_report_email">이메일</string>
<string name="settings_app_report_detail">내용</string>
Expand Down
Loading