diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index ed52fac..a25c4f5 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/java/sopt/uni/presentation/shortgame/missionresult/MissionResultActivity.kt b/app/src/main/java/sopt/uni/presentation/shortgame/missionresult/MissionResultActivity.kt
index c68c907..a7b102c 100644
--- a/app/src/main/java/sopt/uni/presentation/shortgame/missionresult/MissionResultActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/shortgame/missionresult/MissionResultActivity.kt
@@ -83,11 +83,13 @@ class MissionResultActivity :
if (date == null || isMissionComplete == "LOSE") {
view.text = view.context.getString(R.string.mission_result_failure)
view.background = view.context.getDrawable(R.drawable.wish_ment_pink_rectangle)
+ view.setTextColor(view.context.resources.getColor(R.color.Pink_600))
} else {
val dateString = date.split("T")[1].substring(0, 5)
view.text =
"$dateString ${view.context.getString(R.string.mission_result_complete)}"
view.background = view.context.getDrawable(R.drawable.wish_ment_green_rectangle)
+ view.setTextColor(view.context.resources.getColor(R.color.Green_600))
}
}
}
diff --git a/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt b/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
index 42fb6d8..1d7a7c3 100644
--- a/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/wish/WishActivity.kt
@@ -54,23 +54,20 @@ class WishActivity : BindingActivity(R.layout.activity_wish
wishViewModel.wishCouponList.observe(this) {
var wishList = mutableListOf()
- if (it.isEmpty() && wishViewModel.isMineState.value!!) {
+ if (wishViewModel.isMineState.value!!) {
+ wishList.add(WishMultiData(0, wishViewModel.newWishCoupon.value))
+ }
+
+ if (it.isEmpty() && !wishViewModel.isMineState.value!!) {
binding.rvWish.visibility = View.INVISIBLE
- binding.tvWishEmptyMy.visibility = View.VISIBLE
- binding.tvWishEmptyYour.visibility = View.INVISIBLE
+ binding.tvWishEmpty.visibility = View.VISIBLE
return@observe
- } else if (it.isEmpty() && !wishViewModel.isMineState.value!!) {
+ } else if (wishViewModel.isMineState.value!! && wishViewModel.availableWishCoupon.value == 0) {
binding.rvWish.visibility = View.INVISIBLE
- binding.tvWishEmptyYour.visibility = View.VISIBLE
- binding.tvWishEmptyMy.visibility = View.INVISIBLE
- return@observe
+ binding.tvWishEmpty.visibility = View.VISIBLE
} else {
binding.rvWish.visibility = View.VISIBLE
- binding.tvWishEmptyMy.visibility = View.INVISIBLE
- binding.tvWishEmptyYour.visibility = View.INVISIBLE
- }
- if (wishViewModel.isMineState.value!!) {
- wishList.add(WishMultiData(0, wishViewModel.newWishCoupon.value))
+ binding.tvWishEmpty.visibility = View.INVISIBLE
}
for (i in 0 until it.size) {
@@ -108,6 +105,7 @@ class WishActivity : BindingActivity(R.layout.activity_wish
lifecycleScope.launch {
wishViewModel.getMyWishList(userId).join()
}
+ binding.tvWishEmpty.setText(R.string.wish_empty_my)
setupRecyclerView(rvWish, multiviewAdapter)
multiviewAdapter.submitData(_wishList)
}
@@ -117,6 +115,7 @@ class WishActivity : BindingActivity(R.layout.activity_wish
lifecycleScope.launch {
wishViewModel.getPartnerWishList(partnerId!!).join()
}
+ binding.tvWishEmpty.setText(R.string.wish_empty_your)
setupRecyclerView(rvWish, yourMultiviewAdapter)
yourMultiviewAdapter.submitData(_wishList)
}
diff --git a/app/src/main/res/layout/activity_wish.xml b/app/src/main/res/layout/activity_wish.xml
index e4a72c6..eb45175 100644
--- a/app/src/main/res/layout/activity_wish.xml
+++ b/app/src/main/res/layout/activity_wish.xml
@@ -153,7 +153,7 @@
tools:listitem="@layout/item_wish_large" />
-