diff --git a/library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png b/library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png index bf7ba199234..bdf04ccb378 100644 Binary files a/library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png and b/library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png differ diff --git a/library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png b/library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png index caf92afec9d..c1e469e450a 100644 Binary files a/library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png and b/library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png differ diff --git a/library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png b/library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png index 100bd789740..0f5122d885f 100644 Binary files a/library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png and b/library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png differ diff --git a/library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png b/library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png index 4fe7160b658..2ccfa1278b4 100644 Binary files a/library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png and b/library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png differ diff --git a/library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png b/library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png index 101434496ba..6c26c05ca98 100644 Binary files a/library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png and b/library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png differ diff --git a/library/ui-styles/src/main/res/drawable/element_logo_green.xml b/library/ui-styles/src/main/res/drawable/element_logo_green.xml index e9b119c9690..e461579a7c7 100644 --- a/library/ui-styles/src/main/res/drawable/element_logo_green.xml +++ b/library/ui-styles/src/main/res/drawable/element_logo_green.xml @@ -1,22 +1,10 @@ - - - - - + + diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml index 9d8645a7076..5ce4b186b96 100644 --- a/library/ui-styles/src/main/res/values/colors.xml +++ b/library/ui-styles/src/main/res/values/colors.xml @@ -140,7 +140,7 @@ @color/palette_prune - #0DBD8B + #1161fe #0F0DBD8B #17191C #91A1C0 diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml index 999dccf167b..8faa5edcf11 100644 --- a/library/ui-styles/src/main/res/values/palette.xml +++ b/library/ui-styles/src/main/res/values/palette.xml @@ -16,7 +16,7 @@ #E64F7A #FF812D - #0DBD8B + #1161fe #D9B072 #FFFFFF #FF5B55 diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt index 0fd96798c8c..fdd8e5643f2 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt @@ -188,7 +188,13 @@ fun User.toMatrixItem() = MatrixItem.UserItem(userId, displayName, avatarUrl) fun RoomSummary.toMatrixItem() = if (roomType == RoomType.SPACE) { MatrixItem.SpaceItem(roomId, displayName, avatarUrl) } else { - MatrixItem.RoomItem(roomId, displayName, avatarUrl) + if(displayName.startsWith("[TG]")){ + MatrixItem.RoomItem(roomId, displayName.substring(5), avatarUrl) + + }else{ + MatrixItem.RoomItem(roomId, displayName, avatarUrl) + } + } fun RoomSummary.toRoomAliasMatrixItem() = MatrixItem.RoomAliasItem(canonicalAlias ?: roomId, displayName, avatarUrl) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 7c51dcd34ca..e5f12b647e9 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -247,7 +247,7 @@ android { debug { applicationIdSuffix ".debug" signingConfig signingConfigs.debug - resValue "string", "app_name", "Element - dbg" + resValue "string", "app_name", "Superhero - dbg" if (project.hasProperty("coverage")) { testCoverageEnabled = coverage == "true" @@ -255,7 +255,7 @@ android { } release { - resValue "string", "app_name", "Element" + resValue "string", "app_name", "Superhero" postprocessing { // FIXME Set to true. removeUnusedCode false diff --git a/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml index a02583ec025..89dff0e1868 100644 --- a/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml +++ b/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml @@ -1,22 +1,3 @@ - - - - - + + diff --git a/vector-app/src/main/res/values/colors.xml b/vector-app/src/main/res/values/colors.xml index 7054ce23806..488d66e35a8 100644 --- a/vector-app/src/main/res/values/colors.xml +++ b/vector-app/src/main/res/values/colors.xml @@ -1,4 +1,4 @@ - #0DBD8B + #1161fe diff --git a/vector-config/src/main/res/values/config.xml b/vector-config/src/main/res/values/config.xml index cae094f4547..f4147803950 100755 --- a/vector-config/src/main/res/values/config.xml +++ b/vector-config/src/main/res/values/config.xml @@ -4,7 +4,7 @@ - https://matrix.org + https://matrix.superhero.com https://riot.im/bugreports/submit @@ -36,10 +36,9 @@ - app.element.io + chat.superhero.com - develop.element.io - staging.element.io + chat.superhero.chat riot.im diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt index f6090811069..8bd71e60396 100644 --- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt @@ -21,24 +21,28 @@ import im.vector.app.core.resources.StringProvider import im.vector.app.features.autocomplete.AutocompleteClickListener import im.vector.app.features.command.Command import javax.inject.Inject +import timber.log.Timber class AutocompleteCommandController @Inject constructor(private val stringProvider: StringProvider) : TypedEpoxyController>() { var listener: AutocompleteClickListener? = null override fun buildModels(data: List?) { - if (data.isNullOrEmpty()) { - return - } - val host = this - data.forEach { command -> - autocompleteCommandItem { - id(command.command) - name(command.command) - parameters(command.parameters) - description(host.stringProvider.getString(command.description)) - clickListener { host.listener?.onItemClick(command) } - } - } + return + + // if (data.isNullOrEmpty()) { + // return + // } + // val host = this + + // data.forEach { command -> + // autocompleteCommandItem { + // id(command.command) + // name(command.command) + // parameters(command.parameters) + // description(host.stringProvider.getString(command.description)) + // clickListener { host.listener?.onItemClick(command) } + // } + // } } } diff --git a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt index c12f55814b6..84f19f97132 100644 --- a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt +++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt @@ -46,6 +46,7 @@ class CommandParser @Inject constructor( return if (!message.startsWith("/")) { ParsedCommand.ErrorNotACommand } else { + // "/" only if (message.length == 1) { return ParsedCommand.ErrorEmptySlashCommand @@ -411,8 +412,10 @@ class CommandParser @Inject constructor( throw RuntimeException("Application crashed from user demand") } else -> { + // Unknown command - ParsedCommand.ErrorUnknownSlashCommand(slashCommand) + ParsedCommand.ErrorNotACommand + //ParsedCommand.ErrorUnknownSlashCommand(slashCommand) } } } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index feaad386cb5..d64f0e30e87 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1243,6 +1243,7 @@ class TimelineFragment : avatarRenderer.render(matrixItem, views.includeThreadToolbar.roomToolbarThreadImageView) views.includeThreadToolbar.roomToolbarThreadShieldImageView.render(it.roomEncryptionTrustLevel) views.includeThreadToolbar.roomToolbarThreadSubtitleTextView.text = it.displayName + } views.includeThreadToolbar.roomToolbarThreadTitleTextView.text = resources.getText(R.string.thread_timeline_title) } @@ -1253,7 +1254,14 @@ class TimelineFragment : views.includeRoomToolbar.roomToolbarContentView.isClickable = false } else { views.includeRoomToolbar.roomToolbarContentView.isClickable = roomSummary.membership == Membership.JOIN - views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName + if(roomSummary.displayName.startsWith("[TG]")){ + views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName.substring(4) + + views.includeRoomToolbar.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + + }else{ + views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName + } avatarRenderer.render(roomSummary.toMatrixItem(), views.includeRoomToolbar.roomToolbarAvatarImageView) val showPresence = roomSummary.isDirect views.includeRoomToolbar.roomToolbarPresenceImageView.render(showPresence, roomSummary.directUserPresence) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt index d8a91704024..e531abf380c 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt @@ -44,6 +44,7 @@ import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho import org.matrix.android.sdk.api.util.toMatrixItem +import timber.log.Timber @EpoxyModelClass abstract class MergedRoomCreationItem : BasedMergedItem(R.layout.item_timeline_event_base_noinfo) { @@ -175,8 +176,14 @@ abstract class MergedRoomCreationItem : BasedMergedItem { - holder.view.resources.getString(R.string.this_is_the_beginning_of_room, roomDisplayName) + if (roomDisplayName.startsWith("[TG]")){ + holder.view.resources.getString(R.string.this_is_the_beginning_of_room, roomDisplayName.substring(4)) + }else{ + holder.view.resources.getString(R.string.this_is_the_beginning_of_room, roomDisplayName) + } + } } holder.roomDescriptionText.text = description @@ -281,6 +293,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem(R.id.creationTileRoomAvatarImageView) val addPeopleButton by bind(R.id.creationTileAddPeopleButton) val setAvatarButton by bind(R.id.creationTileSetAvatarButton) + val tokenGated by bind(R.id.tokenGatedRoomDecorationImageView) } companion object { diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt index 1e67941856e..d2a3b64c809 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt @@ -212,7 +212,12 @@ class ThreadListFragment : avatarRenderer.render(matrixItem, views.includeThreadListToolbar.roomToolbarThreadImageView) views.includeThreadListToolbar.roomToolbarThreadShieldImageView.render(threadListArgs.roomEncryptionTrustLevel) views.includeThreadListToolbar.roomToolbarThreadTitleTextView.text = resources.getText(R.string.thread_list_title) - views.includeThreadListToolbar.roomToolbarThreadSubtitleTextView.text = threadListArgs.displayName + if(threadListArgs.displayName?.startsWith("[TG]") == true){ + views.includeThreadListToolbar.roomToolbarThreadSubtitleTextView.text = threadListArgs.displayName?.substring(4) + views.includeThreadListToolbar.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + }else{ + views.includeThreadListToolbar.roomToolbarThreadSubtitleTextView.text = threadListArgs.displayName + } } override fun onThreadSummaryClicked(threadSummary: ThreadSummary) { diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt index 7c639dde999..7dd9dc606eb 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt @@ -48,6 +48,7 @@ import im.vector.app.features.themes.ThemeUtils import me.gujun.android.span.span import org.matrix.android.sdk.api.session.room.model.RoomType import org.matrix.android.sdk.api.util.MatrixItem +import timber.log.Timber import javax.inject.Inject /** @@ -198,6 +199,7 @@ class RoomPreviewNoPreviewFragment : views.roomPreviewNoPreviewToolbarAvatar.isVisible = false views.roomPreviewNoPreviewAvatar.isVisible = false } + Timber.w("Display Name in Preview No Preview Fragment ${roomName}") views.roomPreviewNoPreviewToolbarTitle.text = roomName // Screen diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index 9436bafc03a..13146166bf5 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt @@ -121,7 +121,8 @@ class RoomProfileFragment : listOf( views.matrixProfileToolbarAvatarImageView, views.matrixProfileToolbarTitleView, - views.matrixProfileDecorationToolbarAvatarImageView + views.matrixProfileDecorationToolbarAvatarImageView, + views.tokenGatedDecorationToolbarImageView ) ) views.matrixProfileAppBarLayout.addOnOffsetChangedListener(appBarStateChangeListener) @@ -224,6 +225,22 @@ class RoomProfileFragment : } else { headerViews.roomProfileNameView.text = it.displayName views.matrixProfileToolbarTitleView.text = it.displayName + + if (it.displayName.startsWith("[TG]")) { + headerViews.roomProfileNameView.text = it.displayName.substring(4) + views.matrixProfileToolbarTitleView.text = it.displayName.substring(4) + + headerViews.tokenGatedRoomDecorationImageView.setImageResource(R.drawable.tokengated_room) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + } + + if (it.displayName.startsWith("$")) { + headerViews.roomProfileNameView.text = it.displayName.substring(1) + views.matrixProfileToolbarTitleView.text = it.displayName.substring(1) + headerViews.communityRoomDecorationImageView.setImageResource(R.drawable.community_room) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.community_room) + } + headerViews.roomProfileAliasView.setTextOrHide(it.canonicalAlias) val matrixItem = it.toMatrixItem() avatarRenderer.render(matrixItem, headerViews.roomProfileAvatarView) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt index b9b0f604c7d..0c17d8537d4 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt @@ -46,6 +46,7 @@ import org.matrix.android.sdk.api.session.room.alias.RoomAliasError import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility import org.matrix.android.sdk.api.util.toMatrixItem import javax.inject.Inject +import timber.log.Timber @AndroidEntryPoint class RoomAliasFragment : @@ -133,7 +134,13 @@ class RoomAliasFragment : private fun renderRoomSummary(state: RoomAliasViewState) { state.roomSummary()?.let { - views.roomSettingsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")){ + views.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + }else{ + views.roomSettingsToolbarTitleView.text = it.displayName + + } avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt index a8e34d01174..9cf07889184 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt @@ -38,6 +38,7 @@ import im.vector.app.features.roomprofile.RoomProfileArgs import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.util.toMatrixItem import javax.inject.Inject +import timber.log.Timber @AndroidEntryPoint class RoomBannedMemberListFragment : @@ -117,7 +118,13 @@ class RoomBannedMemberListFragment : private fun renderRoomSummary(state: RoomBannedMemberListViewState) { state.roomSummary()?.let { - views.roomSettingsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")){ + views.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + }else{ + views.roomSettingsToolbarTitleView.text = it.displayName + + } avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt index 8ed8db8c6bd..841cecff1fc 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt @@ -42,6 +42,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent import org.matrix.android.sdk.api.util.toMatrixItem +import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint @@ -148,7 +149,14 @@ class RoomMemberListFragment : private fun renderRoomSummary(state: RoomMemberListViewState) { state.roomSummary()?.let { - views.roomSettingGeneric.roomSettingsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")){ + views.roomSettingGeneric.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.roomSettingGeneric.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + + }else{ + views.roomSettingGeneric.roomSettingsToolbarTitleView.text = it.displayName + + } avatarRenderer.render(it.toMatrixItem(), views.roomSettingGeneric.roomSettingsToolbarAvatarImageView) views.roomSettingGeneric.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt index 7afd6963328..bf59679ddf6 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt @@ -101,7 +101,13 @@ class RoomNotificationSettingsFragment : private fun renderRoomSummary(state: RoomNotificationSettingsViewState) { state.roomSummary()?.let { - views.roomSettingsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")) { + views.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + + } else{ + views.roomSettingsToolbarTitleView.text = it.displayName + } avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt index 06b9343dbff..0cde1ee1480 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt @@ -96,7 +96,13 @@ class RoomPermissionsFragment : private fun renderRoomSummary(state: RoomPermissionsViewState) { state.roomSummary()?.let { - views.roomSettingsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")) { + views.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + + } else{ + views.roomSettingsToolbarTitleView.text = it.displayName + } avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt index 26da1a45d28..329bcb31fb7 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt @@ -168,9 +168,18 @@ class RoomSettingsFragment : views.waitingView.root.isVisible = state.isLoading state.roomSummary()?.let { - views.roomSettingsToolbarTitleView.text = it.displayName - avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) + if (it.displayName.startsWith("[TG]")) { + views.roomSettingsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + + } else{ + views.roomSettingsToolbarTitleView.text = it.displayName + } + views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) + avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) + + } invalidateOptionsMenu() diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt index f318ecc638b..b0be2ee8f97 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt @@ -41,6 +41,7 @@ import im.vector.app.features.roomprofile.RoomProfileArgs import im.vector.lib.core.utils.timer.Clock import kotlinx.coroutines.launch import org.matrix.android.sdk.api.util.toMatrixItem +import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint @@ -114,7 +115,13 @@ class RoomUploadsFragment : private fun renderRoomSummary(state: RoomUploadsViewState) { state.roomSummary()?.let { - views.roomUploadsToolbarTitleView.text = it.displayName + if (it.displayName.startsWith("[TG]")){ + views.roomUploadsToolbarTitleView.text = it.displayName.substring(4) + views.tokenGatedDecorationToolbarImageView.setImageResource(R.drawable.tokengated_room) + }else{ + views.roomUploadsToolbarTitleView.text = it.displayName + + } views.roomUploadsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) avatarRenderer.render(it.toMatrixItem(), views.roomUploadsToolbarAvatarImageView) } diff --git a/vector/src/main/res/drawable-hdpi/ic_notification.png b/vector/src/main/res/drawable-hdpi/ic_notification.png index 1f4abec4858..8981af9b93f 100644 Binary files a/vector/src/main/res/drawable-hdpi/ic_notification.png and b/vector/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/vector/src/main/res/drawable-hdpi/ic_splash_control.webp b/vector/src/main/res/drawable-hdpi/ic_splash_control.webp index 82c04e402b1..1bffd04fde9 100644 Binary files a/vector/src/main/res/drawable-hdpi/ic_splash_control.webp and b/vector/src/main/res/drawable-hdpi/ic_splash_control.webp differ diff --git a/vector/src/main/res/drawable-hdpi/ic_splash_control_dark.webp b/vector/src/main/res/drawable-hdpi/ic_splash_control_dark.webp index 0d0c6ad78b3..99b9d3278b5 100644 Binary files a/vector/src/main/res/drawable-hdpi/ic_splash_control_dark.webp and b/vector/src/main/res/drawable-hdpi/ic_splash_control_dark.webp differ diff --git a/vector/src/main/res/drawable-hdpi/ic_splash_secure.webp b/vector/src/main/res/drawable-hdpi/ic_splash_secure.webp index a880031adae..009c3bfb9d4 100644 Binary files a/vector/src/main/res/drawable-hdpi/ic_splash_secure.webp and b/vector/src/main/res/drawable-hdpi/ic_splash_secure.webp differ diff --git a/vector/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp b/vector/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp index 65ef9f35ffd..ecc96786912 100644 Binary files a/vector/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp and b/vector/src/main/res/drawable-hdpi/ic_splash_secure_dark.webp differ diff --git a/vector/src/main/res/drawable-mdpi/ic_notification.png b/vector/src/main/res/drawable-mdpi/ic_notification.png index 198cb2ea7ce..a16df0aa993 100644 Binary files a/vector/src/main/res/drawable-mdpi/ic_notification.png and b/vector/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/vector/src/main/res/drawable-xhdpi/ic_notification.png b/vector/src/main/res/drawable-xhdpi/ic_notification.png index 7e74553f0ba..43f7212cecb 100644 Binary files a/vector/src/main/res/drawable-xhdpi/ic_notification.png and b/vector/src/main/res/drawable-xhdpi/ic_notification.png differ diff --git a/vector/src/main/res/drawable-xhdpi/ic_splash_control.webp b/vector/src/main/res/drawable-xhdpi/ic_splash_control.webp index 972d91d5d0f..42f5788dd91 100644 Binary files a/vector/src/main/res/drawable-xhdpi/ic_splash_control.webp and b/vector/src/main/res/drawable-xhdpi/ic_splash_control.webp differ diff --git a/vector/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp b/vector/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp index cbbea1ae875..708a1c98548 100644 Binary files a/vector/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp and b/vector/src/main/res/drawable-xhdpi/ic_splash_control_dark.webp differ diff --git a/vector/src/main/res/drawable-xhdpi/ic_splash_secure.webp b/vector/src/main/res/drawable-xhdpi/ic_splash_secure.webp index b8c772bde21..4ef2f78ed87 100644 Binary files a/vector/src/main/res/drawable-xhdpi/ic_splash_secure.webp and b/vector/src/main/res/drawable-xhdpi/ic_splash_secure.webp differ diff --git a/vector/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp b/vector/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp index d4c1f97652d..68de5ec16ff 100644 Binary files a/vector/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp and b/vector/src/main/res/drawable-xhdpi/ic_splash_secure_dark.webp differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_notification.png b/vector/src/main/res/drawable-xxhdpi/ic_notification.png index a86508b71b4..ed8f5e34693 100644 Binary files a/vector/src/main/res/drawable-xxhdpi/ic_notification.png and b/vector/src/main/res/drawable-xxhdpi/ic_notification.png differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_splash_control.webp b/vector/src/main/res/drawable-xxhdpi/ic_splash_control.webp index 99d4c4049d0..c84c1da5c72 100644 Binary files a/vector/src/main/res/drawable-xxhdpi/ic_splash_control.webp and b/vector/src/main/res/drawable-xxhdpi/ic_splash_control.webp differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp b/vector/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp index 9afa384f271..672ffc9111c 100644 Binary files a/vector/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp and b/vector/src/main/res/drawable-xxhdpi/ic_splash_control_dark.webp differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_splash_secure.webp b/vector/src/main/res/drawable-xxhdpi/ic_splash_secure.webp index 114421453ec..29cd91fec15 100644 Binary files a/vector/src/main/res/drawable-xxhdpi/ic_splash_secure.webp and b/vector/src/main/res/drawable-xxhdpi/ic_splash_secure.webp differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp b/vector/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp index 737bcbdf17e..6695eff035f 100644 Binary files a/vector/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp and b/vector/src/main/res/drawable-xxhdpi/ic_splash_secure_dark.webp differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_notification.png b/vector/src/main/res/drawable-xxxhdpi/ic_notification.png index f6170e1a251..ee2c65389ae 100644 Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_notification.png and b/vector/src/main/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_splash_control.webp b/vector/src/main/res/drawable-xxxhdpi/ic_splash_control.webp index 93754755132..76246f084b1 100644 Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_splash_control.webp and b/vector/src/main/res/drawable-xxxhdpi/ic_splash_control.webp differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp b/vector/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp index 905851dc263..ca8c0047b18 100644 Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp and b/vector/src/main/res/drawable-xxxhdpi/ic_splash_control_dark.webp differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp b/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp index 6a2a3fda564..af1b7f80e38 100644 Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp and b/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure.webp differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp b/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp index b792cb16ea3..8b04e29aead 100644 Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp and b/vector/src/main/res/drawable-xxxhdpi/ic_splash_secure_dark.webp differ diff --git a/vector/src/main/res/drawable/bg_map_user_pin.xml b/vector/src/main/res/drawable/bg_map_user_pin.xml index 148d3cfa29e..767829aa827 100644 --- a/vector/src/main/res/drawable/bg_map_user_pin.xml +++ b/vector/src/main/res/drawable/bg_map_user_pin.xml @@ -5,6 +5,6 @@ android:viewportHeight="55"> diff --git a/vector/src/main/res/drawable/community_room.xml b/vector/src/main/res/drawable/community_room.xml new file mode 100644 index 00000000000..4edfc67f1af --- /dev/null +++ b/vector/src/main/res/drawable/community_room.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/element_logo_stars.xml b/vector/src/main/res/drawable/element_logo_stars.xml index d982fbedc40..7ad31f2dbc3 100644 --- a/vector/src/main/res/drawable/element_logo_stars.xml +++ b/vector/src/main/res/drawable/element_logo_stars.xml @@ -1,57 +1,12 @@ - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/vector/src/main/res/drawable/element_logotype.xml b/vector/src/main/res/drawable/element_logotype.xml index 0419447b325..4f16568d7be 100644 --- a/vector/src/main/res/drawable/element_logotype.xml +++ b/vector/src/main/res/drawable/element_logotype.xml @@ -1,27 +1,12 @@ - - - - - - - - + + + + + + + + + + + diff --git a/vector/src/main/res/drawable/ic_attachment_camera.xml b/vector/src/main/res/drawable/ic_attachment_camera.xml index 8c7bedb3cf2..c0414af0b0c 100644 --- a/vector/src/main/res/drawable/ic_attachment_camera.xml +++ b/vector/src/main/res/drawable/ic_attachment_camera.xml @@ -5,9 +5,9 @@ android:viewportHeight="24"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_attachment_file.xml b/vector/src/main/res/drawable/ic_attachment_file.xml index b3545e54a6d..e4b5a5cb36b 100644 --- a/vector/src/main/res/drawable/ic_attachment_file.xml +++ b/vector/src/main/res/drawable/ic_attachment_file.xml @@ -8,6 +8,6 @@ android:strokeLineJoin="round" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#0DBD8B" + android:strokeColor="#1161fe" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_attachment_gallery.xml b/vector/src/main/res/drawable/ic_attachment_gallery.xml index 0f3432544f9..a1fedafd4ab 100644 --- a/vector/src/main/res/drawable/ic_attachment_gallery.xml +++ b/vector/src/main/res/drawable/ic_attachment_gallery.xml @@ -6,7 +6,7 @@ diff --git a/vector/src/main/res/drawable/ic_attachment_location.xml b/vector/src/main/res/drawable/ic_attachment_location.xml index c2c8093e1d6..04b5e9aeaa0 100644 --- a/vector/src/main/res/drawable/ic_attachment_location.xml +++ b/vector/src/main/res/drawable/ic_attachment_location.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_attachment_poll.xml b/vector/src/main/res/drawable/ic_attachment_poll.xml index 320dccb7fcd..7cc6d5eac07 100644 --- a/vector/src/main/res/drawable/ic_attachment_poll.xml +++ b/vector/src/main/res/drawable/ic_attachment_poll.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/vector/src/main/res/drawable/ic_attachment_sticker.xml b/vector/src/main/res/drawable/ic_attachment_sticker.xml index eb59eaa75d1..eeece282e9b 100644 --- a/vector/src/main/res/drawable/ic_attachment_sticker.xml +++ b/vector/src/main/res/drawable/ic_attachment_sticker.xml @@ -7,7 +7,7 @@ android:pathData="M10.1479,21.321C5.7873,20.4596 2.4987,16.6135 2.4987,12C2.4987,6.7526 6.7526,2.4987 12,2.4987C16.6316,2.4987 20.4897,5.8131 21.331,10.1992C18.2322,9.4198 14.864,10.147 12.4944,12.5383C10.1572,14.8967 9.4261,18.2332 10.1479,21.321ZM20.2524,13.0424L12.9933,20.3015C12.6064,18.222 13.1681,16.1257 14.6151,14.6655C16.0754,13.1918 18.176,12.6299 20.2524,13.0424Z" android:strokeLineJoin="round" android:strokeWidth="0.997378" - android:fillColor="#0DBD8B" - android:strokeColor="#0DBD8B" + android:fillColor="#1161fe" + android:strokeColor="#1161fe" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml b/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml index e9dbe610e46..ccb21560eeb 100644 --- a/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml +++ b/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml @@ -5,11 +5,11 @@ android:viewportHeight="52"> + android:fillColor="#1161fe"/> - - - - + android:viewportWidth="34" + android:viewportHeight="24" + android:width="200dp" + android:height="180dp"> + diff --git a/vector/src/main/res/drawable/ic_list_item_bullet.xml b/vector/src/main/res/drawable/ic_list_item_bullet.xml index b4f13479f79..2a8218057ad 100644 --- a/vector/src/main/res/drawable/ic_list_item_bullet.xml +++ b/vector/src/main/res/drawable/ic_list_item_bullet.xml @@ -8,13 +8,13 @@ android:strokeWidth="2" android:fillColor="#00000000" android:fillType="evenOdd" - android:strokeColor="#0DBD8B" + android:strokeColor="#1161fe" android:strokeLineCap="square"/> diff --git a/vector/src/main/res/drawable/ic_locate.xml b/vector/src/main/res/drawable/ic_locate.xml index 784665fcdd8..1f180b30b58 100644 --- a/vector/src/main/res/drawable/ic_locate.xml +++ b/vector/src/main/res/drawable/ic_locate.xml @@ -5,5 +5,5 @@ android:viewportHeight="22"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_location_pin.xml b/vector/src/main/res/drawable/ic_location_pin.xml index 8227ea4e057..fb426860319 100644 --- a/vector/src/main/res/drawable/ic_location_pin.xml +++ b/vector/src/main/res/drawable/ic_location_pin.xml @@ -5,7 +5,7 @@ android:viewportHeight="54"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml index 89824b81681..a4712de8ffe 100644 --- a/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml +++ b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml @@ -1,25 +1,18 @@ - - - - - - + + + + + + + + + + + diff --git a/vector/src/main/res/drawable/ic_onboarding_use_case_icon.xml b/vector/src/main/res/drawable/ic_onboarding_use_case_icon.xml index 35b45aa69ae..8e6a1df12d2 100644 --- a/vector/src/main/res/drawable/ic_onboarding_use_case_icon.xml +++ b/vector/src/main/res/drawable/ic_onboarding_use_case_icon.xml @@ -5,7 +5,7 @@ android:viewportHeight="70"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_qr_code.xml b/vector/src/main/res/drawable/ic_qr_code.xml index 1ebdc169c94..e0ee2f7056a 100644 --- a/vector/src/main/res/drawable/ic_qr_code.xml +++ b/vector/src/main/res/drawable/ic_qr_code.xml @@ -5,5 +5,5 @@ android:viewportHeight="12"> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_share_external.xml b/vector/src/main/res/drawable/ic_share_external.xml index c4b78c8a83f..4dbbce5246b 100644 --- a/vector/src/main/res/drawable/ic_share_external.xml +++ b/vector/src/main/res/drawable/ic_share_external.xml @@ -1,5 +1,5 @@ - + diff --git a/vector/src/main/res/drawable/ic_spaces.xml b/vector/src/main/res/drawable/ic_spaces.xml index 113bfb68f4c..274054ebc73 100644 --- a/vector/src/main/res/drawable/ic_spaces.xml +++ b/vector/src/main/res/drawable/ic_spaces.xml @@ -7,20 +7,20 @@ android:pathData="M2,1L7,1A1,1 0,0 1,8 2L8,7A1,1 0,0 1,7 8L2,8A1,1 0,0 1,1 7L1,2A1,1 0,0 1,2 1z" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#0DBD8B"/> + android:strokeColor="#1161fe"/> + android:strokeColor="#1161fe"/> + android:strokeColor="#1161fe"/> + android:strokeColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_text_formatting.xml b/vector/src/main/res/drawable/ic_text_formatting.xml index 375c459692f..70bfb89ee2f 100644 --- a/vector/src/main/res/drawable/ic_text_formatting.xml +++ b/vector/src/main/res/drawable/ic_text_formatting.xml @@ -8,6 +8,6 @@ android:pathData="M0,0h24v24h-24z"/> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/ic_text_formatting_disabled.xml b/vector/src/main/res/drawable/ic_text_formatting_disabled.xml index bb34211c7a9..e24bac8be94 100644 --- a/vector/src/main/res/drawable/ic_text_formatting_disabled.xml +++ b/vector/src/main/res/drawable/ic_text_formatting_disabled.xml @@ -8,11 +8,11 @@ android:pathData="M0,0h24v24h-24z"/> + android:fillColor="#1161fe"/> diff --git a/vector/src/main/res/drawable/tokengated_room.xml b/vector/src/main/res/drawable/tokengated_room.xml new file mode 100644 index 00000000000..653abbd9228 --- /dev/null +++ b/vector/src/main/res/drawable/tokengated_room.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml index 9d09e78eb39..97ead621b77 100644 --- a/vector/src/main/res/layout/fragment_matrix_profile.xml +++ b/vector/src/main/res/layout/fragment_matrix_profile.xml @@ -69,24 +69,41 @@ tools:alpha="1" tools:ignore="MissingConstraints" /> + + + + + @@ -106,4 +123,4 @@ android:id="@+id/waiting_view" layout="@layout/merge_overlay_waiting_view" /> - \ No newline at end of file + diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml index b25313ca2df..22b9590d0e1 100644 --- a/vector/src/main/res/layout/fragment_room_setting_generic.xml +++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml @@ -45,6 +45,18 @@ app:layout_constraintCircleAngle="135" app:layout_constraintCircleRadius="20dp" tools:ignore="MissingConstraints" /> + + + + - \ No newline at end of file + diff --git a/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml b/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml index c58a8cd8376..57ede1835ab 100644 --- a/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml +++ b/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml @@ -44,18 +44,32 @@ app:layout_constraintCircleRadius="10dp" tools:ignore="MissingConstraints" /> + + diff --git a/vector/src/main/res/layout/view_room_detail_toolbar.xml b/vector/src/main/res/layout/view_room_detail_toolbar.xml index d5c1914d41b..a4b22cc0d61 100644 --- a/vector/src/main/res/layout/view_room_detail_toolbar.xml +++ b/vector/src/main/res/layout/view_room_detail_toolbar.xml @@ -79,6 +79,21 @@ app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" tools:ignore="MissingConstraints" /> + + + + + + +