From c788a43cd07fd5a732925a6494ac3f65b850309c Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 17 Apr 2020 13:39:02 +0300 Subject: [PATCH 1/5] Import KTCenterFlowLayout pod Signed-off-by: ismailgulek --- Podfile | 1 + Podfile.lock | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 5b21ad861..87739abb7 100644 --- a/Podfile +++ b/Podfile @@ -77,6 +77,7 @@ abstract_target 'RiotPods' do target "Riot" do import_MatrixKit pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4' + pod 'KTCenterFlowLayout', '~> 1.3.1' pod 'ZXingObjC', '~> 3.6.5' target 'RiotTests' do diff --git a/Podfile.lock b/Podfile.lock index f3e36eae9..074346fe1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,6 +44,7 @@ PODS: - GZIP (1.2.3) - HPGrowingTextView (1.1) - JitsiMeetSDK (2.3.1) + - KTCenterFlowLayout (1.3.1) - libbase58 (0.1.4) - libPhoneNumber-iOS (0.9.15) - MatomoTracker (7.2.0): @@ -110,6 +111,7 @@ DEPENDENCIES: - cmark - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4) - GBDeviceInfo (~> 6.3.0) + - KTCenterFlowLayout (~> 1.3.1) - MatomoTracker (~> 7.2.0) - MatrixKit (= 0.11.4) - MatrixKit/AppExtension (= 0.11.4) @@ -134,6 +136,7 @@ SPEC REPOS: - GZIP - HPGrowingTextView - JitsiMeetSDK + - KTCenterFlowLayout - libbase58 - libPhoneNumber-iOS - MatomoTracker @@ -167,6 +170,7 @@ SPEC CHECKSUMS: GZIP: af5c90ef903776a7e9afe6ebebd794a84a2929d4 HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19 JitsiMeetSDK: 69e4978fbab21f9a535d1bec3b8d43721a4c72b2 + KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97 libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 MatomoTracker: 6f89e2561083685a360e223fb663e9ccd57c1d1a @@ -181,6 +185,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: c7b37d248a316ae786328d88148e3155fea6bee3 +PODFILE CHECKSUM: 423280392fb3008372e2b92282dd0c08e4039c6f COCOAPODS: 1.8.4 From 6d4c865f2d7f62681e1443eb5f2f4feb9ad7d48d Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 17 Apr 2020 13:41:09 +0300 Subject: [PATCH 2/5] Use KTCenterFlowLayout for collection view layout, fixes #3088 Signed-off-by: ismailgulek --- .../SAS/KeyVerificationVerifyBySASViewController.storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard b/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard index 611ec4f21..89ca47a43 100644 --- a/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard +++ b/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard @@ -91,7 +91,7 @@ - + From 5453daa67f6223fb9e600bb58413a3b65d5acec9 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 17 Apr 2020 13:43:46 +0300 Subject: [PATCH 3/5] Update CHANGES.rst Signed-off-by: ismailgulek --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index c3e9a6782..26359b208 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,7 @@ Improvements: * Cross-signing: Complete security at the end of sign in process( #3003). * Make decoration uniform (#2972). * DeactivateAccountViewController: Respect active theme (PR #3107). + * Verification by emojis: Center emojis in screen horizontally (PR #3119). Bug fix: * Key backup banner is not hidden correctly (#2899). From 37ff450d72cc87f0d1241bc3e135e807f227d422 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 17 Apr 2020 14:39:52 +0300 Subject: [PATCH 4/5] Set collectionView width to constant, to show only 4 items in a row Signed-off-by: ismailgulek --- .../KeyVerificationVerifyBySASViewController.storyboard | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard b/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard index 89ca47a43..afd2968eb 100644 --- a/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard +++ b/Riot/Modules/KeyVerification/Common/Verify/SAS/KeyVerificationVerifyBySASViewController.storyboard @@ -86,10 +86,11 @@ - + + @@ -141,7 +142,6 @@ - @@ -153,11 +153,11 @@ - - + + From 99826c86354c19018395a6b80a03a916c8bc38ff Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 17 Apr 2020 17:02:09 +0300 Subject: [PATCH 5/5] Update third_party_licences.hmtl Signed-off-by: ismailgulek --- Riot/Assets/third_party_licenses.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index 3ab25b73b..37848b595 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -1403,6 +1403,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+
  • + KTCenterFlowLayout (https://github.com/keighl/KTCenterFlowLayout) +

    KTCenterFlowLayout is a subclass of UICollectionViewFlowLayout which Aligns cells to the center of a collection view. +

    It is released under the MIT license. +

    Copyright (c) keighl (http://github.com/keighl) +

    Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: +

    The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. +

    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +

    +