Merge pull request #1938 from pantasystem/feature/role-badge-fix

ロールバッジの実装の調整をした
pantasystem · Nov 1, 2023 · 5cf71c9 · 5cf71c9
2 parents 1771ead + 8d70487
commit 5cf71c9
Show file tree

Hide file tree

Showing 16 changed files with 3,997 additions and 210 deletions.
diff --git a/app/src/test/java/jp/panta/misskeyandroidclient/model/users/UserTest.kt b/app/src/test/java/jp/panta/misskeyandroidclient/model/users/UserTest.kt
@@ -24,6 +24,7 @@ class UserTest {
             isSameHost = true,
             instance = null,
             avatarBlurhash = null,
+            badgeRoles = emptyList(),
         )
 
         val profileUrl = user.getProfileUrl(
@@ -54,6 +55,7 @@ class UserTest {
             isSameHost = false,
             instance = null,
             avatarBlurhash = null,
+            badgeRoles = emptyList(),
         )
 
         val profileUrl = user.getProfileUrl(

diff --git a/...test/java/jp/panta/misskeyandroidclient/model/users/nickname/DeleteNicknameUseCaseTest.kt b/...test/java/jp/panta/misskeyandroidclient/model/users/nickname/DeleteNicknameUseCaseTest.kt
@@ -39,6 +39,7 @@ class DeleteNicknameUseCaseTest {
             isSameHost = true,
             instance = null,
             avatarBlurhash = null,
+            badgeRoles = emptyList(),
         )
         deleteNicknameUseCase = DeleteNicknameUseCase(
             userDataSource = userDataSource,

diff --git a/...test/java/jp/panta/misskeyandroidclient/model/users/nickname/UpdateNicknameUseCaseTest.kt b/...test/java/jp/panta/misskeyandroidclient/model/users/nickname/UpdateNicknameUseCaseTest.kt
@@ -38,6 +38,7 @@ class UpdateNicknameUseCaseTest {
                 isSameHost = true,
                 instance = null,
                 avatarBlurhash = null,
+                badgeRoles = emptyList(),
             )
             userDataSource.add(user)
 

diff --git a/.../common_android/src/main/java/net/pantasystem/milktea/common_android/ui/FontSizeHelper.kt b/.../common_android/src/main/java/net/pantasystem/milktea/common_android/ui/FontSizeHelper.kt
@@ -1,5 +1,6 @@
 package net.pantasystem.milktea.common_android.ui
 
+import android.content.Context
 import android.util.TypedValue
 import android.widget.TextView
 
@@ -15,4 +16,12 @@ object FontSizeHelper {
         val baseHeightPx = context.resources.displayMetrics.scaledDensity * fontSize
         setMemoFontPxSize(baseHeightPx)
     }
+
+    fun Context.specialPointToPixel(sp: Float): Float {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_SP,
+            sp,
+            this.resources.displayMetrics
+        )
+    }
 }