This repository has been archived by the owner on Apr 27, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 설정화면 navigation 구현 * 🔥 Test 코드 삭제 * 💄 설정 Option Item 제작 * 💄 설정 Section Header 제작 * 📄 Update license header * 🚚 설정 메뉴 아이템 네이밍 변경 * 💄 Section Composable 완성 * 💄 내정보 화면 구현 * 🚨 CI error fix
- Loading branch information
Showing
14 changed files
with
548 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 0 additions & 39 deletions
39
app/src/androidTest/java/org/sopt/stamp/ExampleInstrumentedTest.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
196 changes: 196 additions & 0 deletions
196
app/src/main/java/org/sopt/stamp/feature/setting/SettingScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| /* | ||
| * Copyright 2023 SOPT - Shout Our Passion Together | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.sopt.stamp.feature.setting | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| 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.remember | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.style.TextDecoration | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import com.ramcosta.composedestinations.annotation.Destination | ||
| import com.ramcosta.composedestinations.navigation.DestinationsNavigator | ||
| import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator | ||
| import org.sopt.stamp.R | ||
| import org.sopt.stamp.config.navigation.SettingNavGraph | ||
| import org.sopt.stamp.designsystem.component.layout.SoptColumn | ||
| import org.sopt.stamp.designsystem.component.toolbar.Toolbar | ||
| import org.sopt.stamp.designsystem.style.Access300 | ||
| import org.sopt.stamp.designsystem.style.Gray50 | ||
| import org.sopt.stamp.designsystem.style.SoptTheme | ||
| import org.sopt.stamp.feature.setting.component.Section | ||
| import org.sopt.stamp.feature.setting.model.SectionUiModel | ||
| import org.sopt.stamp.util.DefaultPreview | ||
|
|
||
| @SettingNavGraph(true) | ||
| @Destination("menu") | ||
| @Composable | ||
| fun SettingScreen( | ||
| navigator: DestinationsNavigator, | ||
| viewModel: SettingScreenViewModel = hiltViewModel() | ||
| ) { | ||
| val myInfoSectionItems = remember { | ||
| listOf( | ||
| SectionUiModel.Header(title = "내 정보"), | ||
| SectionUiModel.Option( | ||
| title = "한 마디 편집", | ||
| optionIconResId = R.drawable.arrow_right | ||
| ) { | ||
| // TODO by Nunu 한 마디 편집 화면으로 넘어가기 | ||
| }, | ||
| SectionUiModel.Spacer, | ||
| SectionUiModel.Option( | ||
| title = "비밀번호 변경", | ||
| optionIconResId = R.drawable.arrow_right | ||
| ) { | ||
| // TODO by Nunu 비밀번호 변경 화면으로 넘어가기 | ||
| }, | ||
| SectionUiModel.Spacer, | ||
| SectionUiModel.Option( | ||
| title = "닉네임 변경", | ||
| optionIconResId = R.drawable.arrow_right, | ||
| containerModifier = Modifier | ||
| .background( | ||
| color = Gray50, | ||
| shape = RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) | ||
| ) | ||
| .padding(horizontal = 16.dp) | ||
| ) { | ||
| // TODO by Nunu 닉네임 변경 화면으로 넘어가기 | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| val serviceTermSectionItems = remember { | ||
| listOf( | ||
| SectionUiModel.Header(title = "서비스 이용방침"), | ||
| SectionUiModel.Option( | ||
| title = "개인정보처리방침", | ||
| optionIconResId = R.drawable.arrow_right | ||
| ) { | ||
| // TODO by Nunu 개인정보처리방침 화면으로 넘어가기 | ||
| }, | ||
| SectionUiModel.Spacer, | ||
| SectionUiModel.Option( | ||
| title = "서비스 이용 약관", | ||
| optionIconResId = R.drawable.arrow_right | ||
| ) { | ||
| // TODO by Nunu 서비스 이용 약관 화면으로 넘어가기 | ||
| }, | ||
| SectionUiModel.Spacer, | ||
| SectionUiModel.Option( | ||
| title = "서비스 의견 제안", | ||
| optionIconResId = R.drawable.arrow_right, | ||
| containerModifier = Modifier | ||
| .background( | ||
| color = Gray50, | ||
| shape = RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) | ||
| ) | ||
| .padding(horizontal = 16.dp) | ||
| ) { | ||
| // TODO by Nunu 서비스 의견 제안 화면으로 넘어가기 | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| val missionSectionItems = listOf( | ||
| SectionUiModel.Header(title = "미션"), | ||
| SectionUiModel.Option( | ||
| title = "스탬프 초기화", | ||
| containerModifier = Modifier | ||
| .background( | ||
| color = Gray50, | ||
| shape = RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) | ||
| ) | ||
| .padding(horizontal = 16.dp) | ||
| ) { | ||
| // TODO by Nunu 스탬프 초기화하기 | ||
| } | ||
| ) | ||
|
|
||
| val logOutSectionItems = listOf( | ||
| SectionUiModel.Option( | ||
| title = "로그아웃", | ||
| textColor = Access300, | ||
| containerModifier = Modifier | ||
| .background( | ||
| color = Gray50, | ||
| shape = RoundedCornerShape(12.dp) | ||
| ) | ||
| .padding(horizontal = 16.dp) | ||
| ) { | ||
| // TODO by Nunu 로그아웃하기 | ||
| } | ||
| ) | ||
|
|
||
| SoptTheme { | ||
| SoptColumn( | ||
| modifier = Modifier.fillMaxSize() | ||
| ) { | ||
| Toolbar( | ||
| modifier = Modifier.padding(bottom = 10.dp), | ||
| title = { | ||
| Text( | ||
| text = "설정", | ||
| style = SoptTheme.typography.h2, | ||
| modifier = Modifier.padding(start = 4.dp), | ||
| color = SoptTheme.colors.onSurface | ||
| ) | ||
| }, | ||
| onBack = { navigator.popBackStack() } | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| Section(items = myInfoSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Section(items = serviceTermSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Section(items = missionSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Section(items = logOutSectionItems) | ||
| Spacer(modifier = Modifier.height(24.dp)) | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.End | ||
| ) { | ||
| Text( | ||
| text = "탈퇴하기", | ||
| style = SoptTheme.typography.caption1, | ||
| color = SoptTheme.colors.onSurface40, | ||
| textDecoration = TextDecoration.Underline | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @DefaultPreview | ||
| @Composable | ||
| private fun SettingScreenPreview() { | ||
| SettingScreen( | ||
| navigator = EmptyDestinationsNavigator, | ||
| viewModel = SettingScreenViewModel() | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.