[FIX/#414] Timeline, Pay / 3차 스프린트 3차 QA 피드백 반영

app/src/main/java/com/el/yello/presentation/main/myyello/read/PointAfterDialog.kt

@@ -107,7 +107,7 @@ class PointAfterDialog :
                 (deviceWidth - dialogHorizontalMargin * 2).toInt(),
                 WindowManager.LayoutParams.WRAP_CONTENT,
             )
-            setBackgroundDrawableResource(R.drawable.shape_fill_gray900_12dp)
+            setBackgroundDrawableResource(R.drawable.shape_grayscales900_fill_12_rect)
         }
         dialog?.setCancelable(true)
     }

app/src/main/java/com/el/yello/presentation/main/myyello/read/PointUseDialog.kt

@@ -106,7 +106,7 @@ class PointUseDialog : BindingDialogFragment<DialogPointUseBinding>(R.layout.dia
                 (deviceWidth - dialogHorizontalMargin * 2).toInt(),
                 WindowManager.LayoutParams.WRAP_CONTENT,
             )
-            setBackgroundDrawableResource(R.drawable.shape_fill_gray900_12dp)
+            setBackgroundDrawableResource(R.drawable.shape_grayscales900_fill_12_rect)
         }
         dialog?.setCancelable(true)
     }

app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketAfterDialog.kt

@@ -78,7 +78,7 @@ class ReadingTicketAfterDialog :
                 (deviceWidth - dialogHorizontalMargin * 2).toInt(),
                 WindowManager.LayoutParams.WRAP_CONTENT,
             )
-            setBackgroundDrawableResource(R.drawable.shape_fill_gray900_12dp)
+            setBackgroundDrawableResource(R.drawable.shape_grayscales900_fill_12_rect)
         }
         dialog?.setCancelable(true)
     }

app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketUseDialog.kt

@@ -68,7 +68,7 @@ class ReadingTicketUseDialog :
                 (deviceWidth - dialogHorizontalMargin * 2).toInt(),
                 WindowManager.LayoutParams.WRAP_CONTENT,
             )
-            setBackgroundDrawableResource(R.drawable.shape_fill_gray900_12dp)
+            setBackgroundDrawableResource(R.drawable.shape_grayscales900_fill_12_rect)
         }
         dialog?.setCancelable(true)
     }

app/src/main/java/com/el/yello/presentation/main/timeline/TimelineFragment.kt

@@ -19,6 +19,7 @@ import com.el.yello.util.manager.AmplitudeManager
 import com.el.yello.util.extension.yelloSnackbar
 import com.example.ui.base.BindingFragment
 import com.example.ui.extension.setOnSingleClickListener
+import com.example.ui.extension.stringOf
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChangedBy
@@ -86,7 +87,15 @@ class TimelineFragment : BindingFragment<FragmentTimelineBinding>(R.layout.fragm
             adapter.refresh()
             viewModel.setFirstLoading(true)
             observeTimelinePagingList(isFilterSelected)
-            binding.tvLookFilterType.text = if (isFilterSelected) TYPE_MINE else TYPE_ALL
+            with(binding) {
+                if (isFilterSelected) {
+                    tvLookFilterType.text = TYPE_MINE
+                    tvLookNoFriendTitle.text = stringOf(R.string.look_invite_no_title_mine)
+                } else {
+                    tvLookFilterType.text = TYPE_ALL
+                    tvLookNoFriendTitle.text = stringOf(R.string.look_invite_no_title)
+                }
+            }
         }
     }
 

app/src/main/java/com/el/yello/presentation/main/yello/start/YelloStartFragment.kt

