Skip to content

Commit 2d3c175

Browse files
committed
feat: 크리스마스 가족사진관 대응
1 parent 134119a commit 2d3c175

7 files changed

Lines changed: 225 additions & 299 deletions

File tree

app/src/main/java/com/no5ing/bbibbi/data/datasource/network/RestAPI.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.no5ing.bbibbi.data.datasource.network.request.member.ImageUploadReque
1010
import com.no5ing.bbibbi.data.datasource.network.request.member.JoinFamilyRequest
1111
import com.no5ing.bbibbi.data.datasource.network.request.member.QuitMemberRequest
1212
import com.no5ing.bbibbi.data.datasource.network.request.member.UpdateMemberRealEmojiRequest
13+
import com.no5ing.bbibbi.data.datasource.network.request.post.CreateAIPostRequest
1314
import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostCommentRequest
1415
import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostReactionRequest
1516
import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostRequest
@@ -202,7 +203,7 @@ interface RestAPI {
202203

203204
@POST("v1/posts")
204205
suspend fun createAiPost(
205-
@Body body: CreatePostRequest,
206+
@Body body: CreateAIPostRequest,
206207
@Query("type") type: String? = null,
207208
): ApiResponse<AIPost>
208209

@@ -333,6 +334,7 @@ interface RestAPI {
333334
@Query("page") page: Int?,
334335
@Query("size") size: Int?,
335336
@Query("memberId") memberId: String?,
337+
@Query("aiPostType") aiPostType: String?,
336338
@Query("sort") sort: String? = "DESC",
337339
): ApiResponse<Pagination<AIPost>>
338340

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.no5ing.bbibbi.data.datasource.network.request.post
2+
3+
import android.os.Parcelable
4+
import com.no5ing.bbibbi.data.model.BaseModel
5+
import kotlinx.parcelize.Parcelize
6+
7+
@Parcelize
8+
data class CreateAIPostRequest(
9+
val imageUrl: String,
10+
val content: String,
11+
val uploadTime: String,
12+
val aiPostType: String,
13+
) : Parcelable, BaseModel()

app/src/main/java/com/no5ing/bbibbi/data/repository/post/GetAIPostsRepository.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class GetAIPostPagingSource @Inject constructor(
6363
memberId = null,
6464
page = loadParams.key ?: 1,
6565
size = loadParams.loadSize,
66+
aiPostType = "CHRISTMAS_2025",
6667
).mapSuccess {
6768
Pagination(
6869
currentPage = currentPage,

app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family_studio/FamilyStudioPage.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.runtime.collectAsState
2828
import androidx.compose.runtime.mutableStateOf
2929
import androidx.compose.ui.Alignment
3030
import androidx.compose.ui.Modifier
31+
import androidx.compose.ui.graphics.Color
3132
import androidx.compose.ui.layout.ContentScale
3233
import androidx.compose.ui.res.painterResource
3334
import androidx.compose.ui.res.stringResource
@@ -122,14 +123,14 @@ fun FamilyStudioPage(
122123
.padding(vertical = 2.dp, horizontal = 6.dp)
123124
) {
124125
Text(
125-
text = "추석",
126+
text = "성탄절",
126127
color = MaterialTheme.bbibbiScheme.backgroundPrimary,
127128
style = MaterialTheme.bbibbiTypo.bodyTwoBold,
128129
)
129130
}
130131
Box(modifier = Modifier.width(6.dp))
131132
Text(
132-
text = "9/29~10/27",
133+
text = "12/12~12/31",
133134
color = MaterialTheme.bbibbiScheme.textPrimary,
134135
style = MaterialTheme.bbibbiTypo.headTwoBold,
135136
)
@@ -171,6 +172,7 @@ fun FamilyStudioPage(
171172

172173
CustomCTAButton(
173174
modifier = Modifier.fillMaxWidth(),
175+
buttonColor = Color(0xFFFF99B1),
174176
contentPadding = PaddingValues(vertical = 18.dp),
175177
onClick = onTapCreateImage,
176178
isActive = aiImageState.value.isReady() && aiImageState.value.data.hasAvailableImage()
@@ -241,7 +243,7 @@ fun FamilyStudioPAagePreview() {
241243
.padding(vertical = 2.dp, horizontal = 6.dp)
242244
) {
243245
Text(
244-
text = "추석",
246+
text = "성탄절",
245247
color = MaterialTheme.bbibbiScheme.backgroundPrimary,
246248
style = MaterialTheme.bbibbiTypo.bodyTwoBold,
247249
)
@@ -279,6 +281,7 @@ fun FamilyStudioPAagePreview() {
279281
) {
280282
CustomCTAButton(
281283
modifier = Modifier.fillMaxWidth(),
284+
buttonColor = Color(0xFFFF99B1),
282285
contentPadding = PaddingValues(vertical = 16.dp)
283286
) {
284287
Text(

app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ fun AIImageTab(
333333
.padding(vertical = 2.dp, horizontal = 6.dp)
334334
) {
335335
Text(
336-
text = "추석",
336+
text = "성탄절",
337337
color = MaterialTheme.bbibbiScheme.backgroundPrimary,
338338
style = MaterialTheme.bbibbiTypo.bodyTwoBold,
339339
)
340340
}
341341
Box(modifier = Modifier.width(6.dp))
342342
Text(
343-
text = "9/29~10/27",
343+
text = "12/12~12/31",
344344
color = MaterialTheme.bbibbiScheme.textPrimary,
345345
style = MaterialTheme.bbibbiTypo.headTwoBold,
346346
)

app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreateFamilyStudioPostViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.no5ing.bbibbi.presentation.feature.view_model.post
22

33
import com.no5ing.bbibbi.data.datasource.network.RestAPI
4+
import com.no5ing.bbibbi.data.datasource.network.request.post.CreateAIPostRequest
45
import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostRequest
56
import com.no5ing.bbibbi.data.model.APIResponse
67
import com.no5ing.bbibbi.data.model.APIResponse.Companion.loading
@@ -30,10 +31,11 @@ class CreateFamilyStudioPostViewModel @Inject constructor(
3031
Timber.d("imageUri: $imageUri")
3132

3233
val postResult = restAPI.getPostApi().createAiPost(
33-
CreatePostRequest(
34+
CreateAIPostRequest(
3435
imageUrl = imageUri,
3536
content = "",
3637
uploadTime = getZonedDateTimeString(),
38+
aiPostType = "CHRISTMAS_2025",
3739
),
3840
type = arguments.get("type")
3941
).wrapToAPIResponse()

app/src/main/res/drawable/family_studio_banner.xml

Lines changed: 197 additions & 292 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)