diff --git a/app/src/main/java/com/mongmong/namo/data/utils/mappers/CategoryMapper.kt b/app/src/main/java/com/mongmong/namo/data/utils/mappers/CategoryMapper.kt index f3e30b61..1009bc29 100644 --- a/app/src/main/java/com/mongmong/namo/data/utils/mappers/CategoryMapper.kt +++ b/app/src/main/java/com/mongmong/namo/data/utils/mappers/CategoryMapper.kt @@ -18,7 +18,8 @@ object CategoryMapper { categoryId = this.categoryId, name = this.categoryName, colorId = this.colorId, - isShare = this.isShared + isShare = this.isShared, + basicCategory = this.baseCategory ) } } \ No newline at end of file diff --git a/app/src/main/java/com/mongmong/namo/domain/model/CategoryModel.kt b/app/src/main/java/com/mongmong/namo/domain/model/CategoryModel.kt index bfabd487..b3d14818 100644 --- a/app/src/main/java/com/mongmong/namo/domain/model/CategoryModel.kt +++ b/app/src/main/java/com/mongmong/namo/domain/model/CategoryModel.kt @@ -6,7 +6,7 @@ data class CategoryModel( var categoryId: Long = 0, var name: String = "", var colorId: Int = 0, - var basicCategory: Boolean = false, + var basicCategory: Boolean = false, // 기본 카테고리는 삭제 불가 var isShare: Boolean = false, ) : Serializable { diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryDetailFragment.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryDetailFragment.kt index a609adc4..e1624034 100644 --- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryDetailFragment.kt +++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryDetailFragment.kt @@ -67,6 +67,10 @@ class CategoryDetailFragment // 카테고리 삭제 binding.categoryDeleteBtn.setOnClickListener { + if (viewModel.category.value!!.basicCategory) { + Toast.makeText(requireContext(), "기본 카테고리는 삭제할 수 없습니다.", Toast.LENGTH_SHORT).show() + return@setOnClickListener + } val dialog = ConfirmDialog( this@CategoryDetailFragment, getString(R.string.dialog_category_delete_title), diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryViewModel.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryViewModel.kt index 2adae545..ab76a1a4 100644 --- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryViewModel.kt +++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/category/CategoryViewModel.kt @@ -17,7 +17,6 @@ import javax.inject.Inject @HiltViewModel class CategoryViewModel @Inject constructor( private val repository: CategoryRepository, - private val getCategoriesUseCase: GetCategoriesUseCase, ) : ViewModel() { var isEditMode: Boolean = false @@ -36,17 +35,6 @@ class CategoryViewModel @Inject constructor( private val _color = MutableLiveData(null) val color: LiveData = _color - private val _canDeleteCategory = MutableLiveData(true) - val canDeleteCategory: LiveData = _canDeleteCategory - - /** 카테고리 조회 */ - fun getCategories() { - viewModelScope.launch { - Log.d("CategoryViewModel", "getCategories") - _categoryList.value = getCategoriesUseCase.invoke() - } - } - /** 카테고리 추가 */ fun addCategory() { viewModelScope.launch { @@ -87,16 +75,6 @@ class CategoryViewModel @Inject constructor( } } - fun setDeliable(canDelete: Boolean) { - _canDeleteCategory.value = canDelete - } - - fun updateTitle(title: String) { - _category.value = _category.value?.copy( - name = title - ) - } - fun updateCategoryColor(color: CategoryColor) { _color.value = color _category.value = _category.value?.copy(colorId = color.colorId)