@@ -94,7 +94,7 @@ class YelloStartFragment :
             when (event.actionMasked) {
                 ACTION_DOWN -> {
                     with(binding.btnStartVote) {
-                        background = drawableOf(R.drawable.shape_yello_main_500_fill_100_rect)
+                        background = drawableOf(R.drawable.shape_yello500_fill_100_rect)
                         setPadding(
                             0,
                             PADDING_HORIZONTAL_VOTE_BTN_PRESSED.dpToPx(requireContext()),
@@ -107,7 +107,7 @@ class YelloStartFragment :
                 ACTION_UP -> {
                     with(binding.btnStartVote) {
                         background =
-                            drawableOf(R.drawable.shape_yello_main_500_fill_500_botshadow_rect)
+                            drawableOf(R.drawable.layerlist_start_yello500_oval_botshadow)
                         setPadding(
                             0,
                             PADDING_TOP_VOTE_BTN.dpToPx(requireContext()),

app/src/main/java/com/el/yello/presentation/onboarding/fragment/code/CodeFragment.kt

@@ -128,11 +128,11 @@ class CodeFragment : BindingFragment<FragmentCodeBinding>(R.layout.fragment_code
 
     private fun initIdEditTextViewError() {
         with(binding) {
-            etCode.setBackgroundResource(R.drawable.shape_fill_red20_line_semantic_status_red500_rect_8)
+            etCode.setBackgroundResource(R.drawable.shape_red_fill_red500_line_8_rect)
             ivCodeDelete.setBackgroundResource(R.drawable.ic_onboarding_delete_red)
             tvCodeWarning.text = getString(R.string.onboarding_code_duplicate_msg)
             tvCodeWarning.setTextColor(colorOf(R.color.semantic_red_500))
-            btnCodeNext.setBackgroundResource(R.drawable.shape_grayscales_800_fill_100_rect)
+            btnCodeNext.setBackgroundResource(R.drawable.shape_grayscales800_fill_100_rect)
             btnCodeNext.setTextColor(colorOf(R.color.grayscales_700))
             btnCodeNext.isEnabled = false
         }

app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/HighSchoolInfoFragment.kt

@@ -108,33 +108,33 @@ class HighSchoolInfoFragment :
 
     private fun changeFirstGradeBtn() {
         with(binding) {
-            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello_main600_line_8_leftrect)
+            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello600_line_rect)
             tvGradeFirst.setTextColor(binding.root.context.colorOf(R.color.yello_main_600))
-            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_square)
+            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_rect)
             tvGradeSecond.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
-            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_rightrect)
+            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_right8_rect)
             tvGradeThird.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
         }
     }
 
     private fun changeSecondGradeBtn() {
         with(binding) {
-            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_leftrect)
+            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_left8_rect)
             tvGradeFirst.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
-            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello_main600_line_8_square)
+            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello600_line_rect)
             tvGradeSecond.setTextColor(binding.root.context.colorOf(R.color.yello_main_600))
-            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_rightrect)
+            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_right8_rect)
             tvGradeThird.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
         }
     }
 
     private fun changeThirdGradeBtn() {
         with(binding) {
-            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_leftrect)
+            tvGradeFirst.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_left8_rect)
             tvGradeFirst.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
-            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_8_square)
+            tvGradeSecond.setBackgroundResource(R.drawable.shape_grayscales900_fill_grayscales700_line_rect)
             tvGradeSecond.setTextColor(binding.root.context.colorOf(R.color.grayscales_700))
-            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello_main600_line_8_rightrect)
+            tvGradeThird.setBackgroundResource(R.drawable.shape_grayscales900_fill_yello600_line_right8_rect)
             tvGradeThird.setTextColor(binding.root.context.colorOf(R.color.yello_main_600))
         }
     }

app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/group/GroupDialogAdapter.kt

@@ -37,7 +37,7 @@ class GroupDialogAdapter(
             binding.group = group
             binding.root.setOnSingleClickListener {
                 storeHighSchoolGroup(group)
-                binding.tvItemGroup.setBackgroundResource(R.drawable.shape_grayscales_800_fill_100_rect)
+                binding.tvItemGroup.setBackgroundResource(R.drawable.shape_grayscales800_fill_100_rect)
             }
         }
     }

app/src/main/java/com/el/yello/presentation/onboarding/fragment/studenttype/SelectStudentFragment.kt

