Skip to content

Commit c01620a

Browse files
style: Fix formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 498aecc commit c01620a

3 files changed

Lines changed: 24 additions & 47 deletions

File tree

app/src/main/java/com/nextcloud/talk/chat/MentionAutocompleteAdapter.kt

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -105,37 +105,25 @@ class MentionAutocompleteAdapter(
105105
}
106106

107107
private fun setAvatar(holder: ViewHolder, item: MentionAutocompleteItem) {
108+
val avatarView = holder.binding.avatarView
108109
when (item.source) {
109110
SOURCE_CALLS -> {
110-
if (isPhoneNumber(item.displayName)) {
111-
holder.binding.avatarView.loadUserAvatar(
112-
viewThemeUtils.talk.themePlaceholderAvatar(
113-
holder.binding.avatarView,
114-
R.drawable.ic_phone_small
115-
)
116-
)
111+
val placeholder = if (isPhoneNumber(item.displayName)) {
112+
R.drawable.ic_phone_small
117113
} else {
118-
holder.binding.avatarView.loadUserAvatar(
119-
viewThemeUtils.talk.themePlaceholderAvatar(
120-
holder.binding.avatarView,
121-
R.drawable.ic_avatar_group_small
122-
)
123-
)
114+
R.drawable.ic_avatar_group_small
124115
}
116+
avatarView.loadUserAvatar(viewThemeUtils.talk.themePlaceholderAvatar(avatarView, placeholder))
125117
}
126118

127-
SOURCE_GROUPS -> {
128-
holder.binding.avatarView.loadUserAvatar(
129-
viewThemeUtils.talk.themePlaceholderAvatar(
130-
holder.binding.avatarView,
131-
R.drawable.ic_avatar_group_small
132-
)
119+
SOURCE_GROUPS ->
120+
avatarView.loadUserAvatar(
121+
viewThemeUtils.talk.themePlaceholderAvatar(avatarView, R.drawable.ic_avatar_group_small)
133122
)
134-
}
135123

136124
SOURCE_FEDERATION -> {
137125
val darkTheme = if (DisplayUtils.isDarkModeOn(context)) 1 else 0
138-
holder.binding.avatarView.loadFederatedUserAvatar(
126+
avatarView.loadFederatedUserAvatar(
139127
currentUser,
140128
currentUser.baseUrl!!,
141129
roomToken,
@@ -148,29 +136,18 @@ class MentionAutocompleteAdapter(
148136

149137
SOURCE_GUESTS, SOURCE_EMAILS -> {
150138
if (item.displayName.equals(context.resources.getString(R.string.nc_guest))) {
151-
holder.binding.avatarView.loadDefaultAvatar(viewThemeUtils)
139+
avatarView.loadDefaultAvatar(viewThemeUtils)
152140
} else {
153-
holder.binding.avatarView.loadGuestAvatar(currentUser, item.displayName!!, false)
141+
avatarView.loadGuestAvatar(currentUser, item.displayName!!, false)
154142
}
155143
}
156144

157-
SOURCE_TEAMS -> {
158-
holder.binding.avatarView.loadUserAvatar(
159-
viewThemeUtils.talk.themePlaceholderAvatar(
160-
holder.binding.avatarView,
161-
R.drawable.ic_avatar_team_small
162-
)
145+
SOURCE_TEAMS ->
146+
avatarView.loadUserAvatar(
147+
viewThemeUtils.talk.themePlaceholderAvatar(avatarView, R.drawable.ic_avatar_team_small)
163148
)
164-
}
165149

166-
else -> {
167-
holder.binding.avatarView.loadUserAvatar(
168-
currentUser,
169-
item.objectId!!,
170-
requestBigSize = true,
171-
ignoreCache = false
172-
)
173-
}
150+
else -> avatarView.loadUserAvatar(currentUser, item.objectId!!, requestBigSize = true, ignoreCache = false)
174151
}
175152
}
176153

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ import java.time.ZonedDateTime
108108
import java.time.format.DateTimeFormatter
109109
import java.time.format.FormatStyle
110110
import java.util.Calendar
111-
import java.util.Collections
112111
import java.util.Locale
113112
import javax.inject.Inject
114113

@@ -836,11 +835,13 @@ class ConversationInfoActivity : BaseActivity() {
836835
compareBy(
837836
{ it.participant.actorType == GROUPS || it.participant.actorType == CIRCLES },
838837
{ !it.isOnline },
839-
{ it.participant.type !in listOf(
840-
Participant.ParticipantType.MODERATOR,
841-
Participant.ParticipantType.OWNER,
842-
Participant.ParticipantType.GUEST_MODERATOR
843-
)},
838+
{
839+
it.participant.type !in listOf(
840+
Participant.ParticipantType.MODERATOR,
841+
Participant.ParticipantType.OWNER,
842+
Participant.ParticipantType.GUEST_MODERATOR
843+
)
844+
},
844845
{ it.participant.displayName!!.lowercase(Locale.ROOT) }
845846
)
846847
)

app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ enum class StatusType(val string: String) {
1818
INVISIBLE("invisible");
1919

2020
companion object {
21-
fun getDescription(value: String?, context: Context): String {
22-
return when (value) {
21+
fun getDescription(value: String?, context: Context): String =
22+
when (value) {
2323
DND.string -> context.getString(R.string.dnd)
2424
BUSY.string -> context.getString(R.string.busy)
2525
AWAY.string -> context.getString(R.string.away)
2626
else -> ""
2727
}
28-
}
2928
}
3029
}

0 commit comments

Comments
 (0)