Skip to content

Commit b6a44b4

Browse files
authored
Merge pull request #67 from YAPP-Github/feat/#35-profile-setting
온보딩 화면 구현
2 parents bfbd80c + 5d84eab commit b6a44b4

File tree

56 files changed

+2263
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2263
-80
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
implementation(projects.feature.login)
3838
implementation(projects.feature.main)
3939
implementation(projects.feature.taskCertification)
40+
implementation(projects.feature.onboarding)
4041
implementation(projects.feature.goalEditor)
4142
implementation(projects.feature.goalManage)
4243
implementation(projects.feature.settings)

app/src/main/java/com/yapp/twix/di/FeatureModules.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.twix.goal_manage.di.goalManageModule
55
import com.twix.home.di.homeModule
66
import com.twix.login.di.loginModule
77
import com.twix.main.di.mainModule
8+
import com.twix.onboarding.di.onBoardingModule
89
import com.twix.settings.di.settingsModule
910
import com.twix.task_certification.di.taskCertificationModule
1011
import org.koin.core.module.Module
@@ -18,4 +19,5 @@ val featureModules: List<Module> =
1819
goalEditorModule,
1920
goalManageModule,
2021
settingsModule,
22+
onBoardingModule,
2123
)

app/src/main/java/com/yapp/twix/main/MainActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.activity.enableEdgeToEdge
77
import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.WindowInsets
99
import androidx.compose.foundation.layout.WindowInsetsSides
10+
import androidx.compose.foundation.layout.fillMaxSize
1011
import androidx.compose.foundation.layout.only
1112
import androidx.compose.foundation.layout.systemBars
1213
import androidx.compose.foundation.layout.windowInsetsPadding
@@ -34,6 +35,7 @@ class MainActivity : ComponentActivity() {
3435
Box(
3536
modifier =
3637
Modifier
38+
.fillMaxSize()
3739
.windowInsetsPadding(
3840
WindowInsets.systemBars.only(WindowInsetsSides.Vertical),
3941
),

core/design-system/src/main/java/com/twix/designsystem/components/text_field/UnderlineTextField.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ fun UnderlineTextField(
8484
maxLines = maxLines,
8585
keyboardOptions = keyboardOptions,
8686
keyboardActions = keyboardActions,
87+
modifier = Modifier.weight(1f),
8788
)
8889

8990
if (shouldShowTrailing) {
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:strokeWidth="1"
8+
android:pathData="M14.5,17.023L9.5,12.023L14.5,7.023"
9+
android:strokeLineJoin="round"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#171717"
12+
android:strokeLineCap="round"/>
13+
</vector>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="22dp"
3+
android:height="22dp"
4+
android:viewportWidth="22"
5+
android:viewportHeight="22">
6+
<path
7+
android:pathData="M4.113,0.6V2.314M16.852,0.6V2.314M20.602,3.314L20.602,19.6C20.602,20.152 20.154,20.6 19.602,20.6H1.602C1.049,20.6 0.602,20.152 0.602,19.6V3.314C0.602,2.762 1.049,2.314 1.602,2.314H19.602C20.154,2.314 20.602,2.762 20.602,3.314Z"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="1.2"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#171717"
12+
android:strokeLineCap="round"/>
13+
<path
14+
android:pathData="M0.602,2.6H20.602V7.6H0.602V2.6Z"
15+
android:fillColor="#171717"/>
16+
</vector>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<path
7+
android:pathData="M7.02,9.26L5.515,7.755C5.387,7.627 5.223,7.563 5.025,7.563C4.827,7.563 4.663,7.627 4.535,7.755C4.407,7.883 4.343,8.047 4.343,8.245C4.343,8.443 4.407,8.607 4.535,8.735L6.53,10.73C6.67,10.87 6.833,10.94 7.02,10.94C7.207,10.94 7.37,10.87 7.51,10.73L11.465,6.775C11.593,6.647 11.658,6.483 11.658,6.285C11.658,6.087 11.593,5.923 11.465,5.795C11.337,5.667 11.173,5.602 10.975,5.602C10.777,5.602 10.613,5.667 10.485,5.795L7.02,9.26ZM8,15C7.032,15 6.122,14.816 5.27,14.449C4.418,14.081 3.678,13.583 3.047,12.953C2.418,12.323 1.919,11.582 1.551,10.73C1.184,9.878 1,8.968 1,8C1,7.032 1.184,6.122 1.551,5.27C1.919,4.418 2.418,3.678 3.047,3.047C3.678,2.418 4.418,1.919 5.27,1.551C6.122,1.184 7.032,1 8,1C8.968,1 9.878,1.184 10.73,1.551C11.582,1.919 12.323,2.418 12.953,3.047C13.583,3.678 14.081,4.418 14.449,5.27C14.816,6.122 15,7.032 15,8C15,8.968 14.816,9.878 14.449,10.73C14.081,11.582 13.583,12.323 12.953,12.953C12.323,13.583 11.582,14.081 10.73,14.449C9.878,14.816 8.968,15 8,15Z"
8+
android:fillColor="#1ED45A"/>
9+
</vector>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="18dp"
3+
android:height="18dp"
4+
android:viewportWidth="18"
5+
android:viewportHeight="18">
6+
<path
7+
android:pathData="M18,9C18,13.971 13.971,18 9,18C4.029,18 0,13.971 0,9C0,4.029 4.029,0 9,0C13.971,0 18,4.029 18,9Z"
8+
android:fillColor="#C6C6C6"/>
9+
<path
10+
android:pathData="M5.867,12.029L8.867,9.029M8.867,9.029L11.867,6.029M8.867,9.029L11.867,12.029M8.867,9.029L5.867,6.029"
11+
android:strokeWidth="1.2"
12+
android:fillColor="#00000000"
13+
android:strokeColor="#ffffff"
14+
android:strokeLineCap="round"/>
15+
</vector>

core/design-system/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<string name="settings_privacy_policy">개인정보 처리방침</string>
7070
<string name="settings_my_app_version">나의 버전</string>
7171

72+
7273
<!-- 토스트 메시지 -->
7374
<string name="toast_end_date_before_start_date">종료 날짜가 시작 날짜보다 이전입니다.</string>
7475
<string name="toast_goal_fetch_failed">목표 조회에 실패했습니다.</string>

core/navigation/src/main/java/com/twix/navigation/.gitkeep

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)