@@ -71,7 +71,7 @@ class SelectStudentFragment :
 
     private fun changeHighSchoolBtn() {
         with(binding) {
-            btnSchoolHighschool.setBackgroundResource(R.drawable.shape_black_fill_yello_main_500_line_8_rect)
+            btnSchoolHighschool.setBackgroundResource(R.drawable.shape_black_fill_yello500_line_8_rect)
             btnSchoolUniversity.setBackgroundResource(R.drawable.shape_black_fill_grayscales700_line_8_rect)
             ivStudentHighschool.setImageResource(R.drawable.ic_student_highschool_face_select)
             ivStudentUniversity.setImageResource(R.drawable.ic_student_university_face_unselected)
@@ -82,7 +82,7 @@ class SelectStudentFragment :
 
     private fun changeUniversityBtn() {
         with(binding) {
-            btnSchoolUniversity.setBackgroundResource(R.drawable.shape_black_fill_yello_main_500_line_8_rect)
+            btnSchoolUniversity.setBackgroundResource(R.drawable.shape_black_fill_yello500_line_8_rect)
             btnSchoolHighschool.setBackgroundResource(R.drawable.shape_black_fill_grayscales700_line_8_rect)
             ivStudentUniversity.setImageResource(R.drawable.ic_student_university_face_select)
             ivStudentHighschool.setImageResource(R.drawable.ic_student_highschool_face_unselected)

app/src/main/java/com/el/yello/presentation/onboarding/fragment/universityinfo/studentid/StudentIdDialogAdapter.kt

@@ -36,7 +36,7 @@ class StudentIdDialogAdapter(
             binding.studentId = id
             binding.root.setOnSingleClickListener {
                 storeStudentId(id)
-                binding.tvItemStudentId.setBackgroundResource(R.drawable.shape_grayscales_800_fill_100_rect)
+                binding.tvItemStudentId.setBackgroundResource(R.drawable.shape_grayscales800_fill_100_rect)
             }
         }
     }

app/src/main/java/com/el/yello/presentation/onboarding/fragment/yelloid/YelIoIdFragment.kt

@@ -88,13 +88,13 @@ class YelIoIdFragment : BindingFragment<FragmentYelloIdBinding>(R.layout.fragmen
 
     private fun initIdEditTextViewError() {
         with(binding) {
-            etId.setBackgroundResource(R.drawable.shape_fill_red20_line_semantic_status_red500_rect_8)
+            etId.setBackgroundResource(R.drawable.shape_red_fill_red500_line_8_rect)
             btnIdDelete.setBackgroundResource(R.drawable.ic_onboarding_delete_red)
             tvIdErrorFirst.text = getString(R.string.onboarding_name_id_duplicate_id_msg)
             tvIdErrorFirst.setTextColor(colorOf(R.color.semantic_red_500))
             tvIdErrorSecond.visibility = View.INVISIBLE
             tvIdErrorThird.visibility = View.INVISIBLE
-            btnYelloIdNext.setBackgroundResource(R.drawable.shape_grayscales_800_fill_100_rect)
+            btnYelloIdNext.setBackgroundResource(R.drawable.shape_grayscales800_fill_100_rect)
             btnYelloIdNext.setTextColor(colorOf(R.color.grayscales_700))
             btnYelloIdNext.isEnabled = false
         }

app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt

@@ -211,7 +211,7 @@ class PayActivity : BindingActivity<ActivityPayBinding>(R.layout.activity_pay) {
                 is UiState.Success -> {
                     if (state.data) {
                         with(binding) {
-                            layoutAdForPoint.background = drawableOf(R.drawable.shape_black_fill_purple_line_10_rect)
+                            layoutAdForPoint.background = drawableOf(R.drawable.shape_black_fill_purple700_line_10_rect)
                             tvAdTitle.setTextColor(colorOf(R.color.purple_sub_100))
                             tvAdReward.setTextColor(colorOf(R.color.white))
                             tvAdTimeAvailable.visibility = View.VISIBLE

app/src/main/java/com/el/yello/presentation/pay/dialog/PayInAppDialog.kt

@@ -59,17 +59,17 @@ class PayInAppDialog :
         when (viewModel.currentInAppItem) {
            YELLO_ONE -> {
                 binding.tvPayDialogSubtitle1.text = getString(R.string.pay_dialog_in_app_title_1)
-                binding.ivPayInApp.load(R.drawable.ic_pay_in_app_1)
+                binding.ivPayInApp.load(R.drawable.img_pay_in_app_1)
             }
 
             YELLO_TWO -> {
                 binding.tvPayDialogSubtitle1.text = getString(R.string.pay_dialog_in_app_title_2)
-                binding.ivPayInApp.load(R.drawable.ic_pay_in_app_2)
+                binding.ivPayInApp.load(R.drawable.img_pay_in_app_2)
             }
 
             YELLO_FIVE -> {
                 binding.tvPayDialogSubtitle1.text = getString(R.string.pay_dialog_in_app_title_5)
-                binding.ivPayInApp.load(R.drawable.ic_pay_in_app_5)
+                binding.ivPayInApp.load(R.drawable.img_pay_in_app_5)
             }
 
             else -> dismiss()