Skip to content

Commit

Permalink
[chore] #22 ktlint 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
HAJIEUN02 committed Jan 7, 2024
1 parent c6fcaf4 commit 498d3ac
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand All @@ -20,31 +20,31 @@ 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,
activatedOutLinedColor = R.color.pingle_orange,
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,
activatedOutLinedColor = R.color.pingle_yellow,
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,
activatedOutLinedColor = R.color.g_01,
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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ class PlanActivity : BindingActivity<ActivityPlanBinding>(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)
}
})
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class PlanViewModel : ViewModel() {
private val _address = MutableStateFlow<String?>(null)
val address get() = _address.asStateFlow()


// TODO 뷰 연결 시 버튼 활성/비활성화 로직 isPlanBtnEnabled에 추가
private val _selectedCategory = MutableStateFlow<CategoryType?>(null)
val selectedCategory get() = _selectedCategory.asStateFlow()
Expand Down

0 comments on commit 498d3ac

Please sign in to comment.