Notifications Refresh (Phase 2)

WordPress/src/androidTest/java/org/wordpress/android/ui/notifications/NotificationsUtilsTest.kt

@@ -51,7 +51,7 @@ class NotificationsUtilsTest {
         // Check if the link is correctly set
         val spans = result.getSpans(10, 14, ClickableSpan::class.java)
         assertTrue(spans.size == 1)
-        assertEquals("https://example.com", (spans[0] as NoteBlockClickableSpan).formattableRange.url)
+        assertEquals("https://example.com", (spans[0] as NoteBlockClickableSpan).formattableRange?.url)
     }
 
     @Test

WordPress/src/main/AndroidManifest.xml

@@ -234,7 +234,7 @@
             android:name=".ui.comments.CommentsDetailActivity"
             android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="adjustResize"
-            android:label="@string/comments"/>
+            android:label=""/>
         <activity
             android:name=".ui.comments.unified.UnifiedCommentsDetailsActivity"
             android:theme="@style/WordPress.NoActionBar"

WordPress/src/main/java/org/wordpress/android/models/NoteExtensions.kt

@@ -1,9 +1,12 @@
+@file:JvmName("NoteExtensions")
 package org.wordpress.android.models
 
 
 val Note.type
     get() = NoteType.from(rawType)
 
+fun Note.isAchievement() = AchievementType.isAchievementType(rawType)
+
 sealed class Notification {
     data class PostLike(val url: String, val title: String): Notification()
     data object NewPost: Notification()
@@ -34,3 +37,29 @@ enum class NoteType(val rawType: String) {
         fun from(rawType: String) = map[rawType] ?: Unknown
     }
 }
+
+enum class AchievementType(val rawType: String) {
+    UserGoalMet("user_goal_met"),
+    AutomatticianAchievement("automattician_achievement"),
+    AchieveBurritoFriday("achieve_burrito_friday"),
+    AchieveDailyStreak("achieve_daily_streak"),
+    FollowedMilestoneAchievement("followed_milestone_achievement"),
+    LikeMilestoneAchievement("like_milestone_achievement"),
+    OnFireAchievement("on_fire_achievement"),
+    PostMilestoneAchievement("post_milestone_achievement"),
+    AchieveUserAnniversary("achieve_user_anniversary"),
+    BestFollowedDayFeat("best_followed_day_feat"),
+    BestLikedDayFeat("best_liked_day_feat"),
+    NewTrafficSurge("new_traffic_surge"),
+    PrivacyChange("privacy_change"),
+    FreeTrialStart("free_trial_start"),
+    FreeTrialNearEndNote("free_trial_near_end_note"),
+    FreeTrialEnd("free_trial_end"),
+    ViewMilestone(Note.NOTE_VIEW_MILESTONE),
+    AscProfileRegenerationStarted("asc_profile_regeneration_started"),
+    AscProfileRegenerationFinished("asc_profile_regeneration_finished");
+
+    companion object {
+        fun isAchievementType(rawType: String) = entries.any { it.rawType == rawType }
+    }
+}

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -58,6 +58,7 @@
 import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment;
 import org.wordpress.android.ui.mysite.MySiteFragment;
 import org.wordpress.android.ui.notifications.DismissNotificationReceiver;
+import org.wordpress.android.ui.notifications.MilestoneDetailFragment;
 import org.wordpress.android.ui.notifications.NotificationsDetailActivity;
 import org.wordpress.android.ui.notifications.NotificationsDetailListFragment;
 import org.wordpress.android.ui.notifications.NotificationsListFragmentPage;
@@ -303,6 +304,8 @@ public interface AppComponent {
 
     void inject(NotificationsDetailListFragment object);
 
+    void inject(MilestoneDetailFragment object);
+
     void inject(ReaderSubsActivity object);
 
     void inject(ReaderUpdateLogic object);

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -1210,6 +1210,8 @@ public static void viewPostLikesListActivity(
             Activity activity,
             long siteId,
             long postId,
+            String postTitle,
+            String postUrl,
             HeaderData headerData,
             EngagementNavigationSource source
     ) {
@@ -1223,6 +1225,8 @@ public static void viewPostLikesListActivity(
                         postId,
                         0L,
                         "",
+                        postTitle,
+                        postUrl,
                         headerData
                 )
         );