mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-28 09:38:14 +03:00
wip. toggle between voters overview and voters details
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
c7014fd063
commit
20dabf3a72
6 changed files with 208 additions and 18 deletions
|
@ -0,0 +1,38 @@
|
||||||
|
/*
|
||||||
|
* Nextcloud Talk application
|
||||||
|
*
|
||||||
|
* @author Marcel Hibbe
|
||||||
|
* Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.nextcloud.talk.polls.adapters
|
||||||
|
|
||||||
|
import com.nextcloud.talk.R
|
||||||
|
import com.nextcloud.talk.polls.model.PollDetails
|
||||||
|
|
||||||
|
data class PollResultVotersOverviewItem(
|
||||||
|
val detailsList: List<PollDetails>
|
||||||
|
) : PollResultItem {
|
||||||
|
|
||||||
|
override fun getViewType(): Int {
|
||||||
|
return VIEW_TYPE
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
// layout is used as view type for uniqueness
|
||||||
|
const val VIEW_TYPE: Int = R.layout.poll_result_voters_overview_item
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,109 @@
|
||||||
|
/*
|
||||||
|
* Nextcloud Talk application
|
||||||
|
*
|
||||||
|
* @author Marcel Hibbe
|
||||||
|
* Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.nextcloud.talk.polls.adapters
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import android.text.TextUtils
|
||||||
|
import android.widget.LinearLayout
|
||||||
|
import com.facebook.drawee.backends.pipeline.Fresco
|
||||||
|
import com.facebook.drawee.generic.RoundingParams
|
||||||
|
import com.facebook.drawee.interfaces.DraweeController
|
||||||
|
import com.facebook.drawee.view.SimpleDraweeView
|
||||||
|
import com.nextcloud.talk.R
|
||||||
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
||||||
|
import com.nextcloud.talk.data.user.model.User
|
||||||
|
import com.nextcloud.talk.databinding.PollResultVotersOverviewItemBinding
|
||||||
|
import com.nextcloud.talk.polls.model.PollDetails
|
||||||
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
|
import com.nextcloud.talk.utils.DisplayUtils
|
||||||
|
|
||||||
|
class PollResultVotersOverviewViewHolder(
|
||||||
|
private val user: User,
|
||||||
|
override val binding: PollResultVotersOverviewItemBinding
|
||||||
|
) : PollResultViewHolder(binding) {
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
|
override fun bind(pollResultItem: PollResultItem, clickListener: PollResultItemClickListener) {
|
||||||
|
val item = pollResultItem as PollResultVotersOverviewItem
|
||||||
|
|
||||||
|
val lp = LinearLayout.LayoutParams(
|
||||||
|
AVATAR_WIDTH,
|
||||||
|
AVATAR_HEIGHT
|
||||||
|
)
|
||||||
|
|
||||||
|
item.detailsList.forEach {
|
||||||
|
val avatar = SimpleDraweeView(binding.root.context)
|
||||||
|
avatar.layoutParams = lp
|
||||||
|
|
||||||
|
val roundingParams = RoundingParams.fromCornersRadius(AVATAR_RADIUS)
|
||||||
|
roundingParams.roundAsCircle = true
|
||||||
|
|
||||||
|
avatar.hierarchy.roundingParams = roundingParams
|
||||||
|
avatar.controller = getAvatarDraweeController(it)
|
||||||
|
|
||||||
|
binding.votersAvatarsOverviewWrapper.addView(avatar)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getAvatarDraweeController(pollDetail: PollDetails): DraweeController? {
|
||||||
|
var draweeController: DraweeController? = null
|
||||||
|
if (pollDetail.actorType == "guests") {
|
||||||
|
var displayName = NextcloudTalkApplication.sharedApplication?.resources?.getString(R.string.nc_guest)
|
||||||
|
if (!TextUtils.isEmpty(pollDetail.actorDisplayName)) {
|
||||||
|
displayName = pollDetail.actorDisplayName!!
|
||||||
|
}
|
||||||
|
draweeController = Fresco.newDraweeControllerBuilder()
|
||||||
|
.setAutoPlayAnimations(true)
|
||||||
|
.setImageRequest(
|
||||||
|
DisplayUtils.getImageRequestForUrl(
|
||||||
|
ApiUtils.getUrlForGuestAvatar(
|
||||||
|
user.baseUrl,
|
||||||
|
displayName,
|
||||||
|
false
|
||||||
|
),
|
||||||
|
user
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.build()
|
||||||
|
} else if (pollDetail.actorType == "users") {
|
||||||
|
draweeController = Fresco.newDraweeControllerBuilder()
|
||||||
|
.setAutoPlayAnimations(true)
|
||||||
|
.setImageRequest(
|
||||||
|
DisplayUtils.getImageRequestForUrl(
|
||||||
|
ApiUtils.getUrlForAvatar(
|
||||||
|
user.baseUrl,
|
||||||
|
pollDetail.actorId,
|
||||||
|
false
|
||||||
|
),
|
||||||
|
user
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
return draweeController
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val AVATAR_WIDTH = 90
|
||||||
|
const val AVATAR_HEIGHT = 70
|
||||||
|
const val AVATAR_RADIUS = 5f
|
||||||
|
}
|
||||||
|
}
|
|
@ -26,6 +26,7 @@ import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.nextcloud.talk.data.user.model.User
|
import com.nextcloud.talk.data.user.model.User
|
||||||
import com.nextcloud.talk.databinding.PollResultHeaderItemBinding
|
import com.nextcloud.talk.databinding.PollResultHeaderItemBinding
|
||||||
import com.nextcloud.talk.databinding.PollResultVoterItemBinding
|
import com.nextcloud.talk.databinding.PollResultVoterItemBinding
|
||||||
|
import com.nextcloud.talk.databinding.PollResultVotersOverviewItemBinding
|
||||||
|
|
||||||
class PollResultsAdapter(
|
class PollResultsAdapter(
|
||||||
private val user: User,
|
private val user: User,
|
||||||
|
@ -51,6 +52,13 @@ class PollResultsAdapter(
|
||||||
)
|
)
|
||||||
viewHolder = PollResultVoterViewHolder(user, itemBinding)
|
viewHolder = PollResultVoterViewHolder(user, itemBinding)
|
||||||
}
|
}
|
||||||
|
PollResultVotersOverviewItem.VIEW_TYPE -> {
|
||||||
|
val itemBinding = PollResultVotersOverviewItemBinding.inflate(
|
||||||
|
LayoutInflater.from(parent.context), parent,
|
||||||
|
false
|
||||||
|
)
|
||||||
|
viewHolder = PollResultVotersOverviewViewHolder(user, itemBinding)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return viewHolder!!
|
return viewHolder!!
|
||||||
}
|
}
|
||||||
|
@ -65,6 +73,10 @@ class PollResultsAdapter(
|
||||||
val pollResultItem = list[position]
|
val pollResultItem = list[position]
|
||||||
holder.bind(pollResultItem as PollResultVoterItem, clickListener)
|
holder.bind(pollResultItem as PollResultVoterItem, clickListener)
|
||||||
}
|
}
|
||||||
|
PollResultVotersOverviewItem.VIEW_TYPE -> {
|
||||||
|
val pollResultItem = list[position]
|
||||||
|
holder.bind(pollResultItem as PollResultVotersOverviewItem, clickListener)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ class PollResultsFragment : Fragment(), PollResultItemClickListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onClick(pollResultHeaderItem: PollResultHeaderItem) {
|
override fun onClick(pollResultHeaderItem: PollResultHeaderItem) {
|
||||||
viewModel.filterItems()
|
viewModel.toggleDetails()
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
|
@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModel
|
||||||
import com.nextcloud.talk.polls.adapters.PollResultHeaderItem
|
import com.nextcloud.talk.polls.adapters.PollResultHeaderItem
|
||||||
import com.nextcloud.talk.polls.adapters.PollResultItem
|
import com.nextcloud.talk.polls.adapters.PollResultItem
|
||||||
import com.nextcloud.talk.polls.adapters.PollResultVoterItem
|
import com.nextcloud.talk.polls.adapters.PollResultVoterItem
|
||||||
|
import com.nextcloud.talk.polls.adapters.PollResultVotersOverviewItem
|
||||||
import com.nextcloud.talk.polls.model.Poll
|
import com.nextcloud.talk.polls.model.Poll
|
||||||
import io.reactivex.disposables.Disposable
|
import io.reactivex.disposables.Disposable
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
@ -40,7 +41,8 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
|
||||||
val poll: Poll?
|
val poll: Poll?
|
||||||
get() = _poll
|
get() = _poll
|
||||||
|
|
||||||
private var _unfilteredItems: ArrayList<PollResultItem> = ArrayList()
|
private var _itemsOverviewList: ArrayList<PollResultItem> = ArrayList()
|
||||||
|
private var _itemsDetailsList: ArrayList<PollResultItem> = ArrayList()
|
||||||
|
|
||||||
private var _items: MutableLiveData<ArrayList<PollResultItem>?> = MutableLiveData<ArrayList<PollResultItem>?>()
|
private var _items: MutableLiveData<ArrayList<PollResultItem>?> = MutableLiveData<ArrayList<PollResultItem>?>()
|
||||||
val items: MutableLiveData<ArrayList<PollResultItem>?>
|
val items: MutableLiveData<ArrayList<PollResultItem>?>
|
||||||
|
@ -72,23 +74,23 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
|
||||||
optionsPercent,
|
optionsPercent,
|
||||||
isOptionSelfVoted(poll, index)
|
isOptionSelfVoted(poll, index)
|
||||||
)
|
)
|
||||||
addToItems(pollResultHeaderItem)
|
_itemsOverviewList.add(pollResultHeaderItem)
|
||||||
|
_itemsDetailsList.add(pollResultHeaderItem)
|
||||||
|
|
||||||
val voters = poll.details?.filter { it.optionId == index }
|
val voters = poll.details?.filter { it.optionId == index }
|
||||||
|
|
||||||
|
if (!voters.isNullOrEmpty()) {
|
||||||
|
_itemsOverviewList.add(PollResultVotersOverviewItem(voters))
|
||||||
|
}
|
||||||
|
|
||||||
if (!voters.isNullOrEmpty()) {
|
if (!voters.isNullOrEmpty()) {
|
||||||
voters.forEach {
|
voters.forEach {
|
||||||
addToItems(PollResultVoterItem(it))
|
_itemsDetailsList.add(PollResultVoterItem(it))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_unfilteredItems = _items.value?.let { ArrayList(it) }!!
|
_items.value = _itemsOverviewList
|
||||||
}
|
|
||||||
|
|
||||||
private fun addToItems(pollResultItem: PollResultItem) {
|
|
||||||
val tempList = _items.value
|
|
||||||
tempList!!.add(pollResultItem)
|
|
||||||
_items.value = tempList
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getVotersAmountForOption(poll: Poll, index: Int): Int {
|
private fun getVotersAmountForOption(poll: Poll, index: Int): Int {
|
||||||
|
@ -108,14 +110,11 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
|
||||||
return poll.votedSelf?.contains(index) == true
|
return poll.votedSelf?.contains(index) == true
|
||||||
}
|
}
|
||||||
|
|
||||||
fun filterItems() {
|
fun toggleDetails() {
|
||||||
if (_items.value?.containsAll(_unfilteredItems) == true) {
|
if (_items.value?.containsAll(_itemsDetailsList) == true) {
|
||||||
val filteredList = _items.value?.filter { it.getViewType() == PollResultHeaderItem.VIEW_TYPE } as
|
_items.value = _itemsOverviewList
|
||||||
MutableList<PollResultItem>
|
|
||||||
|
|
||||||
_items.value = ArrayList(filteredList)
|
|
||||||
} else {
|
} else {
|
||||||
_items.value = _unfilteredItems
|
_items.value = _itemsDetailsList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
32
app/src/main/res/layout/poll_result_voters_overview_item.xml
Normal file
32
app/src/main/res/layout/poll_result_voters_overview_item.xml
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Nextcloud Talk application
|
||||||
|
~
|
||||||
|
~ @author Marcel Hibbe
|
||||||
|
~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
|
||||||
|
~
|
||||||
|
~ This program is free software: you can redistribute it and/or modify
|
||||||
|
~ it under the terms of the GNU General Public License as published by
|
||||||
|
~ the Free Software Foundation, either version 3 of the License, or
|
||||||
|
~ at your option) any later version.
|
||||||
|
~
|
||||||
|
~ This program is distributed in the hope that it will be useful,
|
||||||
|
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
~ GNU General Public License for more details.
|
||||||
|
~
|
||||||
|
~ You should have received a copy of the GNU General Public License
|
||||||
|
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/voters_avatars_overview_wrapper"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="@dimen/standard_half_padding"
|
||||||
|
android:paddingEnd="@dimen/standard_half_padding"
|
||||||
|
android:paddingBottom="4dp"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
tools:background="@color/white">
|
||||||
|
|
||||||
|
</LinearLayout>
|
Loading…
Reference in a new issue