Merge branch 'develop' into feat/#119-photolog-upload-modifiy

Author: chanho0908

README.md

@@ -1 +1,78 @@
-# Twix 🔥
+<div align="center">
+
+<img src="https://img.shields.io/badge/Platform-Android-3DDC84?style=for-the-badge&logo=android&logoColor=white"/>
+<img src="https://img.shields.io/badge/Language-Kotlin-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white"/>
+<img src="https://img.shields.io/badge/UI-Jetpack%20Compose-4285F4?style=for-the-badge&logo=jetpackcompose&logoColor=white"/>
+<img src="https://img.shields.io/badge/Architecture-MVI-FF6B6B?style=for-the-badge"/>
+
+<br/><br/>
+
+> ### *"서로를 원동력으로, 멈추지 않는 우리."*
+> **keep it luv! 💘**
+
+<br/>
+
+<img src="https://github.com/user-attachments/assets/6740fce9-7cda-44dc-87d1-2caeed53dd73" width="700"/>
+
+<br/>
+
+</div>
+
+<br/>
+
+> 우리는 더 나은 내일을 꿈꾸며 목표를 세웁니다.
+>
+> 하지만 혼자만의 다짐은 쉽게 무너지곤 하죠.
+>
+> 키피럽은 **'함께'** 라는 가장 강력한 무기를 쥐여줍니다.
+
+## ⚡️ Synergy — 둘이 함께라면 폭발한다
+
+> 키피럽은 연인 사이의 긍정적인 에너지가 어떻게 **'시너지'** 로 폭발하는지 보여줍니다.
+
+<div align="center">
+<img src="https://github.com/user-attachments/assets/bf40b2d6-f1d1-406d-9e2b-7866bf11cf87" width="700"/>
+</div>
+
+<br/>
+
+## 🛠 Tech Stack
+
+<div align="center">
+
+| 영역 | 기술 |
+|:---:|:---|
+| **Language** | ![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF?style=flat-square&logo=kotlin&logoColor=white) |
+| **UI** | ![Compose](https://img.shields.io/badge/Jetpack%20Compose-4285F4?style=flat-square&logo=jetpackcompose&logoColor=white) |
+| **Architecture** | ![MVI](https://img.shields.io/badge/MVI-FF6B6B?style=flat-square) |
+| **DI** | ![Koin](https://img.shields.io/badge/Koin-F68212?style=flat-square) |
+| **Network** | ![Ktor](https://img.shields.io/badge/Ktor%20Client-087CFA?style=flat-square&logo=ktor&logoColor=white) |
+| **Storage** | ![DataStore](https://img.shields.io/badge/DataStore-4285F4?style=flat-square&logo=google&logoColor=white) |
+| **Camera** | ![CameraX](https://img.shields.io/badge/CameraX-3DDC84?style=flat-square&logo=android&logoColor=white) |
+
+</div>
+
+<br/>
+
+## 🧑‍💻 Contributors
+
+<div align="center">
+
+### 함께이기에 더 강한, 키피럽을 만든 두 사람 💘
+
+<table>
+  <tr>
+    <td align="center" width="160">
+      <a href="https://github.com/chanho0908">
+        <img src="https://github.com/chanho0908.png" width="150px" style="border-radius:50%"/><br/>
+        <sub><b>정찬호</b></sub>
+      </a>
+    </td>
+    <td align="center" width="160">
+      <a href="https://github.com/dogmania">
+        <img src="https://github.com/dogmania.png" width="150px" style="border-radius:50%"/><br/>
+        <sub><b>손현수</b></sub>
+      </a>
+    </td>
+  </tr>
+</table>

app/build.gradle.kts

@@ -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)

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

@@ -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,

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

@@ -27,19 +27,19 @@ import com.twix.ui.extension.noRippleClickable
 
 @Composable
 fun BackgroundCard(
-    isCertificated: Boolean,
     uploadedAt: String,
-    buttonTitle: String,
-    onClick: () -> Unit,
+    actionLabel: String,
     rotation: Float,
+    onClickAction: () -> Unit,
+    showActionButton: Boolean,
 ) {
     Column {
         PhotologCard(
             background = GrayColor.C200,
             borderColor = GrayColor.C500,
             rotation = rotation,
         )
-        if (isCertificated) {
+        if (!showActionButton) {
             AppText(
                 text = uploadedAt,
                 style = AppTextStyle.B4,
@@ -60,19 +60,19 @@ fun BackgroundCard(
                             Modifier
                                 .width(150.dp)
                                 .height(74.dp)
-                                .noRippleClickable { onClick() },
-                        text = buttonTitle,
+                                .noRippleClickable { onClickAction() },
+                        text = actionLabel,
                         textColor = GrayColor.C500,
                         backgroundColor = CommonColor.White,
                     )
                 }
 
                 Image(
-                    imageVector = ImageVector.vectorResource(R.drawable.ic_keepi_sting),
+                    imageVector = ImageVector.vectorResource(R.drawable.ic_photolog_action_poke),
                     contentDescription = null,
                     modifier =
                         Modifier
-                            .padding(end = 24.dp, top = 15.dp)
+                            .padding(end = 16.dp, top = 15.dp)
                             .align(Alignment.TopEnd),
                 )
             }
@@ -85,10 +85,10 @@ fun BackgroundCard(
 fun PreviewBackgroundCard() {
     TwixTheme {
         BackgroundCard(
-            buttonTitle = stringResource(R.string.word_sting),
+            actionLabel = stringResource(R.string.word_sting),
             uploadedAt = "2023.10.31 23:59",
-            onClick = {},
-            isCertificated = true,
+            onClickAction = {},
+            showActionButton = true,
             rotation = -8f,
         )
     }

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

@@ -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,
                             )
                     },