From c89469e208c1221559d03a7d2a8e9d3a4fda25ab Mon Sep 17 00:00:00 2001
From: parneet-guraya <gurayaparneet@gmail.com>
Date: Mon, 16 Dec 2024 01:23:44 +0530
Subject: [PATCH] cleanup

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
---
 .../commons/bookmarks/category/BookmarkCategoriesDao.kt  | 1 -
 .../bookmarks/category/BookmarkCategoriesViewModel.kt    | 9 ---------
 .../{models => category}/BookmarksCategoryModal.kt       | 4 ++--
 .../free/nrw/commons/category/CategoryDetailsActivity.kt | 1 -
 .../nrw/commons/category/CategoryDetailsViewModel.kt     | 5 ++---
 app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt  | 2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesViewModel.kt
 rename app/src/main/java/fr/free/nrw/commons/bookmarks/{models => category}/BookmarksCategoryModal.kt (78%)

diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesDao.kt
index 870c0556f..611ae3ca0 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesDao.kt
@@ -5,7 +5,6 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import fr.free.nrw.commons.bookmarks.models.BookmarksCategoryModal
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesViewModel.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesViewModel.kt
deleted file mode 100644
index 5967813b3..000000000
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesViewModel.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package fr.free.nrw.commons.bookmarks.category
-
-class BookmarkCategoriesViewModel(
-
-) {
-
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/models/BookmarksCategoryModal.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarksCategoryModal.kt
similarity index 78%
rename from app/src/main/java/fr/free/nrw/commons/bookmarks/models/BookmarksCategoryModal.kt
rename to app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarksCategoryModal.kt
index 295803720..966b846dd 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/models/BookmarksCategoryModal.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarksCategoryModal.kt
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.bookmarks.models
+package fr.free.nrw.commons.bookmarks.category
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
@@ -6,4 +6,4 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "bookmarks_categories")
 data class BookmarksCategoryModal(
     @PrimaryKey val categoryName: String
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
index cd13953fc..a42d26fd6 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
@@ -205,7 +205,6 @@ class CategoryDetailsActivity : BaseActivity(),
             }
 
             R.id.menu_bookmark_current_category -> {
-                //TODO: most likely won't be null
                 categoryName?.let {
                     viewModel.onBookmarkClick(categoryName = it)
                 }
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsViewModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsViewModel.kt
index fd3220b0e..e4d010ec1 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsViewModel.kt
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import fr.free.nrw.commons.bookmarks.category.BookmarkCategoriesDao
-import fr.free.nrw.commons.bookmarks.models.BookmarksCategoryModal
+import fr.free.nrw.commons.bookmarks.category.BookmarksCategoryModal
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -43,7 +43,6 @@ class CategoryDetailsViewModel(
 
     private fun addBookmark(categoryName: String) {
         viewModelScope.launch {
-            // TODO [Parry] view only knows about `name` see if we can have more data
             val categoryItem = BookmarksCategoryModal(
                 categoryName = categoryName
             )
@@ -74,4 +73,4 @@ class CategoryDetailsViewModel(
                 throw IllegalArgumentException("Unknown class name")
             }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
index 6222f2462..6ca71239a 100644
--- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
+++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
@@ -4,7 +4,7 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import fr.free.nrw.commons.bookmarks.category.BookmarkCategoriesDao
-import fr.free.nrw.commons.bookmarks.models.BookmarksCategoryModal
+import fr.free.nrw.commons.bookmarks.category.BookmarksCategoryModal
 import fr.free.nrw.commons.contributions.Contribution
 import fr.free.nrw.commons.contributions.ContributionDao
 import fr.free.nrw.commons.customselector.database.NotForUploadStatus