Third pass at detail

wordpress-mobile · Sep 30, 2024 · 5cc702d · 5cc702d
1 parent fb003fb
commit 5cc702d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/...Press/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUserComposables.kt b/...Press/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUserComposables.kt
@@ -30,10 +30,12 @@ import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import org.wordpress.android.R
 import org.wordpress.android.ui.compose.theme.M3Theme
+import uniffi.wp_api.UserWithEditContext
 
 @Composable
-fun UserAvatar(avatarUrl: String?) {
-    if (avatarUrl.isNullOrEmpty()) {
+fun UserAvatar(user: UserWithEditContext) {
+    val avatarUrl = user.avatarUrls?.values?.firstOrNull() ?: ""
+    if (avatarUrl.isEmpty()) {
         Icon(
             imageVector = ImageVector.vectorResource(id = R.drawable.ic_user_placeholder_primary_24),
             contentDescription = null,
@@ -120,3 +122,5 @@ fun UserScreen(
         }
     }
 }
+
+val userScreenPaddingDp = 16.dp
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt
@@ -104,19 +104,18 @@ private fun UserLazyRow(
 ) {
     LazyRow(
         modifier = Modifier
-            .padding(all = 16.dp)
+            .padding(all = userScreenPaddingDp)
             .fillMaxWidth()
             .clickable { onUserClick(user) }
     ) {
         item {
-            val avatarUrl = user.avatarUrls?.values?.firstOrNull() ?: ""
-            UserAvatar(avatarUrl)
+            UserAvatar(user)
         }
 
         item {
             Column(
                 modifier = Modifier
-                    .padding(start = 16.dp)
+                    .padding(start = userScreenPaddingDp)
             ) {
                 Text(
                     text = user.name,
@@ -146,17 +145,16 @@ private fun UserDetail(
 ) {
     Row(
         modifier = Modifier
-            .padding(all = 16.dp)
+            .padding(all = userScreenPaddingDp)
             .fillMaxWidth()
     ) {
         Column {
-            val avatarUrl = user.avatarUrls?.values?.firstOrNull() ?: ""
-            UserAvatar(avatarUrl)
+            UserAvatar(user)
         }
 
         Column(
             modifier = Modifier
-                .padding(start = 16.dp)
+                .padding(start = userScreenPaddingDp)
         ) {
             UserDetailSection(title = stringResource(R.string.name)) {
                 UserDetailRow(
@@ -196,7 +194,9 @@ private fun UserDetail(
             UserDetailSection(title = stringResource(R.string.about_the_user)) {
                 UserDetailRow(
                     label = stringResource(R.string.biographical_info),
-                    text = user.description,
+                    text = user.description.ifEmpty {
+                        stringResource(R.string.biographical_info_empty)
+                    },
                     isMultiline = true
                 )
             }
@@ -213,10 +213,10 @@ private fun UserDetailSection(
         text = title,
         style = MaterialTheme.typography.titleLarge,
     )
-    Spacer(modifier = Modifier.height(16.dp))
+    Spacer(modifier = Modifier.height(userScreenPaddingDp))
     content()
     HorizontalDivider(thickness = 1.dp)
-    Spacer(modifier = Modifier.height(16.dp))
+    Spacer(modifier = Modifier.height(userScreenPaddingDp))
 }
 
 @Composable
@@ -235,7 +235,7 @@ private fun UserDetailRow(
         maxLines = if (isMultiline) 10 else 1,
         overflow = TextOverflow.Ellipsis
     )
-    Spacer(modifier = Modifier.height(16.dp))
+    Spacer(modifier = Modifier.height(userScreenPaddingDp))
 }
 
 @Composable

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -2988,6 +2988,7 @@
     <string name="website">Website</string>
     <string name="about_the_user">About the user</string>
     <string name="biographical_info">Biographical Info</string>
+    <string name="biographical_info_empty">None given</string>
 
     <!--Account Settings-->
     <string name="account_settings">Account Settings</string>