591: Add groups to user info, with sections and using RecyclerView for future expandability #16769
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@ichibi.eu> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| package com.owncloud.android.ui.adapter | ||
|
|
||
| import android.content.Context | ||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.annotation.DrawableRes | ||
| import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter | ||
| import com.afollestad.sectionedrecyclerview.SectionedViewHolder | ||
| import com.nextcloud.android.common.ui.theme.utils.ColorRole | ||
| import com.owncloud.android.R | ||
| import com.owncloud.android.databinding.UserInfoDetailsTableItemBinding | ||
| import com.owncloud.android.databinding.UserInfoDetailsTableItemTitleBinding | ||
| import com.owncloud.android.utils.theme.ViewThemeUtils | ||
|
|
||
| class UserInfoAdapter(val context: Context, val mDisplayList: Map<Int, MutableList<UserInfoDetailsItem>>, val viewThemeUtils: ViewThemeUtils) : | ||
| SectionedRecyclerViewAdapter<SectionedViewHolder>() { | ||
| companion object { | ||
| const val SECTION_USERINFO = 0 | ||
| const val SECTION_GROUPS = 1 | ||
| } | ||
|
|
||
| class UserInfoDetailsItem( | ||
|
||
| @field:DrawableRes @param:DrawableRes var icon: Int, | ||
| var text: String?, | ||
| var iconContentDescription: String? | ||
| ) | ||
|
|
||
| class HeaderSectionedViewHolder(var binding: UserInfoDetailsTableItemTitleBinding) : | ||
| SectionedViewHolder(binding.getRoot()) | ||
|
|
||
| class UserInfoSectionedViewHolder(var binding: UserInfoDetailsTableItemBinding) : | ||
| SectionedViewHolder(binding.getRoot()) | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SectionedViewHolder = when (viewType) { | ||
| VIEW_TYPE_HEADER -> HeaderSectionedViewHolder( | ||
| UserInfoDetailsTableItemTitleBinding.inflate( | ||
| LayoutInflater.from(parent.context), | ||
| parent, | ||
| false | ||
| ) | ||
| ) | ||
| else -> UserInfoSectionedViewHolder( | ||
| UserInfoDetailsTableItemBinding.inflate( | ||
| LayoutInflater.from(parent.context), | ||
| parent, | ||
| false | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| override fun onBindViewHolder( | ||
| holder: SectionedViewHolder?, | ||
|
||
| section: Int, | ||
| relativePosition: Int, | ||
| absolutePosition: Int | ||
| ) { | ||
| val item = mDisplayList[section]?.get(relativePosition) | ||
|
||
| val isFirst = relativePosition == 0 | ||
| val isLast = relativePosition == getItemCount(section) - 1 | ||
| val isSingle = isFirst && isLast | ||
| val uiHolder = holder as UserInfoSectionedViewHolder | ||
|
|
||
| // Set background | ||
| if (isSingle) { | ||
| uiHolder.binding.root.setBackgroundResource(R.drawable.rounded_corners_listitem_single_background) | ||
| } else if (isFirst) { | ||
| uiHolder.binding.root.setBackgroundResource(R.drawable.rounded_corners_listitem_first_background) | ||
| } else if (isLast) { | ||
| uiHolder.binding.root.setBackgroundResource(R.drawable.rounded_corners_listitem_last_background) | ||
| } else { | ||
| uiHolder.binding.root.setBackgroundResource(R.drawable.rounded_corners_listitem_center_background) | ||
| } | ||
|
|
||
| // Populate views | ||
| uiHolder.binding.icon.setImageResource(item?.icon ?: R.drawable.ic_user_outline) | ||
| uiHolder.binding.text.text = item?.text | ||
| uiHolder.binding.icon.contentDescription = item?.iconContentDescription | ||
| viewThemeUtils.platform.colorImageView(holder.binding.icon, ColorRole.PRIMARY) | ||
| } | ||
|
|
||
| override fun getSectionCount(): Int = 2 | ||
|
|
||
| override fun getItemCount(section: Int): Int = when (section) { | ||
| SECTION_GROUPS -> mDisplayList[SECTION_GROUPS]?.size ?: 0 | ||
| SECTION_USERINFO -> mDisplayList[SECTION_USERINFO]?.size ?: 0 | ||
| else -> 0 | ||
| } | ||
|
|
||
| override fun onBindHeaderViewHolder( | ||
| holder: SectionedViewHolder?, | ||
| section: Int, | ||
| expanded: Boolean | ||
| ) { | ||
| val title = when (section) { | ||
| SECTION_GROUPS -> context.getString(R.string.user_info_groups) | ||
| SECTION_USERINFO -> context.getString(R.string.user_info_profile) | ||
| else -> "" | ||
| } | ||
| val titleHolder = holder as HeaderSectionedViewHolder | ||
| titleHolder.binding.root.text = title | ||
| viewThemeUtils.platform.colorTextView(titleHolder.binding.root, ColorRole.PRIMARY) | ||
| } | ||
|
|
||
| override fun onBindFooterViewHolder(p0: SectionedViewHolder?, p1: Int) {} | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| ~ Nextcloud - Android Client | ||
| ~ | ||
| ~ SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@ichibi.eu> | ||
| ~ SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
|
|
||
| <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item android:top="-2dp" android:left="0dp" android:right="0dp" android:bottom="0dp"> | ||
| <shape android:shape="rectangle"> | ||
| <stroke android:width="1dp" android:color="@color/grey_200"/> | ||
| </shape> | ||
| </item> | ||
| </layer-list> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| ~ Nextcloud - Android Client | ||
| ~ | ||
| ~ SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@ichibi.eu> | ||
| ~ SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
| <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item> | ||
| <shape> | ||
| <solid android:color="@color/bg_default"/> | ||
| <stroke android:width="1dp" android:color="@color/grey_200" /> | ||
| <corners android:topLeftRadius="4dp" android:topRightRadius="4dp"/> | ||
| </shape> | ||
| </item> | ||
| </layer-list> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| ~ Nextcloud - Android Client | ||
| ~ | ||
| ~ SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@ichibi.eu> | ||
| ~ SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
|
|
||
| <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item android:top="-2dp" android:left="0dp" android:right="0dp" android:bottom="0dp"> | ||
| <shape> | ||
| <solid android:color="@color/bg_default"/> | ||
| <stroke android:width="1dp" android:color="@color/grey_200" /> | ||
| <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp"/> | ||
| </shape> | ||
| </item> | ||
| </layer-list> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| ~ Nextcloud - Android Client | ||
| ~ | ||
| ~ SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@ichibi.eu> | ||
| ~ SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
|
|
||
| <shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <solid android:color="@color/bg_default"/> | ||
| <stroke android:width="1dp" android:color="@color/grey_200" /> | ||
| <corners android:radius="4dp"/> | ||
| </shape> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why
mDisplayListneeds to have mutable list? Adapter should just display the list.Also since this is a new class;
mDisplayListcan we rename it to thedisplayList?