diff --git a/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointAfterDialog.kt b/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointAfterDialog.kt index 2da5fd563..23ca47bfa 100644 --- a/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointAfterDialog.kt +++ b/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) } diff --git a/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointUseDialog.kt b/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointUseDialog.kt index 7bde07491..742976f87 100644 --- a/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointUseDialog.kt +++ b/app/src/main/java/com/el/yello/presentation/main/myyello/read/PointUseDialog.kt @@ -106,7 +106,7 @@ class PointUseDialog : BindingDialogFragment(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) } diff --git a/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketAfterDialog.kt b/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketAfterDialog.kt index 881dc70bc..33a584424 100644 --- a/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketAfterDialog.kt +++ b/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) } diff --git a/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketUseDialog.kt b/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketUseDialog.kt index 4346f172e..a810916e7 100644 --- a/app/src/main/java/com/el/yello/presentation/main/myyello/read/ReadingTicketUseDialog.kt +++ b/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) } diff --git a/app/src/main/java/com/el/yello/presentation/main/timeline/TimelineFragment.kt b/app/src/main/java/com/el/yello/presentation/main/timeline/TimelineFragment.kt index 886a907b4..7fb134988 100644 --- a/app/src/main/java/com/el/yello/presentation/main/timeline/TimelineFragment.kt +++ b/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(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) + } + } } } diff --git a/app/src/main/java/com/el/yello/presentation/main/yello/start/YelloStartFragment.kt b/app/src/main/java/com/el/yello/presentation/main/yello/start/YelloStartFragment.kt index cf0132fcc..6ed061abf 100644 --- a/app/src/main/java/com/el/yello/presentation/main/yello/start/YelloStartFragment.kt +++ b/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()), diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/code/CodeFragment.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/code/CodeFragment.kt index 97537a9c8..513638054 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/code/CodeFragment.kt +++ b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/code/CodeFragment.kt @@ -128,11 +128,11 @@ class CodeFragment : BindingFragment(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 } diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/HighSchoolInfoFragment.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/HighSchoolInfoFragment.kt index afb01d6b9..68995655d 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/HighSchoolInfoFragment.kt +++ b/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)) } } diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/group/GroupDialogAdapter.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/group/GroupDialogAdapter.kt index 03d1c80f4..e6a67f9fd 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/highschoolinfo/group/GroupDialogAdapter.kt +++ b/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) } } } diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/studenttype/SelectStudentFragment.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/studenttype/SelectStudentFragment.kt index 863a633db..280163fd5 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/studenttype/SelectStudentFragment.kt +++ b/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) diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/universityinfo/studentid/StudentIdDialogAdapter.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/universityinfo/studentid/StudentIdDialogAdapter.kt index ab58063f8..a87f71345 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/universityinfo/studentid/StudentIdDialogAdapter.kt +++ b/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) } } } diff --git a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/yelloid/YelIoIdFragment.kt b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/yelloid/YelIoIdFragment.kt index e9fc3d503..2e252f2f6 100644 --- a/app/src/main/java/com/el/yello/presentation/onboarding/fragment/yelloid/YelIoIdFragment.kt +++ b/app/src/main/java/com/el/yello/presentation/onboarding/fragment/yelloid/YelIoIdFragment.kt @@ -88,13 +88,13 @@ class YelIoIdFragment : BindingFragment(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 } diff --git a/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt b/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt index ef3a72fef..8d7bb6c53 100644 --- a/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt +++ b/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt @@ -211,7 +211,7 @@ class PayActivity : BindingActivity(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 diff --git a/app/src/main/java/com/el/yello/presentation/pay/dialog/PayInAppDialog.kt b/app/src/main/java/com/el/yello/presentation/pay/dialog/PayInAppDialog.kt index 96a4e2422..d37ecae39 100644 --- a/app/src/main/java/com/el/yello/presentation/pay/dialog/PayInAppDialog.kt +++ b/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() diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml deleted file mode 100644 index 64afebd91..000000000 --- a/app/src/main/res/drawable/ic_alert.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml deleted file mode 100644 index 50472f215..000000000 --- a/app/src/main/res/drawable/ic_check.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_gender_check_female.xml b/app/src/main/res/drawable/ic_gender_check_female.xml deleted file mode 100644 index 166231977..000000000 --- a/app/src/main/res/drawable/ic_gender_check_female.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_gender_check_male.xml b/app/src/main/res/drawable/ic_gender_check_male.xml deleted file mode 100644 index cbb644fd8..000000000 --- a/app/src/main/res/drawable/ic_gender_check_male.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_gender_check_unselected.xml b/app/src/main/res/drawable/ic_gender_check_unselected.xml deleted file mode 100644 index 98fb7487f..000000000 --- a/app/src/main/res/drawable/ic_gender_check_unselected.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_gender_female_face.xml b/app/src/main/res/drawable/ic_gender_female_face.xml deleted file mode 100644 index 53b56a590..000000000 --- a/app/src/main/res/drawable/ic_gender_female_face.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gender_male_face.xml b/app/src/main/res/drawable/ic_gender_male_face.xml deleted file mode 100644 index 27eae92f7..000000000 --- a/app/src/main/res/drawable/ic_gender_male_face.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gender_selected_face.xml b/app/src/main/res/drawable/ic_gender_selected_face.xml deleted file mode 100644 index 6ffda9687..000000000 --- a/app/src/main/res/drawable/ic_gender_selected_face.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gender_unselected_face.xml b/app/src/main/res/drawable/ic_gender_unselected_face.xml deleted file mode 100644 index 9402c7c33..000000000 --- a/app/src/main/res/drawable/ic_gender_unselected_face.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/vector_fill_gray700.xml b/app/src/main/res/drawable/ic_indicator_gray700.xml similarity index 100% rename from app/src/main/res/drawable/vector_fill_gray700.xml rename to app/src/main/res/drawable/ic_indicator_gray700.xml diff --git a/app/src/main/res/drawable/vector_fill_white.xml b/app/src/main/res/drawable/ic_indicator_white.xml similarity index 100% rename from app/src/main/res/drawable/vector_fill_white.xml rename to app/src/main/res/drawable/ic_indicator_white.xml diff --git a/app/src/main/res/drawable/ic_look_right_arrow.xml b/app/src/main/res/drawable/ic_look_right_arrow.xml deleted file mode 100644 index bb7e5765a..000000000 --- a/app/src/main/res/drawable/ic_look_right_arrow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_onboarding_name_yello_bubble.xml b/app/src/main/res/drawable/ic_onboarding_name_yello_bubble.xml deleted file mode 100644 index a8b409b1d..000000000 --- a/app/src/main/res/drawable/ic_onboarding_name_yello_bubble.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml deleted file mode 100644 index 3527a1760..000000000 --- a/app/src/main/res/drawable/ic_star.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_yello_face_black.xml b/app/src/main/res/drawable/ic_yello_face_black.xml deleted file mode 100644 index 8155a871e..000000000 --- a/app/src/main/res/drawable/ic_yello_face_black.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_yello_splash.xml b/app/src/main/res/drawable/ic_yello_splash.xml deleted file mode 100644 index 5e40bf4c7..000000000 --- a/app/src/main/res/drawable/ic_yello_splash.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_yello_splash_group.xml b/app/src/main/res/drawable/ic_yello_splash_group.xml deleted file mode 100644 index 7be420311..000000000 --- a/app/src/main/res/drawable/ic_yello_splash_group.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_no_search.xml b/app/src/main/res/drawable/img_no_search.xml similarity index 100% rename from app/src/main/res/drawable/ic_no_search.xml rename to app/src/main/res/drawable/img_no_search.xml diff --git a/app/src/main/res/drawable/ic_onboarding_edit_name_bubble.xml b/app/src/main/res/drawable/img_onboarding_edit_name_bubble.xml similarity index 100% rename from app/src/main/res/drawable/ic_onboarding_edit_name_bubble.xml rename to app/src/main/res/drawable/img_onboarding_edit_name_bubble.xml diff --git a/app/src/main/res/drawable/ic_onboarding_school_yello_bubble.xml b/app/src/main/res/drawable/img_onboarding_school_yello_bubble.xml similarity index 100% rename from app/src/main/res/drawable/ic_onboarding_school_yello_bubble.xml rename to app/src/main/res/drawable/img_onboarding_school_yello_bubble.xml diff --git a/app/src/main/res/drawable/ic_onboarding_yelloid_bubble.xml b/app/src/main/res/drawable/img_onboarding_yelloid_bubble.xml similarity index 100% rename from app/src/main/res/drawable/ic_onboarding_yelloid_bubble.xml rename to app/src/main/res/drawable/img_onboarding_yelloid_bubble.xml diff --git a/app/src/main/res/drawable/ic_pay_dialog_subs.xml b/app/src/main/res/drawable/img_pay_dialog_subs.xml similarity index 100% rename from app/src/main/res/drawable/ic_pay_dialog_subs.xml rename to app/src/main/res/drawable/img_pay_dialog_subs.xml diff --git a/app/src/main/res/drawable/ic_pay_in_app_1.xml b/app/src/main/res/drawable/img_pay_in_app_1.xml similarity index 100% rename from app/src/main/res/drawable/ic_pay_in_app_1.xml rename to app/src/main/res/drawable/img_pay_in_app_1.xml diff --git a/app/src/main/res/drawable/ic_pay_in_app_2.xml b/app/src/main/res/drawable/img_pay_in_app_2.xml similarity index 100% rename from app/src/main/res/drawable/ic_pay_in_app_2.xml rename to app/src/main/res/drawable/img_pay_in_app_2.xml diff --git a/app/src/main/res/drawable/ic_pay_in_app_5.xml b/app/src/main/res/drawable/img_pay_in_app_5.xml similarity index 100% rename from app/src/main/res/drawable/ic_pay_in_app_5.xml rename to app/src/main/res/drawable/img_pay_in_app_5.xml diff --git a/app/src/main/res/drawable/img_point_reward.xml b/app/src/main/res/drawable/img_point_reward.xml new file mode 100644 index 000000000..6f4326767 --- /dev/null +++ b/app/src/main/res/drawable/img_point_reward.xml @@ -0,0 +1,993 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/img_point_welcome.xml b/app/src/main/res/drawable/img_point_welcome.xml deleted file mode 100644 index 020fce87c..000000000 --- a/app/src/main/res/drawable/img_point_welcome.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_point_zero.xml b/app/src/main/res/drawable/img_point_zero.xml similarity index 100% rename from app/src/main/res/drawable/ic_point_zero.xml rename to app/src/main/res/drawable/img_point_zero.xml diff --git a/app/src/main/res/drawable/ic_quit.xml b/app/src/main/res/drawable/img_quit.xml similarity index 100% rename from app/src/main/res/drawable/ic_quit.xml rename to app/src/main/res/drawable/img_quit.xml diff --git a/app/src/main/res/drawable/ic_quit_for_sure_1.xml b/app/src/main/res/drawable/img_quit_for_sure_1.xml similarity index 100% rename from app/src/main/res/drawable/ic_quit_for_sure_1.xml rename to app/src/main/res/drawable/img_quit_for_sure_1.xml diff --git a/app/src/main/res/drawable/ic_quit_for_sure_2.xml b/app/src/main/res/drawable/img_quit_for_sure_2.xml similarity index 100% rename from app/src/main/res/drawable/ic_quit_for_sure_2.xml rename to app/src/main/res/drawable/img_quit_for_sure_2.xml diff --git a/app/src/main/res/drawable/ic_quit_for_sure_3.xml b/app/src/main/res/drawable/img_quit_for_sure_3.xml similarity index 100% rename from app/src/main/res/drawable/ic_quit_for_sure_3.xml rename to app/src/main/res/drawable/img_quit_for_sure_3.xml diff --git a/app/src/main/res/drawable/ic_splash_yello.xml b/app/src/main/res/drawable/img_splash_yello.xml similarity index 100% rename from app/src/main/res/drawable/ic_splash_yello.xml rename to app/src/main/res/drawable/img_splash_yello.xml diff --git a/app/src/main/res/drawable/ic_stroke_gradient_8dp.xml b/app/src/main/res/drawable/img_stroke_gradient_8dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_stroke_gradient_8dp.xml rename to app/src/main/res/drawable/img_stroke_gradient_8dp.xml diff --git a/app/src/main/res/drawable/ic_tutorial_plus_point.xml b/app/src/main/res/drawable/img_tutorial_plus_point.xml similarity index 100% rename from app/src/main/res/drawable/ic_tutorial_plus_point.xml rename to app/src/main/res/drawable/img_tutorial_plus_point.xml diff --git a/app/src/main/res/drawable/ic_tutorial_point.xml b/app/src/main/res/drawable/img_tutorial_point.xml similarity index 100% rename from app/src/main/res/drawable/ic_tutorial_point.xml rename to app/src/main/res/drawable/img_tutorial_point.xml diff --git a/app/src/main/res/drawable/shape_yello_main_500_fill_500_botshadow_rect.xml b/app/src/main/res/drawable/layerlist_start_yello500_oval_botshadow.xml similarity index 100% rename from app/src/main/res/drawable/shape_yello_main_500_fill_500_botshadow_rect.xml rename to app/src/main/res/drawable/layerlist_start_yello500_oval_botshadow.xml diff --git a/app/src/main/res/drawable/shape_unselected_tab_indicator.xml b/app/src/main/res/drawable/layerlist_unselected_tab_indicator.xml similarity index 100% rename from app/src/main/res/drawable/shape_unselected_tab_indicator.xml rename to app/src/main/res/drawable/layerlist_unselected_tab_indicator.xml diff --git a/app/src/main/res/drawable/shape_black_fill_black_oval_yellow_shadow.xml b/app/src/main/res/drawable/layerlist_wait_black_oval_yellow_shadow.xml similarity index 100% rename from app/src/main/res/drawable/shape_black_fill_black_oval_yellow_shadow.xml rename to app/src/main/res/drawable/layerlist_wait_black_oval_yellow_shadow.xml diff --git a/app/src/main/res/drawable/layout_yello_progressbar.xml b/app/src/main/res/drawable/layout_yello_progressbar.xml deleted file mode 100644 index 41d871a0c..000000000 --- a/app/src/main/res/drawable/layout_yello_progressbar.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/sel_onbarding_editext_focus.xml b/app/src/main/res/drawable/sel_onboarding_editext_focus.xml similarity index 100% rename from app/src/main/res/drawable/sel_onbarding_editext_focus.xml rename to app/src/main/res/drawable/sel_onboarding_editext_focus.xml diff --git a/app/src/main/res/drawable/shape_black_fill_grayscales600_line_8_rect.xml b/app/src/main/res/drawable/shape_black_fill_grayscales600_line_8_rect.xml deleted file mode 100644 index e7a4d9531..000000000 --- a/app/src/main/res/drawable/shape_black_fill_grayscales600_line_8_rect.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/shape_grayscales800_line_40_rect.xml b/app/src/main/res/drawable/shape_black_fill_grayscales800_line_40_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales800_line_40_rect.xml rename to app/src/main/res/drawable/shape_black_fill_grayscales800_line_40_rect.xml diff --git a/app/src/main/res/drawable/shape_black_fill_purple_line_10_rect.xml b/app/src/main/res/drawable/shape_black_fill_purple700_line_10_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_black_fill_purple_line_10_rect.xml rename to app/src/main/res/drawable/shape_black_fill_purple700_line_10_rect.xml diff --git a/app/src/main/res/drawable/shape_black_fill_rect.xml b/app/src/main/res/drawable/shape_black_fill_rect.xml deleted file mode 100644 index f014b24d3..000000000 --- a/app/src/main/res/drawable/shape_black_fill_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_black_fill_yello_main_500_line_8_rect.xml b/app/src/main/res/drawable/shape_black_fill_yello500_line_8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_black_fill_yello_main_500_line_8_rect.xml rename to app/src/main/res/drawable/shape_black_fill_yello500_line_8_rect.xml diff --git a/app/src/main/res/drawable/shape_female700_fill_female300_line_8_rect.xml b/app/src/main/res/drawable/shape_female700_fill_female300_line_8_rect.xml deleted file mode 100644 index c1b1cf4c2..000000000 --- a/app/src/main/res/drawable/shape_female700_fill_female300_line_8_rect.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/shape_fill_black_32dp.xml b/app/src/main/res/drawable/shape_fill_black_32dp.xml deleted file mode 100644 index 0bc481598..000000000 --- a/app/src/main/res/drawable/shape_fill_black_32dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_fill_gray900_12dp.xml b/app/src/main/res/drawable/shape_fill_gray900_12dp.xml deleted file mode 100644 index 349162bca..000000000 --- a/app/src/main/res/drawable/shape_fill_gray900_12dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_fill_yello500_100dp.xml b/app/src/main/res/drawable/shape_fill_yello500_100dp.xml deleted file mode 100644 index 3e022bd8d..000000000 --- a/app/src/main/res/drawable/shape_fill_yello500_100dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_fill_yello500_8dp.xml b/app/src/main/res/drawable/shape_fill_yello500_8dp.xml deleted file mode 100644 index 51207c1d3..000000000 --- a/app/src/main/res/drawable/shape_fill_yello500_8dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_purple_gradient_100dp.xml b/app/src/main/res/drawable/shape_gradient_purple_fill_100_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_purple_gradient_100dp.xml rename to app/src/main/res/drawable/shape_gradient_purple_fill_100_rect.xml diff --git a/app/src/main/res/drawable/shape_gradient_plus_fill_10_rect.xml b/app/src/main/res/drawable/shape_gradient_purple_fill_10_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_gradient_plus_fill_10_rect.xml rename to app/src/main/res/drawable/shape_gradient_purple_fill_10_rect.xml diff --git a/app/src/main/res/drawable/shape_purple_gradient_30dp.xml b/app/src/main/res/drawable/shape_gradient_purple_fill_30_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_purple_gradient_30dp.xml rename to app/src/main/res/drawable/shape_gradient_purple_fill_30_rect.xml diff --git a/app/src/main/res/drawable/shape_purple_gradient_8dp.xml b/app/src/main/res/drawable/shape_gradient_purple_fill_8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_purple_gradient_8dp.xml rename to app/src/main/res/drawable/shape_gradient_purple_fill_8_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales50_fill_8_rect.xml b/app/src/main/res/drawable/shape_grayscales50_fill_8_rect.xml deleted file mode 100644 index 2660f70ab..000000000 --- a/app/src/main/res/drawable/shape_grayscales50_fill_8_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/shape_shimmer_grayscale600_circle.xml b/app/src/main/res/drawable/shape_grayscales600_fill_oval.xml similarity index 100% rename from app/src/main/res/drawable/shape_shimmer_grayscale600_circle.xml rename to app/src/main/res/drawable/shape_grayscales600_fill_oval.xml diff --git a/app/src/main/res/drawable/shape_shimmer_grayscale700_fill_2_rect.xml b/app/src/main/res/drawable/shape_grayscales700_fill_2_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_shimmer_grayscale700_fill_2_rect.xml rename to app/src/main/res/drawable/shape_grayscales700_fill_2_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales700_line_8_rect.xml b/app/src/main/res/drawable/shape_grayscales700_line_8_rect.xml deleted file mode 100644 index cc9bcdf7f..000000000 --- a/app/src/main/res/drawable/shape_grayscales700_line_8_rect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grayscales800_fill_100_rect.xml b/app/src/main/res/drawable/shape_grayscales800_fill_100_rect.xml index df4aab4e8..1fd1b7893 100644 --- a/app/src/main/res/drawable/shape_grayscales800_fill_100_rect.xml +++ b/app/src/main/res/drawable/shape_grayscales800_fill_100_rect.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/shape_shimmer_greyscale800_fill_2_rect.xml b/app/src/main/res/drawable/shape_grayscales800_fill_2_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_shimmer_greyscale800_fill_2_rect.xml rename to app/src/main/res/drawable/shape_grayscales800_fill_2_rect.xml diff --git a/app/src/main/res/drawable/shape_shimmer_greyscale800_circle.xml b/app/src/main/res/drawable/shape_grayscales800_fill_oval.xml similarity index 100% rename from app/src/main/res/drawable/shape_shimmer_greyscale800_circle.xml rename to app/src/main/res/drawable/shape_grayscales800_fill_oval.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_leftrect.xml b/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_left8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_leftrect.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_left8_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_square.xml b/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_square.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_rightrect.xml b/app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_right8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_8_rightrect.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_grayscales700_line_right8_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_leftrect.xml b/app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_left8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_leftrect.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_left8_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_square.xml b/app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_square.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_rightrect.xml b/app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_right8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_grayscales900_fill_yello_main600_line_8_rightrect.xml rename to app/src/main/res/drawable/shape_grayscales900_fill_yello600_line_right8_rect.xml diff --git a/app/src/main/res/drawable/shape_grayscales_800_fill_100_rect.xml b/app/src/main/res/drawable/shape_grayscales_800_fill_100_rect.xml deleted file mode 100644 index 1fd1b7893..000000000 --- a/app/src/main/res/drawable/shape_grayscales_800_fill_100_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/shape_shimmer_greyscale_off_fill_2_rect.xml b/app/src/main/res/drawable/shape_grayscales_shimmer_fill_2_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_shimmer_greyscale_off_fill_2_rect.xml rename to app/src/main/res/drawable/shape_grayscales_shimmer_fill_2_rect.xml diff --git a/app/src/main/res/drawable/shape_kakao_100_rect.xml b/app/src/main/res/drawable/shape_kakao_100_rect.xml deleted file mode 100644 index fa29a3ada..000000000 --- a/app/src/main/res/drawable/shape_kakao_100_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_male700_fill_male300_line_8_rect.xml b/app/src/main/res/drawable/shape_male700_fill_male300_line_8_rect.xml deleted file mode 100644 index fc84b93dd..000000000 --- a/app/src/main/res/drawable/shape_male700_fill_male300_line_8_rect.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/shape_purple_sub500_fill_4_rect.xml b/app/src/main/res/drawable/shape_purple500_fill_4_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_purple_sub500_fill_4_rect.xml rename to app/src/main/res/drawable/shape_purple500_fill_4_rect.xml diff --git a/app/src/main/res/drawable/shape_purple_fill_10_left_top_right_bot.xml b/app/src/main/res/drawable/shape_purple_fill_10_left_top_right_bot.xml deleted file mode 100644 index 2759181e3..000000000 --- a/app/src/main/res/drawable/shape_purple_fill_10_left_top_right_bot.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_fill_red20_line_semantic_status_red500_rect_8.xml b/app/src/main/res/drawable/shape_red_fill_red500_line_8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_fill_red20_line_semantic_status_red500_rect_8.xml rename to app/src/main/res/drawable/shape_red_fill_red500_line_8_rect.xml diff --git a/app/src/main/res/drawable/shape_rounded_dialog.xml b/app/src/main/res/drawable/shape_rounded_dialog.xml deleted file mode 100644 index f18e96b99..000000000 --- a/app/src/main/res/drawable/shape_rounded_dialog.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_white_35per_100dp.xml b/app/src/main/res/drawable/shape_white_35per_100dp.xml deleted file mode 100644 index 534952e78..000000000 --- a/app/src/main/res/drawable/shape_white_35per_100dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_white_fill_grayscales500_line_rect.xml b/app/src/main/res/drawable/shape_white_fill_grayscales500_line_rect.xml deleted file mode 100644 index b332efa29..000000000 --- a/app/src/main/res/drawable/shape_white_fill_grayscales500_line_rect.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/shape_fab_circle.xml b/app/src/main/res/drawable/shape_white_oval.xml similarity index 100% rename from app/src/main/res/drawable/shape_fab_circle.xml rename to app/src/main/res/drawable/shape_white_oval.xml diff --git a/app/src/main/res/drawable/shape_yello_main_500_fill_100_rect.xml b/app/src/main/res/drawable/shape_yello500_fill_100_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_yello_main_500_fill_100_rect.xml rename to app/src/main/res/drawable/shape_yello500_fill_100_rect.xml diff --git a/app/src/main/res/drawable/shape_yello500_fill_500_rect.xml b/app/src/main/res/drawable/shape_yello500_fill_500_rect.xml deleted file mode 100644 index fefe68606..000000000 --- a/app/src/main/res/drawable/shape_yello500_fill_500_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_kakao_yellow_fill_8_rect.xml b/app/src/main/res/drawable/shape_yello_kakao_fill_8_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_kakao_yellow_fill_8_rect.xml rename to app/src/main/res/drawable/shape_yello_kakao_fill_8_rect.xml diff --git a/app/src/main/res/drawable/shape_yello_main_500_fill_8_rect.xml b/app/src/main/res/drawable/shape_yello_main_500_fill_8_rect.xml deleted file mode 100644 index 045178e4e..000000000 --- a/app/src/main/res/drawable/shape_yello_main_500_fill_8_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_yello_main_500_fill_black_line_rect.xml b/app/src/main/res/drawable/shape_yello_main_500_fill_black_line_rect.xml deleted file mode 100644 index 16217c6d4..000000000 --- a/app/src/main/res/drawable/shape_yello_main_500_fill_black_line_rect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_get_alarm.xml b/app/src/main/res/layout/activity_get_alarm.xml index 697797ac7..1d912f680 100644 --- a/app/src/main/res/layout/activity_get_alarm.xml +++ b/app/src/main/res/layout/activity_get_alarm.xml @@ -66,7 +66,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:paddingVertical="6dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_my_yello_read.xml b/app/src/main/res/layout/activity_my_yello_read.xml index 68a0a17ed..0b2cb1a59 100644 --- a/app/src/main/res/layout/activity_my_yello_read.xml +++ b/app/src/main/res/layout/activity_my_yello_read.xml @@ -149,7 +149,7 @@ android:layout_height="154dp" android:layout_marginHorizontal="8dp" android:layout_marginTop="42dp" - android:background="@drawable/shape_fill_black_32dp" + android:background="@drawable/shape_black_fill_32_rect" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_gender"> @@ -354,7 +354,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:background="@drawable/shape_white_35per_100dp" + android:background="@drawable/shape_white35_fill_100_rect" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -407,7 +407,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:background="@drawable/shape_white_35per_100dp" + android:background="@drawable/shape_white35_fill_100_rect" android:gravity="center" android:paddingVertical="16dp" android:text="@string/my_yello_point_check" @@ -446,7 +446,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="8dp" - android:background="@drawable/shape_purple_gradient_100dp" + android:background="@drawable/shape_gradient_purple_fill_100_rect" android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/tv_initial_check"> diff --git a/app/src/main/res/layout/activity_name_edit.xml b/app/src/main/res/layout/activity_name_edit.xml index ccb9e00b5..e2ea5006c 100644 --- a/app/src/main/res/layout/activity_name_edit.xml +++ b/app/src/main/res/layout/activity_name_edit.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginTop="48dp" android:layout_marginBottom="24dp" - android:src="@drawable/ic_onboarding_edit_name_bubble" + android:src="@drawable/img_onboarding_edit_name_bubble" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="18dp" - android:background="@{vm.isValidName() ? @drawable/sel_onbarding_editext_focus : @drawable/shape_fill_red20_line_semantic_status_red500_rect_8}" + android:background="@{vm.isValidName() ? @drawable/sel_onboarding_editext_focus : @drawable/shape_red_fill_red500_line_8_rect}" android:fontFamily="@font/font_pretendard_medium" android:gravity="center_vertical" android:hint="@string/onboarding_name_id_name_hint" @@ -135,7 +135,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="32dp" - android:background="@{vm.isValidName() & !vm.nameText.isEmpty() & vm.checkNameLength ? @drawable/shape_yello_main_500_fill_100_rect : @drawable/shape_grayscales_800_fill_100_rect}" + android:background="@{vm.isValidName() & !vm.nameText.isEmpty() & vm.checkNameLength ? @drawable/shape_yello500_fill_100_rect : @drawable/shape_grayscales800_fill_100_rect}" android:clickable="@{vm.isValidName() & !vm.nameText.isEmpty() & vm.checkNameLength}" android:paddingVertical="16dp" android:text="@string/onboarding_btn_edit_name_next" diff --git a/app/src/main/res/layout/activity_pay.xml b/app/src/main/res/layout/activity_pay.xml index 43dc79b09..7ebc98e85 100644 --- a/app/src/main/res/layout/activity_pay.xml +++ b/app/src/main/res/layout/activity_pay.xml @@ -163,8 +163,8 @@ android:layout_width="wrap_content" android:layout_height="16dp" android:layout_marginTop="4dp" - app:ci_drawable="@drawable/vector_fill_white" - app:ci_drawable_unselected="@drawable/vector_fill_gray700" + app:ci_drawable="@drawable/ic_indicator_white" + app:ci_drawable_unselected="@drawable/ic_indicator_gray700" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vp_banner" /> @@ -175,7 +175,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="10dp" - android:background="@drawable/shape_purple_gradient_8dp" + android:background="@drawable/shape_gradient_purple_fill_8_rect" app:layout_constraintTop_toBottomOf="@id/dot_indicator"> @@ -200,7 +200,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="42dp" android:layout_marginTop="6dp" - android:src="@drawable/ic_quit_for_sure_1" + android:src="@drawable/img_quit_for_sure_1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profile_quit_for_sure_reason_1" /> @@ -226,7 +226,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="42dp" android:layout_marginTop="6dp" - android:src="@drawable/ic_quit_for_sure_2" + android:src="@drawable/img_quit_for_sure_2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profile_quit_for_sure_reason_2" /> @@ -253,7 +253,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="42dp" android:layout_marginTop="6dp" - android:src="@drawable/ic_quit_for_sure_3" + android:src="@drawable/img_quit_for_sure_3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profile_quit_for_sure_reason_3" /> diff --git a/app/src/main/res/layout/activity_profile_quit_two.xml b/app/src/main/res/layout/activity_profile_quit_two.xml index 523b23dd9..792733858 100644 --- a/app/src/main/res/layout/activity_profile_quit_two.xml +++ b/app/src/main/res/layout/activity_profile_quit_two.xml @@ -93,7 +93,7 @@ android:layout_marginHorizontal="56dp" android:layout_marginTop="27dp" android:minHeight="246dp" - android:src="@drawable/ic_quit" + android:src="@drawable/img_quit" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index f666f0410..2c2c130b9 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -152,7 +152,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_marginTop="108dp" - android:src="@drawable/ic_no_search" + android:src="@drawable/img_no_search" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml index 92b6c3436..71b51ff27 100644 --- a/app/src/main/res/layout/activity_sign_in.xml +++ b/app/src/main/res/layout/activity_sign_in.xml @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:background="@drawable/shape_kakao_yellow_fill_8_rect" + android:background="@drawable/shape_yello_kakao_fill_8_rect" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_social_sync.xml b/app/src/main/res/layout/activity_social_sync.xml index 62fe01519..ad1d7cc4b 100644 --- a/app/src/main/res/layout/activity_social_sync.xml +++ b/app/src/main/res/layout/activity_social_sync.xml @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:background="@drawable/shape_kakao_yellow_fill_8_rect" + android:background="@drawable/shape_yello_kakao_fill_8_rect" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index dd889d0d1..ef670a0a6 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -45,7 +45,7 @@ android:paddingTop="30dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:src="@drawable/ic_splash_yello" + android:src="@drawable/img_splash_yello" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/activity_tutorial_end_pluspoint.xml b/app/src/main/res/layout/activity_tutorial_end_pluspoint.xml index 6a1b75be3..118b57c5c 100644 --- a/app/src/main/res/layout/activity_tutorial_end_pluspoint.xml +++ b/app/src/main/res/layout/activity_tutorial_end_pluspoint.xml @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="200dp" android:layout_marginTop="20dp" - android:src="@drawable/ic_tutorial_plus_point" + android:src="@drawable/img_tutorial_plus_point" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_tutorial_subtitle" /> @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="34dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:paddingVertical="6dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_tutorial_end_point.xml b/app/src/main/res/layout/activity_tutorial_end_point.xml index 5156bb705..9a2905c15 100644 --- a/app/src/main/res/layout/activity_tutorial_end_point.xml +++ b/app/src/main/res/layout/activity_tutorial_end_point.xml @@ -45,7 +45,7 @@ android:layout_width="0dp" android:layout_height="200dp" android:layout_marginTop="20dp" - android:src="@drawable/ic_tutorial_point" + android:src="@drawable/img_tutorial_point" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_tutorial_subtitle" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="34dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:paddingVertical="6dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_point_use.xml b/app/src/main/res/layout/dialog_point_use.xml index 402ae7afe..fc5d6d31e 100644 --- a/app/src/main/res/layout/dialog_point_use.xml +++ b/app/src/main/res/layout/dialog_point_use.xml @@ -123,7 +123,7 @@ android:layout_marginTop="28dp" android:layout_marginEnd="18dp" android:layout_marginBottom="40dp" - android:background="@drawable/shape_fill_yello500_8dp" + android:background="@drawable/shape_yello500_fill_8_rect" android:gravity="center" android:paddingVertical="11dp" android:text="@string/dialog_get_keyword" diff --git a/app/src/main/res/layout/dialog_reading_ticket_use.xml b/app/src/main/res/layout/dialog_reading_ticket_use.xml index c172880f1..d511554f4 100644 --- a/app/src/main/res/layout/dialog_reading_ticket_use.xml +++ b/app/src/main/res/layout/dialog_reading_ticket_use.xml @@ -115,7 +115,7 @@ android:layout_marginTop="32dp" android:layout_marginEnd="18dp" android:layout_marginBottom="40dp" - android:background="@drawable/shape_fill_yello500_8dp" + android:background="@drawable/shape_yello500_fill_8_rect" android:gravity="center" android:paddingVertical="11dp" android:text="@string/dialog_get_name" diff --git a/app/src/main/res/layout/fragment_add_friend.xml b/app/src/main/res/layout/fragment_add_friend.xml index 94d136a4f..44661455f 100644 --- a/app/src/main/res/layout/fragment_add_friend.xml +++ b/app/src/main/res/layout/fragment_add_friend.xml @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginEnd="16dp" - android:background="@drawable/shape_shimmer_greyscale_off_fill_2_rect" + android:background="@drawable/shape_grayscales_shimmer_fill_2_rect" android:paddingVertical="2dp" android:text=" " android:textAppearance="@style/TextAppearance.Yello.LabelLarge" @@ -115,11 +115,11 @@ android:id="@+id/btn_add_friend_next" android:layout_width="0dp" android:textAlignment="center" - tools:background="@drawable/shape_yello_main_500_fill_100_rect" + tools:background="@drawable/shape_yello500_fill_100_rect" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="34dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:backgroundTint="@color/yello_main_500" android:paddingVertical="16dp" android:text="@string/onboarding_btn_addfriend_next" diff --git a/app/src/main/res/layout/fragment_code.xml b/app/src/main/res/layout/fragment_code.xml index 1e6bdfdd2..f6a671feb 100644 --- a/app/src/main/res/layout/fragment_code.xml +++ b/app/src/main/res/layout/fragment_code.xml @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="24dp" - android:background="@{vm.isValidCode() ? @drawable/sel_onbarding_editext_focus : @drawable/shape_fill_red20_line_semantic_status_red500_rect_8}" + android:background="@{vm.isValidCode() ? @drawable/sel_onboarding_editext_focus : @drawable/shape_red_fill_red500_line_8_rect}" android:ellipsize="end" android:fontFamily="@font/font_pretendard_medium" android:gravity="center_vertical" @@ -172,11 +172,11 @@ + android:background="@drawable/shape_grayscales900_fill_top10_rect"> + android:background="@drawable/shape_grayscales900_fill_top10_rect"> + android:background="@drawable/shape_grayscales900_fill_top10_rect"> + android:background="@drawable/shape_grayscales900_fill_top10_rect"> @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="16dp" - android:background="@drawable/shape_grayscales900_fill_grayscales700_line_8_leftrect" + android:background="@drawable/shape_grayscales900_fill_grayscales700_line_left8_rect" android:clickable="true" android:gravity="center" android:onClick="@{()->vm.selectGrade(firstGrade)}" @@ -98,7 +98,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:background="@drawable/shape_grayscales900_fill_grayscales700_line_8_square" + android:background="@drawable/shape_grayscales900_fill_grayscales700_line_rect" android:clickable="true" android:gravity="center" android:onClick="@{()->vm.selectGrade(secondGrade)}" @@ -118,7 +118,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginEnd="24dp" - android:background="@drawable/shape_grayscales900_fill_grayscales700_line_8_rightrect" + android:background="@drawable/shape_grayscales900_fill_grayscales700_line_right8_rect" android:clickable="true" android:gravity="center" android:onClick="@{()->vm.selectGrade(thirdGrade)}" @@ -160,12 +160,12 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="32dp" - android:background="@{vm.highSchoolText.isEmpty() || vm.highSchoolGroupText == null || vm.studentIdText == null ? @drawable/shape_grayscales_800_fill_100_rect : @drawable/shape_yello_main_500_fill_100_rect}" + android:background="@{vm.highSchoolText.isEmpty() || vm.highSchoolGroupText == null || vm.studentIdText == null ? @drawable/shape_grayscales800_fill_100_rect : @drawable/shape_yello500_fill_100_rect}" android:clickable="@{!vm.highSchoolText.isEmpty() & vm.highSchoolGroupText != null & vm.studentIdText != null }" android:paddingVertical="16dp" android:text="@string/onboarding_btn_next" android:textAlignment="center" - tools:background="@drawable/shape_yello_main_500_fill_100_rect" + tools:background="@drawable/shape_yello500_fill_100_rect" android:textAppearance="?textAppearanceBodyMedium" android:textColor="@{ vm.highSchoolText.isEmpty() || vm.highSchoolGroupText == null || vm.studentIdText == null ? @color/grayscales_700 : @color/black}" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_mod_grade_bottom_sheet.xml b/app/src/main/res/layout/fragment_mod_grade_bottom_sheet.xml index ea79a6e06..3bcb9c99a 100644 --- a/app/src/main/res/layout/fragment_mod_grade_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_mod_grade_bottom_sheet.xml @@ -10,7 +10,7 @@ android:id="@+id/layout_mod_select" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_rounded_dialog" + android:background="@drawable/shape_grayscales900_fill_top10_rect" android:paddingBottom="16dp"> + android:background="@drawable/shape_grayscales900_fill_top10_rect"> + android:background="@drawable/shape_grayscales900_fill_top10_rect"> diff --git a/app/src/main/res/layout/fragment_notice_resubscribe.xml b/app/src/main/res/layout/fragment_notice_resubscribe.xml index 76381510c..72b36b15d 100644 --- a/app/src/main/res/layout/fragment_notice_resubscribe.xml +++ b/app/src/main/res/layout/fragment_notice_resubscribe.xml @@ -164,7 +164,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="42dp" - android:background="@drawable/shape_purple_gradient_100dp" + android:background="@drawable/shape_gradient_purple_fill_100_rect" android:paddingVertical="20dp" android:text="@string/notice_resubscribe_button_tv" android:textAlignment="center" diff --git a/app/src/main/res/layout/fragment_pay_in_app_dialog.xml b/app/src/main/res/layout/fragment_pay_in_app_dialog.xml index 4ec81bf78..0a2d12c73 100644 --- a/app/src/main/res/layout/fragment_pay_in_app_dialog.xml +++ b/app/src/main/res/layout/fragment_pay_in_app_dialog.xml @@ -56,7 +56,7 @@ app:layout_constraintEnd_toEndOf="@id/tv_pay_dialog_subtitle2" app:layout_constraintStart_toStartOf="@id/tv_pay_dialog_subtitle2" app:layout_constraintTop_toBottomOf="@id/tv_pay_dialog_subtitle2" - tools:src="@drawable/ic_pay_in_app_1" /> + tools:src="@drawable/img_pay_in_app_1" /> diff --git a/app/src/main/res/layout/fragment_point.xml b/app/src/main/res/layout/fragment_point.xml index 9ca20957e..f71a563f3 100644 --- a/app/src/main/res/layout/fragment_point.xml +++ b/app/src/main/res/layout/fragment_point.xml @@ -137,7 +137,7 @@ android:layout_height="wrap_content" android:layout_marginStart="-8dp" android:layout_marginBottom="-7dp" - android:background="@drawable/shape_gradient_plus_fill_10_rect" + android:background="@drawable/shape_gradient_purple_fill_10_rect" android:fontFamily="@font/unbounded_medium" android:paddingHorizontal="6dp" android:paddingVertical="1dp" @@ -231,7 +231,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="84dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:fontFamily="@font/font_pretendard_bold" android:gravity="center" android:paddingVertical="16dp" @@ -249,7 +249,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="84dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:fontFamily="@font/font_pretendard_bold" android:paddingHorizontal="40dp" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 715f57660..4bace1966 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_marginBottom="26dp" - android:background="@drawable/shape_fab_circle" + android:background="@drawable/shape_white_oval" android:backgroundTint="@color/white" android:padding="12dp" android:src="@drawable/ic_arrow_upward" diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml index 4aa0607f5..e887b30fb 100644 --- a/app/src/main/res/layout/fragment_recommend.xml +++ b/app/src/main/res/layout/fragment_recommend.xml @@ -52,7 +52,7 @@ android:id="@+id/tab_recommend" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_unselected_tab_indicator" + android:background="@drawable/layerlist_unselected_tab_indicator" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_recommend_title" diff --git a/app/src/main/res/layout/fragment_recommend_kakao.xml b/app/src/main/res/layout/fragment_recommend_kakao.xml index f20c84a59..805963c8f 100644 --- a/app/src/main/res/layout/fragment_recommend_kakao.xml +++ b/app/src/main/res/layout/fragment_recommend_kakao.xml @@ -197,7 +197,7 @@ android:layout_marginHorizontal="40dp" android:layout_marginTop="30dp" android:layout_marginBottom="60dp" - android:background="@drawable/shape_grayscales_800_fill_100_rect" + android:background="@drawable/shape_grayscales800_fill_100_rect" android:gravity="center" android:paddingHorizontal="30dp" android:paddingVertical="17dp" diff --git a/app/src/main/res/layout/fragment_recommend_school.xml b/app/src/main/res/layout/fragment_recommend_school.xml index 1101a7734..95b0cadf6 100644 --- a/app/src/main/res/layout/fragment_recommend_school.xml +++ b/app/src/main/res/layout/fragment_recommend_school.xml @@ -197,7 +197,7 @@ android:layout_marginHorizontal="40dp" android:layout_marginTop="30dp" android:layout_marginBottom="60dp" - android:background="@drawable/shape_grayscales_800_fill_100_rect" + android:background="@drawable/shape_grayscales800_fill_100_rect" android:gravity="center" android:paddingHorizontal="30dp" android:paddingVertical="17dp" diff --git a/app/src/main/res/layout/fragment_select_student_type.xml b/app/src/main/res/layout/fragment_select_student_type.xml index 5519ddaf7..1a81e6391 100644 --- a/app/src/main/res/layout/fragment_select_student_type.xml +++ b/app/src/main/res/layout/fragment_select_student_type.xml @@ -143,8 +143,8 @@ android:layout_marginBottom="34dp" android:paddingVertical="16dp" android:textAlignment="center" - tools:background="@drawable/shape_yello_main_500_fill_100_rect" - android:background="@{vm.studentType.isEmpty() ? @drawable/shape_grayscales_800_fill_100_rect : @drawable/shape_yello_main_500_fill_100_rect}" + tools:background="@drawable/shape_yello500_fill_100_rect" + android:background="@{vm.studentType.isEmpty() ? @drawable/shape_grayscales800_fill_100_rect : @drawable/shape_yello500_fill_100_rect}" android:text="@string/onboarding_btn_gender_done" android:clickable="@{!vm.studentType.isEmpty()}" android:textColor="@{vm.studentType.isEmpty() ? @color/grayscales_700 : @color/black}" diff --git a/app/src/main/res/layout/fragment_timeline.xml b/app/src/main/res/layout/fragment_timeline.xml index 53612b723..58ecfe45d 100644 --- a/app/src/main/res/layout/fragment_timeline.xml +++ b/app/src/main/res/layout/fragment_timeline.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="5dp" - android:background="@drawable/shape_grayscales800_line_40_rect" + android:background="@drawable/shape_black_fill_grayscales800_line_40_rect" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -173,12 +173,12 @@ android:id="@+id/iv_look_no_friend" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginHorizontal="30dp" + android:layout_marginHorizontal="75dp" android:src="@drawable/img_banner_invite" app:layout_constraintBottom_toTopOf="@id/tv_look_no_friend_title" app:layout_constraintDimensionRatio="1" - app:layout_constraintEnd_toEndOf="@id/tv_look_no_friend_title" - app:layout_constraintStart_toStartOf="@id/tv_look_no_friend_title" + app:layout_constraintEnd_toEndOf="@id/btn_look_no_friend" + app:layout_constraintStart_toStartOf="@id/btn_look_no_friend" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" /> @@ -204,7 +204,7 @@ android:layout_marginHorizontal="40dp" android:layout_marginTop="30dp" android:layout_marginBottom="60dp" - android:background="@drawable/shape_grayscales_800_fill_100_rect" + android:background="@drawable/shape_grayscales800_fill_100_rect" android:gravity="center" android:paddingHorizontal="30dp" android:paddingVertical="17dp" diff --git a/app/src/main/res/layout/fragment_university.xml b/app/src/main/res/layout/fragment_university.xml index 99e34c2f9..f06e9f95c 100644 --- a/app/src/main/res/layout/fragment_university.xml +++ b/app/src/main/res/layout/fragment_university.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:src="@drawable/ic_onboarding_school_yello_bubble" + android:src="@drawable/img_onboarding_school_yello_bubble" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -112,8 +112,8 @@ android:layout_marginHorizontal="16dp" android:layout_marginBottom="32dp" android:textAlignment="center" - tools:background="@drawable/shape_yello_main_500_fill_100_rect" - android:background="@{vm.universityText.isEmpty() || vm.departmentText.isEmpty() || vm.studentIdText == null ? @drawable/shape_grayscales_800_fill_100_rect : @drawable/shape_yello_main_500_fill_100_rect}" + tools:background="@drawable/shape_yello500_fill_100_rect" + android:background="@{vm.universityText.isEmpty() || vm.departmentText.isEmpty() || vm.studentIdText == null ? @drawable/shape_grayscales800_fill_100_rect : @drawable/shape_yello500_fill_100_rect}" android:clickable="@{!vm.universityText.isEmpty() & !vm.departmentText.isEmpty() & vm.studentIdText != null }" android:paddingVertical="16dp" android:text="@string/onboarding_btn_next" diff --git a/app/src/main/res/layout/fragment_yello_id.xml b/app/src/main/res/layout/fragment_yello_id.xml index 6ef8aed12..5534a3456 100644 --- a/app/src/main/res/layout/fragment_yello_id.xml +++ b/app/src/main/res/layout/fragment_yello_id.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:src="@drawable/ic_onboarding_yelloid_bubble" + android:src="@drawable/img_onboarding_yelloid_bubble" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="18dp" - android:background="@{vm.isValidId() ? @drawable/sel_onbarding_editext_focus : @drawable/shape_fill_red20_line_semantic_status_red500_rect_8}" + android:background="@{vm.isValidId() ? @drawable/sel_onboarding_editext_focus : @drawable/shape_red_fill_red500_line_8_rect}" android:fontFamily="@font/font_pretendard_medium" android:hint="@string/onboarding_et_id" android:inputType="text" @@ -139,11 +139,11 @@ android:id="@+id/btn_yello_id_next" android:layout_width="0dp" android:textAlignment="center" - tools:background="@drawable/shape_yello_main_500_fill_100_rect" + tools:background="@drawable/shape_yello500_fill_100_rect" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="32dp" - android:background="@{ vm.isValidId() & !vm.idText.isEmpty() ? @drawable/shape_yello_main_500_fill_100_rect : @drawable/shape_grayscales_800_fill_100_rect}" + android:background="@{ vm.isValidId() & !vm.idText.isEmpty() ? @drawable/shape_yello500_fill_100_rect : @drawable/shape_grayscales800_fill_100_rect}" android:clickable="@{ vm.isValidId() & !vm.idText.isEmpty()}" android:paddingVertical="16dp" android:text="@string/onboarding_btn_next" diff --git a/app/src/main/res/layout/fragment_yello_lock.xml b/app/src/main/res/layout/fragment_yello_lock.xml index 0eb8c70ce..2bfaf3498 100644 --- a/app/src/main/res/layout/fragment_yello_lock.xml +++ b/app/src/main/res/layout/fragment_yello_lock.xml @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="35dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:fontFamily="@font/font_pretendard_bold" android:gravity="center" android:paddingVertical="21dp" diff --git a/app/src/main/res/layout/fragment_yello_start.xml b/app/src/main/res/layout/fragment_yello_start.xml index 7b9854510..ee3a5742d 100644 --- a/app/src/main/res/layout/fragment_yello_start.xml +++ b/app/src/main/res/layout/fragment_yello_start.xml @@ -199,7 +199,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-2dp" - android:background="@drawable/shape_purple_sub500_fill_4_rect" + android:background="@drawable/shape_purple500_fill_4_rect" android:padding="10dp" android:text="@string/start_balloon_tooltip" android:textAppearance="?textAppearanceLabelMedium" @@ -225,7 +225,7 @@ android:layout_marginHorizontal="22dp" android:layout_marginBottom="50dp" android:gravity="center" - android:background="@drawable/shape_yello_main_500_fill_500_botshadow_rect" + android:background="@drawable/layerlist_start_yello500_oval_botshadow" android:fontFamily="@font/unbounded_bold" android:paddingVertical="21dp" android:text="@string/yello_start_vote" @@ -265,7 +265,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:background="@drawable/shape_gradient_plus_fill_10_rect" + android:background="@drawable/shape_gradient_purple_fill_10_rect" android:fontFamily="@font/unbounded_medium" android:paddingHorizontal="6dp" android:paddingVertical="1dp" diff --git a/app/src/main/res/layout/fragment_yello_wait.xml b/app/src/main/res/layout/fragment_yello_wait.xml index 38fc3a003..671684c68 100644 --- a/app/src/main/res/layout/fragment_yello_wait.xml +++ b/app/src/main/res/layout/fragment_yello_wait.xml @@ -92,7 +92,7 @@ android:layout_width="217dp" android:layout_height="0dp" android:layout_marginTop="36dp" - android:background="@drawable/shape_black_fill_black_oval_yellow_shadow" + android:background="@drawable/layerlist_wait_black_oval_yellow_shadow" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-2dp" - android:background="@drawable/shape_purple_sub500_fill_4_rect" + android:background="@drawable/shape_purple500_fill_4_rect" android:padding="10dp" android:text="@string/wait_balloon_tooltip" android:textAppearance="?textAppearanceLabelMedium" @@ -163,7 +163,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="44dp" - android:background="@drawable/shape_yello_main_500_fill_100_rect" + android:background="@drawable/shape_yello500_fill_100_rect" android:fontFamily="@font/font_pretendard_bold" android:gravity="center" android:paddingVertical="16dp" diff --git a/app/src/main/res/layout/item_add_friend_shimmer.xml b/app/src/main/res/layout/item_add_friend_shimmer.xml index b6a23304a..cd64b0b00 100644 --- a/app/src/main/res/layout/item_add_friend_shimmer.xml +++ b/app/src/main/res/layout/item_add_friend_shimmer.xml @@ -19,7 +19,7 @@ android:layout_width="42dp" android:layout_height="0dp" android:layout_margin="8dp" - android:background="@drawable/shape_shimmer_greyscale800_circle" + android:background="@drawable/shape_grayscales800_fill_oval" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toStartOf="parent" @@ -34,7 +34,7 @@ android:text=" " android:paddingHorizontal="3dp" android:layout_marginEnd="26dp" - android:background="@drawable/shape_shimmer_greyscale800_fill_2_rect" + android:background="@drawable/shape_grayscales800_fill_2_rect" android:textAppearance="@style/TextAppearance.Yello.BodyMedium" app:layout_constraintStart_toEndOf="@id/iv_friend_profile" app:layout_constraintTop_toTopOf="parent" /> @@ -54,7 +54,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/iv_friend_profile" app:layout_constraintTop_toBottomOf="@id/tv_friend_name" - android:background="@drawable/shape_shimmer_greyscale800_fill_2_rect"/> + android:background="@drawable/shape_grayscales800_fill_2_rect"/> diff --git a/app/src/main/res/layout/item_look_shimmer.xml b/app/src/main/res/layout/item_look_shimmer.xml index 68eaa0ef0..d1f980ea3 100644 --- a/app/src/main/res/layout/item_look_shimmer.xml +++ b/app/src/main/res/layout/item_look_shimmer.xml @@ -26,7 +26,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginStart="16dp" - android:src="@drawable/shape_shimmer_grayscale600_circle" + android:src="@drawable/shape_grayscales600_fill_oval" app:layout_constraintBottom_toBottomOf="@id/tv_look_blank" app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toStartOf="parent" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="24dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:text=" " android:textAppearance="@style/TextAppearance.Yello.Body02" android:textColor="@color/grayscales_300" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_marginTop="24dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:text=" " android:textAppearance="@style/TextAppearance.Yello.Body02" android:textColor="@color/grayscales_300" @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginEnd="130dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:textAppearance="@style/TextAppearance.Yello.BodyLarge" android:textColor="@color/white" app:layout_constraintEnd_toEndOf="parent" @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginEnd="53dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:textAppearance="@style/TextAppearance.Yello.BodyLarge" android:textColor="@color/white" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_my_yello_shimmer.xml b/app/src/main/res/layout/item_my_yello_shimmer.xml index c651690be..3b6ecb8e7 100644 --- a/app/src/main/res/layout/item_my_yello_shimmer.xml +++ b/app/src/main/res/layout/item_my_yello_shimmer.xml @@ -24,7 +24,7 @@ android:layout_height="32dp" android:layout_marginVertical="17dp" android:layout_marginStart="12dp" - android:src="@drawable/shape_shimmer_grayscale600_circle" + android:src="@drawable/shape_grayscales600_fill_oval" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -34,7 +34,7 @@ android:layout_width="80dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:textAppearance="@style/TextAppearance.Yello.BodySmall" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/iv_yello" @@ -45,7 +45,7 @@ android:layout_width="40dp" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:background="@drawable/shape_shimmer_grayscale700_fill_2_rect" + android:background="@drawable/shape_grayscales700_fill_2_rect" android:textAppearance="@style/TextAppearance.Yello.LabelLarge" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_profile_user_info.xml b/app/src/main/res/layout/item_profile_user_info.xml index b16c2053f..1a5b49256 100644 --- a/app/src/main/res/layout/item_profile_user_info.xml +++ b/app/src/main/res/layout/item_profile_user_info.xml @@ -35,7 +35,7 @@ android:id="@+id/iv_subs_line" android:layout_width="match_parent" android:layout_height="6dp" - android:src="@drawable/shape_purple_gradient_8dp" + android:src="@drawable/shape_gradient_purple_fill_8_rect" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -252,7 +252,7 @@ android:layout_height="wrap_content" android:layout_marginTop="-6dp" android:layout_marginEnd="16dp" - android:background="@drawable/shape_purple_sub500_fill_4_rect" + android:background="@drawable/shape_purple500_fill_4_rect" android:elevation="2dp" android:paddingHorizontal="6dp" android:paddingVertical="3dp" diff --git a/app/src/main/res/layout/item_recommend_list_shimmer.xml b/app/src/main/res/layout/item_recommend_list_shimmer.xml index 3c43a98cb..5e50ed765 100644 --- a/app/src/main/res/layout/item_recommend_list_shimmer.xml +++ b/app/src/main/res/layout/item_recommend_list_shimmer.xml @@ -11,7 +11,7 @@ android:layout_height="0dp" android:layout_marginVertical="17dp" android:layout_marginStart="24dp" - android:src="@drawable/shape_shimmer_greyscale800_circle" + android:src="@drawable/shape_grayscales800_fill_oval" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toStartOf="parent" @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="19dp" - android:background="@drawable/shape_shimmer_greyscale800_fill_2_rect" + android:background="@drawable/shape_grayscales800_fill_2_rect" android:text=" " android:textAppearance="@style/TextAppearance.Yello.Subtitle02" app:layout_constraintStart_toEndOf="@id/iv_recommend_item_thumbnail" @@ -37,7 +37,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="65dp" android:layout_marginBottom="18dp" - android:background="@drawable/shape_shimmer_greyscale800_fill_2_rect" + android:background="@drawable/shape_grayscales800_fill_2_rect" android:paddingVertical="2dp" android:textAppearance="@style/TextAppearance.Yello.LabelMedium" android:textColor="@color/grayscales_600" @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginHorizontal="24dp" - android:background="@drawable/shape_shimmer_greyscale800_fill_2_rect" + android:background="@drawable/shape_grayscales800_fill_2_rect" app:layout_constraintBottom_toBottomOf="parent"/> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75841fc10..daac86648 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -145,6 +145,7 @@ 타임라인 친구들이 받은 쪽지가 궁금하다면\n친구를 초대해볼까요? + 쪽지를 보낼 친구가 없다면\n친구를 초대하세요! 쪽지를 보낸 사람의 이름은 공개되지 않아요. 모든 쪽지 @@ -252,7 +253,7 @@ 친구추가 친구 검색 - | 이름 또는 아이디로 검색해보세요! + | 이름/학교/아이디로 검색해보세요! 내 친구 ex. 옐로중/고등학교