diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..878e67125e8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "disabled" +} 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..da35d27ab85 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..11ec7a4c1d2 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..70eb23dcdc3 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..0b69fa034af 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..89b94c5450a 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/bg_carousel_page_3.xml b/library/ui-styles/src/main/res/drawable/bg_carousel_page_3.xml index b114f9c804f..98c2f58f4c1 100644 --- a/library/ui-styles/src/main/res/drawable/bg_carousel_page_3.xml +++ b/library/ui-styles/src/main/res/drawable/bg_carousel_page_3.xml @@ -2,6 +2,6 @@ + android:endColor="#5E50F480" + android:startColor="#AB4EE380" /> \ No newline at end of file diff --git a/library/ui-styles/src/main/res/drawable/bg_carousel_page_4.xml b/library/ui-styles/src/main/res/drawable/bg_carousel_page_4.xml index e8ee3644319..98c2f58f4c1 100644 --- a/library/ui-styles/src/main/res/drawable/bg_carousel_page_4.xml +++ b/library/ui-styles/src/main/res/drawable/bg_carousel_page_4.xml @@ -2,6 +2,6 @@ + android:endColor="#5E50F480" + android:startColor="#AB4EE380" /> \ No newline at end of file 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..c9b84b780a0 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,16 @@ - - - - + android:width="50dp" + android:height="30dp" + android:viewportWidth="50" + android:viewportHeight="80"> + + + + + diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml index 9d8645a7076..cea1bade42b 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 + #6147FF #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..22cb6aa0c76 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 + #6147FF #D9B072 #FFFFFF #FF5B55 @@ -42,6 +42,6 @@ #6F7882 #394049 #15191E - #21262C + #21262C diff --git a/library/ui-styles/src/main/res/values/palette_mobile.xml b/library/ui-styles/src/main/res/values/palette_mobile.xml index 5610771f8ac..ae5686d9a23 100644 --- a/library/ui-styles/src/main/res/values/palette_mobile.xml +++ b/library/ui-styles/src/main/res/values/palette_mobile.xml @@ -53,4 +53,5 @@ @color/palette_verde @color/palette_azure @color/palette_grape - \ No newline at end of file + + 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..7ca591d9533 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 @@ -142,7 +142,7 @@ sealed class MatrixItem( is RoomAliasItem -> roomDisplayName ?: displayName else -> displayName } - return (displayName?.takeIf { it.isNotBlank() } ?: id) + return (displayName?.takeIf { it.isNotBlank() }?.replace("\\[TG] ".toRegex(), "")?.replace("\\$".toRegex(), "") ?: id) .let { dn -> var startIndex = 0 val initial = dn[startIndex] diff --git a/vector-app/build.gradle b/vector-app/build.gradle index a5df2ae1d53..5923d13b469 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..c9b84b780a0 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,16 @@ - - - - + android:width="50dp" + android:height="30dp" + android:viewportWidth="50" + android:viewportHeight="80"> + + + + + diff --git a/vector-app/src/main/res/values/colors.xml b/vector-app/src/main/res/values/colors.xml index 7054ce23806..f2801ed545a 100644 --- a/vector-app/src/main/res/values/colors.xml +++ b/vector-app/src/main/res/values/colors.xml @@ -1,4 +1,4 @@ - #0DBD8B + #6147FF diff --git a/vector-config/src/main/res/values/config.xml b/vector-config/src/main/res/values/config.xml index cae094f4547..903b8e839bb 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.chat https://riot.im/bugreports/submit @@ -29,17 +29,16 @@ meet.element.io - matrix.org + matrix.superhero.chat gitter.im - 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/displayname/Extension.kt b/vector/src/main/java/im/vector/app/features/displayname/Extension.kt index 4069b41a0c3..a46bbb71344 100644 --- a/vector/src/main/java/im/vector/app/features/displayname/Extension.kt +++ b/vector/src/main/java/im/vector/app/features/displayname/Extension.kt @@ -24,8 +24,26 @@ fun MatrixItem.getBestName(): String { // Best name is the id, and we keep the displayName of the room for the case we need the first letter id } else { - displayName +// displayName +// ?.takeIf { it.isNotBlank() }?.replace("[TG] ","")?.replace("$","") +// ?: VectorMatrixItemDisplayNameFallbackProvider.getDefaultName(this).replace("[TG] ","").replace("$","") + val modifiedDisplayName = displayName ?.takeIf { it.isNotBlank() } - ?: VectorMatrixItemDisplayNameFallbackProvider.getDefaultName(this) + ?.let { + when { + it.startsWith("[TG] ") -> { + it.replaceFirst("[TG] ", "") // Remove [TG] from the beginning + } + it.contains("$") -> { + it.replace("$", "") // Remove $ from the string + } + else -> it + } + } + ?: VectorMatrixItemDisplayNameFallbackProvider.getDefaultName(this).replace("[TG] ","").replace("$","") + + modifiedDisplayName.replace("[TG] ", "").replace("$","") + } + } diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt index 7214db41efe..ae45ffe6e10 100644 --- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt @@ -147,7 +147,7 @@ class AvatarRenderer @Inject constructor( val matrixItem = MatrixItem.UserItem( // Need an id starting with @ id = profileInfo.matrixId, - displayName = profileInfo.displayName, + displayName = profileInfo.displayName?.replace("[TG] ","")?.replace("$",""), ) val placeholder = getPlaceholderDrawable(matrixItem) 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..e824874de84 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 @@ -1253,7 +1253,27 @@ class TimelineFragment : views.includeRoomToolbar.roomToolbarContentView.isClickable = false } else { views.includeRoomToolbar.roomToolbarContentView.isClickable = roomSummary.membership == Membership.JOIN - views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName +// views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName.replace("[TG] ","").replace("$","") + if (roomSummary.displayName.startsWith("[TG]") && roomSummary.displayName.contains("$")) { + // Remove [TG] from the beginning + val modifiedString = roomSummary.displayName.replace("[TG] ", "") + // Update the roomToolbarTitleView.text with the modified string + views.includeRoomToolbar.roomToolbarTitleView.text = modifiedString + } else if (roomSummary.displayName.startsWith("$") && roomSummary.displayName.contains("[TG]")) { + // Remove $ from the beginning + val modifiedString = roomSummary.displayName.replace("$", "") + // Update the roomToolbarTitleView.text with the modified string + views.includeRoomToolbar.roomToolbarTitleView.text = modifiedString + } else if (roomSummary.displayName.startsWith("[TG] ")){ + val modifiedString = roomSummary.displayName.replace("[TG] ","") + views.includeRoomToolbar.roomToolbarTitleView.text = modifiedString + } else if (roomSummary.displayName.startsWith("$")) { + val modifiedString = roomSummary.displayName.replace("$","") + views.includeRoomToolbar.roomToolbarTitleView.text = modifiedString + } 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) @@ -1265,6 +1285,7 @@ class TimelineFragment : } } + private fun displayE2eError(withHeldCode: WithHeldCode?) { val msgId = when (withHeldCode) { WithHeldCode.BLACKLISTED -> R.string.crypto_error_withheld_blacklisted 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..d50435a8126 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 @@ -173,10 +173,23 @@ abstract class MergedRoomCreationItem : BasedMergedItem { - holder.view.resources.getString(R.string.this_is_the_beginning_of_room, roomDisplayName) + holder.view.resources.getString(R.string.this_is_the_beginning_of_room, roomDisplayName.replace("[TG] ","").replace("$","")) } } holder.roomDescriptionText.text = description diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt index 764f50456c2..309386248d1 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt @@ -93,6 +93,19 @@ abstract class RoomSummaryCenteredItem : VectorEpoxyModel(R.layo it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) itemLongClickListener?.onLongClick(it) ?: false } +// if (matrixItem.displayName!!.contains("[TG] ")) { +// holder.titleView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.chatimg, 0,0,0) +// holder.titleView.setCompoundDrawablePadding(10) +// Log.d("Debug", "Setting [TG] image for ${matrixItem.displayName}") +// } else { +// holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0) +// holder.titleView.setCompoundDrawablePadding(0) +// Log.d("Debug", "No image set for ${matrixItem.displayName}") +// } +// if (matrixItem.displayName!!.contains("$")) { +// holder.titleView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.dollar,0,0,0) +// holder.titleView.setCompoundDrawablePadding(10) +// Log.d("Debug", "Setting $ image for ${matrixItem.displayName}") +// } else { +// holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0) +// holder.titleView.setCompoundDrawablePadding(0) +// Log.d("Debug", "No image set for ${matrixItem.displayName}") +// +// } + + if (matrixItem.displayName!!.contains("[TG] ")) { + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.chatimg, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(10) + } else if (matrixItem.displayName!!.contains("$")) { + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.dollar, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(10) + } else { + // Reset compound drawables if none of the conditions are met + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(0) + } + holder.titleView.invalidate() holder.titleView.text = matrixItem.getBestName() holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted)) holder.unreadIndentIndicator.isVisible = hasUnreadMessage diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt index 964a39fb0ff..c6de30f3996 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt @@ -68,6 +68,18 @@ abstract class SpaceChildInfoItem : VectorEpoxyModel( itemLongClickListener?.onLongClick(it) ?: false } holder.titleView.text = matrixItem.displayName ?: holder.rootView.context.getString(R.string.unnamed_room) + if (matrixItem.displayName!!.contains("[TG] ")) { + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.chatimg, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(10) + } else if (matrixItem.displayName!!.contains("$")) { + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.dollar, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(10) + } else { + // Reset compound drawables if none of the conditions are met + holder.titleView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0) + holder.titleView.setCompoundDrawablePadding(0) + } + holder.titleView.invalidate() avatarRenderer.render(matrixItem, holder.avatarImageView) holder.descriptionText.text = span { diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt index e542277d4c0..66e7317f540 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt @@ -63,7 +63,18 @@ abstract class PublicRoomItem : VectorEpoxyModel(R.layout holder.rootView.onClick(globalListener) avatarRenderer.render(matrixItem, holder.avatarView) - holder.nameView.text = matrixItem.displayName + holder.nameView.text = matrixItem.displayName?.replace("[TG] ", "")?.replace("$","") + if (matrixItem.displayName!!.contains("[TG] ")) { + holder.nameView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.chatimg,0,0,0) + holder.nameView.setCompoundDrawablePadding(10) + } else if (matrixItem.displayName!!.contains("$")) { + holder.nameView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.dollar, 0,0,0) + holder.nameView.setCompoundDrawablePadding(10) + } else { + holder.nameView.setCompoundDrawablesRelativeWithIntrinsicBounds(0,0,0,0) + holder.nameView.setCompoundDrawablePadding(0) + } + holder.aliasView.setTextOrHide(roomAlias) holder.topicView.setTextOrHide(roomTopic) // TODO Use formatter for big numbers? 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..bf2c1f98581 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 @@ -198,10 +198,28 @@ class RoomPreviewNoPreviewFragment : views.roomPreviewNoPreviewToolbarAvatar.isVisible = false views.roomPreviewNoPreviewAvatar.isVisible = false } - views.roomPreviewNoPreviewToolbarTitle.text = roomName + if (roomName.startsWith("[TG] ")) { + views.roomPreviewNoPreviewToolbarTitle.text = roomName.replace("[TG] ","") + } else if (roomName.startsWith("$")) { + views.roomPreviewNoPreviewToolbarTitle.text = roomName.replace("$","") + } else { + views.roomPreviewNoPreviewToolbarTitle.text = roomName + } + // Screen - views.roomPreviewNoPreviewName.text = roomName + if (roomName.startsWith("[TG] ")) { + views.roomPreviewNoPreviewName.text = roomName.replace("[TG]","") + views.roomPreviewNoPreviewName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.chatimg,0,0,0) + views.roomPreviewNoPreviewName.setCompoundDrawablePadding(10) + } else if (roomName.startsWith("$")) { + views.roomPreviewNoPreviewName.text = roomName.replace("$","") + views.roomPreviewNoPreviewName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.dollar,0,0,0) + views.roomPreviewNoPreviewName.setCompoundDrawablePadding(10) + } else { + views.roomPreviewNoPreviewName.text = roomName + } + views.roomPreviewNoPreviewTopic.setTextOrHide(topic) } } 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..e506dbe5c8d 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 @@ -222,7 +222,25 @@ class RoomProfileFragment : Timber.w("The room has been left") activity?.finish() } else { - headerViews.roomProfileNameView.text = it.displayName +// headerViews.roomProfileNameView.text = it.displayName.replace("[TG] ","").replace("$","") + if (it.displayName.startsWith("[TG]")) { + val modifiedString = it.displayName.replace("[TG] ","").replace("$","$") + headerViews.roomProfileNameView.text = modifiedString + } else if (it.displayName.startsWith("$")) { + val modifiedString = it.displayName.replace("$","").replace("[TG]","[TG]") + headerViews.roomProfileNameView.text = modifiedString + } else { + headerViews.roomProfileNameView.text = it.displayName + } + if (it.displayName.contains("[TG]")) { + headerViews.roomProfileNameView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.chatimg,0,0,0) + headerViews.roomProfileNameView.setCompoundDrawablePadding(10); + } + + if (it.displayName.contains("$")) { + headerViews.roomProfileNameView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.dollar, 0,0,0) + headerViews.roomProfileNameView.setCompoundDrawablePadding(10); + } views.matrixProfileToolbarTitleView.text = it.displayName headerViews.roomProfileAliasView.setTextOrHide(it.canonicalAlias) val matrixItem = it.toMatrixItem() diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt index df15d3001c7..404b72687b5 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt @@ -152,7 +152,13 @@ class SpacePreviewFragment : val spaceAvatarUrl = spacePreviewState.spaceInfo.invoke()?.avatarUrl ?: spacePreviewState.avatarUrl val mxItem = MatrixItem.SpaceItem(spacePreviewState.idOrAlias, spaceName, spaceAvatarUrl) avatarRenderer.render(mxItem, views.spacePreviewToolbarAvatar) - views.roomPreviewNoPreviewToolbarTitle.text = spaceName + if (spaceName.startsWith("[TG] ")) { + views.roomPreviewNoPreviewToolbarTitle.text = spaceName.replace("[TG]","") + } else if (spaceName.startsWith("$")) { + views.roomPreviewNoPreviewToolbarTitle.text = spaceName.replace("$","") + } else { + views.roomPreviewNoPreviewToolbarTitle.text = spaceName + } // } // is SpacePeekResult.SpacePeekError, // null -> { 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..8b3bb121df9 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/chatimg.png b/vector/src/main/res/drawable/chatimg.png new file mode 100644 index 00000000000..ea02a6ac7f1 Binary files /dev/null and b/vector/src/main/res/drawable/chatimg.png differ diff --git a/vector/src/main/res/drawable/dollar.png b/vector/src/main/res/drawable/dollar.png new file mode 100644 index 00000000000..9d47b225862 Binary files /dev/null and b/vector/src/main/res/drawable/dollar.png differ diff --git a/vector/src/main/res/drawable/element_logo_stars.xml b/vector/src/main/res/drawable/element_logo_stars.xml index d982fbedc40..e21519b4390 100644 --- a/vector/src/main/res/drawable/element_logo_stars.xml +++ b/vector/src/main/res/drawable/element_logo_stars.xml @@ -1,57 +1,15 @@ + - - - - - - - - - - - - - + android:width="48dp" + android:height="48dp" + android:viewportWidth="48" + android:viewportHeight="48"> + + + + diff --git a/vector/src/main/res/drawable/ic_attachment_camera.xml b/vector/src/main/res/drawable/ic_attachment_camera.xml index 8c7bedb3cf2..8ddeda96bab 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="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_attachment_file.xml b/vector/src/main/res/drawable/ic_attachment_file.xml index b3545e54a6d..730c7dcdb69 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="#6147FF" 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..cc2f5999344 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..28ea0a9b11e 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="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_attachment_poll.xml b/vector/src/main/res/drawable/ic_attachment_poll.xml index 320dccb7fcd..c27868c8ba3 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..3dec64bf41d 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="#6147FF" + android:strokeColor="#6147FF" 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..d378c27cc80 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="#6147FF"/> - - - - + android:viewportHeight="80"> + + + + + 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..99131e8575b 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="#6147FF" 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..d7cde6841ee 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="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_location_pin.xml b/vector/src/main/res/drawable/ic_location_pin.xml index 8227ea4e057..7eed8f722ae 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="#6147FF"/> 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..ef6c2119400 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,16 @@ - - - - - + android:width="50dp" + android:height="30dp" + android:viewportWidth="50" + android:viewportHeight="80"> + + + + + 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..39d3c43892b 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="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_qr_code.xml b/vector/src/main/res/drawable/ic_qr_code.xml index 1ebdc169c94..d1c234c626e 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="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_share_external.xml b/vector/src/main/res/drawable/ic_share_external.xml index c4b78c8a83f..593aa23d8f0 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..598a450f47d 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="#6147FF"/> + android:strokeColor="#6147FF"/> + android:strokeColor="#6147FF"/> + android:strokeColor="#6147FF"/> diff --git a/vector/src/main/res/drawable/ic_text_formatting.xml b/vector/src/main/res/drawable/ic_text_formatting.xml index 375c459692f..bf4812b35bb 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="#6147FF"/> 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..af804285a85 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="#6147FF"/>