filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename class to follow naling convention for Epoxy items

Browse Source
This commit is contained in:
Benoit Marty 2021-05-31 15:52:11 +02:00 committed by Benoit Marty
parent 243b6a93f4
commit ffde34cbb2
11 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt → vector/src/main/java/im/vector/app/core/ui/list/GenericHeaderItem.kt
View File

@ -29,7 +29,7 @@ import im.vector.app.features.themes.ThemeUtils
* A generic list item header left aligned with notice color. * A generic list item header left aligned with notice color.
*/ */
@EpoxyModelClass(layout = R.layout.item_generic_header) @EpoxyModelClass(layout = R.layout.item_generic_header)
abstract class GenericItemHeader : VectorEpoxyModel<GenericItemHeader.Holder>() { abstract class GenericHeaderItem : VectorEpoxyModel<GenericHeaderItem.Holder>() {
@EpoxyAttribute @EpoxyAttribute
var text: String? = null var text: String? = null

3
vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt → vector/src/main/java/im/vector/app/core/ui/list/GenericWithValueItem.kt
View File

@ -37,9 +37,8 @@ import im.vector.app.features.themes.ThemeUtils
* Can display an accessory on the right, that can be an image or an indeterminate progress. * Can display an accessory on the right, that can be an image or an indeterminate progress.
* If provided with an action, will display a button at the bottom of the list item. * If provided with an action, will display a button at the bottom of the list item.
*/ */
// TODO This class is not following the name convention. Should end with `Item
@EpoxyModelClass(layout = R.layout.item_generic_with_value) @EpoxyModelClass(layout = R.layout.item_generic_with_value)
abstract class GenericItemWithValue : VectorEpoxyModel<GenericItemWithValue.Holder>() { abstract class GenericWithValueItem : VectorEpoxyModel<GenericWithValueItem.Holder>() {
@EpoxyAttribute @EpoxyAttribute
var title: CharSequence? = null var title: CharSequence? = null

4
vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
View File

@ -29,7 +29,7 @@ import im.vector.app.core.date.VectorDateFormatter
import im.vector.app.core.epoxy.loadingItem import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.epoxy.noResultItem import im.vector.app.core.epoxy.noResultItem
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.GenericItemHeader_ import im.vector.app.core.ui.list.GenericHeaderItem_
import im.vector.app.features.home.AvatarRenderer import im.vector.app.features.home.AvatarRenderer
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.events.model.Content import org.matrix.android.sdk.api.session.events.model.Content
@ -111,7 +111,7 @@ class SearchResultController @Inject constructor(
timeInMillis = eventAndSender.event.originServerTs ?: System.currentTimeMillis() timeInMillis = eventAndSender.event.originServerTs ?: System.currentTimeMillis()
} }
if (lastDate?.get(Calendar.DAY_OF_YEAR) != eventDate.get(Calendar.DAY_OF_YEAR)) { if (lastDate?.get(Calendar.DAY_OF_YEAR) != eventDate.get(Calendar.DAY_OF_YEAR)) {
GenericItemHeader_() GenericHeaderItem_()
.id(eventDate.hashCode()) .id(eventDate.hashCode())
.text(dateFormatter.format(eventDate.timeInMillis, DateFormatKind.EDIT_HISTORY_HEADER)) .text(dateFormatter.format(eventDate.timeInMillis, DateFormatKind.EDIT_HISTORY_HEADER))
.let { result.add(it) } .let { result.add(it) }

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
View File

@ -26,8 +26,8 @@ import im.vector.app.core.date.VectorDateFormatter
import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericHeaderItem
import im.vector.app.core.ui.list.genericItem import im.vector.app.core.ui.list.genericItem
import im.vector.app.core.ui.list.genericItemHeader
import im.vector.app.core.ui.list.genericLoaderItem import im.vector.app.core.ui.list.genericLoaderItem
import im.vector.app.features.html.EventHtmlRenderer import im.vector.app.features.html.EventHtmlRenderer
import me.gujun.android.span.span import me.gujun.android.span.span
@ -87,7 +87,7 @@ class ViewEditHistoryEpoxyController @Inject constructor(
} }
if (lastDate?.get(Calendar.DAY_OF_YEAR) != evDate.get(Calendar.DAY_OF_YEAR)) { if (lastDate?.get(Calendar.DAY_OF_YEAR) != evDate.get(Calendar.DAY_OF_YEAR)) {
// need to display header with day // need to display header with day
genericItemHeader { genericHeaderItem {
id(evDate.hashCode()) id(evDate.hashCode())
text(host.dateFormatter.format(evDate.timeInMillis, DateFormatKind.EDIT_HISTORY_HEADER)) text(host.dateFormatter.format(evDate.timeInMillis, DateFormatKind.EDIT_HISTORY_HEADER))
} }

10
vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
View File

@ -29,7 +29,7 @@ import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.ItemStyle import im.vector.app.core.ui.list.ItemStyle
import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericItem import im.vector.app.core.ui.list.genericItem
import im.vector.app.core.ui.list.genericItemWithValue import im.vector.app.core.ui.list.genericWithValueItem
import im.vector.app.core.utils.DimensionConverter import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import me.gujun.android.span.span import me.gujun.android.span.span
@ -101,7 +101,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
} else { } else {
// Build list of device with status // Build list of device with status
deviceList.forEach { device -> deviceList.forEach { device ->
genericItemWithValue { genericWithValueItem {
id(device.deviceId) id(device.deviceId)
titleIconResourceId(if (device.isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning) titleIconResourceId(if (device.isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
apply { apply {
@ -152,7 +152,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
private fun addDebugInfo(data: DeviceListViewState) { private fun addDebugInfo(data: DeviceListViewState) {
val host = this val host = this
data.memberCrossSigningKey?.masterKey()?.let { data.memberCrossSigningKey?.masterKey()?.let {
genericItemWithValue { genericWithValueItem {
id("msk") id("msk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(
@ -168,7 +168,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
} }
} }
data.memberCrossSigningKey?.userKey()?.let { data.memberCrossSigningKey?.userKey()?.let {
genericItemWithValue { genericWithValueItem {
id("usk") id("usk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(
@ -184,7 +184,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
} }
} }
data.memberCrossSigningKey?.selfSigningKey()?.let { data.memberCrossSigningKey?.selfSigningKey()?.let {
genericItemWithValue { genericWithValueItem {
id("ssk") id("ssk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(

4
vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
View File

@ -23,7 +23,7 @@ import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.ItemStyle import im.vector.app.core.ui.list.ItemStyle
import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericItem import im.vector.app.core.ui.list.genericItem
import im.vector.app.core.ui.list.genericItemWithValue import im.vector.app.core.ui.list.genericWithValueItem
import im.vector.app.core.utils.DimensionConverter import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
@ -77,7 +77,7 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
// text(stringProvider.getString(R.string.verification_profile_device_untrust_info)) // text(stringProvider.getString(R.string.verification_profile_device_untrust_info))
} }
genericItemWithValue { genericWithValueItem {
id(cryptoDeviceInfo.deviceId) id(cryptoDeviceInfo.deviceId)
titleIconResourceId(if (isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning) titleIconResourceId(if (isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
title( title(

8
vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
View File

@ -21,8 +21,8 @@ import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericButtonItem import im.vector.app.core.ui.list.genericButtonItem
import im.vector.app.core.ui.list.genericItem import im.vector.app.core.ui.list.genericItem
import im.vector.app.core.ui.list.genericItemWithValue
import im.vector.app.core.ui.list.genericPositiveButtonItem import im.vector.app.core.ui.list.genericPositiveButtonItem
import im.vector.app.core.ui.list.genericWithValueItem
import im.vector.app.core.utils.DimensionConverter import im.vector.app.core.utils.DimensionConverter
import me.gujun.android.span.span import me.gujun.android.span.span
import javax.inject.Inject import javax.inject.Inject
@ -104,7 +104,7 @@ class CrossSigningSettingsController @Inject constructor(
val crossSigningKeys = data.crossSigningInfo val crossSigningKeys = data.crossSigningInfo
crossSigningKeys?.masterKey()?.let { crossSigningKeys?.masterKey()?.let {
genericItemWithValue { genericWithValueItem {
id("msk") id("msk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(
@ -120,7 +120,7 @@ class CrossSigningSettingsController @Inject constructor(
} }
} }
crossSigningKeys?.userKey()?.let { crossSigningKeys?.userKey()?.let {
genericItemWithValue { genericWithValueItem {
id("usk") id("usk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(
@ -136,7 +136,7 @@ class CrossSigningSettingsController @Inject constructor(
} }
} }
crossSigningKeys?.selfSigningKey()?.let { crossSigningKeys?.selfSigningKey()?.let {
genericItemWithValue { genericWithValueItem {
id("ssk") id("ssk")
titleIconResourceId(R.drawable.key_small) titleIconResourceId(R.drawable.key_small)
title( title(

6
vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
View File

@ -29,7 +29,7 @@ import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.error.ErrorFormatter import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericItemHeader import im.vector.app.core.ui.list.genericHeaderItem
import im.vector.app.core.utils.DimensionConverter import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
@ -90,7 +90,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
}?.let { fullInfo -> }?.let { fullInfo ->
val deviceInfo = fullInfo.deviceInfo val deviceInfo = fullInfo.deviceInfo
// Current device // Current device
genericItemHeader { genericHeaderItem {
id("current") id("current")
text(host.stringProvider.getString(R.string.devices_current_device)) text(host.stringProvider.getString(R.string.devices_current_device))
} }
@ -126,7 +126,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
// Other devices // Other devices
if (devices.size > 1) { if (devices.size > 1) {
genericItemHeader { genericHeaderItem {
id("others") id("others")
text(host.stringProvider.getString(R.string.devices_other_devices)) text(host.stringProvider.getString(R.string.devices_other_devices))
} }

4
vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
View File

@ -25,7 +25,7 @@ import im.vector.app.R
import im.vector.app.core.epoxy.loadingItem import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericItemWithValue import im.vector.app.core.ui.list.genericWithValueItem
import org.matrix.android.sdk.api.session.accountdata.AccountDataEvent import org.matrix.android.sdk.api.session.accountdata.AccountDataEvent
import javax.inject.Inject import javax.inject.Inject
@ -65,7 +65,7 @@ class AccountDataEpoxyController @Inject constructor(
} }
} else { } else {
dataList.forEach { accountData -> dataList.forEach { accountData ->
genericItemWithValue { genericWithValueItem {
id(accountData.type) id(accountData.type)
title(accountData.type) title(accountData.type)
itemClickAction { itemClickAction {

3
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
View File

@ -22,7 +22,6 @@ import im.vector.app.RoomGroupingMethod
import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericItemHeader
import im.vector.app.features.grouplist.groupSummaryItem import im.vector.app.features.grouplist.groupSummaryItem
import im.vector.app.features.grouplist.homeSpaceSummaryItem import im.vector.app.features.grouplist.homeSpaceSummaryItem
import im.vector.app.features.home.AvatarRenderer import im.vector.app.features.home.AvatarRenderer
@ -72,7 +71,7 @@ class SpaceSummaryController @Inject constructor(
text(" ") text(" ")
} }
genericItemHeader { genericHeaderItem {
id("legacy_groups") id("legacy_groups")
text(host.stringProvider.getString(R.string.groups_header)) text(host.stringProvider.getString(R.string.groups_header))
textColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)) textColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))

4
vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
View File

@ -22,7 +22,7 @@ import com.airbnb.mvrx.Success
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.epoxy.loadingItem import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericItemHeader import im.vector.app.core.ui.list.genericHeaderItem
import im.vector.app.core.utils.TextUtils import im.vector.app.core.utils.TextUtils
import im.vector.app.features.home.AvatarRenderer import im.vector.app.features.home.AvatarRenderer
import javax.inject.Inject import javax.inject.Inject
@ -48,7 +48,7 @@ class SpacePreviewController @Inject constructor(
val result = data?.childInfoList?.invoke() ?: return val result = data?.childInfoList?.invoke() ?: return
if (result.isNotEmpty()) { if (result.isNotEmpty()) {
genericItemHeader { genericHeaderItem {
id("header_rooms") id("header_rooms")
text(host.stringProvider.getString(R.string.rooms)) text(host.stringProvider.getString(R.string.rooms))
} }