Merge remote-tracking branch 'origin/master'

dead8309 · Oct 7, 2023 · c8bbe2e · c8bbe2e
2 parents f55f8b9 + b4e9916
commit c8bbe2e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/data/src/test/kotlin/com/my/kizzy/data/KizzyRepositoryTest.kt b/data/src/test/kotlin/com/my/kizzy/data/KizzyRepositoryTest.kt
@@ -87,7 +87,7 @@ class KizzyRepositoryTest {
     @Test
     fun `Get a User Through Api`() = runBlocking {
         val user = kizzyRepository.getUser("888890990956511263")
-        assert(user.username == "yzziK")
+        assert(user.username == "yzzik")
         assert(user.verified)
     }
 

diff --git a/domain/src/main/java/com/my/kizzy/domain/model/user/User.kt b/domain/src/main/java/com/my/kizzy/domain/model/user/User.kt
@@ -44,7 +44,9 @@ data class User(
     @SerialName("special")
     val special: String? = null,
     @SerialName("verified")
-    val verified: Boolean = false
+    val verified: Boolean = false,
+    @SerialName("global_name")
+val globalName: String? = null
 ) {
     fun getAvatarImage(): String {
         return if (avatar?.startsWith("a_") == true)

diff --git a/feature_profile/src/main/java/com/my/kizzy/feature_profile/ui/component/ProfileCard.kt b/feature_profile/src/main/java/com/my/kizzy/feature_profile/ui/component/ProfileCard.kt
@@ -160,7 +160,7 @@ fun ProfileCard(
                     .background(Color.White)
             ) {
                 ProfileText(
-                    text = user.username + "#" + user.discriminator,
+                    text = user.globalName ?: (user.username + "#" + user.discriminator),
                     style = MaterialTheme.typography.titleLarge,
                 )
                 Spacer(

diff --git a/feature_settings/src/main/java/com/my/kizzy/feature_settings/Settings.kt b/feature_settings/src/main/java/com/my/kizzy/feature_settings/Settings.kt
@@ -246,7 +246,7 @@ fun ProfileCardSmall(
                     modifier = Modifier
                         .weight(9f)
                         .padding(5.dp),
-                    text = user?.username+"#"+user?.discriminator,
+                    text = user?.globalName ?: (user?.username + "#" + user?.discriminator),
                     maxLines = 1,
                     style = MaterialTheme.typography.titleLarge.copy(fontSize = 20.sp, fontWeight = FontWeight.SemiBold),
                     overflow = TextOverflow.Ellipsis