feat(feed): add info about repo collaborator actions

Signed-off-by: SphericalKat <[email protected]>
SphericalKat · Aug 1, 2021 · ffbbdd8 · ffbbdd8
1 parent 1dd5cdb
commit ffbbdd8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/app/src/main/java/at/sphericalk/gidget/data/db/AppDb.kt b/app/src/main/java/at/sphericalk/gidget/data/db/AppDb.kt
@@ -5,7 +5,7 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import at.sphericalk.gidget.model.Event
 
-@Database(entities = [Event::class], version = 1, exportSchema = true)
+@Database(entities = [Event::class], version = 2, exportSchema = true)
 @TypeConverters(Converters::class)
 abstract class AppDb : RoomDatabase() {
     abstract fun eventDao(): EventDao

diff --git a/app/src/main/java/at/sphericalk/gidget/data/db/Converters.kt b/app/src/main/java/at/sphericalk/gidget/data/db/Converters.kt
@@ -62,6 +62,7 @@ class Converters {
         Action.Unassigned -> 7
         Action.Labeled -> 8
         Action.Unlabeled -> 9
+        Action.Added -> 10
         else -> null
     }
 
@@ -76,6 +77,7 @@ class Converters {
         7 -> Action.Unassigned
         8 -> Action.Labeled
         9 -> Action.Unlabeled
+        10 -> Action.Added
         null -> null
         else -> throw IllegalStateException("unknown action type")
     }

diff --git a/app/src/main/java/at/sphericalk/gidget/model/Events.kt b/app/src/main/java/at/sphericalk/gidget/model/Events.kt
@@ -50,6 +50,12 @@ data class Payload(
     val distinct_size: Long? = null,
     val head: String? = null,
     val before: String? = null,
+    @Embedded val member: Member?
+)
+
+@Keep
+data class Member(
+    @ColumnInfo(name = "payload_member_name") val login: String
 )
 
 @Keep
@@ -62,7 +68,8 @@ enum class Action {
     Assigned,
     Unassigned,
     Labeled,
-    Unlabeled;
+    Unlabeled,
+    Added;
 
     override fun toString() = when (this) {
         Published -> "published"
@@ -74,6 +81,7 @@ enum class Action {
         Unassigned -> "unassigned"
         Labeled -> "labeled"
         Unlabeled -> "unlabeled"
+        Added -> "added"
     }
 }
 
@@ -151,7 +159,7 @@ enum class EventType {
         GollumEvent -> "created a wiki page for"
         IssueCommentEvent -> "commented on an issue in"
         IssuesEvent -> ""
-        MemberEvent -> "became a member of"
+        MemberEvent -> "added"
         PullRequestEvent -> "created a pull request in"
         PullRequestReviewEvent -> "reviewed a pull request in"
         PullRequestReviewCommentEvent -> "commented on a pull request review in"

diff --git a/app/src/main/java/at/sphericalk/gidget/repo/GithubRepository.kt b/app/src/main/java/at/sphericalk/gidget/repo/GithubRepository.kt
@@ -4,6 +4,7 @@ import android.util.Log
 import at.sphericalk.gidget.data.db.EventDao
 import at.sphericalk.gidget.data.network.GithubDataSource
 import at.sphericalk.gidget.model.Event
+import at.sphericalk.gidget.model.EventType
 import at.sphericalk.gidget.model.RepoExtra
 import at.sphericalk.gidget.utils.destructure
 import kotlinx.coroutines.FlowPreview

diff --git a/app/src/main/java/at/sphericalk/gidget/ui/routes/Feed.kt b/app/src/main/java/at/sphericalk/gidget/ui/routes/Feed.kt
@@ -137,6 +137,13 @@ fun Feed(navController: NavController, viewModel: FeedViewModel) {
                                         EventType.IssuesEvent -> {
                                             append("${event.payload?.action.toString()} an issue in")
                                         }
+                                        EventType.MemberEvent -> {
+                                            append(" ")
+                                            withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
+                                                append(event.payload?.member?.login.toString())
+                                            }
+                                            append(" to")
+                                        }
                                     }
                                     append(" ")
                                     withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {