Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ dependencies {
implementation(projects.domain)
implementation(projects.feature.login)
implementation(projects.feature.main)
implementation(projects.feature.taskCertification)
implementation(projects.feature.photolog.capture)
implementation(projects.feature.photolog.detail)
implementation(projects.feature.photolog.editor)
implementation(projects.feature.onboarding)
implementation(projects.feature.goalEditor)
implementation(projects.feature.goalManage)
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/yapp/twix/di/FeatureModules.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@ import com.twix.login.di.loginModule
import com.twix.main.di.mainModule
import com.twix.notification.di.notificationFeatureModule
import com.twix.onboarding.di.onBoardingModule
import com.twix.photolog.capture.di.photologCaptureModule
import com.twix.photolog.detail.di.photologDetailModule
import com.twix.photolog.editor.di.photologEditorModule
import com.twix.settings.di.settingsModule
import com.twix.splash.di.splashModule
import com.twix.stats.detail.di.statsDetailModule
import com.twix.stats.di.statsModule
import com.twix.task_certification.di.taskCertificationModule
import org.koin.core.module.Module

val featureModules: List<Module> =
listOf(
loginModule,
mainModule,
homeModule,
taskCertificationModule,
photologCaptureModule,
photologDetailModule,
photologEditorModule,
goalEditorModule,
goalManageModule,
settingsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fun ForegroundCard(
when (currentShow) {
BetweenUs.ME -> stringResource(R.string.keep_it_up)
BetweenUs.PARTNER ->
stringResource(R.string.partner_not_task_certification).format(
stringResource(R.string.partner_not_photolog).format(
nickName,
)
},
Expand Down
242 changes: 0 additions & 242 deletions core/design-system/src/main/res/drawable/ic_keepi_singing.xml

This file was deleted.

34 changes: 17 additions & 17 deletions core/design-system/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<string name="comment_condition_guide">5글자로 코멘트를 남길 수 있어요</string>

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

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

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

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

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

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

<!-- 로그인 화면 -->
<string name="google_login_button_title">Google로 시작하기</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fun AppNavHost(
) {
ensureMainStack(navController)
navController.navigate(
NavRoutes.TaskCertificationDetailRoute.createRoute(
NavRoutes.PhotologDetailRoute.createRoute(
goalId = goalId,
date = date,
betweenUs = BetweenUs.ME.name,
Expand All @@ -79,7 +79,7 @@ fun AppNavHost(
) {
ensureMainStack(navController)
navController.navigate(
NavRoutes.TaskCertificationDetailRoute.createRoute(
NavRoutes.PhotologDetailRoute.createRoute(
goalId = goalId,
date = date,
betweenUs = BetweenUs.PARTNER.name,
Expand Down
Loading