Skip to content

Commit fce1472

Browse files
authored
Merge pull request #122 from YAPP-Github/refactor/#121-phtolog-refactor
photolog 모듈 분리
2 parents a5502e0 + 5eaa345 commit fce1472

File tree

84 files changed

+612
-776
lines changed

Some content is hidden

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

84 files changed

+612
-776
lines changed

app/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ dependencies {
6060
implementation(projects.domain)
6161
implementation(projects.feature.login)
6262
implementation(projects.feature.main)
63-
implementation(projects.feature.taskCertification)
63+
implementation(projects.feature.photolog.capture)
64+
implementation(projects.feature.photolog.detail)
65+
implementation(projects.feature.photolog.editor)
6466
implementation(projects.feature.onboarding)
6567
implementation(projects.feature.goalEditor)
6668
implementation(projects.feature.goalManage)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,23 @@ import com.twix.login.di.loginModule
77
import com.twix.main.di.mainModule
88
import com.twix.notification.di.notificationFeatureModule
99
import com.twix.onboarding.di.onBoardingModule
10+
import com.twix.photolog.capture.di.photologCaptureModule
11+
import com.twix.photolog.detail.di.photologDetailModule
12+
import com.twix.photolog.editor.di.photologEditorModule
1013
import com.twix.settings.di.settingsModule
1114
import com.twix.splash.di.splashModule
1215
import com.twix.stats.detail.di.statsDetailModule
1316
import com.twix.stats.di.statsModule
14-
import com.twix.task_certification.di.taskCertificationModule
1517
import org.koin.core.module.Module
1618

1719
val featureModules: List<Module> =
1820
listOf(
1921
loginModule,
2022
mainModule,
2123
homeModule,
22-
taskCertificationModule,
24+
photologCaptureModule,
25+
photologDetailModule,
26+
photologEditorModule,
2327
goalEditorModule,
2428
goalManageModule,
2529
settingsModule,

core/design-system/src/main/java/com/twix/designsystem/components/photolog/ForegroundCard.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fun ForegroundCard(
3333
when (currentShow) {
3434
BetweenUs.ME -> stringResource(R.string.keep_it_up)
3535
BetweenUs.PARTNER ->
36-
stringResource(R.string.partner_not_task_certification).format(
36+
stringResource(R.string.partner_not_photolog).format(
3737
nickName,
3838
)
3939
},

core/design-system/src/main/res/drawable/ic_keepi_singing.xml

Lines changed: 0 additions & 242 deletions
This file was deleted.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<string name="comment_condition_guide">5글자로 코멘트를 남길 수 있어요</string>
5959

6060
<!-- 인증샷 화면 -->
61-
<string name="partner_not_task_certification">%s님은\n아직…</string>
61+
<string name="partner_not_photolog">%s님은\n아직…</string>
6262

6363
<!-- 목표 생성, 편집 화면 -->
6464
<string name="goal_editor_title">목표 직접 만들기</string>
@@ -130,28 +130,28 @@
130130
<string name="marketing_dialog_description">* 언제든지 설정 > 알림 설정에서 변경 가능해요</string>
131131

132132
<!-- 인증샷 촬영 화면 !-->
133-
<string name="task_certification_upload">업로드</string>
134-
<string name="task_certification_image_capture_fail">이미지 캡처에 실패했습니다. 다시 시도해 주세요.</string>
135-
<string name="task_certification_image_pick_fail">이미지를 불러오는 데 실패했습니다. 다시 시도해 주세요.</string>
136-
<string name="task_certification_take_picture">인증샷 찍기</string>
137-
<string name="task_certification_upload_fail">인증샷 등록에 실패했습니다.</string>
138-
<string name="task_certification_image_translate_fail">이미지 변환에 실패했습니다.</string>
139-
<string name="task_certification_loading">인증샷 업로드 중...</string>
140-
<string name="task_certification_plz_waiting">잠시만 기다려 주세요.</string>
133+
<string name="photolog_upload">업로드</string>
134+
<string name="photolog_image_capture_fail">이미지 캡처에 실패했습니다. 다시 시도해 주세요.</string>
135+
<string name="photolog_image_pick_fail">이미지를 불러오는 데 실패했습니다. 다시 시도해 주세요.</string>
136+
<string name="photolog_take_picture">인증샷 찍기</string>
137+
<string name="photolog_upload_fail">인증샷 등록에 실패했습니다.</string>
138+
<string name="photolog_image_translate_fail">이미지 변환에 실패했습니다.</string>
139+
<string name="photolog_loading">인증샷 업로드 중...</string>
140+
<string name="photolog_plz_waiting">잠시만 기다려 주세요.</string>
141141
<string name="comment_error_message">코멘트는 5글자로 입력해주세요!</string>
142142

143143
<!-- 인증샷 보기 화면 !-->
144-
<string name="task_certification_detail_fetch_photolog_fail">인증샷 조회에 실패했습니다.</string>
145-
<string name="task_certification_modify_fail">인증샷 수정에 실패했어요.</string>
144+
<string name="photolog_detail_fetch_photolog_fail">인증샷 조회에 실패했습니다.</string>
145+
<string name="photolog_modify_fail">인증샷 수정에 실패했어요.</string>
146146

147147
<!-- 인증샷 수정 화면 !-->
148-
<string name="task_certification_editor_retake">다시 찍기</string>
149-
<string name="task_certification_editor_modify_success">코멘트가 수정 되었어요.</string>
150-
<string name="task_certification_editor_not_modified">코멘트가 수정되지 않았어요.</string>
151-
<string name="task_certification_editor_modify_fail">코멘트 수정에 실패했어요.</string>
152-
<string name="task_certification_detail_reaction_fail">리액션 요청에 실패했어요.</string>
148+
<string name="photolog_editor_retake">다시 찍기</string>
149+
<string name="photolog_editor_modify_success">코멘트가 수정 되었어요.</string>
150+
<string name="photolog_editor_not_modified">코멘트가 수정되지 않았어요.</string>
151+
<string name="photolog_editor_modify_fail">코멘트 수정에 실패했어요.</string>
152+
<string name="photolog_detail_reaction_fail">리액션 요청에 실패했어요.</string>
153153

154-
<string name="task_certification_camera_permission_denied_permanently">인증샷 촬영을 위해서 카메라 권한이 필요해요.</string>
154+
<string name="photolog_camera_permission_denied_permanently">인증샷 촬영을 위해서 카메라 권한이 필요해요.</string>
155155

156156
<!-- 로그인 화면 -->
157157
<string name="google_login_button_title">Google로 시작하기</string>

core/navigation/src/main/java/com/twix/navigation/AppNavHost.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun AppNavHost(
6363
) {
6464
ensureMainStack(navController)
6565
navController.navigate(
66-
NavRoutes.TaskCertificationDetailRoute.createRoute(
66+
NavRoutes.PhotologDetailRoute.createRoute(
6767
goalId = goalId,
6868
date = date,
6969
betweenUs = BetweenUs.ME.name,
@@ -79,7 +79,7 @@ fun AppNavHost(
7979
) {
8080
ensureMainStack(navController)
8181
navController.navigate(
82-
NavRoutes.TaskCertificationDetailRoute.createRoute(
82+
NavRoutes.PhotologDetailRoute.createRoute(
8383
goalId = goalId,
8484
date = date,
8585
betweenUs = BetweenUs.PARTNER.name,

0 commit comments

Comments
 (0)