Refactor: notification models (commons-app#4866)

ben-mathu · web-flow · commit 6ad70932c550 · 2022-04-28T18:23:44.000+03:00
* Refactor: move notification modesl to data.models.notification

* Refactor: move notification models to notifications/models
diff --git a/app/CommonsContributions/e998b507-60b6-4ea0-80c5-e30b8285c75610074820572125241785.jpg b/app/CommonsContributions/e998b507-60b6-4ea0-80c5-e30b8285c75610074820572125241785.jpg
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -29,7 +29,7 @@
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
-import fr.free.nrw.commons.notification.Notification;
+import fr.free.nrw.commons.notification.models.Notification;
 import fr.free.nrw.commons.notification.NotificationController;
 import fr.free.nrw.commons.profile.ProfileActivity;
 import fr.free.nrw.commons.theme.BaseActivity;
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.notification
 
+import fr.free.nrw.commons.notification.models.Notification
 import fr.free.nrw.commons.upload.categories.BaseDelegateAdapter
 
 internal class NotificatinAdapter(onNotificationClicked: (Notification) -> Unit) :
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -23,6 +23,7 @@
 import com.google.android.material.snackbar.Snackbar;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.notification.models.Notification;
 import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.notification
 
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import fr.free.nrw.commons.notification.models.Notification
 import fr.free.nrw.commons.databinding.ItemNotificationBinding
 import org.wikipedia.util.StringUtil
 
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.notification;
 
+import fr.free.nrw.commons.notification.models.Notification;
 import org.wikipedia.csrf.CsrfTokenClient;
 import org.wikipedia.dataclient.Service;
 
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.notification;
 
+import fr.free.nrw.commons.notification.models.Notification;
 import java.util.List;
 
 import javax.inject.Inject;
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java
@@ -5,6 +5,7 @@
 
 import androidx.annotation.Nullable;
 
+import fr.free.nrw.commons.notification.models.Notification;
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt b/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt
@@ -1,23 +1,24 @@
-package fr.free.nrw.commons.notification
+package fr.free.nrw.commons.notification.models
 
 import org.wikipedia.util.DateUtil
 
 /**
  * Created by root on 18.12.2017.
  */
 data class Notification(var notificationType: NotificationType,
-                   var notificationText: String,
-                   var date: String,
-                   var link: String,
-                   var iconUrl: String,
-                   var notificationId: String) {
+                        var notificationText: String,
+                        var date: String,
+                        var link: String,
+                        var iconUrl: String,
+                        var notificationId: String) {
 
     companion object {
         @JvmStatic
         fun from(wikiNotification: org.wikipedia.notifications.Notification): Notification {
             val contents = wikiNotification.contents
             val notificationLink = if (contents == null || contents.links == null || contents.links!!.primary == null) "" else contents.links!!.primary!!.url
-            return Notification(NotificationType.UNKNOWN,
+            return Notification(
+                NotificationType.UNKNOWN,
                     contents?.compactHeader ?: "",
                     DateUtil.getMonthOnlyDateString(wikiNotification.timestamp),
                     notificationLink,
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/models/NotificationType.java b/app/src/main/java/fr/free/nrw/commons/notification/models/NotificationType.java
@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.notification;
+package fr.free.nrw.commons.notification.models;
 
 public enum NotificationType {
     THANK_YOU_EDIT("thank-you-edit"),
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt
@@ -17,9 +17,9 @@ import fr.free.nrw.commons.kvstore.JsonKvStore
 import fr.free.nrw.commons.media.MediaDetailPagerFragment
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
 import fr.free.nrw.commons.nearby.NearbyNotificationCardView
-import fr.free.nrw.commons.notification.Notification
+import fr.free.nrw.commons.notification.models.Notification
 import fr.free.nrw.commons.notification.NotificationController
-import fr.free.nrw.commons.notification.NotificationType
+import fr.free.nrw.commons.notification.models.NotificationType
 import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable
 import org.junit.Assert
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt
@@ -8,6 +8,8 @@ import fr.free.nrw.commons.R
 import fr.free.nrw.commons.ShadowActionBar
 import fr.free.nrw.commons.TestAppAdapter
 import fr.free.nrw.commons.TestCommonsApplication
+import fr.free.nrw.commons.notification.models.Notification
+import fr.free.nrw.commons.notification.models.NotificationType
 import fr.free.nrw.commons.utils.NetworkUtils
 import org.junit.Assert
 import org.junit.Before
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.notification
 
+import fr.free.nrw.commons.notification.models.Notification
 import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt
@@ -4,6 +4,8 @@ import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import fr.free.nrw.commons.TestCommonsApplication
+import fr.free.nrw.commons.notification.models.Notification
+import fr.free.nrw.commons.notification.models.NotificationType
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package fr.free.nrw.commons.notification;`
	`1`	`+package fr.free.nrw.commons.notification.models;`
`2`	`2`
`3`	`3`	`public enum NotificationType {`
`4`	`4`	`THANK_YOU_EDIT("thank-you-edit"),`