Skip to content

Commit

Permalink
Reworked sample users to resolve SonarCloud warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nbradbury committed Sep 27, 2024
1 parent ba74377 commit a59abb3
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 145 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package org.wordpress.android.ui.selfhostedusers

import uniffi.wp_api.UserWithEditContext

/**
* This is a temporary object to supply a list of users for the self-hosted user list.
* It will be removed once the network request to retrieve users is implemented.
*/
object SampleUsers {
private val sampleUserList = ArrayList<UserWithEditContext>()

private val sampleUser1 = UserWithEditContext(
id = 1,
username = "@sampleUser",
avatarUrls = emptyMap(),
capabilities = emptyMap(),
description = "User description",
email = "[email protected]",
extraCapabilities = emptyMap(),
firstName = "Sample",
lastName = "User",
link = "example.com",
locale = "en-US",
name = "Sample User",
nickname = "User nickname",
registeredDate = "2023-01-01",
roles = listOf("admin"),
slug = "sample-user",
url = "example.com",
)

// TODO remove the avatar url
private val sampleUser2 = UserWithEditContext(
id = 2,
username = "@sampleUserWithALongUserName",
avatarUrls = mapOf("sampleUserTwo" to "https://nickbradbury.com/wp-content/uploads/2022/03/1394-2.jpg"),
capabilities = emptyMap(),
description = "User description",
email = "[email protected]",
extraCapabilities = emptyMap(),
firstName = "Sample",
lastName = "User",
link = "example.com",
locale = "en-US",
name = "Sample User",
nickname = "User nickname",
registeredDate = "2023-01-01",
roles = listOf("contributor"),
slug = "sample-user",
url = "example.com",
)

fun getSampleUsers(): ArrayList<UserWithEditContext> {
if (sampleUserList.isEmpty()) {
repeat(25) {
sampleUserList.add(sampleUser1)
sampleUserList.add(sampleUser2)
}
}
return sampleUserList
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ private fun Screen(
)
fun UserListScreenPreview() {
UserListScreen(
users = MutableStateFlow(sampleUserList).collectAsState(),
users = MutableStateFlow(SampleUsers.getSampleUsers()).collectAsState(),
progressDialogState = null,
)
}
Expand Down Expand Up @@ -262,143 +262,3 @@ fun ProgressPreview() {
progressDialogState = MutableStateFlow(progressDialogState).collectAsState(),
)
}

private val sampleUser1 = UserWithEditContext(
id = 1,
username = "@sampleUser",
avatarUrls = emptyMap(),
capabilities = emptyMap(),
description = "User description",
email = "[email protected]",
extraCapabilities = emptyMap(),
firstName = "Sample",
lastName = "User",
link = "example.com",
locale = "en-US",
name = "Sample User",
nickname = "User nickname",
registeredDate = "2023-01-01",
roles = listOf("admin"),
slug = "sample-user",
url = "example.com",
)

// TODO remove the avatar url
private val sampleUser2 = UserWithEditContext(
id = 2,
username = "@sampleUserWithALongUserName",
avatarUrls = mapOf("sampleUserTwo" to "https://nickbradbury.com/wp-content/uploads/2022/03/1394-2.jpg"),
capabilities = emptyMap(),
description = "User description",
email = "[email protected]",
extraCapabilities = emptyMap(),
firstName = "Sample",
lastName = "User",
link = "example.com",
locale = "en-US",
name = "Sample User",
nickname = "User nickname",
registeredDate = "2023-01-01",
roles = listOf("contributor"),
slug = "sample-user",
url = "example.com",
)

val sampleUserList = listOf(
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
sampleUser1,
sampleUser2,
)
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ class UserListViewModel @Inject constructor(
_users.value = listOf()
launch {
delay(1000L)
_users.value = sampleUserList
_users.value = SampleUsers.getSampleUsers()
hideProgressDialog()
}
}

private fun showProgressDialog(
@StringRes message: Int
) {
private fun showProgressDialog(@StringRes message: Int) {
_progressDialogState.value =
ProgressDialogState(
message = message,
Expand Down

0 comments on commit a59abb3

Please sign in to comment.