Refactor: Bookmark model (commons-app#4851)

ben-mathu · web-flow · commit 7fa3ff0eee74 · 2022-04-26T12:34:14.000+03:00
* Bookmark: moved model to data.models package

* Refactor: move bookmark models to bookmark/models
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.bookmarks
+package fr.free.nrw.commons.bookmarks.models
 
 import android.net.Uri
 
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java
@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.bookmarks.pictures;
 
 import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.bookmarks.Bookmark;
+import fr.free.nrw.commons.bookmarks.models.Bookmark;
 import fr.free.nrw.commons.media.MediaClient;
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java
@@ -16,7 +16,7 @@
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import fr.free.nrw.commons.bookmarks.Bookmark;
+import fr.free.nrw.commons.bookmarks.models.Bookmark;
 
 import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI;
 
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -25,7 +25,7 @@
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.SessionManager;
-import fr.free.nrw.commons.bookmarks.Bookmark;
+import fr.free.nrw.commons.bookmarks.models.Bookmark;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
 import fr.free.nrw.commons.contributions.Contribution;
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt
@@ -8,9 +8,8 @@ import android.database.sqlite.SQLiteDatabase
 import android.net.Uri
 import android.os.RemoteException
 import com.nhaarman.mockitokotlin2.*
-import fr.free.nrw.commons.BuildConfig
 import fr.free.nrw.commons.TestCommonsApplication
-import fr.free.nrw.commons.bookmarks.Bookmark
+import fr.free.nrw.commons.bookmarks.models.Bookmark
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt
@@ -3,7 +3,7 @@ package fr.free.nrw.commons.bookmarks.pictures
 import android.net.Uri
 import com.nhaarman.mockitokotlin2.whenever
 import fr.free.nrw.commons.Media
-import fr.free.nrw.commons.bookmarks.Bookmark
+import fr.free.nrw.commons.bookmarks.models.Bookmark
 import fr.free.nrw.commons.media.MediaClient
 import io.reactivex.Single
 import media

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package fr.free.nrw.commons.bookmarks`
	`1`	`+package fr.free.nrw.commons.bookmarks.models`
`2`	`2`
`3`	`3`	`import android.net.Uri`
`4`	`4`