Skip to content

Commit

Permalink
update users to show username
Browse files Browse the repository at this point in the history
  • Loading branch information
strawberrybread committed Jul 8, 2024
1 parent 036b120 commit 3b1ccf4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ open class RealmUserModel : RealmObject() {
@JvmField
var birthPlace: String? = null
@JvmField
var communityName: String? = null
@JvmField
var userImage: String? = null
@JvmField
var key: String? = null
Expand Down Expand Up @@ -172,7 +170,7 @@ open class RealmUserModel : RealmObject() {
}

override fun toString(): String {
return "$firstName $lastName"
return "$name"
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.graphics.drawable.AnimationDrawable
import android.os.*
import android.os.Build.VERSION_CODES.TIRAMISU
import android.text.*
import android.util.Log
import android.view.*
import android.view.inputmethod.EditorInfo
import android.widget.*
Expand Down Expand Up @@ -259,7 +260,7 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
if (selectedTeamId?.isNotEmpty() == true) {
users = RealmMyTeam.getUsers(selectedTeamId, mRealm, "")
val userList = (users as? MutableList<RealmUserModel>)?.map {
User(it.getFullName(), it.name ?: "", "", it.userImage ?: "", "team")
User(it.name ?: "", it.name ?: "", "", it.userImage ?: "", "team")
} ?: emptyList()

val existingUsers = prefData.getSAVEDUSERS().toMutableList()
Expand Down

0 comments on commit 3b1ccf4

Please sign in to comment.