diff --git a/app/src/main/java/org/sopt/pingle/presentation/type/CategoryType.kt b/app/src/main/java/org/sopt/pingle/presentation/type/CategoryType.kt index 249bc08d..4ad2c848 100644 --- a/app/src/main/java/org/sopt/pingle/presentation/type/CategoryType.kt +++ b/app/src/main/java/org/sopt/pingle/presentation/type/CategoryType.kt @@ -10,7 +10,7 @@ enum class CategoryType( @ColorRes val backgroundChipColor: Int, @ColorRes val backgroundBadgeColor: Int, @StringRes val categoryNameRes: Int, - @StringRes val categoryDescriptionRes: Int, + @StringRes val categoryDescriptionRes: Int // TODO 해당 부분은 UX, icon 정해지면 추가하기 // @DrawableRes val categoryIconRes: Int, ) { @@ -20,7 +20,7 @@ enum class CategoryType( backgroundChipColor = R.color.chip_green, backgroundBadgeColor = R.color.badge_green, categoryNameRes = R.string.category_play, - categoryDescriptionRes = R.string.category_play_detail, + categoryDescriptionRes = R.string.category_play_detail ), STUDY( textColor = R.color.pingle_orange, @@ -28,7 +28,7 @@ enum class CategoryType( backgroundChipColor = R.color.chip_orange, backgroundBadgeColor = R.color.badge_orange, categoryNameRes = R.string.category_study, - categoryDescriptionRes = R.string.category_study_detail, + categoryDescriptionRes = R.string.category_study_detail ), MULTI( textColor = R.color.pingle_yellow, @@ -36,7 +36,7 @@ enum class CategoryType( backgroundChipColor = R.color.chip_yellow, backgroundBadgeColor = R.color.badge_yellow, categoryNameRes = R.string.category_multi, - categoryDescriptionRes = R.string.category_multi_detail, + categoryDescriptionRes = R.string.category_multi_detail ), OTHERS( textColor = R.color.g_01, @@ -44,7 +44,7 @@ enum class CategoryType( backgroundChipColor = R.color.g_10, backgroundBadgeColor = R.color.g_07, categoryNameRes = R.string.category_others, - categoryDescriptionRes = R.string.category_others_detail, + categoryDescriptionRes = R.string.category_others_detail ); companion object { diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanActivity.kt index 95017a64..995f5d9c 100644 --- a/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanActivity.kt +++ b/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanActivity.kt @@ -41,12 +41,12 @@ class PlanActivity : BindingActivity(R.layout.activity_plan this.adapter = adapter isUserInputEnabled = false registerOnPageChangeCallback(object : - ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - super.onPageSelected(position) - planViewModel.setCurrentPage(position) - } - }) + ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + planViewModel.setCurrentPage(position) + } + }) } } diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt index 40b05e6c..c7140c70 100644 --- a/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt +++ b/app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt @@ -45,7 +45,6 @@ class PlanViewModel : ViewModel() { private val _address = MutableStateFlow(null) val address get() = _address.asStateFlow() - // TODO 뷰 연결 시 버튼 활성/비활성화 로직 isPlanBtnEnabled에 추가 private val _selectedCategory = MutableStateFlow(null) val selectedCategory get() = _selectedCategory.asStateFlow()