Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

login: show members username (fixes #3787) #3788

Merged
merged 4 commits into from
Jul 9, 2024
Merged

login: show members username (fixes #3787) #3788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b1ccf4
update users to show username
strawberrybread Jul 8, 2024
7dc14a4
Update LoginActivity.kt
Okuro3499 Jul 8, 2024
2e89ca9
Update build.gradle
dogi Jul 9, 2024
134010b
Merge branch 'master' into 3787-update-teams-list-to-display-username…
dogi Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1662
versionName "0.16.62"
versionCode 1663
versionName "0.16.63"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/org/ole/planet/myplanet/model/RealmUserModel.kt
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,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