From be679277f0b4fa65272ee563bc92ba3217ca4c32 Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Thu, 25 Mar 2021 15:15:43 +0100 Subject: [PATCH 1/4] Update develop version --- TCHAP_CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst index 73c062d33a..46e7cd2e70 100644 --- a/TCHAP_CHANGES.rst +++ b/TCHAP_CHANGES.rst @@ -1,3 +1,12 @@ +Changes in Tchap 1.3.0 (2021-xx-xx) +=================================================== + +Features/Improvements: + * + +Bug Fixes: + * + Changes in Tchap 1.2.0 (2021-03-24) =================================================== From f7f82b6d315a942adcce329d5c99ca9b3f7c51d9 Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Sun, 11 Apr 2021 19:27:32 +0200 Subject: [PATCH 2/4] Bug Fix: Crash when the user selects "forward" on a selected message Fix we ignore the rooms without display name in the suggested rooms list --- TCHAP_CHANGES.rst | 4 ++-- Tchap/Modules/Forward/ForwardDataSource.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst index 46e7cd2e70..efbb3fb943 100644 --- a/TCHAP_CHANGES.rst +++ b/TCHAP_CHANGES.rst @@ -1,11 +1,11 @@ -Changes in Tchap 1.3.0 (2021-xx-xx) +Changes in Tchap 1.2.1 (2021-xx-xx) =================================================== Features/Improvements: * Bug Fixes: - * + * Crash when the user selects "forward" on a selected message Changes in Tchap 1.2.0 (2021-03-24) =================================================== diff --git a/Tchap/Modules/Forward/ForwardDataSource.swift b/Tchap/Modules/Forward/ForwardDataSource.swift index f596f9228f..ffa19006f8 100644 --- a/Tchap/Modules/Forward/ForwardDataSource.swift +++ b/Tchap/Modules/Forward/ForwardDataSource.swift @@ -36,7 +36,7 @@ class ForwardDataSource: MXKRecentsDataSource { continue } - if let recentCellData = MXKRecentCellData(roomSummary: summary, andRecentListDataSource: nil) { + if let recentCellData = MXKRecentCellData(roomSummary: summary, andRecentListDataSource: nil), recentCellData.roomDisplayname != nil { self.cellDataArray.append(recentCellData) } } From c6e9d08b2ff90e824322b3bd20be8f4c476fee0b Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Mon, 12 Apr 2021 00:03:12 +0200 Subject: [PATCH 3/4] Fix some points in case of Dark mode - Favorite messages are not readable in dark mode - Share extension: the rooms list are not readable in dark mode --- TCHAP_CHANGES.rst | 2 ++ .../FavouriteMessages/FavouriteMessagesViewController.swift | 1 + .../Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift | 2 ++ .../Modules/Share/Listing/Views/ShareRoomsRoomCell.swift | 2 ++ 4 files changed, 7 insertions(+) diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst index efbb3fb943..619906de31 100644 --- a/TCHAP_CHANGES.rst +++ b/TCHAP_CHANGES.rst @@ -6,6 +6,8 @@ Features/Improvements: Bug Fixes: * Crash when the user selects "forward" on a selected message + * Favorite messages are not readable in dark mode + * Share extension: the rooms list are not readable in dark mode Changes in Tchap 1.2.0 (2021-03-24) =================================================== diff --git a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift index 34a92051bf..3b4cea79fc 100644 --- a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift +++ b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift @@ -117,6 +117,7 @@ final class FavouriteMessagesViewController: UIViewController { private func update(style: Style) { self.currentStyle = style + self.tableView.backgroundColor = style.backgroundColor; self.view.backgroundColor = style.backgroundColor if let navigationBar = self.navigationController?.navigationBar { diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift index f386085214..55e8b737f2 100644 --- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift +++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift @@ -39,6 +39,8 @@ import UIKit override func update(style: Style) { super.update(style: style) self.domainLabel.textColor = style.primarySubTextColor + + self.contentView.backgroundColor = style.backgroundColor } func renderedCellData() -> MXKCellData! { diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift index c3c5e219d9..81f059c3aa 100644 --- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift +++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift @@ -41,6 +41,8 @@ class ShareRoomsRoomCell: RoomsCell { override func update(style: Style) { super.update(style: style) + + self.contentView.backgroundColor = style.backgroundColor } private func updateAvatarView () { From 80ab8943e1a6df0e15cd2570cfb17273d55babf8 Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Mon, 12 Apr 2021 00:15:26 +0200 Subject: [PATCH 4/4] version ++ --- TCHAP_CHANGES.rst | 5 +---- Tchap.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst index 619906de31..274d5404d0 100644 --- a/TCHAP_CHANGES.rst +++ b/TCHAP_CHANGES.rst @@ -1,9 +1,6 @@ -Changes in Tchap 1.2.1 (2021-xx-xx) +Changes in Tchap 1.2.1 (2021-04-12) =================================================== -Features/Improvements: - * - Bug Fixes: * Crash when the user selects "forward" on a selected message * Favorite messages are not readable in dark mode diff --git a/Tchap.xcodeproj/project.pbxproj b/Tchap.xcodeproj/project.pbxproj index 27d2393d9f..231c03bad6 100644 --- a/Tchap.xcodeproj/project.pbxproj +++ b/Tchap.xcodeproj/project.pbxproj @@ -9874,7 +9874,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -9926,7 +9926,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule;