diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread.png deleted file mode 100644 index ec23ad509..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@2x.png deleted file mode 100644 index 0fc08fd6b..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@3x.png deleted file mode 100644 index 64c675d3c..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Thread@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Contents.json new file mode 100644 index 000000000..32dd965fb --- /dev/null +++ b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "Vector.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vector@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" + } +} diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector.png new file mode 100644 index 000000000..38cd35e5f Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@2x.png new file mode 100644 index 000000000..dc6713ff5 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@3x.png new file mode 100644 index 000000000..11067906e Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_thread.imageset/Vector@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Contents.json similarity index 84% rename from Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Contents.json index d2c033d2d..92eec1362 100644 --- a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply_in_thread.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Contents.json @@ -19,5 +19,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } } diff --git a/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread.png b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread.png new file mode 100644 index 000000000..b2cc0cb72 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@2x.png b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@2x.png new file mode 100644 index 000000000..fe86d55c3 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@3x.png b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@3x.png new file mode 100644 index 000000000..fae5443be Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Threads/threads_icon.imageset/Thread@3x.png differ diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index 52b436dda..610343379 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -133,8 +133,8 @@ internal enum Asset { internal static let roomContextMenuEdit = ImageAsset(name: "room_context_menu_edit") internal static let roomContextMenuMore = ImageAsset(name: "room_context_menu_more") internal static let roomContextMenuReply = ImageAsset(name: "room_context_menu_reply") - internal static let roomContextMenuReplyInThread = ImageAsset(name: "room_context_menu_reply_in_thread") internal static let roomContextMenuRetry = ImageAsset(name: "room_context_menu_retry") + internal static let roomContextMenuThread = ImageAsset(name: "room_context_menu_thread") internal static let inputCloseIcon = ImageAsset(name: "input_close_icon") internal static let inputEditIcon = ImageAsset(name: "input_edit_icon") internal static let inputReplyIcon = ImageAsset(name: "input_reply_icon") @@ -154,6 +154,7 @@ internal enum Asset { internal static let pollEndIcon = ImageAsset(name: "poll_end_icon") internal static let pollWinnerIcon = ImageAsset(name: "poll_winner_icon") internal static let threadsFilter = ImageAsset(name: "threads_filter") + internal static let threadsIcon = ImageAsset(name: "threads_icon") internal static let urlPreviewClose = ImageAsset(name: "url_preview_close") internal static let urlPreviewCloseDark = ImageAsset(name: "url_preview_close_dark") internal static let voiceMessageCancelGradient = ImageAsset(name: "voice_message_cancel_gradient") diff --git a/Riot/Modules/Room/ContextualMenu/RoomContextualMenuAction.swift b/Riot/Modules/Room/ContextualMenu/RoomContextualMenuAction.swift index d138df3cf..87089ecca 100644 --- a/Riot/Modules/Room/ContextualMenu/RoomContextualMenuAction.swift +++ b/Riot/Modules/Room/ContextualMenu/RoomContextualMenuAction.swift @@ -59,7 +59,7 @@ import Foundation case .reply: image = Asset.Images.roomContextMenuReply.image case .replyInThread: - image = Asset.Images.roomContextMenuReplyInThread.image + image = Asset.Images.roomContextMenuThread.image case .edit: image = Asset.Images.roomContextMenuEdit.image case .more: diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 4370f793e..b6d8526e1 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -1535,7 +1535,8 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05; - (UIBarButtonItem *)threadListBarButtonItem { - UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"room_context_menu_reply_in_thread"] + UIImage *icon = [[UIImage imageNamed:@"threads_icon"] vc_resizedWith:CGSizeMake(24, 24)]; + UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(onThreadListTapped:)]; diff --git a/Riot/Modules/Room/Views/Threads/ThreadSummaryView.swift b/Riot/Modules/Room/Views/Threads/ThreadSummaryView.swift index 7aa13f872..47e3a1834 100644 --- a/Riot/Modules/Room/Views/Threads/ThreadSummaryView.swift +++ b/Riot/Modules/Room/Views/Threads/ThreadSummaryView.swift @@ -27,7 +27,7 @@ protocol ThreadSummaryViewDelegate: AnyObject { class ThreadSummaryView: UIView { private enum Constants { - static let viewHeight: CGFloat = 32 + static let viewHeight: CGFloat = 40 static let viewDefaultWidth: CGFloat = 320 static let cornerRadius: CGFloat = 4 } @@ -129,6 +129,7 @@ extension ThreadSummaryView: Themable { func update(theme: Theme) { backgroundColor = theme.colors.system + iconView.tintColor = theme.colors.secondaryContent numberOfRepliesLabel.textColor = theme.colors.secondaryContent lastMessageContentLabel.textColor = theme.colors.secondaryContent } diff --git a/Riot/Modules/Room/Views/Threads/ThreadSummaryView.xib b/Riot/Modules/Room/Views/Threads/ThreadSummaryView.xib index 62e9a2d6c..66752fca3 100644 --- a/Riot/Modules/Room/Views/Threads/ThreadSummaryView.xib +++ b/Riot/Modules/Room/Views/Threads/ThreadSummaryView.xib @@ -18,35 +18,35 @@ - + - + - - + + - + @@ -84,6 +84,6 @@ - + diff --git a/Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift b/Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift index 1e980520d..b4de8df79 100644 --- a/Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift +++ b/Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift @@ -117,14 +117,14 @@ final class ThreadListViewModel: ThreadListViewModelProtocol { private var emptyViewModel: ThreadListEmptyViewModel { switch selectedFilterType { case .all: - return ThreadListEmptyViewModel(icon: Asset.Images.roomContextMenuReplyInThread.image, + return ThreadListEmptyViewModel(icon: Asset.Images.threadsIcon.image, title: VectorL10n.threadsEmptyTitle, info: VectorL10n.threadsEmptyInfoAll, tip: VectorL10n.threadsEmptyTip, showAllThreadsButtonTitle: VectorL10n.threadsEmptyShowAllThreads, showAllThreadsButtonHidden: true) case .myThreads: - return ThreadListEmptyViewModel(icon: Asset.Images.roomContextMenuReplyInThread.image, + return ThreadListEmptyViewModel(icon: Asset.Images.threadsIcon.image, title: VectorL10n.threadsEmptyTitle, info: VectorL10n.threadsEmptyInfoMy, tip: VectorL10n.threadsEmptyTip, diff --git a/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.swift b/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.swift index 213f1fa18..98e9b0535 100644 --- a/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.swift +++ b/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.swift @@ -64,6 +64,7 @@ extension ThreadListEmptyView: Themable { func update(theme: Theme) { iconBackgroundView.backgroundColor = theme.colors.system + iconView.tintColor = theme.colors.secondaryContent titleLabel.textColor = theme.colors.primaryContent infoLabel.textColor = theme.colors.secondaryContent tipLabel.textColor = theme.colors.secondaryContent diff --git a/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.xib b/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.xib index 50c62af99..bf0f68982 100644 --- a/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.xib +++ b/Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.xib @@ -36,7 +36,7 @@ - + @@ -105,6 +105,6 @@ - +