Make content the last param on ScreenWithTopBar

wordpress-mobile · Oct 3, 2024 · 0ea0d7e · 0ea0d7e
1 parent c7e3017
commit 0ea0d7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 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
@@ -165,10 +165,10 @@ fun MessageView(
 @Composable
 fun ScreenWithTopBar(
     title: String,
-    content: @Composable () -> Unit,
     onCloseClick: () -> Unit,
     isScrollable: Boolean,
     closeIcon: ImageVector = Icons.Default.Close,
+    content: @Composable () -> Unit,
 ) {
     M3Theme {
         Scaffold(

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
@@ -56,7 +56,12 @@ fun SelfHostedUsersScreen(
         else -> false
     }
 
-    val content: @Composable () -> Unit = @Composable {
+    ScreenWithTopBar(
+        title = title,
+        onCloseClick = { onCloseClick() },
+        isScrollable = isScrollable,
+        closeIcon = closeIcon,
+    ) {
         when (state) {
             is SelfHostedUserState.Loading -> {
                 ProgressDialog(
@@ -95,14 +100,6 @@ fun SelfHostedUsersScreen(
             }
         }
     }
-
-    ScreenWithTopBar(
-        content = content,
-        title = title,
-        onCloseClick = { onCloseClick() },
-        isScrollable = isScrollable,
-        closeIcon = closeIcon,
-    )
 }
 
 @Composable