gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

solve detekt warnings

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-07-01 12:32:20 +02:00 committed by Andy Scherzinger (Rebase PR Action)
parent 1b13812202
commit 2b8ee4953b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterViewHolder.kt
View File

@ -45,12 +45,13 @@ class PollResultVoterViewHolder(
} }
private fun getAvatarDraweeController(pollDetail: PollDetails): DraweeController? { private fun getAvatarDraweeController(pollDetail: PollDetails): DraweeController? {
var draweeController: DraweeController? = null
if (pollDetail.actorType == "guests") { if (pollDetail.actorType == "guests") {
var displayName = NextcloudTalkApplication.sharedApplication?.resources?.getString(R.string.nc_guest) var displayName = NextcloudTalkApplication.sharedApplication?.resources?.getString(R.string.nc_guest)
if (!TextUtils.isEmpty(pollDetail.actorDisplayName)) { if (!TextUtils.isEmpty(pollDetail.actorDisplayName)) {
displayName = pollDetail.actorDisplayName!! displayName = pollDetail.actorDisplayName!!
} }
return Fresco.newDraweeControllerBuilder() draweeController = Fresco.newDraweeControllerBuilder()
.setAutoPlayAnimations(true) .setAutoPlayAnimations(true)
.setImageRequest( .setImageRequest(
DisplayUtils.getImageRequestForUrl( DisplayUtils.getImageRequestForUrl(
@ -64,7 +65,7 @@ class PollResultVoterViewHolder(
) )
.build() .build()
} else if (pollDetail.actorType == "users") { } else if (pollDetail.actorType == "users") {
return Fresco.newDraweeControllerBuilder() draweeController = Fresco.newDraweeControllerBuilder()
.setAutoPlayAnimations(true) .setAutoPlayAnimations(true)
.setImageRequest( .setImageRequest(
DisplayUtils.getImageRequestForUrl( DisplayUtils.getImageRequestForUrl(
@ -78,6 +79,6 @@ class PollResultVoterViewHolder(
) )
.build() .build()
} }
return null return draweeController
} }
} }

10
app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt
View File

@ -34,25 +34,25 @@ class PollResultsAdapter(
internal var list: MutableList<PollResultItem> = ArrayList() internal var list: MutableList<PollResultItem> = ArrayList()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PollResultViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PollResultViewHolder {
var viewHolder: PollResultViewHolder? = null
when (viewType) { when (viewType) {
PollResultHeaderItem.VIEW_TYPE -> { PollResultHeaderItem.VIEW_TYPE -> {
val itemBinding = PollResultHeaderItemBinding.inflate( val itemBinding = PollResultHeaderItemBinding.inflate(
LayoutInflater.from(parent.context), parent, LayoutInflater.from(parent.context), parent,
false false
) )
return PollResultHeaderViewHolder(itemBinding) viewHolder = PollResultHeaderViewHolder(itemBinding)
} }
PollResultVoterItem.VIEW_TYPE -> { PollResultVoterItem.VIEW_TYPE -> {
val itemBinding = PollResultVoterItemBinding.inflate( val itemBinding = PollResultVoterItemBinding.inflate(
LayoutInflater.from(parent.context), parent, LayoutInflater.from(parent.context), parent,
false false
) )
return PollResultVoterViewHolder(user, itemBinding) viewHolder = PollResultVoterViewHolder(user, itemBinding)
} }
} }
return viewHolder!!
val itemBinding = PollResultHeaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return PollResultHeaderViewHolder(itemBinding)
} }
override fun onBindViewHolder(holder: PollResultViewHolder, position: Int) { override fun onBindViewHolder(holder: PollResultViewHolder, position: Int) {

12
app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
View File

@ -40,7 +40,6 @@
package com.nextcloud.talk.polls.viewmodels package com.nextcloud.talk.polls.viewmodels
import android.util.Log
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
@ -86,7 +85,7 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
_items.value = ArrayList() _items.value = ArrayList()
val votersAmount = getVotersAmount(poll) val votersAmount = getVotersAmount(poll)
val oneVoteInPercent = 100 / votersAmount val oneVoteInPercent = HUNDRED / votersAmount
poll.options?.forEachIndexed { index, option -> poll.options?.forEachIndexed { index, option ->
val votersAmountForThisOption = getVotersAmountForOption(poll, index) val votersAmountForThisOption = getVotersAmountForOption(poll, index)
@ -117,13 +116,13 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
} }
private fun getVotersAmount(poll: Poll): Int { private fun getVotersAmount(poll: Poll): Int {
var votersAmount = 0
if (poll.details != null) { if (poll.details != null) {
return poll.details.size votersAmount = poll.details.size
} else if (poll.votes != null) { } else if (poll.votes != null) {
return poll.numVoters votersAmount = poll.numVoters
} }
Log.e(TAG, "something went wrong while getting amount of voters.") return votersAmount
return 0
} }
private fun getVotersAmountForOption(poll: Poll, index: Int): Int { private fun getVotersAmountForOption(poll: Poll, index: Int): Int {
@ -156,5 +155,6 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
companion object { companion object {
private val TAG = PollResultsViewModel::class.java.simpleName private val TAG = PollResultsViewModel::class.java.simpleName
private const val HUNDRED = 100
} }
} }