From adba9da754eb4a44666ae6ad13b5e2b2fa7942da Mon Sep 17 00:00:00 2001
From: Infi <infi@infi.sh>
Date: Sat, 11 Nov 2023 03:49:24 +0100
Subject: [PATCH] refactor: rename user context sheet to user info sheet

Signed-off-by: Infi <infi@infi.sh>
---
 .../chat/revolt/screens/chat/ChatRouterScreen.kt |  4 ++--
 .../java/chat/revolt/sheets/MemberListSheet.kt   | 16 +++++++++-------
 .../{UserContextSheet.kt => UserInfoSheet.kt}    |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename app/src/main/java/chat/revolt/sheets/{UserContextSheet.kt => UserInfoSheet.kt} (98%)

diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
index d2d8b056..99b7b68c 100644
--- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
@@ -104,7 +104,7 @@ import chat.revolt.sheets.EmoteInfoSheet
 import chat.revolt.sheets.LinkInfoSheet
 import chat.revolt.sheets.ServerContextSheet
 import chat.revolt.sheets.StatusSheet
-import chat.revolt.sheets.UserContextSheet
+import chat.revolt.sheets.UserInfoSheet
 import com.airbnb.lottie.RenderMode
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
@@ -584,7 +584,7 @@ fun ChatRouterScreen(
                 showUserContextSheet = false
             }
         ) {
-            UserContextSheet(
+            UserInfoSheet(
                 userId = userContextSheetTarget,
                 serverId = userContextSheetServer
             )
diff --git a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
index 47051da2..cbb1e247 100644
--- a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
@@ -61,9 +61,9 @@ import chat.revolt.components.generic.UserAvatar
 import chat.revolt.components.generic.presenceFromStatus
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 val DO_NOT_FETCH_OFFLINE_MEMBERS_SERVERS = listOf(
     "01F7ZSBSFHQ8TA81725KQCSDDP" // Revolt Lounge
@@ -245,7 +245,7 @@ fun MemberListSheet(
                 showUserContextSheet = false
             }
         ) {
-            UserContextSheet(
+            UserInfoSheet(
                 userId = userContextSheetTarget,
                 serverId = serverId
             )
@@ -312,11 +312,13 @@ fun MemberListMemberUser(
     onSelectUser: (String) -> Unit
 ) {
     val highestColourRole = serverId?.let {
-        Roles.resolveHighestRole(
-            it,
-            user.id!!,
-            true
-        )
+        user.id?.let { userId ->
+            Roles.resolveHighestRole(
+                it,
+                userId,
+                true
+            )
+        }
     }
     val colour = highestColourRole?.colour?.let { WebCompat.parseColour(it) }
         ?: Brush.solidColor(LocalContentColor.current)
diff --git a/app/src/main/java/chat/revolt/sheets/UserContextSheet.kt b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
similarity index 98%
rename from app/src/main/java/chat/revolt/sheets/UserContextSheet.kt
rename to app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
index d6d6824b..f2141946 100644
--- a/app/src/main/java/chat/revolt/sheets/UserContextSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
@@ -40,7 +40,7 @@ import chat.revolt.components.screens.settings.RawUserOverview
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun UserContextSheet(userId: String, serverId: String? = null) {
+fun UserInfoSheet(userId: String, serverId: String? = null) {
     val user = RevoltAPI.userCache[userId]
 
     val member = serverId?.let { RevoltAPI.members.getMember(it, userId) }