Skip to content

Commit 4f68eaf

Browse files
sohyun127sohyun127
authored
Merge pull request #269 from TeamDon-tBe/feature/#268-version-code-snackbar
[Feature/#268] : 스낵바 로딩 중일 때, 버전 코드 변경
2 parents a133135 + cda5aab commit 4f68eaf

File tree

8 files changed

+75
-67
lines changed

8 files changed

+75
-67
lines changed

‎build-logic/src/main/java/com/teamdontbe/dontbe/plugin/CommonConfigs.kt‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,28 @@ internal fun Project.configureAndroidCommonPlugin() {
2222

2323
extensions.getByType<BaseExtension>().apply {
2424
defaultConfig {
25-
val dontbeBaseUrl = properties["dontbe.base.url"] as? String ?: ""
2625
val kakaoApiKey = properties["kakao.api.key"] as? String ?: ""
2726
val amplitudeApiKey = properties["amplitude.api.key"] as? String ?: ""
2827

29-
manifestPlaceholders["dontbeBaseUrl"] = properties["dontbe.base.url"] as String
3028
manifestPlaceholders["kakaoApiKey"] = properties["kakao.api.key"] as String
3129

32-
buildConfigField("String", "DONTBE_BASE_URL", "\"${dontbeBaseUrl}\"")
3330
buildConfigField("String", "KAKAO_APP_KEY", "\"${kakaoApiKey}\"")
3431
buildConfigField("String", "AMPLITUDE_API_KEY", "\"${amplitudeApiKey}\"")
3532
}
33+
34+
buildTypes {
35+
getByName("debug") {
36+
val dontbeDevBaseUrl = properties["dontbe.dev.base.url"] as? String ?: ""
37+
buildConfigField("String", "DONTBE_BASE_URL", "\"${dontbeDevBaseUrl}\"")
38+
manifestPlaceholders["dontbeBaseUrl"] = properties["dontbe.dev.base.url"] as String
39+
}
40+
getByName("release") {
41+
val dontbeRelBaseUrl = properties["dontbe.rel.base.url"] as? String ?: ""
42+
buildConfigField("String", "DONTBE_BASE_URL", "\"${dontbeRelBaseUrl}\"")
43+
manifestPlaceholders["dontbeBaseUrl"] = properties["dontbe.rel.base.url"] as String
44+
}
45+
}
46+
3647
buildFeatures.apply {
3748
viewBinding = true
3849
buildConfig = true
@@ -47,4 +58,4 @@ internal fun Project.configureAndroidCommonPlugin() {
4758
"implementation"(libs.findLibrary("material").get())
4859
"implementation"(libs.findLibrary("timber").get())
4960
}
50-
}
61+
}

‎feature/src/main/java/com/teamdontbe/feature/home/HomeViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class HomeViewModel
100100
uriString: String?
101101
) {
102102
viewModelScope.launch {
103+
_postCommentPosting.emit(UiState.Loading)
103104
homeRepository.postCommentPosting(contentId, commentText, uriString)
104105
.onSuccess {
105106
if (it) _postCommentPosting.emit(UiState.Success(it))

‎feature/src/main/java/com/teamdontbe/feature/homedetail/HomeDetailFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ class HomeDetailFragment :
301301
}
302302
}
303303

304-
else -> Unit
304+
is UiState.Loading -> UploadingSnackBar.make(binding.root).show()
305+
is UiState.Empty -> Unit
305306
}
306307
}.launchIn(viewLifeCycleScope)
307308
}
@@ -314,7 +315,6 @@ class HomeDetailFragment :
314315
requireContext().hideKeyboard(binding.root)
315316
(requireActivity() as MainActivity).findViewById<View>(R.id.bnv_main).visibility =
316317
View.VISIBLE
317-
UploadingSnackBar.make(binding.root).show()
318318
}
319319

320320
private fun observeDeleteComment() {

‎feature/src/main/java/com/teamdontbe/feature/posting/PostingFragment.kt‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,12 @@ class PostingFragment : BindingFragment<FragmentPostingBinding>(R.layout.fragmen
160160
private fun initObservePost() {
161161
postingViewModel.postPosting.flowWithLifecycle(viewLifeCycle).onEach {
162162
when (it) {
163-
is UiState.Loading -> Unit
164-
is UiState.Success -> {
165-
navigateToMainActivity()
166-
context?.let { it ->
167-
UploadingSnackBar.make(binding.root)
168-
.show(it.pxToDp(16), 0, it.pxToDp(16), it.pxToDp(80))
169-
}
163+
is UiState.Loading -> context?.let { it ->
164+
UploadingSnackBar.make(binding.root)
165+
.show(it.pxToDp(16), 0, it.pxToDp(16), it.pxToDp(80))
170166
}
171167

168+
is UiState.Success -> navigateToMainActivity()
172169
is UiState.Empty -> Unit
173170
is UiState.Failure -> {
174171
LinkCountErrorSnackBar.make(binding.root).apply {
@@ -279,9 +276,9 @@ class PostingFragment : BindingFragment<FragmentPostingBinding>(R.layout.fragmen
279276
trackEvent(CLICK_POST_UPLOAD)
280277
postingViewModel.posting(
281278
binding.etPostingContent.text.toString() + (
282-
binding.etPostingLink.text.takeIf { it.isNotEmpty() }
283-
?.let { "\n$it" }.orEmpty()
284-
),
279+
binding.etPostingLink.text.takeIf { it.isNotEmpty() }
280+
?.let { "\n$it" }.orEmpty()
281+
),
285282
postingViewModel.photoUri.value
286283
)
287284
}
@@ -413,7 +410,6 @@ class PostingFragment : BindingFragment<FragmentPostingBinding>(R.layout.fragmen
413410
}
414411
}
415412

416-
417413
private fun observePhotoUri() {
418414
postingViewModel.photoUri.flowWithLifecycle(viewLifeCycle).onEach { getUri ->
419415
getUri?.let { uri ->

‎feature/src/main/res/layout/item_home_comment.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,22 @@
127127
app:layout_constraintStart_toStartOf="@id/iv_comment_profile"
128128
app:layout_constraintTop_toBottomOf="@id/iv_comment_profile" />
129129

130+
<com.google.android.material.imageview.ShapeableImageView
131+
android:id="@+id/iv_home_feed_img"
132+
setEmptyImageUrl="@{comment.commentImageUrl}"
133+
android:layout_width="0dp"
134+
android:layout_height="0dp"
135+
android:layout_marginTop="8dp"
136+
android:scaleType="centerCrop"
137+
android:visibility="visible"
138+
app:layout_constraintBottom_toTopOf="@id/btn_comment_heart"
139+
app:layout_constraintDimensionRatio="270:330"
140+
app:layout_constraintEnd_toEndOf="@id/tv_comment_content"
141+
app:layout_constraintStart_toStartOf="@id/tv_comment_content"
142+
app:layout_constraintTop_toBottomOf="@id/tv_comment_content"
143+
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
144+
tools:background="@color/primary" />
145+
130146
<View
131147
android:id="@+id/view_comment_transparent_bg"
132148
android:layout_width="0dp"
@@ -187,22 +203,6 @@
187203
app:layout_constraintStart_toEndOf="@id/btn_comment_heart"
188204
app:layout_constraintTop_toTopOf="@id/btn_comment_heart"
189205
tools:text="544" />
190-
191-
<com.google.android.material.imageview.ShapeableImageView
192-
android:id="@+id/iv_home_feed_img"
193-
setEmptyImageUrl="@{comment.commentImageUrl}"
194-
android:layout_width="0dp"
195-
android:layout_height="0dp"
196-
android:layout_marginTop="8dp"
197-
android:scaleType="centerCrop"
198-
android:visibility="visible"
199-
app:layout_constraintBottom_toTopOf="@id/btn_comment_heart"
200-
app:layout_constraintDimensionRatio="270:330"
201-
app:layout_constraintEnd_toEndOf="@id/tv_comment_content"
202-
app:layout_constraintStart_toStartOf="@id/tv_comment_content"
203-
app:layout_constraintTop_toBottomOf="@id/tv_comment_content"
204-
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
205-
tools:background="@color/primary" />
206206
</androidx.constraintlayout.widget.ConstraintLayout>
207207
</androidx.constraintlayout.widget.ConstraintLayout>
208208
</layout>

‎feature/src/main/res/layout/item_home_feed.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,22 @@
9191
app:layout_constraintStart_toStartOf="@id/iv_home_profile"
9292
app:layout_constraintTop_toBottomOf="@id/iv_home_profile" />
9393

94+
<com.google.android.material.imageview.ShapeableImageView
95+
android:id="@+id/iv_home_feed_img"
96+
setEmptyImageUrl="@{feed.contentImageUrl}"
97+
android:layout_width="0dp"
98+
android:layout_height="0dp"
99+
android:layout_marginTop="8dp"
100+
android:scaleType="centerCrop"
101+
android:visibility="visible"
102+
app:layout_constraintBottom_toTopOf="@id/btn_home_heart"
103+
app:layout_constraintDimensionRatio="270:330"
104+
app:layout_constraintEnd_toEndOf="@id/tv_home_feed_content"
105+
app:layout_constraintStart_toStartOf="@id/tv_home_feed_content"
106+
app:layout_constraintTop_toBottomOf="@id/tv_home_feed_content"
107+
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
108+
tools:background="@color/primary" />
109+
94110
<View
95111
android:id="@+id/view_home_transparent_bg"
96112
android:layout_width="0dp"
@@ -180,21 +196,5 @@
180196
app:layout_constraintStart_toEndOf="@id/btn_home_heart"
181197
app:layout_constraintTop_toTopOf="@id/btn_home_heart"
182198
tools:text="541" />
183-
184-
<com.google.android.material.imageview.ShapeableImageView
185-
android:id="@+id/iv_home_feed_img"
186-
setEmptyImageUrl="@{feed.contentImageUrl}"
187-
android:layout_width="0dp"
188-
android:layout_height="0dp"
189-
android:layout_marginTop="8dp"
190-
android:scaleType="centerCrop"
191-
android:visibility="visible"
192-
app:layout_constraintBottom_toTopOf="@id/btn_home_heart"
193-
app:layout_constraintDimensionRatio="270:330"
194-
app:layout_constraintEnd_toEndOf="@id/tv_home_feed_content"
195-
app:layout_constraintStart_toStartOf="@id/tv_home_feed_content"
196-
app:layout_constraintTop_toBottomOf="@id/tv_home_feed_content"
197-
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
198-
tools:background="@color/primary" />
199199
</androidx.constraintlayout.widget.ConstraintLayout>
200200
</layout>

‎feature/src/main/res/layout/item_my_page_comment.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@
8181
tools:text="돈비를 사용하면 진짜 돈비를 맞을 수 있나요?
8282
저 돈비 맞고 싶어요 돈벼락이 최고입니다. 그나저나 돈비 정말 흥미로운 서비스인 것 같아요 어떻게 이런 기획을 ? 대박 ㄷ ㄷ ㄷ돈비를 사용하면 진짜 돈비를 맞을 수 있나요?" />
8383

84+
<com.google.android.material.imageview.ShapeableImageView
85+
android:id="@+id/iv_home_feed_img"
86+
setEmptyImageUrl="@{feed.commentImageUrl}"
87+
android:layout_width="0dp"
88+
android:layout_height="0dp"
89+
android:layout_marginTop="8dp"
90+
android:scaleType="centerCrop"
91+
android:visibility="visible"
92+
app:layout_constraintBottom_toTopOf="@id/iv_comment_ghost_fill_green"
93+
app:layout_constraintDimensionRatio="270:330"
94+
app:layout_constraintEnd_toEndOf="@id/tv_comment_content"
95+
app:layout_constraintStart_toStartOf="@id/tv_comment_content"
96+
app:layout_constraintTop_toBottomOf="@id/tv_comment_content"
97+
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
98+
tools:background="@color/primary" />
99+
84100
<View
85101
android:id="@+id/view_home_transparent_bg"
86102
android:layout_width="0dp"
@@ -151,21 +167,5 @@
151167
app:layout_constraintEnd_toEndOf="parent"
152168
app:layout_constraintTop_toTopOf="@id/btn_comment_heart"
153169
tools:text="54" />
154-
155-
<com.google.android.material.imageview.ShapeableImageView
156-
android:id="@+id/iv_home_feed_img"
157-
setEmptyImageUrl="@{feed.commentImageUrl}"
158-
android:layout_width="0dp"
159-
android:layout_height="0dp"
160-
android:layout_marginTop="8dp"
161-
android:scaleType="centerCrop"
162-
android:visibility="visible"
163-
app:layout_constraintBottom_toTopOf="@id/iv_comment_ghost_fill_green"
164-
app:layout_constraintDimensionRatio="270:330"
165-
app:layout_constraintEnd_toEndOf="@id/tv_comment_content"
166-
app:layout_constraintStart_toStartOf="@id/tv_comment_content"
167-
app:layout_constraintTop_toBottomOf="@id/tv_comment_content"
168-
app:shapeAppearance="@style/ShapeAppearanceOverlay.App.CornerRadius4"
169-
tools:background="@color/primary" />
170170
</androidx.constraintlayout.widget.ConstraintLayout>
171171
</layout>

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
compileSdk = "34"
33
minSdk = "28"
44
targetSdk = "34"
5-
appVersion = "1.1.0"
6-
versionCode = "7"
5+
appVersion = "1.2.0"
6+
versionCode = "8"
77

88
# kotlin
99
kotlin = "1.9.10"

0 commit comments

Comments
 (0)