diff --git a/Gemfile b/Gemfile index 6b41ce0d6..4d6ef2604 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "xcode-install" gem "fastlane" -gem "cocoapods", '~>1.8.3' +gem "cocoapods", '~>1.9.3' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Podfile b/Podfile index 3409748e2..4a09ca96d 100644 --- a/Podfile +++ b/Podfile @@ -7,7 +7,7 @@ use_frameworks! # Different flavours of pods to MatrixKit # The current MatrixKit pod version -$matrixKitVersion = '0.12.7' +$matrixKitVersion = '0.12.8' # The specific branch version (supported: develop) #$matrixKitVersion = 'develop' diff --git a/Podfile.lock b/Podfile.lock index 45e72022f..13434adc6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -43,45 +43,45 @@ PODS: - GBDeviceInfo/Core (6.3.0) - GZIP (1.2.3) - HPGrowingTextView (1.1) - - JitsiMeetSDK (2.3.1) + - JitsiMeetSDK (2.8.1) - KTCenterFlowLayout (1.3.1) - libbase58 (0.1.4) - libPhoneNumber-iOS (0.9.15) - - MatomoTracker (7.2.0): - - MatomoTracker/Core (= 7.2.0) - - MatomoTracker/Core (7.2.0) - - MatrixKit (0.12.7): + - MatomoTracker (7.2.1): + - MatomoTracker/Core (= 7.2.1) + - MatomoTracker/Core (7.2.1) + - MatrixKit (0.12.8): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.23) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixKit/Core (= 0.12.7) - - MatrixSDK (= 0.16.6) - - MatrixKit/AppExtension (0.12.7): + - MatrixKit/Core (= 0.12.8) + - MatrixSDK (= 0.16.7) + - MatrixKit/AppExtension (0.12.8): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.23) - DTCoreText/Extension - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.16.6) - - MatrixKit/Core (0.12.7): + - MatrixSDK (= 0.16.7) + - MatrixKit/Core (0.12.8): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.23) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.16.6) - - MatrixSDK (0.16.6): - - MatrixSDK/Core (= 0.16.6) - - MatrixSDK/Core (0.16.6): + - MatrixSDK (= 0.16.7) + - MatrixSDK (0.16.7): + - MatrixSDK/Core (= 0.16.7) + - MatrixSDK/Core (0.16.7): - AFNetworking (~> 4.0.0) - GZIP (~> 1.2.2) - libbase58 (~> 0.1.4) - OLMKit (~> 3.1.0) - Realm (~> 4.4.0) - - MatrixSDK/JingleCallStack (0.16.6): - - JitsiMeetSDK (~> 2.3.1) + - MatrixSDK/JingleCallStack (0.16.7): + - JitsiMeetSDK (~> 2.8.1) - MatrixSDK/Core - - MatrixSDK/SwiftSupport (0.16.6): + - MatrixSDK/SwiftSupport (0.16.7): - MatrixSDK/Core - OLMKit (3.1.0): - OLMKit/olmc (= 3.1.0) @@ -91,12 +91,12 @@ PODS: - Realm (4.4.1): - Realm/Headers (= 4.4.1) - Realm/Headers (4.4.1) - - Reusable (4.1.0): - - Reusable/Storyboard (= 4.1.0) - - Reusable/View (= 4.1.0) - - Reusable/Storyboard (4.1.0) - - Reusable/View (4.1.0) - - SwiftGen (6.1.0) + - Reusable (4.1.1): + - Reusable/Storyboard (= 4.1.1) + - Reusable/View (= 4.1.1) + - Reusable/Storyboard (4.1.1) + - Reusable/View (4.1.1) + - SwiftGen (6.2.1) - SwiftLint (0.36.0) - zxcvbn-ios (1.0.4) - ZXingObjC (3.6.5): @@ -109,8 +109,8 @@ DEPENDENCIES: - GBDeviceInfo (~> 6.3.0) - KTCenterFlowLayout (~> 1.3.1) - MatomoTracker (~> 7.2.0) - - MatrixKit (= 0.12.7) - - MatrixKit/AppExtension (= 0.12.7) + - MatrixKit (= 0.12.8) + - MatrixKit/AppExtension (= 0.12.8) - MatrixSDK/JingleCallStack - MatrixSDK/SwiftSupport - OLMKit @@ -154,21 +154,21 @@ SPEC CHECKSUMS: GBDeviceInfo: a3f39dba1a04dcb630abff65d6f7e8fbf319eadd GZIP: af5c90ef903776a7e9afe6ebebd794a84a2929d4 HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19 - JitsiMeetSDK: 69e4978fbab21f9a535d1bec3b8d43721a4c72b2 + JitsiMeetSDK: 2984eac1343690bf1c0c72bde75b48b0148d0f79 KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97 libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 - MatomoTracker: 6f89e2561083685a360e223fb663e9ccd57c1d1a - MatrixKit: 12c75de764ebecf5dd0fab75136e731744902834 - MatrixSDK: 01b42da45d1fb28a3bceee9f3a31096bbf0a948f + MatomoTracker: 246b6b0693cf39b356134dec7561f719d3538b96 + MatrixKit: 0e519c481b87930e30b1732a9a8d5605dba03176 + MatrixSDK: 24e0adca0dc0dbbaa502bafdc75564bafd964c7b OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639 Realm: 4eb04d7487bd43c0581256f40b424eafb711deff - Reusable: 82be188f29d96dc5eff0db7b2393bcc08d2cdd5b - SwiftGen: f872ca75cbd17bf7103c17f13dcfa0d9a15667b0 + Reusable: 53a9acf5c536f229b31b5865782414b508252ddb + SwiftGen: 62e69d127507be1538d4263e137b2290cd6ab272 SwiftLint: fc9859e4e1752340664851f667bb1898b9c90114 zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: fe376c5be11f319b515df4af2d760189ca80364b +PODFILE CHECKSUM: a6f754f2d6b9d3ef6ead7aa90e2cd23b80dde8e4 -COCOAPODS: 1.9.3 +COCOAPODS: 1.8.4 diff --git a/README.rst b/README.rst index 7e398492b..c152a77a1 100644 --- a/README.rst +++ b/README.rst @@ -1,11 +1,11 @@ -Riot-iOS +Element iOS ========== -.. image:: https://img.shields.io/matrix/riot-ios:matrix.org.svg?label=%23riot-ios:matrix.org - :alt: #riot-ios:matrix.org - :target: https://matrix.to/#/#riot-ios:matrix.org +.. image:: https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org + :alt: #element-ios:matrix.org + :target: https://matrix.to/#/#element-ios:matrix.org -Riot/iOS is an iOS Matrix client. +Element iOS is an iOS Matrix client. .. image:: https://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg :target: https://itunes.apple.com/us/app/riot-open-source-collaboration/id1083446067?mt=8 @@ -17,14 +17,14 @@ You can build the app from source as per below: Build instructions ================== -Before opening the Riot Xcode workspace, you need to build it with the +Before opening the Element Xcode workspace, you need to build it with the CocoaPods command:: $ cd Riot $ bundle install $ bundle exec pod install -This will load all dependencies for the Riot source code, including MatrixKit +This will load all dependencies for the Element source code, including MatrixKit and MatrixSDK. You will need an recent and updated (``pod setup``) install of CocoaPods. diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index cea467537..d0d3031fd 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -116,6 +116,22 @@ 32F6B96D2270623100BBA352 /* KeyVerificationDataLoadingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F6B9672270623100BBA352 /* KeyVerificationDataLoadingViewModel.swift */; }; 32F6B96E2270623100BBA352 /* KeyVerificationDataLoadingViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F6B9682270623100BBA352 /* KeyVerificationDataLoadingViewModelType.swift */; }; 32FDC1CD2386CD390084717A /* RiotSettingIntegrationProvisioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FDC1CC2386CD390084717A /* RiotSettingIntegrationProvisioning.swift */; }; + 39D49C6524B8D40500FEDBC8 /* ElementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */; }; + 39D49C6624B8D40500FEDBC8 /* Timeline_1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */; }; + 39D49C6724B8D40500FEDBC8 /* ElementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6424B8D40500FEDBC8 /* ElementView.swift */; }; + 39D49C7724B8D42A00FEDBC8 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6A24B8D42900FEDBC8 /* UIImage+Extension.swift */; }; + 39D49C7824B8D42A00FEDBC8 /* ShapeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6B24B8D42900FEDBC8 /* ShapeView.swift */; }; + 39D49C7924B8D42A00FEDBC8 /* CAKeyframeAnimation+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6C24B8D42900FEDBC8 /* CAKeyframeAnimation+Extension.swift */; }; + 39D49C7A24B8D42A00FEDBC8 /* CATransaction+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6D24B8D42900FEDBC8 /* CATransaction+Extension.swift */; }; + 39D49C7B24B8D42A00FEDBC8 /* CGPath+SVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6E24B8D42900FEDBC8 /* CGPath+SVG.swift */; }; + 39D49C7C24B8D42A00FEDBC8 /* CAMediaTimingFunction+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6F24B8D42900FEDBC8 /* CAMediaTimingFunction+Extension.swift */; }; + 39D49C7D24B8D42A00FEDBC8 /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7024B8D42900FEDBC8 /* Timeline.swift */; }; + 39D49C7E24B8D42A00FEDBC8 /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7124B8D42900FEDBC8 /* TextView.swift */; }; + 39D49C7F24B8D42A00FEDBC8 /* NSMutableParagraphStyle+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7224B8D42900FEDBC8 /* NSMutableParagraphStyle+Extension.swift */; }; + 39D49C8024B8D42A00FEDBC8 /* Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7324B8D42900FEDBC8 /* Animation.swift */; }; + 39D49C8124B8D42A00FEDBC8 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7424B8D42900FEDBC8 /* UIView+Extension.swift */; }; + 39D49C8224B8D42A00FEDBC8 /* Sound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7524B8D42A00FEDBC8 /* Sound.swift */; }; + 39D49C8324B8D42A00FEDBC8 /* NSShadow+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C7624B8D42A00FEDBC8 /* NSShadow+Extension.swift */; }; 3AF393339D2D566CE14AC200 /* Pods_RiotTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 129EB7E27E7E4AC3F5F098F5 /* Pods_RiotTests.framework */; }; 405FD41D306133A48D9B5AA1 /* Pods_RiotPods_Riot.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACF09217ADF1D7E7A35BC02 /* Pods_RiotPods_Riot.framework */; }; 670966FEFE120D865FD8A5B6 /* Pods_RiotPods_SiriIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51187E952D5CECF6D6F5A28E /* Pods_RiotPods_SiriIntents.framework */; }; @@ -209,6 +225,8 @@ B1550FCA2420E8F500CE097B /* QRCodeReaderViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1550FC72420E8F400CE097B /* QRCodeReaderViewController.storyboard */; }; B1550FCB2420E8F500CE097B /* QRCodeReaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1550FC82420E8F400CE097B /* QRCodeReaderViewController.swift */; }; B1550FCC2420E8F500CE097B /* QRCodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1550FC92420E8F400CE097B /* QRCodeGenerator.swift */; }; + B1560DA224B65AFA00490F50 /* LaunchLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1560DA124B65AFA00490F50 /* LaunchLoadingView.swift */; }; + B1560DA424B65B3700490F50 /* LaunchLoadingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1560DA324B65B3700490F50 /* LaunchLoadingView.xib */; }; B157FA9F23264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B157FA9723264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinator.swift */; }; B157FAA023264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B157FA9823264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsViewModelType.swift */; }; B157FAA123264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B157FA9923264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinatorType.swift */; }; @@ -263,6 +281,9 @@ B183226623F55D6B0035B2E8 /* CameraAccessManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B183226523F55D6B0035B2E8 /* CameraAccessManager.swift */; }; B183226823F561380035B2E8 /* CameraAccessAlertPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B183226723F561380035B2E8 /* CameraAccessAlertPresenter.swift */; }; B183226C23F59F810035B2E8 /* CloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B183226B23F59F810035B2E8 /* CloseButton.swift */; }; + B185145524B7CFA700EE19EA /* AppVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = B185145424B7CFA700EE19EA /* AppVersion.swift */; }; + B185145B24B8C98200EE19EA /* MajorUpdateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B185145A24B8C98200EE19EA /* MajorUpdateViewController.swift */; }; + B185145D24B8C9A400EE19EA /* MajorUpdateViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B185145C24B8C9A400EE19EA /* MajorUpdateViewController.storyboard */; }; B18DEDD4243377C10075FEF7 /* KeyVerificationSelfVerifyWaitViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18DEDCC243377C00075FEF7 /* KeyVerificationSelfVerifyWaitViewModelType.swift */; }; B18DEDD5243377C10075FEF7 /* KeyVerificationSelfVerifyWaitViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18DEDCD243377C00075FEF7 /* KeyVerificationSelfVerifyWaitViewModel.swift */; }; B18DEDD6243377C10075FEF7 /* KeyVerificationSelfVerifyWaitCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18DEDCE243377C00075FEF7 /* KeyVerificationSelfVerifyWaitCoordinator.swift */; }; @@ -287,6 +308,7 @@ B19EFA3921F8BB2C00FC070E /* KeyBackupRecoverCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B19EFA3821F8BB2C00FC070E /* KeyBackupRecoverCoordinatorType.swift */; }; B19EFA3B21F8BB4100FC070E /* KeyBackupRecoverCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B19EFA3A21F8BB4100FC070E /* KeyBackupRecoverCoordinator.swift */; }; B1A5B33E227ADF2A004CBA85 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A5B33D227ADF2A004CBA85 /* UIImage.swift */; }; + B1A6805424B7C65200E312CC /* MajorUpdateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A6805324B7C65200E312CC /* MajorUpdateManager.swift */; }; B1A68593229E807A00D6C09A /* RoomBubbleCellLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A68592229E807800D6C09A /* RoomBubbleCellLayout.swift */; }; B1A6C10723881EF2002882FD /* SlidingModalPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A6C10623881EF2002882FD /* SlidingModalPresenter.swift */; }; B1A6C109238828A6002882FD /* SlidingModalPresentationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A6C108238828A6002882FD /* SlidingModalPresentationDelegate.swift */; }; @@ -973,6 +995,22 @@ 32F6B9682270623100BBA352 /* KeyVerificationDataLoadingViewModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyVerificationDataLoadingViewModelType.swift; sourceTree = ""; }; 32FDC1CC2386CD390084717A /* RiotSettingIntegrationProvisioning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RiotSettingIntegrationProvisioning.swift; sourceTree = ""; }; 3942DD65EBEB7AE647C6392A /* Pods-RiotPods-SiriIntents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-SiriIntents.debug.xcconfig"; path = "Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.debug.xcconfig"; sourceTree = ""; }; + 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementViewController.swift; sourceTree = ""; }; + 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timeline_1.swift; sourceTree = ""; }; + 39D49C6424B8D40500FEDBC8 /* ElementView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementView.swift; sourceTree = ""; }; + 39D49C6A24B8D42900FEDBC8 /* UIImage+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIImage+Extension.swift"; path = "FlowCommon/UIImage+Extension.swift"; sourceTree = ""; }; + 39D49C6B24B8D42900FEDBC8 /* ShapeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShapeView.swift; path = FlowCommon/ShapeView.swift; sourceTree = ""; }; + 39D49C6C24B8D42900FEDBC8 /* CAKeyframeAnimation+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CAKeyframeAnimation+Extension.swift"; path = "FlowCommon/CAKeyframeAnimation+Extension.swift"; sourceTree = ""; }; + 39D49C6D24B8D42900FEDBC8 /* CATransaction+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CATransaction+Extension.swift"; path = "FlowCommon/CATransaction+Extension.swift"; sourceTree = ""; }; + 39D49C6E24B8D42900FEDBC8 /* CGPath+SVG.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CGPath+SVG.swift"; path = "FlowCommon/CGPath+SVG.swift"; sourceTree = ""; }; + 39D49C6F24B8D42900FEDBC8 /* CAMediaTimingFunction+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CAMediaTimingFunction+Extension.swift"; path = "FlowCommon/CAMediaTimingFunction+Extension.swift"; sourceTree = ""; }; + 39D49C7024B8D42900FEDBC8 /* Timeline.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = FlowCommon/Timeline.swift; sourceTree = ""; }; + 39D49C7124B8D42900FEDBC8 /* TextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TextView.swift; path = FlowCommon/TextView.swift; sourceTree = ""; }; + 39D49C7224B8D42900FEDBC8 /* NSMutableParagraphStyle+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSMutableParagraphStyle+Extension.swift"; path = "FlowCommon/NSMutableParagraphStyle+Extension.swift"; sourceTree = ""; }; + 39D49C7324B8D42900FEDBC8 /* Animation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Animation.swift; path = FlowCommon/Animation.swift; sourceTree = ""; }; + 39D49C7424B8D42900FEDBC8 /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+Extension.swift"; path = "FlowCommon/UIView+Extension.swift"; sourceTree = ""; }; + 39D49C7524B8D42A00FEDBC8 /* Sound.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Sound.swift; path = FlowCommon/Sound.swift; sourceTree = ""; }; + 39D49C7624B8D42A00FEDBC8 /* NSShadow+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSShadow+Extension.swift"; path = "FlowCommon/NSShadow+Extension.swift"; sourceTree = ""; }; 3D78489021AC9E6400B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = ""; }; 3D78489121AC9E6500B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; 3D78489221AC9E6500B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Vector.strings; sourceTree = ""; }; @@ -1080,6 +1118,8 @@ B1550FC72420E8F400CE097B /* QRCodeReaderViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = QRCodeReaderViewController.storyboard; sourceTree = ""; }; B1550FC82420E8F400CE097B /* QRCodeReaderViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QRCodeReaderViewController.swift; sourceTree = ""; }; B1550FC92420E8F400CE097B /* QRCodeGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QRCodeGenerator.swift; sourceTree = ""; }; + B1560DA124B65AFA00490F50 /* LaunchLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchLoadingView.swift; sourceTree = ""; }; + B1560DA324B65B3700490F50 /* LaunchLoadingView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchLoadingView.xib; sourceTree = ""; }; B157FA9723264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsDiscoveryThreePidDetailsCoordinator.swift; sourceTree = ""; }; B157FA9823264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsViewModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsDiscoveryThreePidDetailsViewModelType.swift; sourceTree = ""; }; B157FA9923264AE800EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsDiscoveryThreePidDetailsCoordinatorType.swift; sourceTree = ""; }; @@ -1183,6 +1223,9 @@ B183226523F55D6B0035B2E8 /* CameraAccessManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraAccessManager.swift; sourceTree = ""; }; B183226723F561380035B2E8 /* CameraAccessAlertPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraAccessAlertPresenter.swift; sourceTree = ""; }; B183226B23F59F810035B2E8 /* CloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloseButton.swift; sourceTree = ""; }; + B185145424B7CFA700EE19EA /* AppVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersion.swift; sourceTree = ""; }; + B185145A24B8C98200EE19EA /* MajorUpdateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MajorUpdateViewController.swift; sourceTree = ""; }; + B185145C24B8C9A400EE19EA /* MajorUpdateViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MajorUpdateViewController.storyboard; sourceTree = ""; }; B18DEDCC243377C00075FEF7 /* KeyVerificationSelfVerifyWaitViewModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyVerificationSelfVerifyWaitViewModelType.swift; sourceTree = ""; }; B18DEDCD243377C00075FEF7 /* KeyVerificationSelfVerifyWaitViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyVerificationSelfVerifyWaitViewModel.swift; sourceTree = ""; }; B18DEDCE243377C00075FEF7 /* KeyVerificationSelfVerifyWaitCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyVerificationSelfVerifyWaitCoordinator.swift; sourceTree = ""; }; @@ -1207,6 +1250,7 @@ B19EFA3821F8BB2C00FC070E /* KeyBackupRecoverCoordinatorType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyBackupRecoverCoordinatorType.swift; sourceTree = ""; }; B19EFA3A21F8BB4100FC070E /* KeyBackupRecoverCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyBackupRecoverCoordinator.swift; sourceTree = ""; }; B1A5B33D227ADF2A004CBA85 /* UIImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = ""; }; + B1A6805324B7C65200E312CC /* MajorUpdateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MajorUpdateManager.swift; sourceTree = ""; }; B1A68592229E807800D6C09A /* RoomBubbleCellLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomBubbleCellLayout.swift; sourceTree = ""; }; B1A6C10623881EF2002882FD /* SlidingModalPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlidingModalPresenter.swift; sourceTree = ""; }; B1A6C108238828A6002882FD /* SlidingModalPresentationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlidingModalPresentationDelegate.swift; sourceTree = ""; }; @@ -2238,6 +2282,36 @@ path = Modal; sourceTree = ""; }; + 39D49C6124B8D3B000FEDBC8 /* LaunchLoadingAnimation */ = { + isa = PBXGroup; + children = ( + 39D49C6424B8D40500FEDBC8 /* ElementView.swift */, + 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */, + 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */, + ); + name = LaunchLoadingAnimation; + sourceTree = ""; + }; + 39D49C6924B8D41A00FEDBC8 /* FlowCommon */ = { + isa = PBXGroup; + children = ( + 39D49C7324B8D42900FEDBC8 /* Animation.swift */, + 39D49C6C24B8D42900FEDBC8 /* CAKeyframeAnimation+Extension.swift */, + 39D49C6F24B8D42900FEDBC8 /* CAMediaTimingFunction+Extension.swift */, + 39D49C6D24B8D42900FEDBC8 /* CATransaction+Extension.swift */, + 39D49C6E24B8D42900FEDBC8 /* CGPath+SVG.swift */, + 39D49C7224B8D42900FEDBC8 /* NSMutableParagraphStyle+Extension.swift */, + 39D49C7624B8D42A00FEDBC8 /* NSShadow+Extension.swift */, + 39D49C6B24B8D42900FEDBC8 /* ShapeView.swift */, + 39D49C7524B8D42A00FEDBC8 /* Sound.swift */, + 39D49C7124B8D42900FEDBC8 /* TextView.swift */, + 39D49C7024B8D42900FEDBC8 /* Timeline.swift */, + 39D49C6A24B8D42900FEDBC8 /* UIImage+Extension.swift */, + 39D49C7424B8D42900FEDBC8 /* UIView+Extension.swift */, + ); + name = FlowCommon; + sourceTree = ""; + }; 4220F60B660591FD80AF3428 /* Pods */ = { isa = PBXGroup; children = ( @@ -2520,6 +2594,16 @@ path = KeyVerification; sourceTree = ""; }; + B1560DA024B65A9500490F50 /* LaunchLoading */ = { + isa = PBXGroup; + children = ( + 39D49C6124B8D3B000FEDBC8 /* LaunchLoadingAnimation */, + B1560DA124B65AFA00490F50 /* LaunchLoadingView.swift */, + B1560DA324B65B3700490F50 /* LaunchLoadingView.xib */, + ); + path = LaunchLoading; + sourceTree = ""; + }; B157FA9623264AE800EBFBD4 /* ThreePidDetails */ = { isa = PBXGroup; children = ( @@ -2808,6 +2892,14 @@ path = Close; sourceTree = ""; }; + B185145324B7CF9500EE19EA /* AppVersion */ = { + isa = PBXGroup; + children = ( + B185145424B7CFA700EE19EA /* AppVersion.swift */, + ); + path = AppVersion; + sourceTree = ""; + }; B18DEDAB243372560075FEF7 /* SelfVerifyWait */ = { isa = PBXGroup; children = ( @@ -2875,6 +2967,16 @@ path = KeyVerification; sourceTree = ""; }; + B1A6805224B7C60900E312CC /* MajorUpdate */ = { + isa = PBXGroup; + children = ( + B1A6805324B7C65200E312CC /* MajorUpdateManager.swift */, + B185145A24B8C98200EE19EA /* MajorUpdateViewController.swift */, + B185145C24B8C9A400EE19EA /* MajorUpdateViewController.storyboard */, + ); + path = MajorUpdate; + sourceTree = ""; + }; B1A6C10523881ECB002882FD /* SlidingModal */ = { isa = PBXGroup; children = ( @@ -2938,9 +3040,11 @@ EC711B9A24A63B58008F830C /* SecureBackup */, EC711B4724A63B36008F830C /* Secrets */, B1B556EA20EE6C4C00210D55 /* Main */, + B1560DA024B65A9500490F50 /* LaunchLoading */, B1B556CA20EE6C4C00210D55 /* TabBar */, B1B556F920EE6C4C00210D55 /* Authentication */, B17982FD2119FEA7001FD722 /* GDPR */, + B1A6805224B7C60900E312CC /* MajorUpdate */, B1B5568420EE6C4C00210D55 /* Home */, B1B556C720EE6C4C00210D55 /* Favorites */, B1B556E720EE6C4C00210D55 /* People */, @@ -3243,6 +3347,7 @@ B1B556CD20EE6C4C00210D55 /* Common */ = { isa = PBXGroup; children = ( + 39D49C6924B8D41A00FEDBC8 /* FlowCommon */, EC85D7312477DD54002C44C9 /* SectionHeaders */, B183226923F59F3E0035B2E8 /* Buttons */, B1963B3622933B9500CBA17F /* CollectionView */, @@ -4005,6 +4110,7 @@ B1B5597C20EFC3DF00210D55 /* Managers */ = { isa = PBXGroup; children = ( + B185145324B7CF9500EE19EA /* AppVersion */, EC85D73B2477DDD0002C44C9 /* PushNotification */, B12C56ED2396CB0100FAC6DE /* RoomMessageLinkParser */, B1B9DED822E9B7120065E677 /* Serialization */, @@ -5011,6 +5117,7 @@ B1B9DEEA22EB34EF0065E677 /* ReactionHistoryViewController.storyboard in Resources */, B1B9194C2118984300FE25B5 /* RoomPredecessorBubbleCell.xib in Resources */, B1C562E9228C7CF20037F12A /* ContextualMenuItemView.xib in Resources */, + B1560DA424B65B3700490F50 /* LaunchLoadingView.xib in Resources */, B1BEE73A23DF44A60003A4CB /* UserVerificationSessionsStatusViewController.storyboard in Resources */, B1B5572120EE6C4D00210D55 /* ContactsTableViewController.xib in Resources */, B1B5593A20EF7BAC00210D55 /* TableViewCellWithLabelAndLargeTextView.xib in Resources */, @@ -5148,6 +5255,7 @@ B1B558BF20EF768F00210D55 /* RoomOutgoingEncryptedTextMsgWithoutSenderNameBubbleCell.xib in Resources */, B1B558FD20EF768F00210D55 /* RoomIncomingAttachmentBubbleCell.xib in Resources */, B1B558DB20EF768F00210D55 /* RoomIncomingEncryptedTextMsgWithoutSenderNameBubbleCell.xib in Resources */, + B185145D24B8C9A400EE19EA /* MajorUpdateViewController.storyboard in Resources */, B1CE83E42422817200D07506 /* KeyVerificationVerifyBySASViewController.storyboard in Resources */, B1B5572B20EE6C4D00210D55 /* RoomMemberDetailsViewController.xib in Resources */, B1D4752C21EE52C30067973F /* KeyBackupSetupIntroViewController.storyboard in Resources */, @@ -5437,6 +5545,7 @@ B12D7A0023E2462200FACEDC /* UserVerificationStartCoordinatorType.swift in Sources */, EC711B9324A63B37008F830C /* SecretsRecoveryWithKeyViewController.swift in Sources */, B1B5572220EE6C4D00210D55 /* RoomSettingsViewController.m in Sources */, + 39D49C7B24B8D42A00FEDBC8 /* CGPath+SVG.swift in Sources */, B1B5577320EE702800210D55 /* JitsiViewController.m in Sources */, B169331620F3CAFC00746532 /* PublicRoomsDirectoryDataSource.m in Sources */, B110871D21F087F4003554A5 /* KeyBackupSetupPassphraseViewState.swift in Sources */, @@ -5456,7 +5565,9 @@ EC711B9624A63B37008F830C /* SecretsRecoveryWithKeyViewState.swift in Sources */, B120863722EF375F001F89E0 /* ReactionHistoryBridgeCoordinatorPresenter.swift in Sources */, EC711B9224A63B37008F830C /* SecretsRecoveryWithKeyViewModel.swift in Sources */, + 39D49C7924B8D42A00FEDBC8 /* CAKeyframeAnimation+Extension.swift in Sources */, B1B5598620EFC3E000210D55 /* RiotSettings.swift in Sources */, + 39D49C8024B8D42A00FEDBC8 /* Animation.swift in Sources */, B1CE83D52422817200D07506 /* KeyVerificationVerifyByScanningViewController.swift in Sources */, EC711B8D24A63B37008F830C /* SecretsRecoveryGoal.swift in Sources */, 3232ABA3225730E100AD6A5C /* DeviceVerificationStartCoordinatorType.swift in Sources */, @@ -5537,6 +5648,7 @@ B1C3360222F1ED600021BA8D /* MediaPickerCoordinatorBridgePresenter.swift in Sources */, B1B558DF20EF768F00210D55 /* RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m in Sources */, F083BE041E7009ED00A9B29C /* Tools.m in Sources */, + 39D49C8324B8D42A00FEDBC8 /* NSShadow+Extension.swift in Sources */, 3275FD8C21A5A2C500B9C13D /* TermsView.swift in Sources */, B1B9DEE822EB34EF0065E677 /* ReactionHistoryCoordinatorType.swift in Sources */, EC711B7424A63B37008F830C /* SecretsSetupRecoveryKeyViewModelType.swift in Sources */, @@ -5551,7 +5663,9 @@ B1B5594520EF7BD000210D55 /* TableViewCellWithCollectionView.m in Sources */, B1A6C109238828A6002882FD /* SlidingModalPresentationDelegate.swift in Sources */, 32DB557722FDADE50016329E /* ServiceTermsModalCoordinator.swift in Sources */, + B185145B24B8C98200EE19EA /* MajorUpdateViewController.swift in Sources */, 32DB557922FDADE50016329E /* ServiceTermsModalScreenViewModel.swift in Sources */, + 39D49C7E24B8D42A00FEDBC8 /* TextView.swift in Sources */, 32891D75226728EE00C82226 /* KeyVerificationDataLoadingViewController.swift in Sources */, F083BDEF1E7009ED00A9B29C /* UINavigationController+Riot.m in Sources */, B1B5581F20EF625800210D55 /* SimpleRoomTitleView.m in Sources */, @@ -5561,6 +5675,7 @@ B1B5571920EE6C4D00210D55 /* LanguagePickerViewController.m in Sources */, B183226823F561380035B2E8 /* CameraAccessAlertPresenter.swift in Sources */, 3232AB512256558300AD6A5C /* TemplateScreenViewAction.swift in Sources */, + B1A6805424B7C65200E312CC /* MajorUpdateManager.swift in Sources */, 3232AB4E2256558300AD6A5C /* TemplateScreenViewModelType.swift in Sources */, 32DB557D22FDADE50016329E /* ServiceTermsModalScreenCoordinatorType.swift in Sources */, B1B5590520EF768F00210D55 /* RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m in Sources */, @@ -5583,6 +5698,7 @@ B1DCC61B22E5E17100625807 /* EmojiPickerCoordinator.swift in Sources */, EC85D7292477DCF2002C44C9 /* KeyVerificationManuallyVerifyViewModelType.swift in Sources */, 32F6B96E2270623100BBA352 /* KeyVerificationDataLoadingViewModelType.swift in Sources */, + B185145524B7CFA700EE19EA /* AppVersion.swift in Sources */, EC711B7E24A63B37008F830C /* SecretsSetupRecoveryPassphraseCoordinatorType.swift in Sources */, B1B5592C20EF7A5D00210D55 /* TableViewCellWithButton.m in Sources */, 32242F1421E8FBA900725742 /* DefaultTheme.swift in Sources */, @@ -5590,7 +5706,9 @@ 32242F1321E8FBA900725742 /* Theme.swift in Sources */, B108932523AB93A200802670 /* KeyVerificationConclusionViewData.swift in Sources */, B1B5582520EF638A00210D55 /* RoomMemberTitleView.m in Sources */, + B1560DA224B65AFA00490F50 /* LaunchLoadingView.swift in Sources */, B1B5582C20EF666100210D55 /* DirectoryRecentTableViewCell.m in Sources */, + 39D49C8124B8D42A00FEDBC8 /* UIView+Extension.swift in Sources */, B1B558E420EF768F00210D55 /* RoomMembershipWithPaginationTitleBubbleCell.m in Sources */, B18DEDD8243377C10075FEF7 /* KeyVerificationSelfVerifyWaitCoordinatorType.swift in Sources */, B1B5573620EE6C4D00210D55 /* GroupsViewController.m in Sources */, @@ -5679,6 +5797,7 @@ B1B5574020EE6C4D00210D55 /* SegmentedViewController.m in Sources */, EC711BAE24A63B58008F830C /* SecureBackupSetupCoordinator.swift in Sources */, B1B5599320EFC5E400210D55 /* DecryptionFailure.m in Sources */, + 39D49C7D24B8D42A00FEDBC8 /* Timeline.swift in Sources */, B1CE83E12422817200D07506 /* KeyVerificationVerifyBySASCoordinator.swift in Sources */, B125FE1F231D5DF700B72806 /* SettingsDiscoveryViewModelType.swift in Sources */, EC85D7162477DCD7002C44C9 /* KeyVerificationScanConfirmationViewAction.swift in Sources */, @@ -5713,7 +5832,9 @@ B1B5573220EE6C4D00210D55 /* GroupHomeViewController.m in Sources */, B1B5595220EF9A8700210D55 /* RecentTableViewCell.m in Sources */, B158253B2475350A00604D79 /* EventFormatter+DTCoreTextFix.m in Sources */, + 39D49C7F24B8D42A00FEDBC8 /* NSMutableParagraphStyle+Extension.swift in Sources */, EC711B9824A63B37008F830C /* SecretsRecoveryCoordinatorBridgePresenter.swift in Sources */, + 39D49C7A24B8D42A00FEDBC8 /* CATransaction+Extension.swift in Sources */, 32F6B96C2270623100BBA352 /* KeyVerificationDataLoadingCoordinatorType.swift in Sources */, B14084CA23BF89310010F692 /* KeyVerificationRequestStatusWithPaginationTitleBubbleCell.swift in Sources */, B1DCC61D22E5E17100625807 /* EmojiPickerViewModelType.swift in Sources */, @@ -5748,6 +5869,7 @@ EC85D7372477DD97002C44C9 /* LocalContactsSectionHeaderContainerView.m in Sources */, B1DCC61A22E5E17100625807 /* EmojiPickerViewController.swift in Sources */, B1963B32228F1C6B00CBA17F /* BubbleReactionsViewModelType.swift in Sources */, + 39D49C7824B8D42A00FEDBC8 /* ShapeView.swift in Sources */, 32A6001722C661100042C1D9 /* EditHistoryViewController.swift in Sources */, B1098BFA21ECFE65000DDA48 /* KeyBackupSetupPassphraseViewModel.swift in Sources */, B1B5575220EE6C4D00210D55 /* RoomKeyRequestViewController.m in Sources */, @@ -5767,6 +5889,7 @@ B1B557D820EF5EA900210D55 /* RoomActivitiesView.m in Sources */, B1B9DEE922EB34EF0065E677 /* ReactionHistoryViewController.swift in Sources */, B1B5596620EF9E9B00210D55 /* RoomTableViewCell.m in Sources */, + 39D49C6624B8D40500FEDBC8 /* Timeline_1.swift in Sources */, EC711B7D24A63B37008F830C /* SecretsSetupRecoveryPassphraseViewModel.swift in Sources */, EC711B8024A63B37008F830C /* SecretsSetupRecoveryPassphraseViewState.swift in Sources */, B1C45A89232A8C2600165425 /* SettingsIdentityServerViewController.swift in Sources */, @@ -5790,6 +5913,7 @@ B1BEE74A23E093260003A4CB /* UserVerificationSessionStatusCoordinatorType.swift in Sources */, 3232ABA4225730E100AD6A5C /* DeviceVerificationStartViewAction.swift in Sources */, B1550FCC2420E8F500CE097B /* QRCodeGenerator.swift in Sources */, + 39D49C8224B8D42A00FEDBC8 /* Sound.swift in Sources */, B1B5575A20EE6C4D00210D55 /* UnifiedSearchViewController.m in Sources */, 3232AB492256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift in Sources */, B1B5572820EE6C4D00210D55 /* RoomViewController.m in Sources */, @@ -5799,6 +5923,7 @@ B1B9DEED22EB34EF0065E677 /* ReactionHistoryCoordinator.swift in Sources */, B1DCC62A22E60D1000625807 /* EmojiMartService.swift in Sources */, EC711BA924A63B58008F830C /* SecureBackupSetupCoordinatorBridgePresenter.swift in Sources */, + 39D49C7724B8D42A00FEDBC8 /* UIImage+Extension.swift in Sources */, B1B558C720EF768F00210D55 /* RoomOutgoingEncryptedTextMsgWithPaginationTitleBubbleCell.m in Sources */, B1B336C5242B933700F95EC4 /* KeyVerificationSelfVerifyStartViewModel.swift in Sources */, B1B558F020EF768F00210D55 /* RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m in Sources */, @@ -5828,8 +5953,10 @@ B1B558D220EF768F00210D55 /* RoomEncryptedDataBubbleCell.m in Sources */, EC711BB024A63B58008F830C /* SecureBackupBannerCell.swift in Sources */, B1B558FA20EF768F00210D55 /* RoomMembershipBubbleCell.m in Sources */, + 39D49C6724B8D40500FEDBC8 /* ElementView.swift in Sources */, B157FAA223264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsViewAction.swift in Sources */, EC85D6AE2477DC89002C44C9 /* RoundedButton.swift in Sources */, + 39D49C6524B8D40500FEDBC8 /* ElementViewController.swift in Sources */, B1CE83D72422817200D07506 /* KeyVerificationVerifyByScanningViewModelType.swift in Sources */, 3232ABA1225730E100AD6A5C /* KeyVerificationCoordinatorType.swift in Sources */, B1C562D9228C0B760037F12A /* RoomContextualMenuItem.swift in Sources */, @@ -5883,6 +6010,7 @@ B18DEDDB243377C10075FEF7 /* KeyVerificationSelfVerifyWaitViewAction.swift in Sources */, 32B94DF9228EC26400716A26 /* ReactionsMenuViewAction.swift in Sources */, B1B5599420EFC5E400210D55 /* DecryptionFailureTracker.m in Sources */, + 39D49C7C24B8D42A00FEDBC8 /* CAMediaTimingFunction+Extension.swift in Sources */, F083BDF01E7009ED00A9B29C /* UIViewController+RiotSearch.m in Sources */, 32DB557522FDADE50016329E /* ServiceTermsModalCoordinatorType.swift in Sources */, F083BDF91E7009ED00A9B29C /* RoomEmailInvitation.m in Sources */, @@ -6325,7 +6453,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.11.6; + CURRENT_PROJECT_VERSION = 1.0.0; DEFINES_MODULE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -6345,7 +6473,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 0.11.6; + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -6383,7 +6511,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.11.6; + CURRENT_PROJECT_VERSION = 1.0.0; DEFINES_MODULE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -6396,7 +6524,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 0.11.6; + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/Riot/AppDelegate.h b/Riot/AppDelegate.h index 805f057a4..009ee9a83 100644 --- a/Riot/AppDelegate.h +++ b/Riot/AppDelegate.h @@ -218,4 +218,11 @@ extern NSString *const AppDelegateUniversalLinkDidChangeNotification; @property (nonatomic, readonly) UIWindow* callStatusBarWindow; @property (nonatomic, readonly) UIButton* callStatusBarButton; +#pragma mark - App version management + +/** + Check for app version related informations to display +*/ +- (void)checkAppVersion; + @end diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m index efed5f883..2137e2278 100644 --- a/Riot/AppDelegate.m +++ b/Riot/AppDelegate.m @@ -237,6 +237,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni */ @property (nonatomic, strong) PushNotificationService *pushNotificationService; +@property (nonatomic, strong) MajorUpdateManager *majorUpdateManager; + @end @implementation AppDelegate @@ -524,6 +526,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni [JitsiService.shared configureDefaultConferenceOptionsWith:jitsiServerURL]; [JitsiService.shared application:application didFinishLaunchingWithOptions:launchOptions]; + + self.majorUpdateManager = [MajorUpdateManager new]; NSLog(@"[AppDelegate] didFinishLaunchingWithOptions: Done in %.0fms", [[NSDate date] timeIntervalSinceDate:startDate] * 1000); @@ -2487,54 +2491,14 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni if (!launchAnimationContainerView && window) { - launchAnimationContainerView = [[UIView alloc] initWithFrame:window.bounds]; - launchAnimationContainerView.backgroundColor = ThemeService.shared.theme.backgroundColor; - launchAnimationContainerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - [window addSubview:launchAnimationContainerView]; + LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiate]; + launchLoadingView.frame = window.bounds; + [launchLoadingView updateWithTheme:ThemeService.shared.theme]; + launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - // Add animation view - UIImageView *animationView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 170, 170)]; - animationView.image = [UIImage animatedImageNamed:@"animatedLogo-" duration:2]; - - animationView.center = CGPointMake(launchAnimationContainerView.center.x, 3 * launchAnimationContainerView.center.y / 4); - - animationView.translatesAutoresizingMaskIntoConstraints = NO; - [launchAnimationContainerView addSubview:animationView]; - - NSLayoutConstraint* widthConstraint = [NSLayoutConstraint constraintWithItem:animationView - attribute:NSLayoutAttributeWidth - relatedBy:NSLayoutRelationEqual - toItem:nil - attribute:NSLayoutAttributeNotAnAttribute - multiplier:1 - constant:170]; - - NSLayoutConstraint* heightConstraint = [NSLayoutConstraint constraintWithItem:animationView - attribute:NSLayoutAttributeHeight - relatedBy:NSLayoutRelationEqual - toItem:nil - attribute:NSLayoutAttributeNotAnAttribute - multiplier:1 - constant:170]; - - NSLayoutConstraint* centerXConstraint = [NSLayoutConstraint constraintWithItem:animationView - attribute:NSLayoutAttributeCenterX - relatedBy:NSLayoutRelationEqual - toItem:launchAnimationContainerView - attribute:NSLayoutAttributeCenterX - multiplier:1 - constant:0]; - - NSLayoutConstraint* centerYConstraint = [NSLayoutConstraint constraintWithItem:animationView - attribute:NSLayoutAttributeCenterY - relatedBy:NSLayoutRelationEqual - toItem:launchAnimationContainerView - attribute:NSLayoutAttributeCenterY - multiplier:3.0/4.0 - constant:0]; - - [NSLayoutConstraint activateConstraints:@[widthConstraint, heightConstraint, centerXConstraint, centerYConstraint]]; + [window addSubview:launchLoadingView]; + launchAnimationContainerView = launchLoadingView; launchAnimationStart = [NSDate date]; } @@ -2549,12 +2513,12 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni // Track it on our analytics [[Analytics sharedInstance] trackLaunchScreenDisplayDuration:duration]; - + // TODO: Send durationMs to Piwik // Such information should be the same on all platforms - [launchAnimationContainerView removeFromSuperview]; - launchAnimationContainerView = nil; + [self->launchAnimationContainerView removeFromSuperview]; + self->launchAnimationContainerView = nil; } } @@ -2566,7 +2530,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni { // Create adapter for Riot MXCallKitConfiguration *callKitConfiguration = [[MXCallKitConfiguration alloc] init]; - callKitConfiguration.iconName = @"riot_icon_callkit"; + callKitConfiguration.iconName = @"callkit_icon"; NSData *riotCallKitIconData = UIImagePNGRepresentation([UIImage imageNamed:callKitConfiguration.iconName]); @@ -4476,22 +4440,27 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni // Leave the GDPR consent right now [self dismissGDPRConsent]; + + BOOL botCreationEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableBotCreation"]; - // And create the room with riot bot in // - self.onBoardingManager = [[OnBoardingManager alloc] initWithSession:session]; - - MXWeakify(self); - void (^createRiotBotDMcompletion)(void) = ^() { - MXStrongifyAndReturnIfNil(self); + if (botCreationEnabled) + { + // And create the room with riot bot in // + self.onBoardingManager = [[OnBoardingManager alloc] initWithSession:session]; + + MXWeakify(self); + void (^createRiotBotDMcompletion)(void) = ^() { + MXStrongifyAndReturnIfNil(self); - self.onBoardingManager = nil; - }; - - [self.onBoardingManager createRiotBotDirectMessageIfNeededWithSuccess:^{ - createRiotBotDMcompletion(); - } failure:^(NSError * _Nonnull error) { - createRiotBotDMcompletion(); - }]; + self.onBoardingManager = nil; + }; + + [self.onBoardingManager createRiotBotDirectMessageIfNeededWithSuccess:^{ + createRiotBotDMcompletion(); + } failure:^(NSError * _Nonnull error) { + createRiotBotDMcompletion(); + }]; + } } #pragma mark - Identity server service terms @@ -4595,4 +4564,66 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni } } +#pragma mark - App version management + +- (void)checkAppVersion +{ + // Check if we should display a major update alert + [self checkMajorUpdate]; + + // Update the last app version used + [AppVersion updateLastUsedVersion]; +} + +- (void)checkMajorUpdate +{ + if (self.majorUpdateManager.shouldShowMajorUpdate) + { + [self showMajorUpdate]; + } +} + +- (void)showMajorUpdate +{ + if (!self.slidingModalPresenter) + { + self.slidingModalPresenter = [SlidingModalPresenter new]; + } + + [self.slidingModalPresenter dismissWithAnimated:NO completion:nil]; + + MajorUpdateViewController *majorUpdateViewController = [MajorUpdateViewController instantiate]; + + MXWeakify(self); + + majorUpdateViewController.didTapLearnMoreButton = ^{ + + MXStrongifyAndReturnIfNil(self); + + [[UIApplication sharedApplication] vc_open:self.majorUpdateManager.learnMoreURL completionHandler:^(BOOL success) { + if (!success) + { + [self showAlertWithTitle:[NSBundle mxk_localizedStringForKey:@"error"] message:NSLocalizedStringFromTable(@"room_message_unable_open_link_error_message", @"Vector", nil)]; + } + }]; + + [self.slidingModalPresenter dismissWithAnimated:YES completion:^{ + }]; + }; + + majorUpdateViewController.didTapDoneButton = ^{ + + MXStrongifyAndReturnIfNil(self); + + [self.slidingModalPresenter dismissWithAnimated:YES completion:^{ + }]; + }; + + [self.slidingModalPresenter present:majorUpdateViewController + from:self.presentedViewController + animated:YES + completion:nil]; +} + + @end diff --git a/Riot/Assets/Base.lproj/LaunchScreen.storyboard b/Riot/Assets/Base.lproj/LaunchScreen.storyboard index 5b33d249c..47f7c6d30 100644 --- a/Riot/Assets/Base.lproj/LaunchScreen.storyboard +++ b/Riot/Assets/Base.lproj/LaunchScreen.storyboard @@ -1,12 +1,9 @@ - - - - + + - - + @@ -18,22 +15,23 @@ - + - - + + + - - + + - + - - + + @@ -43,6 +41,6 @@ - + diff --git a/Riot/Assets/Base.lproj/Main.storyboard b/Riot/Assets/Base.lproj/Main.storyboard index 21786c705..be2955e41 100644 --- a/Riot/Assets/Base.lproj/Main.storyboard +++ b/Riot/Assets/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -482,7 +482,7 @@ - + @@ -589,21 +589,6 @@ - - - - - - - - - - - - - - - @@ -611,4 +596,15 @@ + + + + + + + + + + + diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/Contents.json index 049d8057a..4ab85603f 100644 --- a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { + "filename" : "call_audio_mute_on_icon.png", "idiom" : "universal", - "filename" : "call_audio_mute_off_icon.png", "scale" : "1x" }, { + "filename" : "call_audio_mute_on_icon@2x.png", "idiom" : "universal", - "filename" : "call_audio_mute_off_icon@2x.png", "scale" : "2x" }, { + "filename" : "call_audio_mute_on_icon@3x.png", "idiom" : "universal", - "filename" : "call_audio_mute_off_icon@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png deleted file mode 100644 index faa1cbd04..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png deleted file mode 100644 index cf8d33c36..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png deleted file mode 100644 index 229c0f15c..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon.png new file mode 100644 index 000000000..34bcaaf01 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@2x.png new file mode 100644 index 000000000..7b63fde7b Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@3x.png new file mode 100644 index 000000000..88f122d63 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/Contents.json index 7450b3434..035d643df 100644 --- a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { + "filename" : "call_audio_mute_off_icon.png", "idiom" : "universal", - "filename" : "call_audio_mute_on_icon.png", "scale" : "1x" }, { + "filename" : "call_audio_mute_off_icon@2x.png", "idiom" : "universal", - "filename" : "call_audio_mute_on_icon@2x.png", "scale" : "2x" }, { + "filename" : "call_audio_mute_off_icon@3x.png", "idiom" : "universal", - "filename" : "call_audio_mute_on_icon@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon.png new file mode 100644 index 000000000..44225b355 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@2x.png new file mode 100644 index 000000000..6f9c4f168 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@3x.png new file mode 100644 index 000000000..19839d529 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png deleted file mode 100644 index 013c41d5c..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png deleted file mode 100644 index 215a080fc..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png deleted file mode 100644 index 95624f6a6..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/Contents.json index 36f25cf2c..f4e3fa806 100644 --- a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "call_chat_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "call_chat_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "call_chat_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png index 44864f900..a704776e3 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png index 13fefb36c..a6744b918 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png index 39e3c5052..2b70dd92f 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json deleted file mode 100644 index fcc56fed2..000000000 --- a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "call_hangup_icon.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "call_hangup_icon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "call_hangup_icon@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png deleted file mode 100644 index 159cf2ea3..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png deleted file mode 100644 index ca996ebbf..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png deleted file mode 100644 index 383d5dbcd..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json new file mode 100644 index 000000000..738bd32c7 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "call_hangup_big.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "call_hangup_big@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "call_hangup_big@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png new file mode 100644 index 000000000..1ce2c0d62 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png new file mode 100644 index 000000000..0f64361ce Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png new file mode 100644 index 000000000..b33700210 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/Contents.json index fca8ac013..5b4d42839 100644 --- a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "call_speaker_off_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "call_speaker_off_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "call_speaker_off_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png index fbafbd024..5d8901204 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png index 90aa4ee1b..0f460c384 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png index 61ffad725..b09c2b88a 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/Contents.json index 149a95037..9c250ae88 100644 --- a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "call_speaker_on_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "call_speaker_on_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "call_speaker_on_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png index db46e4226..9f63fa17f 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png index e77a0fe96..1dd05a3a6 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png index 17aa6b00c..16dcbc728 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/Contents.json index 0ab1a150d..91edfe9b1 100644 --- a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { + "filename" : "call_video_mute_on_icon.png", "idiom" : "universal", - "filename" : "call_video_mute_off_icon.png", "scale" : "1x" }, { + "filename" : "call_video_mute_on_icon@2x.png", "idiom" : "universal", - "filename" : "call_video_mute_off_icon@2x.png", "scale" : "2x" }, { + "filename" : "call_video_mute_on_icon@3x.png", "idiom" : "universal", - "filename" : "call_video_mute_off_icon@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png deleted file mode 100644 index 86fb6880f..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png deleted file mode 100644 index b78646748..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png deleted file mode 100644 index 9a5e5b622..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon.png new file mode 100644 index 000000000..fe9838b71 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@2x.png new file mode 100644 index 000000000..071185caf Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@3x.png new file mode 100644 index 000000000..2f90f11b6 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/Contents.json index 230fb2eed..ecab96b47 100644 --- a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { + "filename" : "call_video_mute_off_icon.png", "idiom" : "universal", - "filename" : "call_video_mute_on_icon.png", "scale" : "1x" }, { + "filename" : "call_video_mute_off_icon@2x.png", "idiom" : "universal", - "filename" : "call_video_mute_on_icon@2x.png", "scale" : "2x" }, { + "filename" : "call_video_mute_off_icon@3x.png", "idiom" : "universal", - "filename" : "call_video_mute_on_icon@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon.png new file mode 100644 index 000000000..15dc99bf2 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@2x.png new file mode 100644 index 000000000..0c37cf99e Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@3x.png new file mode 100644 index 000000000..8041bd8d8 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png deleted file mode 100644 index e4027cf3f..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png deleted file mode 100644 index f52ebfd34..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png deleted file mode 100644 index ccdebb760..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/Contents.json similarity index 57% rename from Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/Contents.json index 4a94be135..afd8f9130 100644 --- a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "callkit_icon.png", "idiom" : "universal", - "filename" : "riot_icon.png", "scale" : "1x" }, { + "filename" : "callkit_icon@2x.png", "idiom" : "universal", - "filename" : "riot_icon@2x.png", "scale" : "2x" }, { + "filename" : "callkit_icon@3x.png", "idiom" : "universal", - "filename" : "riot_icon@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon.png b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon.png new file mode 100644 index 000000000..7c3f5f8e0 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@2x.png b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@2x.png new file mode 100644 index 000000000..e57813303 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@3x.png b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@3x.png new file mode 100644 index 000000000..03f63dec5 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/callkit_icon.imageset/callkit_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/Contents.json index df1e2bb50..67ecee5d6 100644 --- a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "camera_switch.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "camera_switch@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "camera_switch@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png index c5edbd95c..27d63753e 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png index b09dc61f8..3f526d9a8 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png index 445b5c633..872210582 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/Contents.json deleted file mode 100644 index 2828aba84..000000000 --- a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "riot_icon_callkit.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "riot_icon_callkit@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "riot_icon_callkit@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit.png b/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit.png deleted file mode 100644 index 3698dba7e..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@2x.png b/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@2x.png deleted file mode 100644 index 4db45b362..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@3x.png b/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@3x.png deleted file mode 100644 index d8bfb0eb1..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/riot_icon_callkit.imageset/riot_icon_callkit@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/Contents.json deleted file mode 100644 index c7566989c..000000000 --- a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "admin_icon.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "admin_icon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "admin_icon@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon.png b/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon.png deleted file mode 100644 index b30fcdea6..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@2x.png b/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@2x.png deleted file mode 100644 index 2ace230e9..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@3x.png b/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@3x.png deleted file mode 100644 index ce9e1f09d..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/admin_icon.imageset/admin_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/Contents.json index a5542d153..17e2a1344 100644 --- a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "back_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "back_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "back_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon.png b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon.png index 789f53946..1cff3515a 100644 Binary files a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon.png and b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@2x.png b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@2x.png index beab3807b..3bc5c061c 100644 Binary files a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@2x.png and b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@3x.png b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@3x.png index ef8620069..ec035430f 100644 Binary files a/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@3x.png and b/Riot/Assets/Images.xcassets/Common/back_icon.imageset/back_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/camera.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/camera.imageset/Contents.json index d21aeca7b..4bdd4e265 100644 --- a/Riot/Assets/Images.xcassets/Common/camera.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/camera.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "camera.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "camera@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "camera@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera.png b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera.png index 541f81921..7beb3793d 100644 Binary files a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera.png and b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera.png differ diff --git a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@2x.png b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@2x.png index af9e1c0ec..88eea3b6a 100644 Binary files a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@2x.png and b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@3x.png b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@3x.png index 3458fb8d8..67cf17f32 100644 Binary files a/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@3x.png and b/Riot/Assets/Images.xcassets/Common/camera.imageset/camera@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json deleted file mode 100644 index ffbc6e03b..000000000 --- a/Riot/Assets/Images.xcassets/Common/logo.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "logo.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "logo@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "logo@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png deleted file mode 100644 index eea53f0e7..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png deleted file mode 100644 index 64378a435..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png b/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png deleted file mode 100644 index 2907add84..000000000 Binary files a/Riot/Assets/Images.xcassets/Common/logo.imageset/logo@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/Contents.json index c3e2c886a..b51975a14 100644 --- a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "plus_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "plus_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "plus_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon.png b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon.png index 82afbee39..1ad35fea1 100644 Binary files a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon.png and b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@2x.png b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@2x.png index 149e1b4c2..03579615a 100644 Binary files a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@2x.png and b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@3x.png b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@3x.png index 63897a198..ebde393b2 100644 Binary files a/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@3x.png and b/Riot/Assets/Images.xcassets/Common/plus_icon.imageset/plus_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json similarity index 77% rename from Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json index 2762fc2b1..c36c70f55 100644 --- a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "reveal_password_button.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "reveal_password_button@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "reveal_password_button@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png new file mode 100644 index 000000000..b1c176d8e Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png differ diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png new file mode 100644 index 000000000..25c0f9e44 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png new file mode 100644 index 000000000..1bb741161 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/Contents.json index 4c63e3d9b..5b86a7d2a 100644 --- a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "selection_tick.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "selection_tick@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "selection_tick@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick.png b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick.png index f694efee6..50291bbd4 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick.png and b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@2x.png b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@2x.png index 8c1e20566..b3665d31a 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@2x.png and b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@3x.png b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@3x.png index 643cfeafb..7717a22d9 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@3x.png and b/Riot/Assets/Images.xcassets/Common/selection_tick.imageset/selection_tick@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/Contents.json index 5ef9b3165..ef330cf86 100644 --- a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "selection_untick.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "selection_untick@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "selection_untick@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick.png b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick.png index 62ba9621a..c75c99a22 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick.png and b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@2x.png b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@2x.png index f8aa7c49e..cd4b14476 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@2x.png and b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@3x.png b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@3x.png index 4f320f7d8..eeecf911c 100644 Binary files a/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@3x.png and b/Riot/Assets/Images.xcassets/Common/selection_untick.imageset/selection_untick@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/Contents.json b/Riot/Assets/Images.xcassets/Communities/create_group.imageset/Contents.json deleted file mode 100644 index 8ed01c4c9..000000000 --- a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "create_group.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "create_group@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "create_group@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group.png b/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group.png deleted file mode 100644 index b5c41a287..000000000 Binary files a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@2x.png b/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@2x.png deleted file mode 100644 index dd155f0e3..000000000 Binary files a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@3x.png b/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@3x.png deleted file mode 100644 index 5d3297978..000000000 Binary files a/Riot/Assets/Images.xcassets/Communities/create_group.imageset/create_group@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Contacts/Contents.json b/Riot/Assets/Images.xcassets/Contacts/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/Riot/Assets/Images.xcassets/Contacts/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon.png b/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon.png deleted file mode 100644 index 8879f851f..000000000 Binary files a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@2x.png b/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@2x.png deleted file mode 100644 index b333a6523..000000000 Binary files a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@3x.png b/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@3x.png deleted file mode 100644 index c6ed87c18..000000000 Binary files a/Riot/Assets/Images.xcassets/Contacts/riot_icon.imageset/riot_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/Contents.json deleted file mode 100644 index 9286677d0..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "directChatOff.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "directChatOff@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "directChatOff@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff.png deleted file mode 100644 index 04b10d525..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@2x.png deleted file mode 100644 index 31db105b7..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@3x.png deleted file mode 100644 index 8759d79fc..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOff.imageset/directChatOff@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/Contents.json deleted file mode 100644 index 994f7c4c7..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "directChatOn.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "directChatOn@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "directChatOn@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn.png deleted file mode 100644 index 1d093e3e9..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@2x.png deleted file mode 100644 index 0a60d421b..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@3x.png deleted file mode 100644 index d5cfc0049..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/directChatOn.imageset/directChatOn@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/Contents.json deleted file mode 100644 index ddaaacdcf..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "favourite.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "favourite@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "favourite@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite.png deleted file mode 100644 index a073830ac..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@2x.png deleted file mode 100644 index 9fb29fbe1..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@3x.png deleted file mode 100644 index 032c4c6cf..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favourite.imageset/favourite@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/Contents.json deleted file mode 100644 index ad9a229aa..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "favouriteOff.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "favouriteOff@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "favouriteOff@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff.png deleted file mode 100644 index fd5c8bd53..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@2x.png deleted file mode 100644 index 13d8b05f1..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@3x.png deleted file mode 100644 index 0785e80fb..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/favouriteOff.imageset/favouriteOff@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/Contents.json deleted file mode 100644 index 0393f62ab..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "leave.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "leave@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "leave@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave.png deleted file mode 100644 index 6484d7363..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@2x.png deleted file mode 100644 index ff74e39f8..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@3x.png deleted file mode 100644 index d0b772d24..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/leave.imageset/leave@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/Contents.json deleted file mode 100644 index 499d33aaa..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "notifications.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "notifications@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "notifications@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications.png deleted file mode 100644 index c349e8be1..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@2x.png deleted file mode 100644 index f8384254f..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@3x.png deleted file mode 100644 index f9e6ce4e7..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notifications.imageset/notifications@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/Contents.json deleted file mode 100644 index bd468a4b9..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "notificationsOff.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "notificationsOff@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "notificationsOff@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff.png deleted file mode 100644 index 251ee225a..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@2x.png deleted file mode 100644 index 2ef0716aa..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@3x.png deleted file mode 100644 index da6a19b1e..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/notificationsOff.imageset/notificationsOff@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/Contents.json deleted file mode 100644 index 683a08201..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "priorityHigh.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "priorityHigh@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "priorityHigh@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh.png deleted file mode 100644 index c84af379d..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@2x.png deleted file mode 100644 index b9121080d..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@3x.png deleted file mode 100644 index 0007d53ca..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityHigh.imageset/priorityHigh@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/Contents.json deleted file mode 100644 index b9e753883..000000000 --- a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "priorityLow.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "priorityLow@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "priorityLow@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow.png deleted file mode 100644 index f49a688ee..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@2x.png deleted file mode 100644 index e67d0beee..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@3x.png deleted file mode 100644 index 17a6cca8c..000000000 Binary files a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/priorityLow.imageset/priorityLow@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/Contents.json new file mode 100644 index 000000000..39a6a241d --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_direct_chat.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_direct_chat@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_direct_chat@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat.png new file mode 100644 index 000000000..f76685a14 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@2x.png new file mode 100644 index 000000000..3c8b956fc Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@3x.png new file mode 100644 index 000000000..a336f37f6 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_direct_chat.imageset/room_action_direct_chat@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/Contents.json new file mode 100644 index 000000000..96d0dc30f --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_favourite.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_favourite@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_favourite@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite.png new file mode 100644 index 000000000..04581456b Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@2x.png new file mode 100644 index 000000000..31fae86d4 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@3x.png new file mode 100644 index 000000000..b75b71824 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_favourite.imageset/room_action_favourite@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/Contents.json new file mode 100644 index 000000000..0b6c600ac --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_leave.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_leave@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_leave@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave.png new file mode 100644 index 000000000..7fbae6566 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@2x.png new file mode 100644 index 000000000..0eb18989d Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@3x.png new file mode 100644 index 000000000..ad6530cc1 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_leave.imageset/room_action_leave@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/Contents.json new file mode 100644 index 000000000..b4c2b7402 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_notification.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_notification@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_notification@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification.png new file mode 100644 index 000000000..5316c899b Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@2x.png new file mode 100644 index 000000000..0a3ef62e8 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@3x.png new file mode 100644 index 000000000..960f6eab0 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification.imageset/room_action_notification@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/Contents.json new file mode 100644 index 000000000..37467db0f --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_priority_high.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_priority_high@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_priority_high@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high.png new file mode 100644 index 000000000..b4bfeff73 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@2x.png new file mode 100644 index 000000000..65d9f3655 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@3x.png new file mode 100644 index 000000000..48369bad7 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_high.imageset/room_action_priority_high@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/Contents.json new file mode 100644 index 000000000..41c7f2718 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "room_action_priority_low.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_action_priority_low@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_action_priority_low@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low.png new file mode 100644 index 000000000..444833135 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@2x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@2x.png new file mode 100644 index 000000000..6350d0a68 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@3x.png b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@3x.png new file mode 100644 index 000000000..105f0f9c1 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_priority_low.imageset/room_action_priority_low@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Home/create_room.imageset/Contents.json b/Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/Contents.json similarity index 88% rename from Riot/Assets/Images.xcassets/Home/create_room.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/Contents.json index f09690a18..19d716b06 100644 --- a/Riot/Assets/Images.xcassets/Home/create_room.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "create_room.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "create_room@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "create_room@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room.png b/Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room.png similarity index 100% rename from Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room.png rename to Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room.png diff --git a/Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room@2x.png b/Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room@2x.png rename to Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room@2x.png diff --git a/Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room@3x.png b/Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Home/create_room.imageset/create_room@3x.png rename to Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/create_room@3x.png diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png deleted file mode 100644 index eafa300c8..000000000 Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png deleted file mode 100644 index 3e9307b0f..000000000 Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png deleted file mode 100644 index 31f4c088d..000000000 Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png b/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png deleted file mode 100644 index e8d821507..000000000 Binary files a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/LaunchScreenRiot.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/MajorUpdate/Contents.json b/Riot/Assets/Images.xcassets/MajorUpdate/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/Riot/Assets/Images.xcassets/MajorUpdate/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/Contents.json similarity index 59% rename from Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json rename to Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/Contents.json index 90949704d..31dc9c476 100644 --- a/Riot/Assets/Images.xcassets/LaunchScreenRiot.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/Contents.json @@ -1,21 +1,23 @@ { "images" : [ { + "filename" : "old_logo.png", "idiom" : "universal", - "filename" : "LaunchScreenRiot.png", "scale" : "1x" }, { + "filename" : "old_logo@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "old_logo@3x.png", "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo.png b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo.png new file mode 100644 index 000000000..98e2ca8b3 Binary files /dev/null and b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo.png differ diff --git a/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@2x.png b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@2x.png new file mode 100644 index 000000000..bfe788510 Binary files /dev/null and b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@2x.png differ diff --git a/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@3x.png b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@3x.png new file mode 100644 index 000000000..3bc52dcf0 Binary files /dev/null and b/Riot/Assets/Images.xcassets/MajorUpdate/old_logo.imageset/old_logo@3x.png differ diff --git a/Riot/Assets/Images.xcassets/People/Contents.json b/Riot/Assets/Images.xcassets/People/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/Riot/Assets/Images.xcassets/People/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/Contents.json b/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/Contents.json deleted file mode 100644 index 407dd65db..000000000 --- a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "create_direct_chat.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "create_direct_chat@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "create_direct_chat@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat.png b/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat.png deleted file mode 100644 index de289fc08..000000000 Binary files a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@2x.png b/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@2x.png deleted file mode 100644 index d9b709ae8..000000000 Binary files a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@3x.png b/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@3x.png deleted file mode 100644 index f12d709ca..000000000 Binary files a/Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/create_direct_chat@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/Contents.json index 3e5932ea6..91c1a9f08 100644 --- a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "error.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "error@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "error@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error.png b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error.png index 6c22b91f7..4290079bb 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error.png and b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@2x.png index 9b0a524ef..1acb4a7b5 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@2x.png and b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@3x.png index ac7e4eca0..656ff49e9 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@3x.png and b/Riot/Assets/Images.xcassets/Room/Activities/error.imageset/error@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/Contents.json deleted file mode 100644 index a3c475a14..000000000 --- a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "newmessages.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "newmessages@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "newmessages@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages.png b/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages.png deleted file mode 100644 index 9695c3547..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@2x.png deleted file mode 100644 index ca6cc104f..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@3x.png deleted file mode 100644 index 2b9212985..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/newmessages.imageset/newmessages@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/Contents.json index f8bfbe270..8d7bcd9ce 100644 --- a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "scrolldown.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "scrolldown@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "scrolldown@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown.png b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown.png index d609d1458..ac61fd1ea 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown.png and b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@2x.png index 0c045230d..490d720c2 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@2x.png and b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@3x.png index be11b41d7..cd5dba5f1 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@3x.png and b/Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/scrolldown@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup.png b/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup.png deleted file mode 100644 index 7c105000b..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@2x.png deleted file mode 100644 index d52039cfa..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@3x.png deleted file mode 100644 index 0237eb3ec..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/scrollup@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json index b3800274c..18810f03f 100644 --- a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "typing.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "typing@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "typing@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png index 8b57471d5..b331520c1 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png index 5766b6eba..8460383bd 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png index 0e75d5408..1bec72b58 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/Contents.json index a5230d6fe..14ecf7424 100644 --- a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "room_context_menu_copy.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "room_context_menu_copy@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "room_context_menu_copy@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy.png index 7bf0c6e82..5cd3b68ea 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@2x.png index 853e03326..d537de1db 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@2x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@3x.png index 15363a0b0..65056fe4e 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@3x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_copy.imageset/room_context_menu_copy@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/Contents.json index 1290bc2c4..74e600ffc 100644 --- a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "room_context_menu_edit.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "room_context_menu_edit@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "room_context_menu_edit@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit.png index 208378c76..965937b0f 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@2x.png index 4b9f38f01..685745a00 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@2x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@3x.png index 45034e075..56388fa2f 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@3x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_edit.imageset/room_context_menu_edit@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/Contents.json index aba738f89..a6867c5ea 100644 --- a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "room_context_menu_more.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "room_context_menu_more@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "room_context_menu_more@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more.png index bb4a70d8a..7ea419188 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@2x.png index bedd0c99c..154f1d47d 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@2x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@3x.png index b7eb52e56..0fa544d63 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@3x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_more.imageset/room_context_menu_more@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/Contents.json index caedf0179..635b5fd26 100644 --- a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "room_context_menu_reply.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "room_context_menu_reply@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "room_context_menu_reply@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply.png index da8c8d608..6f009fa7c 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@2x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@2x.png index 3767d9b0c..28e6fce0b 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@2x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@3x.png b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@3x.png index a7f162b4a..e1264d772 100644 Binary files a/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@3x.png and b/Riot/Assets/Images.xcassets/Room/ContextMenu/room_context_menu_reply.imageset/room_context_menu_reply@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/Contents.json index fdd402548..b3ad81cfb 100644 --- a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "upload_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "upload_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "upload_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon.png b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon.png index d95f6057a..428fdaee0 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon.png and b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@2x.png index 43da3f5eb..9bb121756 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@2x.png and b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@3x.png index d5c75745a..6b83baa76 100644 Binary files a/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@3x.png and b/Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/upload_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/Contents.json new file mode 100644 index 000000000..0bc7ccb12 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "voice_call_hangon_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "voice_call_hangon_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "voice_call_hangon_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon.png new file mode 100644 index 000000000..402bbcba1 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@2x.png new file mode 100644 index 000000000..b067dbcf6 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@3x.png new file mode 100644 index 000000000..3859c6670 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangon_icon.imageset/voice_call_hangon_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/Contents.json new file mode 100644 index 000000000..7f325a523 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "voice_call_hangup_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "voice_call_hangup_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "voice_call_hangup_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon.png new file mode 100644 index 000000000..6751ddb38 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@2x.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@2x.png new file mode 100644 index 000000000..26d7bef11 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@3x.png b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@3x.png new file mode 100644 index 000000000..db5d6ee2c Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/Input/voice_call_hangup_icon.imageset/voice_call_hangup_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/Contents.json index 54548db05..c0f1d164f 100644 --- a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "add_participant.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "add_participant@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "add_participant@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant.png b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant.png index 21a651840..eda8bbf62 100644 Binary files a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant.png and b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant.png differ diff --git a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@2x.png b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@2x.png index 9383bae0c..e6e17061d 100644 Binary files a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@2x.png and b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@3x.png b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@3x.png index 4f66714cb..80f35e898 100644 Binary files a/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@3x.png and b/Riot/Assets/Images.xcassets/Room/add_participant.imageset/add_participant@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/Contents.json deleted file mode 100644 index d84f100ee..000000000 --- a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "apps-icon.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "apps-icon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "apps-icon@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon.png b/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon.png deleted file mode 100644 index 414e4acea..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@2x.png b/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@2x.png deleted file mode 100644 index 8b231c19f..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@3x.png b/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@3x.png deleted file mode 100644 index 7d95650a6..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/apps-icon.imageset/apps-icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/details_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/details_icon.imageset/Contents.json index d63c01c3e..8c6800670 100644 --- a/Riot/Assets/Images.xcassets/Room/details_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/details_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "details_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "details_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "details_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/Contents.json new file mode 100644 index 000000000..485fb7e59 --- /dev/null +++ b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "integrations_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "integrations_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "integrations_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon.png b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon.png new file mode 100644 index 000000000..dc2da4535 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@2x.png b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@2x.png new file mode 100644 index 000000000..1e4a9ab1d Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@3x.png b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@3x.png new file mode 100644 index 000000000..d99605f5e Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/integrations_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/Contents.json deleted file mode 100644 index 232d19666..000000000 --- a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "jump_to_unread.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "jump_to_unread@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "jump_to_unread@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread.png b/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread.png deleted file mode 100644 index 9a2e4bab3..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@2x.png b/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@2x.png deleted file mode 100644 index 336c3625b..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@3x.png b/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@3x.png deleted file mode 100644 index decb05e85..000000000 Binary files a/Riot/Assets/Images.xcassets/Room/jump_to_unread.imageset/jump_to_unread@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/Contents.json index 94a0be306..ac66b23f4 100644 --- a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "members_list_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "members_list_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "members_list_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon.png b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon.png index 8522a9c34..5a588faad 100644 Binary files a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon.png and b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@2x.png b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@2x.png index c697bde87..6dddb9364 100644 Binary files a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@2x.png and b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@3x.png b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@3x.png index b5af8cb0a..912e59bc2 100644 Binary files a/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@3x.png and b/Riot/Assets/Images.xcassets/Room/members_list_icon.imageset/members_list_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/more_reactions.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/more_reactions.imageset/Contents.json index deb17e0f5..1e35d8afc 100644 --- a/Riot/Assets/Images.xcassets/Room/more_reactions.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/more_reactions.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "more_reactions.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "more_reactions@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "more_reactions@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/Contents.json similarity index 74% rename from Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Room/scrollup.imageset/Contents.json index de37a71c3..bf8878a9b 100644 --- a/Riot/Assets/Images.xcassets/Room/Activities/scrollup.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "scrollup.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "scrollup@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "scrollup@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup.png b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup.png new file mode 100644 index 000000000..f6886dcc3 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup.png differ diff --git a/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@2x.png b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@2x.png new file mode 100644 index 000000000..06c754b0b Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@3x.png b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@3x.png new file mode 100644 index 000000000..d6cdc56bc Binary files /dev/null and b/Riot/Assets/Images.xcassets/Room/scrollup.imageset/scrollup@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/Contents.json index 00819b0b9..3432447b0 100644 --- a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "search_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "search_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "search_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon.png b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon.png index 1dc4c6ab8..fecc384b8 100644 Binary files a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon.png and b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@2x.png b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@2x.png index f3fe24c96..606d874ea 100644 Binary files a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@2x.png and b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@3x.png b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@3x.png index 9452169db..f0788a675 100644 Binary files a/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@3x.png and b/Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/Contents.json index 72b8e2ed5..febebcfc8 100644 --- a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "settings_icon.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "settings_icon@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "settings_icon@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon.png b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon.png index 571e1018d..049b3b8b0 100644 Binary files a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon.png and b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@2x.png b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@2x.png index a282bdca8..4bb343d0b 100644 Binary files a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@2x.png and b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@3x.png b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@3x.png index ce1920ae9..f7ff5d1ed 100644 Binary files a/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@3x.png and b/Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/Contents.json index 9f7ca7e49..10543f6f4 100644 --- a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "tab_favourites.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "tab_favourites@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "tab_favourites@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites.png index 9bff010c9..6b8ad9525 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites.png and b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@2x.png index da28fc6d7..7aef382d8 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@2x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@3x.png index 75601eb86..4adff5940 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/Contents.json deleted file mode 100644 index e6a4dcc53..000000000 --- a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tab_favourites_selected.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tab_favourites_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tab_favourites_selected@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected.png deleted file mode 100644 index 747ce8cfb..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@2x.png deleted file mode 100644 index 35cfca7ed..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@3x.png deleted file mode 100644 index bbd1e09b1..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/Contents.json index 0b6bb3783..9571921b5 100644 --- a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "tab_groups.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "tab_groups@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "tab_groups@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups.png index cacde46ab..6f92945e7 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups.png and b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@2x.png index 18cf117ad..76b56cd0a 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@2x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@3x.png index 29dd4ac2a..96576fb10 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/Contents.json deleted file mode 100644 index 7aea2185e..000000000 --- a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tab_groups_selected.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tab_groups_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tab_groups_selected@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected.png deleted file mode 100644 index 52dce3360..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@2x.png deleted file mode 100644 index bc6bf05f5..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@3x.png deleted file mode 100644 index d04cc3886..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/Contents.json index f8caa51a1..e0bf402e3 100644 --- a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "tab_home.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "tab_home@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "tab_home@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home.png b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home.png index 6f0d097ab..2a1a02918 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home.png and b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@2x.png index c5298ef29..ea44d5ea9 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@2x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@3x.png index 61a2eb218..34a50673b 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/Contents.json deleted file mode 100644 index c94539be5..000000000 --- a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tab_home_selected.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tab_home_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tab_home_selected@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected.png b/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected.png deleted file mode 100644 index 8da89fccd..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@2x.png deleted file mode 100644 index cfb149bac..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@3x.png deleted file mode 100644 index b3a70aeea..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/Contents.json index 88727d694..2f904b1d3 100644 --- a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "tab_people.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "tab_people@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "tab_people@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people.png b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people.png index 92f738bb1..f76685a14 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people.png and b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@2x.png index 775644479..3c8b956fc 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@2x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@3x.png index 7206dc1ec..bf14b13db 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/Contents.json deleted file mode 100644 index 45cddb392..000000000 --- a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tab_people_selected.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tab_people_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tab_people_selected@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected.png b/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected.png deleted file mode 100644 index b0dd91d5a..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@2x.png deleted file mode 100644 index 170778a9d..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@3x.png deleted file mode 100644 index 0f5b6ae72..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/Contents.json index 5684bb0ab..984caedcc 100644 --- a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "tab_rooms.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "tab_rooms@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "tab_rooms@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png index 84d09d73e..1b5e4bdd9 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png index 158851870..69b448cd9 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png index 410204b14..55bba3ba0 100644 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png and b/Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/Contents.json b/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/Contents.json deleted file mode 100644 index 14cf89063..000000000 --- a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tab_rooms_selected.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tab_rooms_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tab_rooms_selected@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected.png deleted file mode 100644 index 3557dc3d5..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@2x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@2x.png deleted file mode 100644 index f0b5a72eb..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@3x.png b/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@3x.png deleted file mode 100644 index 6f8a36803..000000000 Binary files a/Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/Contents.json b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/Contents.json new file mode 100644 index 000000000..332aaf86f --- /dev/null +++ b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "launch_screen_logo.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "launch_screen_logo@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "launch_screen_logo@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo.png b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo.png new file mode 100644 index 000000000..85d7a6a01 Binary files /dev/null and b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo.png differ diff --git a/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@2x.png b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@2x.png new file mode 100644 index 000000000..ac3f21dfb Binary files /dev/null and b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@2x.png differ diff --git a/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@3x.png b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@3x.png new file mode 100644 index 000000000..e049f4e98 Binary files /dev/null and b/Riot/Assets/Images.xcassets/launch_screen_logo.imageset/launch_screen_logo@3x.png differ diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist index c7f887560..cb7f7b57d 100644 --- a/Riot/Assets/Riot-Defaults.plist +++ b/Riot/Assets/Riot-Defaults.plist @@ -23,11 +23,11 @@ homeserver matrix.org webAppUrlDev - https://riot.im/develop - webAppUrlBeta - https://riot.im/beta + https://develop.element.io + webAppUrlStaging + https://staging.element.io webAppUrl - https://riot.im/app + https://app.element.io matrixApps integrationsUiUrl @@ -86,5 +86,13 @@ matrix.org + settingsCopyrightUrl + https://element.io/copyright + settingsPrivacyPolicyUrl + https://element.io/privacy + settingsTermsConditionsUrl + https://element.io/terms-of-service + enableBotCreation + diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json deleted file mode 100644 index 03409e8e8..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-0.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png deleted file mode 100644 index e8d821507..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json deleted file mode 100644 index ff9dd52fd..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png deleted file mode 100644 index 6c6f15c9c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json deleted file mode 100644 index 74dd17810..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png deleted file mode 100644 index 714008e4c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json deleted file mode 100644 index 17c939fab..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png deleted file mode 100644 index f5e02a9bb..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json deleted file mode 100644 index 50bc23e82..000000000 --- a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "animatedLogo-4.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png deleted file mode 100644 index dfe41a330..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png new file mode 100644 index 000000000..d0fda273a Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png new file mode 100644 index 000000000..6c9b3a53b Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png new file mode 100644 index 000000000..ca66da10a Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png new file mode 100644 index 000000000..ddfe1e525 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png new file mode 100644 index 000000000..0a77ec724 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png new file mode 100644 index 000000000..ca66da10a Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png new file mode 100644 index 000000000..f4afdbcad Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png new file mode 100644 index 000000000..96a684566 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png new file mode 100644 index 000000000..58ed6ff6b Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png new file mode 100644 index 000000000..5c9c91801 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png new file mode 100644 index 000000000..ca66da10a Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png new file mode 100644 index 000000000..20b6df7cf Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png new file mode 100644 index 000000000..0a77ec724 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png new file mode 100644 index 000000000..10519c275 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png new file mode 100644 index 000000000..f4afdbcad Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png new file mode 100644 index 000000000..b1aa2a401 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png new file mode 100644 index 000000000..b1aa2a401 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png new file mode 100644 index 000000000..1b0df4b6a Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json index 7021df30b..82463f805 100644 --- a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json +++ b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json @@ -1,116 +1,116 @@ { "images" : [ { - "size" : "20x20", + "filename" : "AppIcon~iPhone-20@2x.png", "idiom" : "iphone", - "filename" : "Icon-20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "AppIcon~iPhone-20@3x.png", "idiom" : "iphone", - "filename" : "Icon-20@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "AppIcon~iPhone-29@2x.png", "idiom" : "iphone", - "filename" : "Icon-29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "AppIcon~iPhone-29@3x.png", "idiom" : "iphone", - "filename" : "Icon-29@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "AppIcon~iPhone-40@2x.png", "idiom" : "iphone", - "filename" : "Icon-40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "AppIcon~iPhone-40@3x.png", "idiom" : "iphone", - "filename" : "Icon-40@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", + "filename" : "AppIcon~iPhone-60@2x.png", "idiom" : "iphone", - "filename" : "Icon-60@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", + "filename" : "AppIcon~iPhone-60@3x.png", "idiom" : "iphone", - "filename" : "Icon-60@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", + "filename" : "AppIcon~iPad-20@1x.png", "idiom" : "ipad", - "filename" : "Icon-20.png", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "AppIcon~iPad-20@2x.png", "idiom" : "ipad", - "filename" : "Icon-20@2x-1.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "AppIcon~iPad-29@1x.png", "idiom" : "ipad", - "filename" : "Icon-29.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "AppIcon~iPad-29@2x.png", "idiom" : "ipad", - "filename" : "Icon-29@2x-1.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "AppIcon~iPad-40@1x.png", "idiom" : "ipad", - "filename" : "Icon-40.png", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "AppIcon~iPad-40@2x.png", "idiom" : "ipad", - "filename" : "Icon-40@2x-1.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", + "filename" : "AppIcon~iPad-76@1x.png", "idiom" : "ipad", - "filename" : "Icon-76.png", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", + "filename" : "AppIcon~iPad-76@2x.png", "idiom" : "ipad", - "filename" : "Icon-76@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", + "filename" : "AppIcon~iPad-83.5@2x.png", "idiom" : "ipad", - "filename" : "Icon-83.5@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "AppIcon~iOS-Marketing-1024@1x.png", "idiom" : "ios-marketing", - "filename" : "Icon-1024.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png deleted file mode 100644 index ecd3015a3..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20.png deleted file mode 100755 index fd7681886..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x-1.png deleted file mode 100755 index 839031adb..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x-1.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x.png deleted file mode 100755 index 839031adb..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@3x.png deleted file mode 100755 index 78c68287b..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@3x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29.png deleted file mode 100755 index 979854402..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x-1.png deleted file mode 100755 index 1074e04a9..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x-1.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x.png deleted file mode 100755 index 1074e04a9..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@3x.png deleted file mode 100755 index b39bcd51f..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@3x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40.png deleted file mode 100755 index 839031adb..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x-1.png deleted file mode 100755 index 6cedc584c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x-1.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x.png deleted file mode 100755 index 6cedc584c..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@3x.png deleted file mode 100755 index 475467f8d..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@3x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@2x.png deleted file mode 100755 index 475467f8d..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@3x.png deleted file mode 100755 index fceef4406..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76.png deleted file mode 100755 index 99615b99e..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76@2x.png deleted file mode 100755 index fd0ba7c6d..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-83.5@2x.png deleted file mode 100755 index 844ae7fe4..000000000 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and /dev/null differ diff --git a/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/Contents.json new file mode 100644 index 000000000..77a3e65b5 --- /dev/null +++ b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "horizontal_logo.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "horizontal_logo@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "horizontal_logo@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo.png new file mode 100644 index 000000000..8da11cec0 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo.png differ diff --git a/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@2x.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@2x.png new file mode 100644 index 000000000..6427db5ea Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@3x.png b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@3x.png new file mode 100644 index 000000000..e7baca3a8 Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/horizontal_logo.imageset/horizontal_logo@3x.png differ diff --git a/Riot/Assets/en.lproj/InfoPlist.strings b/Riot/Assets/en.lproj/InfoPlist.strings index 59ff9575a..32ea190e2 100644 --- a/Riot/Assets/en.lproj/InfoPlist.strings +++ b/Riot/Assets/en.lproj/InfoPlist.strings @@ -18,6 +18,6 @@ "NSCameraUsageDescription" = "The camera is used to take photos and videos, make video calls."; "NSPhotoLibraryUsageDescription" = "The photo library is used to send photos and videos."; "NSMicrophoneUsageDescription" = "The microphone is used to take videos, make calls."; -"NSContactsUsageDescription" = "To discover contacts already using Matrix, Riot can send email addresses and phone numbers in your address book to your chosen Matrix identity server. Where supported, personal data is hashed before sending - please check your identity server's privacy policy for more details."; +"NSContactsUsageDescription" = "To discover contacts already using Matrix, Element can send email addresses and phone numbers in your address book to your chosen Matrix identity server. Where supported, personal data is hashed before sending - please check your identity server's privacy policy for more details."; "NSCalendarsUsageDescription" = "See your scheduled meetings in the app."; diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index a16022aab..ead991796 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -17,7 +17,8 @@ // String for App Store "store_short_description" = "Secure decentralised chat/VoIP"; -"store_full_description" = "Communicate, your way.\n\nA chat app, under your control and entirely flexible. Riot lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.\n\nGet a free matrix.org account, get your own server at https://modular.im, or use another Matrix server.\n\nWhy choose Riot.im?\n\nCOMPLETE COMMUNICATION: Build rooms around your teams, your friends, your community - however you like! Chat, share files, add widgets and make voice and video calls - all free of charge.\n\nPOWERFUL INTEGRATIONS: Use Riot.im with the tools you know and love. With Riot.im you can even chat with users and groups on other chat apps.\n\nPRIVATE AND SECURE: Keep your conversations secret. State of the art end-to-end encryption ensures that private communication stays private.\n\nOPEN, NOT CLOSED: Open source, and built on Matrix. Own your own data by hosting your own server, or selecting one you trust.\n\nEVERYWHERE YOU ARE: Stay in touch wherever you are with fully synchronised message history across all your devices and online at https://riot.im."; +"store_full_description" = "Element is a new type of messenger and collaboration app that:\n\n1. Puts you in control to preserve your privacy\n2. Lets you communicate with anyone in the Matrix network, and even beyond by integrating with apps such as Slack\n3. Protects you from advertising, datamining, backdoors and walled gardens\n4. Secures you through end-to-end encryption, with cross-signing to verify others\n\nElement is completely different from other messaging and collaboration apps because it is decentralised and open source.\n\nElement lets you self-host - or choose a host - so that you have privacy, ownership and control of your data and conversations. It gives you access to an open network; so you’re not just stuck speaking to other Element users only. And it is very secure.\n\nElement is able to do all this because it operates on Matrix - the standard for open, decentralised communication. \n\nElement puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:\n\n1. Get a free account on the matrix.org public server\n2. Self-host your account by running a server on your own hardware\n3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform\n\nWhy choose Element?\n\nOWN YOUR DATA: You decide where to keep your data and messages. You own it and control it, not some MEGACORP that mines your data or gives access to third parties.\n\nOPEN MESSAGING AND COLLABORATION: You can chat with anyone else in the Matrix network, whether they’re using Element or another Matrix app, and even if they are using a different messaging system of the likes of Slack, IRC or XMPP.\n\nSUPER-SECURE: Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signing to verify the devices of conversation participants.\n\nCOMPLETE COMMUNICATION: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.\n\nEVERYWHERE YOU ARE: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://element.io/app."; +"store_promotional_text" = "Privacy-preserving chat and collaboration app, on an open network. Decentralised to put you in control. No datamining, no backdoors and no third party access."; // Titles "title_home" = "Home"; @@ -63,10 +64,10 @@ "accessibility_checkbox_label" = "checkbox"; // MARK: Clients -"client_desktop_name" = "Riot Desktop"; -"client_web_name" = "Riot Web"; -"client_ios_name" = "Riot iOS"; -"client_android_name" = "Riot X for Android"; +"client_desktop_name" = "Element Desktop"; +"client_web_name" = "Element Web"; +"client_ios_name" = "Element iOS"; +"client_android_name" = "Element Android"; // Authentication "auth_login" = "Log in"; @@ -214,7 +215,7 @@ "contacts_address_book_no_identity_server" = "No identity server configured"; "contacts_address_book_no_contact" = "No local contacts"; "contacts_address_book_permission_required" = "Permission required to access local contacts"; -"contacts_address_book_permission_denied" = "You didn't allow Riot to access your local contacts"; +"contacts_address_book_permission_denied" = "You didn't allow Element to access your local contacts"; "contacts_user_directory_section" = "USER DIRECTORY"; "contacts_user_directory_offline_section" = "USER DIRECTORY (offline)"; @@ -458,7 +459,7 @@ //"settings_call_invitations" = "Call invitations"; "settings_enable_callkit" = "Integrated calling"; -"settings_callkit_info" = "Receive incoming calls on your lock screen. See your Riot calls in the system's call history. If iCloud is enabled, this call history will be shared with Apple."; +"settings_callkit_info" = "Receive incoming calls on your lock screen. See your Element calls in the system's call history. If iCloud is enabled, this call history will be shared with Apple."; "settings_calls_stun_server_fallback_button" = "Allow fallback call assist server"; "settings_calls_stun_server_fallback_description" = "Allow fallback call assist server %@ when your homeserver does not offer one (your IP address would be shared during a call)."; @@ -489,11 +490,8 @@ "settings_version" = "Version %@"; "settings_olm_version" = "Olm Version %@"; "settings_copyright" = "Copyright"; -"settings_copyright_url" = "https://riot.im/copyright"; "settings_term_conditions" = "Terms & Conditions"; -"settings_term_conditions_url" = "https://riot.im/tac_apple"; "settings_privacy_policy" = "Privacy Policy"; -"settings_privacy_policy_url" = "https://riot.im/privacy"; "settings_third_party_notices" = "Third-party Notices"; "settings_send_crash_report" = "Send anon crash & usage data"; "settings_enable_rageshake" = "Rage shake to report bug"; @@ -601,7 +599,7 @@ "security_settings_complete_security_alert_title" = "Complete security"; "security_settings_complete_security_alert_message" = "You should complete security on your current session first."; -"security_settings_coming_soon" = "Sorry. This action is not available on Riot-iOS yet. Please use another Matrix client to set it up. Riot-iOS will use it."; +"security_settings_coming_soon" = "Sorry. This action is not available on Element iOS yet. Please use another Matrix client to set it up. Element iOS will use it."; "security_settings_user_password_description" = "Confirm your identity by entering your account password"; // Manage session @@ -814,7 +812,7 @@ "google_analytics_use_prompt" = "Would you like to help improve %@ by automatically reporting anonymous crash reports and usage data?"; // Crypto -"e2e_enabling_on_app_update" = "Riot now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings."; +"e2e_enabling_on_app_update" = "Element now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings."; "e2e_need_log_in_again" = "You need to log back in to generate end-to-end encryption keys for this session and submit the public key to your homeserver.\nThis is a once off; sorry for the inconvenience."; // Key backup wrong version @@ -932,7 +930,7 @@ // Re-request confirmation dialog "rerequest_keys_alert_title" = "Request Sent"; -"rerequest_keys_alert_message" = "Please launch Riot on another device that can decrypt the message so it can send the keys to this session."; +"rerequest_keys_alert_message" = "Please launch Element on another device that can decrypt the message so it can send the keys to this session."; // MARK: Secure backup setup @@ -1117,7 +1115,7 @@ "device_verification_self_verify_wait_title" = "Complete security"; "device_verification_self_verify_wait_new_sign_in_title" = "Verify this login"; -"device_verification_self_verify_wait_information" = "Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest Riot on your other devices:"; +"device_verification_self_verify_wait_information" = "Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest Element on your other devices:"; "device_verification_self_verify_wait_additional_information" = "or another cross-signing capable Matrix client"; "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Use Recovery Key"; "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Use Recovery Passphrase or Key"; @@ -1409,3 +1407,10 @@ "cross_signing_setup_banner_title" = "Set up encryption"; "cross_signing_setup_banner_subtitle" = "Verify your other devices easier"; + +// MARK: - Major update + +"major_update_title" = "Riot is now Element"; +"major_update_information" = "We're excited to announce we've changed name! Your app is up to date and you're signed in to your account."; +"major_update_learn_more_action" = "Learn more"; +"major_update_done_action" = "Got it"; diff --git a/Riot/Categories/UIImage.swift b/Riot/Categories/UIImage.swift index 63a35d9da..c413707c2 100644 --- a/Riot/Categories/UIImage.swift +++ b/Riot/Categories/UIImage.swift @@ -37,7 +37,7 @@ extension UIImage { return image } - func vc_tintedImage(usingColor tintColor: UIColor) -> UIImage? { + @objc func vc_tintedImage(usingColor tintColor: UIColor) -> UIImage? { UIGraphicsBeginImageContextWithOptions(self.size, false, self.scale) let drawRect = CGRect(x: 0, y: 0, width: self.size.width, height: self.size.height) @@ -49,7 +49,7 @@ extension UIImage { return tintedImage } - func vc_withAlpha(_ alpha: CGFloat) -> UIImage? { + @objc func vc_withAlpha(_ alpha: CGFloat) -> UIImage? { UIGraphicsBeginImageContextWithOptions(size, false, scale) draw(at: .zero, blendMode: .normal, alpha: alpha) let newImage = UIGraphicsGetImageFromCurrentImageContext() diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index 0fd4a093b..eca64a0ad 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -22,82 +22,74 @@ internal enum Asset { internal static let callAudioMuteOffIcon = ImageAsset(name: "call_audio_mute_off_icon") internal static let callAudioMuteOnIcon = ImageAsset(name: "call_audio_mute_on_icon") internal static let callChatIcon = ImageAsset(name: "call_chat_icon") - internal static let callHangupIcon = ImageAsset(name: "call_hangup_icon") + internal static let callHangupLarge = ImageAsset(name: "call_hangup_large") internal static let callSpeakerOffIcon = ImageAsset(name: "call_speaker_off_icon") internal static let callSpeakerOnIcon = ImageAsset(name: "call_speaker_on_icon") internal static let callVideoMuteOffIcon = ImageAsset(name: "call_video_mute_off_icon") internal static let callVideoMuteOnIcon = ImageAsset(name: "call_video_mute_on_icon") + internal static let callkitIcon = ImageAsset(name: "callkit_icon") internal static let cameraSwitch = ImageAsset(name: "camera_switch") - internal static let riotIconCallkit = ImageAsset(name: "riot_icon_callkit") - internal static let adminIcon = ImageAsset(name: "admin_icon") internal static let backIcon = ImageAsset(name: "back_icon") internal static let camera = ImageAsset(name: "camera") internal static let chevron = ImageAsset(name: "chevron") internal static let closeButton = ImageAsset(name: "close_button") internal static let disclosureIcon = ImageAsset(name: "disclosure_icon") internal static let group = ImageAsset(name: "group") - internal static let logo = ImageAsset(name: "logo") internal static let monitor = ImageAsset(name: "monitor") internal static let placeholder = ImageAsset(name: "placeholder") internal static let plusIcon = ImageAsset(name: "plus_icon") internal static let removeIcon = ImageAsset(name: "remove_icon") + internal static let revealPasswordButton = ImageAsset(name: "reveal_password_button") internal static let selectionTick = ImageAsset(name: "selection_tick") internal static let selectionUntick = ImageAsset(name: "selection_untick") internal static let shrinkIcon = ImageAsset(name: "shrink_icon") internal static let smartphone = ImageAsset(name: "smartphone") internal static let startChat = ImageAsset(name: "start_chat") internal static let addGroupParticipant = ImageAsset(name: "add_group_participant") - internal static let createGroup = ImageAsset(name: "create_group") internal static let removeIconBlue = ImageAsset(name: "remove_icon_blue") - internal static let riotIcon = ImageAsset(name: "riot_icon") internal static let e2eBlocked = ImageAsset(name: "e2e_blocked") internal static let e2eUnencrypted = ImageAsset(name: "e2e_unencrypted") internal static let e2eWarning = ImageAsset(name: "e2e_warning") internal static let encryptionNormal = ImageAsset(name: "encryption_normal") internal static let encryptionTrusted = ImageAsset(name: "encryption_trusted") internal static let encryptionWarning = ImageAsset(name: "encryption_warning") - internal static let directChatOff = ImageAsset(name: "directChatOff") - internal static let directChatOn = ImageAsset(name: "directChatOn") - internal static let favourite = ImageAsset(name: "favourite") - internal static let favouriteOff = ImageAsset(name: "favouriteOff") - internal static let leave = ImageAsset(name: "leave") - internal static let notifications = ImageAsset(name: "notifications") - internal static let notificationsOff = ImageAsset(name: "notificationsOff") - internal static let priorityHigh = ImageAsset(name: "priorityHigh") - internal static let priorityLow = ImageAsset(name: "priorityLow") - internal static let createRoom = ImageAsset(name: "create_room") + internal static let roomActionDirectChat = ImageAsset(name: "room_action_direct_chat") + internal static let roomActionFavourite = ImageAsset(name: "room_action_favourite") + internal static let roomActionLeave = ImageAsset(name: "room_action_leave") + internal static let roomActionNotification = ImageAsset(name: "room_action_notification") + internal static let roomActionPriorityHigh = ImageAsset(name: "room_action_priority_high") + internal static let roomActionPriorityLow = ImageAsset(name: "room_action_priority_low") + internal static let plusFloatingAction = ImageAsset(name: "plus_floating_action") internal static let closeBanner = ImageAsset(name: "close_banner") internal static let importFilesButton = ImageAsset(name: "import_files_button") internal static let keyBackupLogo = ImageAsset(name: "key_backup_logo") - internal static let revealPasswordButton = ImageAsset(name: "reveal_password_button") internal static let keyVerificationSuccessShield = ImageAsset(name: "key_verification_success_shield") - internal static let launchScreenRiot = ImageAsset(name: "LaunchScreenRiot") + internal static let oldLogo = ImageAsset(name: "old_logo") internal static let cameraCapture = ImageAsset(name: "camera_capture") internal static let cameraPlay = ImageAsset(name: "camera_play") internal static let cameraStop = ImageAsset(name: "camera_stop") internal static let cameraVideoCapture = ImageAsset(name: "camera_video_capture") internal static let videoIcon = ImageAsset(name: "video_icon") - internal static let createDirectChat = ImageAsset(name: "create_direct_chat") internal static let error = ImageAsset(name: "error") - internal static let newmessages = ImageAsset(name: "newmessages") internal static let scrolldown = ImageAsset(name: "scrolldown") - internal static let scrollup = ImageAsset(name: "scrollup") internal static let typing = ImageAsset(name: "typing") internal static let roomContextMenuCopy = ImageAsset(name: "room_context_menu_copy") 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 uploadIcon = ImageAsset(name: "upload_icon") + internal static let voiceCallHangonIcon = ImageAsset(name: "voice_call_hangon_icon") + internal static let voiceCallHangupIcon = ImageAsset(name: "voice_call_hangup_icon") internal static let voiceCallIcon = ImageAsset(name: "voice_call_icon") internal static let addParticipant = ImageAsset(name: "add_participant") - internal static let appsIcon = ImageAsset(name: "apps-icon") internal static let detailsIcon = ImageAsset(name: "details_icon") internal static let editIcon = ImageAsset(name: "edit_icon") - internal static let jumpToUnread = ImageAsset(name: "jump_to_unread") + internal static let integrationsIcon = ImageAsset(name: "integrations_icon") internal static let mainAliasIcon = ImageAsset(name: "main_alias_icon") internal static let membersListIcon = ImageAsset(name: "members_list_icon") internal static let modIcon = ImageAsset(name: "mod_icon") internal static let moreReactions = ImageAsset(name: "more_reactions") + internal static let scrollup = ImageAsset(name: "scrollup") internal static let fileDocIcon = ImageAsset(name: "file_doc_icon") internal static let fileMusicIcon = ImageAsset(name: "file_music_icon") internal static let filePhotoIcon = ImageAsset(name: "file_photo_icon") @@ -111,24 +103,16 @@ internal enum Asset { internal static let removeIconPink = ImageAsset(name: "remove_icon_pink") internal static let settingsIcon = ImageAsset(name: "settings_icon") internal static let tabFavourites = ImageAsset(name: "tab_favourites") - internal static let tabFavouritesSelected = ImageAsset(name: "tab_favourites_selected") internal static let tabGroups = ImageAsset(name: "tab_groups") - internal static let tabGroupsSelected = ImageAsset(name: "tab_groups_selected") internal static let tabHome = ImageAsset(name: "tab_home") - internal static let tabHomeSelected = ImageAsset(name: "tab_home_selected") internal static let tabPeople = ImageAsset(name: "tab_people") - internal static let tabPeopleSelected = ImageAsset(name: "tab_people_selected") internal static let tabRooms = ImageAsset(name: "tab_rooms") - internal static let tabRoomsSelected = ImageAsset(name: "tab_rooms_selected") + internal static let launchScreenLogo = ImageAsset(name: "launch_screen_logo") } internal enum SharedImages { - internal static let animatedLogo0 = ImageAsset(name: "animatedLogo-0") - internal static let animatedLogo1 = ImageAsset(name: "animatedLogo-1") - internal static let animatedLogo2 = ImageAsset(name: "animatedLogo-2") - internal static let animatedLogo3 = ImageAsset(name: "animatedLogo-3") - internal static let animatedLogo4 = ImageAsset(name: "animatedLogo-4") internal static let cancel = ImageAsset(name: "cancel") internal static let e2eVerified = ImageAsset(name: "e2e_verified") + internal static let horizontalLogo = ImageAsset(name: "horizontal_logo") } } // swiftlint:enable identifier_name line_length nesting type_body_length type_name diff --git a/Riot/Generated/RiotDefaults.swift b/Riot/Generated/RiotDefaults.swift index 3cb6f869a..f9f6d79db 100644 --- a/Riot/Generated/RiotDefaults.swift +++ b/Riot/Generated/RiotDefaults.swift @@ -15,6 +15,7 @@ internal enum RiotDefaults { internal static let bugReportApp: String = _document["bugReportApp"] internal static let bugReportEndpointUrl: String = _document["bugReportEndpointUrl"] internal static let createConferenceCallsWithJitsi: Bool = _document["createConferenceCallsWithJitsi"] + internal static let enableBotCreation: Bool = _document["enableBotCreation"] internal static let enableRageShake: Bool = _document["enableRageShake"] internal static let homeserver: String = _document["homeserver"] internal static let homeserverurl: String = _document["homeserverurl"] @@ -37,6 +38,9 @@ internal enum RiotDefaults { internal static let pusherAppIdDev: String = _document["pusherAppIdDev"] internal static let pusherAppIdProd: String = _document["pusherAppIdProd"] internal static let roomDirectoryServers: [String: Any] = _document["roomDirectoryServers"] + internal static let settingsCopyrightUrl: String = _document["settingsCopyrightUrl"] + internal static let settingsPrivacyPolicyUrl: String = _document["settingsPrivacyPolicyUrl"] + internal static let settingsTermsConditionsUrl: String = _document["settingsTermsConditionsUrl"] internal static let showAllEventsInRoomHistory: Bool = _document["showAllEventsInRoomHistory"] internal static let showLeftMembersInRoomMemberList: Bool = _document["showLeftMembersInRoomMemberList"] internal static let showRedactionsInRoomHistory: Bool = _document["showRedactionsInRoomHistory"] @@ -45,8 +49,8 @@ internal enum RiotDefaults { internal static let stunServerFallback: String = _document["stunServerFallback"] internal static let syncLocalContacts: Bool = _document["syncLocalContacts"] internal static let webAppUrl: String = _document["webAppUrl"] - internal static let webAppUrlBeta: String = _document["webAppUrlBeta"] internal static let webAppUrlDev: String = _document["webAppUrlDev"] + internal static let webAppUrlStaging: String = _document["webAppUrlStaging"] } // swiftlint:enable identifier_name line_length type_body_length diff --git a/Riot/Generated/Storyboards.swift b/Riot/Generated/Storyboards.swift index 9d11ef21f..69927836b 100644 --- a/Riot/Generated/Storyboards.swift +++ b/Riot/Generated/Storyboards.swift @@ -112,6 +112,11 @@ internal enum StoryboardScene { internal static let initialScene = InitialSceneType(storyboard: KeyVerificationVerifyByScanningViewController.self) } + internal enum MajorUpdateViewController: StoryboardType { + internal static let storyboardName = "MajorUpdateViewController" + + internal static let initialScene = InitialSceneType(storyboard: MajorUpdateViewController.self) + } internal enum QRCodeReaderViewController: StoryboardType { internal static let storyboardName = "QRCodeReaderViewController" diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index a01e9efcf..b3d35b061 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -418,19 +418,19 @@ internal enum VectorL10n { internal static var cancel: String { return VectorL10n.tr("Vector", "cancel") } - /// Riot X for Android + /// Element Android internal static var clientAndroidName: String { return VectorL10n.tr("Vector", "client_android_name") } - /// Riot Desktop + /// Element Desktop internal static var clientDesktopName: String { return VectorL10n.tr("Vector", "client_desktop_name") } - /// Riot iOS + /// Element iOS internal static var clientIosName: String { return VectorL10n.tr("Vector", "client_ios_name") } - /// Riot Web + /// Element Web internal static var clientWebName: String { return VectorL10n.tr("Vector", "client_web_name") } @@ -454,7 +454,7 @@ internal enum VectorL10n { internal static var contactsAddressBookNoIdentityServer: String { return VectorL10n.tr("Vector", "contacts_address_book_no_identity_server") } - /// You didn't allow Riot to access your local contacts + /// You didn't allow Element to access your local contacts internal static var contactsAddressBookPermissionDenied: String { return VectorL10n.tr("Vector", "contacts_address_book_permission_denied") } @@ -858,7 +858,7 @@ internal enum VectorL10n { internal static var deviceVerificationSelfVerifyWaitAdditionalInformation: String { return VectorL10n.tr("Vector", "device_verification_self_verify_wait_additional_information") } - /// Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest Riot on your other devices: + /// Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest Element on your other devices: internal static var deviceVerificationSelfVerifyWaitInformation: String { return VectorL10n.tr("Vector", "device_verification_self_verify_wait_information") } @@ -970,7 +970,7 @@ internal enum VectorL10n { internal static var doNotAskAgain: String { return VectorL10n.tr("Vector", "do_not_ask_again") } - /// Riot now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings. + /// Element now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings. internal static var e2eEnablingOnAppUpdate: String { return VectorL10n.tr("Vector", "e2e_enabling_on_app_update") } @@ -1782,6 +1782,22 @@ internal enum VectorL10n { internal static var leave: String { return VectorL10n.tr("Vector", "leave") } + /// Got it + internal static var majorUpdateDoneAction: String { + return VectorL10n.tr("Vector", "major_update_done_action") + } + /// We're excited to announce we've changed name! Your app is up to date and you're signed in to your account. + internal static var majorUpdateInformation: String { + return VectorL10n.tr("Vector", "major_update_information") + } + /// Learn more + internal static var majorUpdateLearnMoreAction: String { + return VectorL10n.tr("Vector", "major_update_learn_more_action") + } + /// Riot is now Element + internal static var majorUpdateTitle: String { + return VectorL10n.tr("Vector", "major_update_title") + } /// SESSION INFO internal static var manageSessionInfo: String { return VectorL10n.tr("Vector", "manage_session_info") @@ -1918,7 +1934,7 @@ internal enum VectorL10n { internal static var rename: String { return VectorL10n.tr("Vector", "rename") } - /// Please launch Riot on another device that can decrypt the message so it can send the keys to this session. + /// Please launch Element on another device that can decrypt the message so it can send the keys to this session. internal static var rerequestKeysAlertMessage: String { return VectorL10n.tr("Vector", "rerequest_keys_alert_message") } @@ -3142,7 +3158,7 @@ internal enum VectorL10n { internal static var securitySettingsBlacklistUnverifiedDevicesDescription: String { return VectorL10n.tr("Vector", "security_settings_blacklist_unverified_devices_description") } - /// Sorry. This action is not available on Riot-iOS yet. Please use another Matrix client to set it up. Riot-iOS will use it. + /// Sorry. This action is not available on Element iOS yet. Please use another Matrix client to set it up. Element iOS will use it. internal static var securitySettingsComingSoon: String { return VectorL10n.tr("Vector", "security_settings_coming_soon") } @@ -3310,7 +3326,7 @@ internal enum VectorL10n { internal static var settingsAdvanced: String { return VectorL10n.tr("Vector", "settings_advanced") } - /// Receive incoming calls on your lock screen. See your Riot calls in the system's call history. If iCloud is enabled, this call history will be shared with Apple. + /// Receive incoming calls on your lock screen. See your Element calls in the system's call history. If iCloud is enabled, this call history will be shared with Apple. internal static var settingsCallkitInfo: String { return VectorL10n.tr("Vector", "settings_callkit_info") } @@ -3370,10 +3386,6 @@ internal enum VectorL10n { internal static var settingsCopyright: String { return VectorL10n.tr("Vector", "settings_copyright") } - /// https://riot.im/copyright - internal static var settingsCopyrightUrl: String { - return VectorL10n.tr("Vector", "settings_copyright_url") - } /// Encrypt to verified sessions only internal static var settingsCryptoBlacklistUnverifiedDevices: String { return VectorL10n.tr("Vector", "settings_crypto_blacklist_unverified_devices") @@ -3722,10 +3734,6 @@ internal enum VectorL10n { internal static var settingsPrivacyPolicy: String { return VectorL10n.tr("Vector", "settings_privacy_policy") } - /// https://riot.im/privacy - internal static var settingsPrivacyPolicyUrl: String { - return VectorL10n.tr("Vector", "settings_privacy_policy_url") - } /// Profile Picture internal static var settingsProfilePicture: String { return VectorL10n.tr("Vector", "settings_profile_picture") @@ -3778,10 +3786,6 @@ internal enum VectorL10n { internal static var settingsTermConditions: String { return VectorL10n.tr("Vector", "settings_term_conditions") } - /// https://riot.im/tac_apple - internal static var settingsTermConditionsUrl: String { - return VectorL10n.tr("Vector", "settings_term_conditions_url") - } /// Third-party Notices internal static var settingsThirdPartyNotices: String { return VectorL10n.tr("Vector", "settings_third_party_notices") @@ -3914,7 +3918,7 @@ internal enum VectorL10n { internal static var start: String { return VectorL10n.tr("Vector", "start") } - /// Communicate, your way.\n\nA chat app, under your control and entirely flexible. Riot lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.\n\nGet a free matrix.org account, get your own server at https://modular.im, or use another Matrix server.\n\nWhy choose Riot.im?\n\nCOMPLETE COMMUNICATION: Build rooms around your teams, your friends, your community - however you like! Chat, share files, add widgets and make voice and video calls - all free of charge.\n\nPOWERFUL INTEGRATIONS: Use Riot.im with the tools you know and love. With Riot.im you can even chat with users and groups on other chat apps.\n\nPRIVATE AND SECURE: Keep your conversations secret. State of the art end-to-end encryption ensures that private communication stays private.\n\nOPEN, NOT CLOSED: Open source, and built on Matrix. Own your own data by hosting your own server, or selecting one you trust.\n\nEVERYWHERE YOU ARE: Stay in touch wherever you are with fully synchronised message history across all your devices and online at https://riot.im. + /// Communicate, your way.\n\nA chat app, under your control and entirely flexible. Riot lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.\n\nGet a free matrix.org account, get your own server at https://modular.im, or use another Matrix server.\n\nWhy choose Riot.im?\n\nCOMPLETE COMMUNICATION: Build rooms around your teams, your friends, your community - however you like! Chat, share files, add widgets and make voice and video calls - all free of charge.\n\nPOWERFUL INTEGRATIONS: Use Riot.im with the tools you know and love. With Riot.im you can even chat with users and groups on other chat apps.\n\nPRIVATE AND SECURE: Keep your conversations secret. State of the art end-to-end encryption ensures that private communication stays private.\n\nOPEN, NOT CLOSED: Open source, and built on Matrix. Own your own data by hosting your own server, or selecting one you trust.\n\nEVERYWHERE YOU ARE: Stay in touch wherever you are with fully synchronised message history across all your devices and online at https://element.io. internal static var storeFullDescription: String { return VectorL10n.tr("Vector", "store_full_description") } diff --git a/Riot/Managers/AppVersion/AppVersion.swift b/Riot/Managers/AppVersion/AppVersion.swift new file mode 100644 index 000000000..733c41b55 --- /dev/null +++ b/Riot/Managers/AppVersion/AppVersion.swift @@ -0,0 +1,103 @@ +/* + Copyright 2019 New Vector Ltd + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +import Foundation + +/// A structure used to handle the application version +@objcMembers +final class AppVersion: NSObject { + + // MARK: - Constants + + private enum Constants { + static let lastBundleShortVersion: String = "lastBundleShortVersion" + static let lastBundleVersion: String = "lastBundleVersion" + static let shortVersionComponentsSeparator: Character = "." + } + + // Current app version from Info.plist + static var current: AppVersion? { + guard let bundleShortVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String, + let bundleVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String else { + return nil + } + return AppVersion(bundleShortVersion: bundleShortVersion, bundleVersion: bundleVersion) + } + + // Last app version used by user + static var lastUsed: AppVersion? { + guard let bundleShortVersion = UserDefaults.standard.string(forKey: Constants.lastBundleShortVersion), + let bundleVersion = UserDefaults.standard.string(forKey: Constants.lastBundleVersion) else { + return nil + } + return AppVersion(bundleShortVersion: bundleShortVersion, bundleVersion: bundleVersion) + } + + // MARK: - Properties + + let bundleShortVersion: String + let bundleVersion: String + + // MARK: - Setup + + init(bundleShortVersion: String, bundleVersion: String) { + self.bundleShortVersion = bundleShortVersion + self.bundleVersion = bundleVersion + super.init() + } + + // MARK: - Public + + func compare(_ appVersion: AppVersion) -> ComparisonResult { + + let appVersionComparisonResult: ComparisonResult + + let bundleShortVersionComparisonResult = AppVersion.compare(stringVersion: self.bundleShortVersion, with: appVersion.bundleShortVersion) + + // If short versions are equal compare build version + if bundleShortVersionComparisonResult == ComparisonResult.orderedSame { + appVersionComparisonResult = AppVersion.compare(stringVersion: self.bundleVersion, with: appVersion.bundleVersion) + } else { + appVersionComparisonResult = bundleShortVersionComparisonResult + } + + return appVersionComparisonResult + } + + /// Return true if the last stored version is lower than the provided one. + /// Retrun true by default when there is no stored version. + static func isLastUsedVersionLowerThan(_ appVersion: AppVersion) -> Bool { + guard let lastAppVersion = AppVersion.lastUsed else { + return true + } + return lastAppVersion.compare(appVersion) == .orderedAscending + } + + /// Store the current application version. + static func updateLastUsedVersion() { + guard let currentVersion = AppVersion.current else { + return + } + UserDefaults.standard.set(currentVersion.bundleShortVersion, forKey: Constants.lastBundleShortVersion) + UserDefaults.standard.set(currentVersion.bundleVersion, forKey: Constants.lastBundleVersion) + } + + // MARK: - Private + + private static func compare(stringVersion: String, with otherStringVersion: String) -> ComparisonResult { + return stringVersion.compare(otherStringVersion, options: NSString.CompareOptions.numeric, range: nil, locale: nil) + } +} diff --git a/Riot/Managers/Theme/Theme.swift b/Riot/Managers/Theme/Theme.swift index 0054dad68..3216c6eb9 100644 --- a/Riot/Managers/Theme/Theme.swift +++ b/Riot/Managers/Theme/Theme.swift @@ -25,6 +25,7 @@ import UIKit var backgroundColor: UIColor { get } var baseColor: UIColor { get } + var baseIconPrimaryColor: UIColor { get } var baseTextPrimaryColor: UIColor { get } var baseTextSecondaryColor: UIColor { get } @@ -41,6 +42,8 @@ import UIKit var tintColor: UIColor { get } var tintBackgroundColor: UIColor { get } + + var tabBarUnselectedItemTintColor: UIColor { get } var unreadRoomIndentColor: UIColor { get } @@ -55,6 +58,10 @@ import UIKit var avatarColors: [UIColor] { get } var userNameColors: [UIColor] { get } + + var placeholderTextColor: UIColor { get } + + var selectedBackgroundColor: UIColor { get } // MARK: - Appearance and style @@ -69,13 +76,6 @@ import UIKit // MARK: - Colors not defined in the design palette - - /// nil is used to keep the default color - var placeholderTextColor: UIColor { get } - - /// nil is used to keep the default color - var selectedBackgroundColor: UIColor? { get } - /// fading behind dialog modals var overlayBackgroundColor: UIColor { get } diff --git a/Riot/Managers/Theme/ThemeService.h b/Riot/Managers/Theme/ThemeService.h index 4097896f5..b10e6cb7f 100644 --- a/Riot/Managers/Theme/ThemeService.h +++ b/Riot/Managers/Theme/ThemeService.h @@ -61,10 +61,7 @@ extern NSString *const kThemeServiceDidChangeThemeNotification; #pragma mark - Riot Colors not yet themeable -@property (nonatomic, readonly) UIColor *riotColorBlue; @property (nonatomic, readonly) UIColor *riotColorCuriousBlue; -@property (nonatomic, readonly) UIColor *riotColorIndigo; -@property (nonatomic, readonly) UIColor *riotColorOrange; @end diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m index f31619c1f..68ec98c4b 100644 --- a/Riot/Managers/Theme/ThemeService.m +++ b/Riot/Managers/Theme/ThemeService.m @@ -63,8 +63,8 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan - (id)themeWithThemeId:(NSString*)themeId { id theme; - - if ([themeId isEqualToString:@"auto"]) + + if (themeId == nil || [themeId isEqualToString:@"auto"]) { if (@available(iOS 13, *)) { @@ -103,10 +103,7 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan if (self) { // Riot Colors not yet themeable - _riotColorBlue = [[UIColor alloc] initWithRgb:0x81BDDB]; - _riotColorCuriousBlue = [[UIColor alloc] initWithRgb:0x2A9EDB]; - _riotColorIndigo = [[UIColor alloc] initWithRgb:0xBD79CC]; - _riotColorOrange = [[UIColor alloc] initWithRgb:0xF8A15F]; + _riotColorCuriousBlue = [[UIColor alloc] initWithRgb:0x2A9EDB]; if (@available(iOS 13, *)) { diff --git a/Riot/Managers/Theme/Themes/BlackTheme.swift b/Riot/Managers/Theme/Themes/BlackTheme.swift index 5e507fc63..a8263c5dc 100644 --- a/Riot/Managers/Theme/Themes/BlackTheme.swift +++ b/Riot/Managers/Theme/Themes/BlackTheme.swift @@ -22,8 +22,8 @@ class BlackTheme: DarkTheme { super.init() self.identifier = "black" self.backgroundColor = UIColor(rgb: 0x000000) - self.baseColor = UIColor(rgb: 0x060708) - self.headerBackgroundColor = UIColor(rgb: 0x090A0C) - self.headerBorderColor = UIColor(rgb: 0x0D0F12) + self.baseColor = UIColor(rgb: 0x000000) + self.headerBackgroundColor = UIColor(rgb: 0x000000) + self.headerBorderColor = UIColor(rgb: 0x15191E) } } diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 55fe6ee91..be331bed1 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -23,27 +23,29 @@ class DarkTheme: NSObject, Theme { var identifier: String = "dark" - var backgroundColor: UIColor = UIColor(rgb: 0x181B21) + var backgroundColor: UIColor = UIColor(rgb: 0x15191E) - var baseColor: UIColor = UIColor(rgb: 0x15171B) - var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xEDF3FF) - var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xEDF3FF) + var baseColor: UIColor = UIColor(rgb: 0x21262C) + var baseIconPrimaryColor: UIColor = UIColor(rgb: 0xEDF3FF) + var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF) + var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xA9B2BC) - var searchBackgroundColor: UIColor = UIColor(rgb: 0x181B21) - var searchPlaceholderColor: UIColor = UIColor(rgb: 0x61708B) + var searchBackgroundColor: UIColor = UIColor(rgb: 0x15191E) + var searchPlaceholderColor: UIColor = UIColor(rgb: 0xA9B2BC) - var headerBackgroundColor: UIColor = UIColor(rgb: 0x22262E) - var headerBorderColor: UIColor = UIColor(rgb: 0x181B21) - var headerTextPrimaryColor: UIColor = UIColor(rgb: 0xA1B2D1) - var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD) + var headerBackgroundColor: UIColor = UIColor(rgb: 0x21262C) + var headerBorderColor: UIColor = UIColor(rgb: 0x15191E) + var headerTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF) + var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xA9B2BC) - var textPrimaryColor: UIColor = UIColor(rgb: 0xEDF3FF) - var textSecondaryColor: UIColor = UIColor(rgb: 0xA1B2D1) + var textPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF) + var textSecondaryColor: UIColor = UIColor(rgb: 0xA9B2BC) - var tintColor: UIColor = UIColor(rgb: 0x03B381) + var tintColor: UIColor = UIColor(displayP3Red: 0.05098039216, green: 0.7450980392, blue: 0.5450980392, alpha: 1.0) var tintBackgroundColor: UIColor = UIColor(rgb: 0x1F6954) + var tabBarUnselectedItemTintColor: UIColor = UIColor(rgb: 0x8E99A4) var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648) - var lineBreakColor: UIColor = UIColor(rgb: 0x61708B) + var lineBreakColor: UIColor = UIColor(rgb: 0x363D49) var noticeColor: UIColor = UIColor(rgb: 0xFF4B55) var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B) @@ -70,41 +72,45 @@ class DarkTheme: NSObject, Theme { var scrollBarStyle: UIScrollView.IndicatorStyle = .white var keyboardAppearance: UIKeyboardAppearance = .dark - var placeholderTextColor: UIColor = UIColor(white: 1.0, alpha: 0.3) - var selectedBackgroundColor: UIColor? = UIColor.black + var placeholderTextColor: UIColor = UIColor(rgb: 0xA1B2D1) // Use secondary text color + var selectedBackgroundColor: UIColor = UIColor(rgb: 0x040506) var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5) var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0x7E7E7E) func applyStyle(onTabBar tabBar: UITabBar) { + tabBar.unselectedItemTintColor = self.tabBarUnselectedItemTintColor tabBar.tintColor = self.tintColor - tabBar.barTintColor = self.headerBackgroundColor + tabBar.barTintColor = self.baseColor tabBar.isTranslucent = false } - + + // Note: We are not using UINavigationBarAppearance on iOS 13+ atm because of UINavigationBar directly include UISearchBar on their titleView that cause crop issues with UINavigationController pop. func applyStyle(onNavigationBar navigationBar: UINavigationBar) { - navigationBar.tintColor = self.baseTextPrimaryColor + navigationBar.tintColor = self.tintColor navigationBar.titleTextAttributes = [ - NSAttributedString.Key.foregroundColor: self.baseTextPrimaryColor + NSAttributedString.Key.foregroundColor: self.textPrimaryColor ] navigationBar.barTintColor = self.baseColor + navigationBar.shadowImage = UIImage() // Remove bottom shadow // The navigation bar needs to be opaque so that its background color is the expected one navigationBar.isTranslucent = false } - + func applyStyle(onSearchBar searchBar: UISearchBar) { - searchBar.barStyle = .default + searchBar.searchBarStyle = .default + searchBar.barStyle = .black searchBar.barTintColor = self.baseColor + searchBar.isTranslucent = false + searchBar.backgroundImage = UIImage() // Remove top and bottom shadow + searchBar.tintColor = self.tintColor if #available(iOS 13.0, *) { searchBar.searchTextField.backgroundColor = self.searchBackgroundColor searchBar.searchTextField.textColor = self.searchPlaceholderColor - searchBar.tintColor = self.tintColor } else { - searchBar.tintColor = self.searchPlaceholderColor - if let searchBarTextField = searchBar.vc_searchTextField { - searchBarTextField.textColor = searchBar.tintColor + searchBarTextField.textColor = self.searchPlaceholderColor } } } diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift index 5aec50aa1..357870f8f 100644 --- a/Riot/Managers/Theme/Themes/DefaultTheme.swift +++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift @@ -25,25 +25,27 @@ class DefaultTheme: NSObject, Theme { var backgroundColor: UIColor = UIColor(rgb: 0xFFFFFF) - var baseColor: UIColor = UIColor(rgb: 0x27303A) + var baseColor: UIColor = UIColor(rgb: 0xF5F7FA) + var baseIconPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF) var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xFFFFFF) - var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xFFFFFF) + var baseTextSecondaryColor: UIColor = UIColor(rgb: 0x8F97A3) var searchBackgroundColor: UIColor = UIColor(rgb: 0xFFFFFF) - var searchPlaceholderColor: UIColor = UIColor(rgb: 0x61708B) + var searchPlaceholderColor: UIColor = UIColor(rgb: 0x8F97A3) - var headerBackgroundColor: UIColor = UIColor(rgb: 0xF3F8FD) + var headerBackgroundColor: UIColor = UIColor(rgb: 0xF5F7FA) var headerBorderColor: UIColor = UIColor(rgb: 0xE9EDF1) - var headerTextPrimaryColor: UIColor = UIColor(rgb: 0x61708B) - var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD) + var headerTextPrimaryColor: UIColor = UIColor(rgb: 0x171910) + var headerTextSecondaryColor: UIColor = UIColor(rgb: 0x8F97A3) - var textPrimaryColor: UIColor = UIColor(rgb: 0x2E2F32) - var textSecondaryColor: UIColor = UIColor(rgb: 0x9E9E9E) + var textPrimaryColor: UIColor = UIColor(rgb: 0x171910) + var textSecondaryColor: UIColor = UIColor(rgb: 0x8F97A3) - var tintColor: UIColor = UIColor(rgb: 0x03B381) + var tintColor: UIColor = UIColor(displayP3Red: 0.05098039216, green: 0.7450980392, blue: 0.5450980392, alpha: 1.0) var tintBackgroundColor: UIColor = UIColor(rgb: 0xe9fff9) + var tabBarUnselectedItemTintColor: UIColor = UIColor(rgb: 0xC1C6CD) var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648) - var lineBreakColor: UIColor = UIColor(rgb: 0xEEEFEF) + var lineBreakColor: UIColor = UIColor(rgb: 0xDDE4EE) var noticeColor: UIColor = UIColor(rgb: 0xFF4B55) var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B) @@ -65,52 +67,57 @@ class DefaultTheme: NSObject, Theme { UIColor(rgb: 0x5C56F5), UIColor(rgb: 0x74D12C) ] - - var statusBarStyle: UIStatusBarStyle = .lightContent + + var statusBarStyle: UIStatusBarStyle { + if #available(iOS 13.0, *) { + return .darkContent + } else { + return .default + } + } var scrollBarStyle: UIScrollView.IndicatorStyle = .default var keyboardAppearance: UIKeyboardAppearance = .light - var placeholderTextColor: UIColor = UIColor(white: 0.7, alpha: 1.0) // Use default 70% gray color - var selectedBackgroundColor: UIColor? { - // Use a color close to the iOS default selection gray on iOS 13+ - if #available(iOS 13, *) { - return UIColor(rgb: 0xD1D1D6) - } - return nil - } + var placeholderTextColor: UIColor = UIColor(rgb: 0x8F97A3) // Use secondary text color + + var selectedBackgroundColor: UIColor = UIColor(rgb: 0xF5F7FA) + var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5) var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0xE7E7E7) func applyStyle(onTabBar tabBar: UITabBar) { + tabBar.unselectedItemTintColor = self.tabBarUnselectedItemTintColor tabBar.tintColor = self.tintColor - tabBar.barTintColor = self.headerBackgroundColor + tabBar.barTintColor = self.baseColor tabBar.isTranslucent = false } - + + // Note: We are not using UINavigationBarAppearance on iOS 13+ atm because of UINavigationBar directly include UISearchBar on their titleView that cause crop issues with UINavigationController pop. func applyStyle(onNavigationBar navigationBar: UINavigationBar) { - navigationBar.tintColor = self.baseTextPrimaryColor + navigationBar.tintColor = self.tintColor navigationBar.titleTextAttributes = [ - NSAttributedString.Key.foregroundColor: self.baseTextPrimaryColor + NSAttributedString.Key.foregroundColor: self.textPrimaryColor ] navigationBar.barTintColor = self.baseColor + navigationBar.shadowImage = UIImage() // Remove bottom shadow // The navigation bar needs to be opaque so that its background color is the expected one navigationBar.isTranslucent = false } - + func applyStyle(onSearchBar searchBar: UISearchBar) { - searchBar.barStyle = .default + searchBar.searchBarStyle = .default searchBar.barTintColor = self.baseColor + searchBar.isTranslucent = false + searchBar.backgroundImage = UIImage() // Remove top and bottom shadow + searchBar.tintColor = self.tintColor if #available(iOS 13.0, *) { searchBar.searchTextField.backgroundColor = self.searchBackgroundColor searchBar.searchTextField.textColor = self.searchPlaceholderColor - searchBar.tintColor = self.tintColor } else { - searchBar.tintColor = self.searchPlaceholderColor - if let searchBarTextField = searchBar.vc_searchTextField { - searchBarTextField.textColor = searchBar.tintColor + searchBarTextField.textColor = self.searchPlaceholderColor } } } diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m index 05b0c7a27..84f014f78 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.m +++ b/Riot/Modules/Authentication/AuthenticationViewController.m @@ -96,7 +96,7 @@ self.defaultIdentityServerUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"identityserverurl"]; - self.welcomeImageView.image = [UIImage imageNamed:@"logo"]; + self.welcomeImageView.image = [UIImage imageNamed:@"horizontal_logo"]; [self.submitButton.layer setCornerRadius:5]; self.submitButton.clipsToBounds = YES; @@ -172,6 +172,8 @@ self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; self.authenticationScrollView.backgroundColor = ThemeService.shared.theme.backgroundColor; + + self.welcomeImageView.tintColor = ThemeService.shared.theme.tintColor; // Style the authentication fallback webview screen so that its header matches to navigation bar style self.authFallbackContentView.backgroundColor = ThemeService.shared.theme.baseColor; @@ -223,6 +225,8 @@ self.softLogoutClearDataLabel.textColor = ThemeService.shared.theme.textPrimaryColor; self.softLogoutClearDataButton.backgroundColor = ThemeService.shared.theme.warningColor; + + self.customServersTickButton.tintColor = ThemeService.shared.theme.tintColor; [self.authInputsView customizeViewRendering]; @@ -1108,8 +1112,10 @@ MXKAccount *account = [[MXKAccountManager sharedManager] accountForUserId:userId]; MXSession *session = account.mxSession; + BOOL botCreationEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableBotCreation"]; + // Create DM with Riot-bot on new account creation. - if (self.authType == MXKAuthenticationTypeRegister) + if (self.authType == MXKAuthenticationTypeRegister && botCreationEnabled) { MXRoomCreationParameters *roomCreationParameters = [MXRoomCreationParameters parametersForDirectRoomWithUser:@"@riot-bot:matrix.org"]; [session createRoomWithParameters:roomCreationParameters success:nil failure:^(NSError *error) { diff --git a/Riot/Modules/Authentication/AuthenticationViewController.xib b/Riot/Modules/Authentication/AuthenticationViewController.xib index b97dc1c03..44d5623af 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.xib +++ b/Riot/Modules/Authentication/AuthenticationViewController.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -91,12 +89,11 @@ - - + + - - + @@ -430,7 +427,7 @@ Clear it if you're finished using this device, or want to sign in to another acc - + @@ -510,7 +507,7 @@ Clear it if you're finished using this device, or want to sign in to another acc - + diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m index cd46b57c0..879fa5111 100644 --- a/Riot/Modules/BugReport/BugReportViewController.m +++ b/Riot/Modules/BugReport/BugReportViewController.m @@ -163,6 +163,9 @@ self.cancelButton.tintColor = ThemeService.shared.theme.tintColor; _bugReportDescriptionTextView.layer.borderColor = ThemeService.shared.theme.headerBackgroundColor.CGColor; + + self.sendLogsButtonImage.tintColor = ThemeService.shared.theme.tintColor; + self.sendScreenshotButtonImage.tintColor = ThemeService.shared.theme.tintColor; [self setNeedsStatusBarAppearanceUpdate]; } diff --git a/Riot/Modules/Call/CallViewController.h b/Riot/Modules/Call/CallViewController.h index 23fe8b82e..97033feb6 100644 --- a/Riot/Modules/Call/CallViewController.h +++ b/Riot/Modules/Call/CallViewController.h @@ -24,6 +24,8 @@ @property (weak, nonatomic) IBOutlet UIView *gradientMaskContainerView; @property (weak, nonatomic) IBOutlet UIButton *chatButton; +@property (weak, nonatomic) IBOutlet UIView *callControlsBackgroundView; + @property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *callerImageViewWidthConstraint; // At the end of call, this flag indicates if the prompt to use the fallback should be displayed diff --git a/Riot/Modules/Call/CallViewController.m b/Riot/Modules/Call/CallViewController.m index c2a1c48ff..6f0811af4 100644 --- a/Riot/Modules/Call/CallViewController.m +++ b/Riot/Modules/Call/CallViewController.m @@ -64,27 +64,61 @@ { [super viewDidLoad]; - [self.backToAppButton setImage:[UIImage imageNamed:@"back_icon"] forState:UIControlStateNormal]; - [self.backToAppButton setImage:[UIImage imageNamed:@"back_icon"] forState:UIControlStateHighlighted]; + UIColor *unselectedColor = ThemeService.shared.theme.tabBarUnselectedItemTintColor; + UIColor *selectedColor = ThemeService.shared.theme.tintColor; - [self.cameraSwitchButton setImage:[UIImage imageNamed:@"camera_switch"] forState:UIControlStateNormal]; - [self.cameraSwitchButton setImage:[UIImage imageNamed:@"camera_switch"] forState:UIControlStateHighlighted]; + // Back button - [self.audioMuteButton setImage:[UIImage imageNamed:@"call_audio_mute_off_icon"] forState:UIControlStateNormal]; - [self.audioMuteButton setImage:[UIImage imageNamed:@"call_audio_mute_off_icon"] forState:UIControlStateHighlighted]; - [self.audioMuteButton setImage:[UIImage imageNamed:@"call_audio_mute_on_icon"] forState:UIControlStateSelected]; - [self.videoMuteButton setImage:[UIImage imageNamed:@"call_video_mute_off_icon"] forState:UIControlStateNormal]; - [self.videoMuteButton setImage:[UIImage imageNamed:@"call_video_mute_off_icon"] forState:UIControlStateHighlighted]; - [self.videoMuteButton setImage:[UIImage imageNamed:@"call_video_mute_on_icon"] forState:UIControlStateSelected]; - [self.speakerButton setImage:[UIImage imageNamed:@"call_speaker_off_icon"] forState:UIControlStateNormal]; - [self.speakerButton setImage:[UIImage imageNamed:@"call_speaker_on_icon"] forState:UIControlStateSelected]; - [self.chatButton setImage:[UIImage imageNamed:@"call_chat_icon"] forState:UIControlStateNormal]; - [self.chatButton setImage:[UIImage imageNamed:@"call_chat_icon"] forState:UIControlStateHighlighted]; + UIImage *backButtonImage = [[UIImage imageNamed:@"back_icon"] vc_tintedImageUsingColor:selectedColor]; + [self.backToAppButton setImage:backButtonImage forState:UIControlStateNormal]; + [self.backToAppButton setImage:backButtonImage forState:UIControlStateHighlighted]; + + // Camera switch + + UIImage *cameraSwitchButtonImage = [[UIImage imageNamed:@"camera_switch"] vc_tintedImageUsingColor:selectedColor]; + [self.cameraSwitchButton setImage:cameraSwitchButtonImage forState:UIControlStateNormal]; + [self.cameraSwitchButton setImage:cameraSwitchButtonImage forState:UIControlStateHighlighted]; + + // Audio mute + + UIImage *audioMuteOffButtonImage = [[UIImage imageNamed:@"call_audio_mute_off_icon"] vc_tintedImageUsingColor:unselectedColor]; + + UIImage *audioMuteOnButtonImage = [[UIImage imageNamed:@"call_audio_mute_on_icon"] vc_tintedImageUsingColor:unselectedColor]; + + [self.audioMuteButton setImage:audioMuteOffButtonImage forState:UIControlStateNormal]; + [self.audioMuteButton setImage:audioMuteOffButtonImage forState:UIControlStateHighlighted]; + [self.audioMuteButton setImage:audioMuteOnButtonImage forState:UIControlStateSelected]; + + // Video mute + + UIImage *videoOffButtonImage = [[UIImage imageNamed:@"call_video_mute_off_icon"] vc_tintedImageUsingColor:unselectedColor]; + UIImage *videoOnButtonImage = [[UIImage imageNamed:@"call_video_mute_on_icon"] vc_tintedImageUsingColor:unselectedColor]; + + [self.videoMuteButton setImage:videoOffButtonImage forState:UIControlStateNormal]; + [self.videoMuteButton setImage:videoOffButtonImage forState:UIControlStateHighlighted]; + [self.videoMuteButton setImage:videoOnButtonImage forState:UIControlStateSelected]; + + // Speaker + + UIImage *speakerOffButtonImage = [[UIImage imageNamed:@"call_speaker_off_icon"] vc_tintedImageUsingColor:unselectedColor]; + UIImage *speakerOnButtonImage = [[UIImage imageNamed:@"call_speaker_on_icon"] vc_tintedImageUsingColor:unselectedColor]; + [self.speakerButton setImage:speakerOffButtonImage forState:UIControlStateNormal]; + [self.speakerButton setImage:speakerOnButtonImage forState:UIControlStateSelected]; + + // Chat + + UIImage *chatButtonImage = [[UIImage imageNamed:@"call_chat_icon"] vc_tintedImageUsingColor:unselectedColor]; + [self.chatButton setImage:chatButtonImage forState:UIControlStateNormal]; + [self.chatButton setImage:chatButtonImage forState:UIControlStateHighlighted]; + + // Hang up + + UIImage *hangUpButtonImage = [[UIImage imageNamed:@"call_hangup_large"] vc_tintedImageUsingColor:ThemeService.shared.theme.noticeColor]; [self.endCallButton setTitle:nil forState:UIControlStateNormal]; [self.endCallButton setTitle:nil forState:UIControlStateHighlighted]; - [self.endCallButton setImage:[UIImage imageNamed:@"call_hangup_icon"] forState:UIControlStateNormal]; - [self.endCallButton setImage:[UIImage imageNamed:@"call_hangup_icon"] forState:UIControlStateHighlighted]; + [self.endCallButton setImage:hangUpButtonImage forState:UIControlStateNormal]; + [self.endCallButton setImage:hangUpButtonImage forState:UIControlStateHighlighted]; // Define caller image view size CGSize size = [[UIScreen mainScreen] bounds].size; @@ -143,6 +177,8 @@ // it seems only being supported on Mac OS. // so viewDidLayoutSubviews will refresh the layout bounds. [self.gradientMaskContainerView.layer addSublayer:gradientMaskLayer]; + + self.callControlsBackgroundView.backgroundColor = ThemeService.shared.theme.baseColor; } - (BOOL)prefersStatusBarHidden diff --git a/Riot/Modules/Call/CallViewController.xib b/Riot/Modules/Call/CallViewController.xib index 4bcc66978..50da8494a 100644 --- a/Riot/Modules/Call/CallViewController.xib +++ b/Riot/Modules/Call/CallViewController.xib @@ -1,9 +1,9 @@ - - + + - + @@ -15,6 +15,7 @@ + @@ -39,7 +40,7 @@ - + - + @@ -62,17 +63,17 @@ - + - + + + + + - + - + @@ -206,17 +210,17 @@ - + @@ -152,10 +150,10 @@ - - - - - + + + + + diff --git a/Riot/Modules/KeyVerification/Device/ManuallyVerify/KeyVerificationManuallyVerifyViewController.storyboard b/Riot/Modules/KeyVerification/Device/ManuallyVerify/KeyVerificationManuallyVerifyViewController.storyboard index 0c734284b..41a749c7f 100644 --- a/Riot/Modules/KeyVerification/Device/ManuallyVerify/KeyVerificationManuallyVerifyViewController.storyboard +++ b/Riot/Modules/KeyVerification/Device/ManuallyVerify/KeyVerificationManuallyVerifyViewController.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -45,7 +43,7 @@ - diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m index d348f2bb5..7d8c16d2f 100644 --- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m +++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m @@ -2526,7 +2526,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti addAddressCell.mxkLabel.text = nil; addAddressCell.accessoryType = UITableViewCellAccessoryNone; - addAddressCell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"plus_icon"]]; + addAddressCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]]; addAddressTextField = addAddressCell.mxkTextField; addAddressTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_address_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix]; @@ -2614,7 +2614,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti addCommunityCell.mxkLabel.text = nil; addCommunityCell.accessoryType = UITableViewCellAccessoryNone; - addCommunityCell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"plus_icon"]]; + addCommunityCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]]; addGroupTextField = addCommunityCell.mxkTextField; addGroupTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_flair_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix]; diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m index 5f575c745..088f72b19 100644 --- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m +++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m @@ -27,6 +27,7 @@ [super customizeTableViewCellRendering]; _label.textColor = ThemeService.shared.theme.textPrimaryColor; + self.checkBox.tintColor = ThemeService.shared.theme.tintColor; } - (void)setEnabled:(BOOL)enabled diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m index 76a7839a8..0b588bbdc 100644 --- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m +++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m @@ -17,6 +17,8 @@ #import "TableViewCellWithCheckBoxes.h" +#import "Riot-Swift.h" + // The space between 2 check boxes #define TABLEVIEWCELLWITHCHECKBOXES_MARGIN 8 @@ -130,6 +132,7 @@ // Store the new check box unselected by default checkbox.image = [UIImage imageNamed:@"selection_untick"]; + checkbox.tintColor = ThemeService.shared.theme.tintColor; checkbox.tag = 0; [checkBoxesArray addObject:checkbox]; diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m index 1baaf2079..b29435bb4 100644 --- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m +++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m @@ -162,6 +162,7 @@ } self.iconImageView.image = [UIImage imageNamed:@"error"]; + self.iconImageView.tintColor = ThemeService.shared.theme.tintColor; self.iconImageView.hidden = NO; if (onIconTapGesture) @@ -187,6 +188,7 @@ if (labelText.length) { self.iconImageView.image = [UIImage imageNamed:@"error"]; + self.iconImageView.tintColor = ThemeService.shared.theme.noticeColor; self.messageLabel.text = labelText; self.messageLabel.textColor = ThemeService.shared.theme.warningColor; @@ -204,6 +206,7 @@ if (labelText.length) { self.iconImageView.image = [UIImage imageNamed:@"typing"]; + self.iconImageView.tintColor = ThemeService.shared.theme.tintColor; self.messageLabel.text = labelText; self.iconImageView.hidden = NO; @@ -284,7 +287,8 @@ { [self reset]; - self.iconImageView.image = [UIImage imageNamed:@"newmessages"]; + self.iconImageView.image = [UIImage imageNamed:@"scrolldown"]; + self.iconImageView.tintColor = ThemeService.shared.theme.noticeColor; NSString *notification; if (newMessagesCount > 1) @@ -305,6 +309,7 @@ [self resetIcon]; self.iconImageView.image = [UIImage imageNamed:@"scrolldown"]; + self.iconImageView.tintColor = ThemeService.shared.theme.textPrimaryColor; } self.iconImageView.hidden = NO; @@ -376,6 +381,7 @@ self.messageTextView.backgroundColor = [UIColor clearColor]; self.iconImageView.image = [UIImage imageNamed:@"error"]; + self.iconImageView.tintColor = ThemeService.shared.theme.noticeColor; self.iconImageView.hidden = NO; [self checkHeight:YES]; diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m index 233ccab1d..d31342d42 100644 --- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m +++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m @@ -81,7 +81,7 @@ self.backgroundColor = [UIColor clearColor]; self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; - + // Custom the growingTextView display growingTextView.layer.cornerRadius = 0; growingTextView.layer.borderWidth = 0; @@ -96,6 +96,10 @@ self.attachMediaButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_upload", @"Vector", nil); self.voiceCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_call", @"Vector", nil); self.hangupCallButton.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_hangup", @"Vector", nil); + + self.hangupCallButton.tintColor = ThemeService.shared.theme.noticeColor; + self.voiceCallButton.tintColor = ThemeService.shared.theme.tintColor; + self.attachMediaButton.tintColor = ThemeService.shared.theme.tintColor; } #pragma mark - diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib index 6060dc4af..8cab0f465 100644 --- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib +++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.xib @@ -1,12 +1,9 @@ - - - - + + - - + @@ -92,10 +89,10 @@ - + - + @@ -106,10 +103,10 @@ - + - + @@ -173,12 +170,13 @@ + - - - + + + diff --git a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m index cd2972cbb..e71dc688a 100644 --- a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m +++ b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.m @@ -30,29 +30,14 @@ bundle:[NSBundle bundleForClass:[self class]]]; } -- (void)awakeFromNib -{ - [super awakeFromNib]; -} - -- (void)layoutSubviews -{ - [super layoutSubviews]; - - self.membersListIcon.image = [MXKTools paintImage:self.membersListIcon.image - withColor:ThemeService.shared.theme.tintColor]; - - // TODO: paintImage does not work here because addParticipantIcon has 2 colors -// self.addParticipantIcon.image = [MXKTools paintImage:self.addParticipantIcon.image -// withColor:ThemeService.shared.theme.accent]; -} - -(void)customizeViewRendering { [super customizeViewRendering]; self.roomTopic.textColor = ThemeService.shared.theme.baseTextSecondaryColor; self.roomMembers.textColor = ThemeService.shared.theme.tintColor; + self.membersListIcon.tintColor = ThemeService.shared.theme.tintColor; + self.addParticipantIcon.tintColor = ThemeService.shared.theme.tintColor; } - (void)refreshDisplay diff --git a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.xib b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.xib index 453addbd9..133698a2b 100644 --- a/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.xib +++ b/Riot/Modules/Room/Views/Title/Expanded/ExpandedRoomTitleView.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -46,7 +44,7 @@ - + @@ -69,12 +67,12 @@ - - + + - - + + @@ -95,10 +93,10 @@ - - + + - + @@ -141,7 +139,7 @@ - + @@ -170,6 +168,6 @@ - + diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m index 8e7329564..40e5ca003 100644 --- a/Riot/Modules/Room/Views/Title/RoomTitleView.m +++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m @@ -74,8 +74,7 @@ { [super layoutSubviews]; - self.roomDetailsIconImageView.image = [MXKTools paintImage:self.roomDetailsIconImageView.image - withColor:ThemeService.shared.theme.tintColor]; + self.roomDetailsIconImageView.image = self.roomDetailsIconImageView.image; if (self.superview) { @@ -140,7 +139,8 @@ [super customizeViewRendering]; self.backgroundColor = UIColor.clearColor; - self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? ThemeService.shared.theme.baseTextPrimaryColor : ThemeService.shared.theme.textSecondaryColor); + self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? ThemeService.shared.theme.textPrimaryColor : ThemeService.shared.theme.textSecondaryColor); + self.roomDetailsIconImageView.tintColor = ThemeService.shared.theme.textPrimaryColor; } - (void)setRoomPreviewData:(RoomPreviewData *)roomPreviewData @@ -169,7 +169,7 @@ } else { - self.displayNameTextField.textColor = ThemeService.shared.theme.baseTextPrimaryColor; + self.displayNameTextField.textColor = ThemeService.shared.theme.textPrimaryColor; } } } diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m index 8d35500f0..ce0519741 100644 --- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m +++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m @@ -129,6 +129,8 @@ static CGFloat const kTextFontSize = 15.0; self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor; self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; + + self.forgetMessageButton.tintColor = ThemeService.shared.theme.tintColor; [self updateStringAttributes]; [self updateNavigationBar]; diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index bfdc7215d..c7fdac05d 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -1486,8 +1486,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> newEmailCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_add_email_address", @"Vector", nil); newEmailCell.mxkTextField.text = nil; newEmailCell.mxkTextField.userInteractionEnabled = NO; - - newEmailCell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"plus_icon"]]; + newEmailCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]]; } else { @@ -1522,7 +1521,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> newEmailTextField = newEmailCell.mxkTextField; } - UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:ThemeService.shared.theme.tintColor]; + UIImage *accessoryViewImage = [[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.tintColor]; newEmailCell.accessoryView = [[UIImageView alloc] initWithImage:accessoryViewImage]; } @@ -1551,7 +1550,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> newPhoneCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_add_phone_number", @"Vector", nil); newPhoneCell.mxkTextField.text = nil; newPhoneCell.mxkTextField.userInteractionEnabled = NO; - newPhoneCell.accessoryView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"plus_icon"]]; + newPhoneCell.accessoryView = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]]; cell = newPhoneCell; } @@ -1614,7 +1613,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> newPhoneNumberCell = newPhoneCell; } - UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:ThemeService.shared.theme.tintColor]; + UIImage *accessoryViewImage = [[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.tintColor]; newPhoneCell.accessoryView = [[UIImageView alloc] initWithImage:accessoryViewImage]; cell = newPhoneCell; @@ -2556,7 +2555,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> { if (row == OTHER_COPYRIGHT_INDEX) { - WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_copyright_url", @"Vector", nil)]; + NSString *copyrightUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsCopyrightUrl"]; + WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:copyrightUrlString]; webViewViewController.title = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil); @@ -2564,7 +2564,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> } else if (row == OTHER_TERM_CONDITIONS_INDEX) { - WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_term_conditions_url", @"Vector", nil)]; + NSString *termsConditionsUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsTermsConditionsUrl"]; + WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:termsConditionsUrlString]; webViewViewController.title = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil); @@ -2572,7 +2573,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> } else if (row == OTHER_PRIVACY_INDEX) { - WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_privacy_policy_url", @"Vector", nil)]; + NSString *privacyPolicyUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsPrivacyPolicyUrl"]; + WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:privacyPolicyUrlString]; webViewViewController.title = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil); diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m index 8fe299252..5158ad675 100644 --- a/Riot/Modules/StartChat/StartChatViewController.m +++ b/Riot/Modules/StartChat/StartChatViewController.m @@ -103,7 +103,7 @@ dataSource.forceMatrixIdInDisplayName = YES; // Add a plus icon to the contact cell when a search session is in progress, // in order to make it more understandable for the end user. - dataSource.contactCellAccessoryImage = [UIImage imageNamed:@"plus_icon"]; + dataSource.contactCellAccessoryImage = [[UIImage imageNamed:@"plus_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textPrimaryColor]; [self displayList:dataSource]; @@ -639,10 +639,7 @@ // place holder if (searchBarTextField.placeholder) { - searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder - attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), - NSUnderlineColorAttributeName: ThemeService.shared.theme.tintColor, - NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}]; + searchBarTextField.textColor = ThemeService.shared.theme.placeholderTextColor; } } diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m index 26c247f9c..3d2b09c1e 100644 --- a/Riot/Modules/TabBar/MasterTabBarController.m +++ b/Riot/Modules/TabBar/MasterTabBarController.m @@ -221,6 +221,8 @@ } [self presentReviewSessionsAlertIfNeeded]; + + [[AppDelegate theDelegate] checkAppVersion]; } if (unifiedSearchViewController) diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist index 0b961ba10..1c742fe68 100644 --- a/Riot/SupportingFiles/Info.plist +++ b/Riot/SupportingFiles/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Riot.im + Element (Riot.im) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/Riot/SupportingFiles/Riot.entitlements b/Riot/SupportingFiles/Riot.entitlements index d65fe32b0..d277e4bf8 100644 --- a/Riot/SupportingFiles/Riot.entitlements +++ b/Riot/SupportingFiles/Riot.entitlements @@ -11,6 +11,9 @@ applinks:riot.im applinks:www.riot.im webcredentials:riot.im + applinks:element.io + applinks:*.element.io + webcredentials:*.element.io com.apple.developer.icloud-container-identifiers diff --git a/Riot/Utils/Tools.m b/Riot/Utils/Tools.m index 842ae1f3f..ebf860265 100644 --- a/Riot/Utils/Tools.m +++ b/Riot/Utils/Tools.m @@ -64,7 +64,7 @@ + (NSString *)webAppUrl { return [[NSUserDefaults standardUserDefaults] objectForKey:@"webAppUrl"]; - //return [[NSUserDefaults standardUserDefaults] objectForKey:@"webAppUrlBeta"]; + //return [[NSUserDefaults standardUserDefaults] objectForKey:@"webAppUrlStaging"]; //return [[NSUserDefaults standardUserDefaults] objectForKey:@"webAppUrlDev"]; } @@ -78,11 +78,17 @@ // iOS Patch: fix vector.im/riot.im urls before using it NSURL *fixedURL = [Tools fixURLWithSeveralHashKeys:url]; - if (NSNotFound != [@[@"/app", @"/staging", @"/beta", @"/develop"] indexOfObject:fixedURL.path]) + if (NSNotFound != [@[@"/app", @"/staging", @"/develop"] indexOfObject:fixedURL.path]) { isUniversalLink = YES; } } + else if ([url.host isEqualToString:@"staging.element.io"] + || [url.host isEqualToString:@"develop.element.io"] + || [url.host isEqualToString:@"app.element.io"]) + { + isUniversalLink = YES; + } else if ([url.host isEqualToString:@"matrix.to"] || [url.host isEqualToString:@"www.matrix.to"]) { // iOS Patch: fix matrix.to urls before using it diff --git a/RiotShareExtension/Modules/Fallback/FallbackViewController.m b/RiotShareExtension/Modules/Fallback/FallbackViewController.m index 42d213e82..da7ebc5f1 100644 --- a/RiotShareExtension/Modules/Fallback/FallbackViewController.m +++ b/RiotShareExtension/Modules/Fallback/FallbackViewController.m @@ -26,6 +26,7 @@ @interface FallbackViewController () @property (weak, nonatomic) IBOutlet UILabel *titleLabel; +@property (weak, nonatomic) IBOutlet UIImageView *logoImageView; @end @@ -37,6 +38,7 @@ self.titleLabel.textColor = ThemeService.shared.theme.textSecondaryColor; self.titleLabel.text = NSLocalizedStringFromTable(@"share_extension_auth_prompt", @"Vector", nil); + self.logoImageView.tintColor = ThemeService.shared.theme.tintColor; } - (void)didReceiveMemoryWarning diff --git a/RiotShareExtension/Modules/Fallback/FallbackViewController.xib b/RiotShareExtension/Modules/Fallback/FallbackViewController.xib index ae9868127..381c1504d 100644 --- a/RiotShareExtension/Modules/Fallback/FallbackViewController.xib +++ b/RiotShareExtension/Modules/Fallback/FallbackViewController.xib @@ -1,35 +1,33 @@ - - - - + + - - + + - + - + - - + + @@ -58,6 +57,6 @@ - + diff --git a/RiotShareExtension/SupportingFiles/Info.plist b/RiotShareExtension/SupportingFiles/Info.plist index 9affc58fe..2cc673eea 100644 --- a/RiotShareExtension/SupportingFiles/Info.plist +++ b/RiotShareExtension/SupportingFiles/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Riot.im + Element (Riot.im) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard index 971f172ed..0503467c2 100644 --- a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard +++ b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -19,7 +17,7 @@ - + @@ -27,7 +25,7 @@ - + @@ -147,6 +145,6 @@ - +