Commit Graph

33 Commits

Author SHA1 Message Date
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
ismailgulek 073eb73302 Adapt api changes from key backup module 2022-08-11 13:52:01 +03:00
Doug a4075c89cb Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
Doug 29d7262e38 Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
SBiOSoftWhare 103aaa3a0a Fix SwiftLint warnings 2019-02-27 10:07:51 +01:00
SBiOSoftWhare 9ab0b74007 Fix SwiftLint warnings 2019-02-27 10:07:51 +01:00
SBiOSoftWhare a4cff07872 Update key backup setup passphrase scene 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 4f7adadc1d Update key backup setup passphrase scene 2019-02-13 14:58:16 +01:00
manuroe 048455190a Reskin: Replace separatorColor with lineBreakColor, the color introduced in the new uniformed palette 2019-02-13 09:39:32 +01:00
manuroe 214af86039 Reskin: Replace separatorColor with lineBreakColor, the color introduced in the new uniformed palette 2019-02-13 09:39:32 +01:00
manuroe 0a73f23be6 Reskin: Use same color names as in https://app.zeplin.io/project/5c122fa790c5b4241ffa6be7/screen/5c619592daff2f1241d82e75 2019-02-12 19:06:22 +01:00
manuroe 29aa20f810 Reskin: Use same color names as in https://app.zeplin.io/project/5c122fa790c5b4241ffa6be7/screen/5c619592daff2f1241d82e75 2019-02-12 19:06:22 +01:00
manuroe cab2ef3534 Key backup: Fix some recovery setup bugs 2019-01-31 20:00:38 +01:00
manuroe 25c69eb44c Key backup: Fix some recovery setup bugs 2019-01-31 20:00:38 +01:00
SBiOSoftWhare a66a950639 Make small improvements on KeyBackupSetupCoordinator and KeyBackupSetupPassphraseViewController 2019-01-30 11:14:03 +01:00
SBiOSoftWhare 5b1a0ec874 Make small improvements on KeyBackupSetupCoordinator and KeyBackupSetupPassphraseViewController 2019-01-30 11:14:03 +01:00
SBiOSoftWhare 2913c7fbca Remove a Swift 4.2 API usage as project use Swift 4.0 for the moment. 2019-01-23 15:31:31 +01:00
SBiOSoftWhare 69d1b6872a Remove a Swift 4.2 API usage as project use Swift 4.0 for the moment. 2019-01-23 15:31:31 +01:00
SBiOSoftWhare 811b5c5b3a Add commodity methods on OperationQueue and use them in key backup setup view models. 2019-01-23 12:11:30 +01:00
SBiOSoftWhare 4c7e40ac16 Add commodity methods on OperationQueue and use them in key backup setup view models. 2019-01-23 12:11:30 +01:00
SBiOSoftWhare eb03313dcd Revert "Add CoordinatorDelegateQueuable protocol used by view models to handle coordinator delegation in an operation queue."
This reverts commit 01bc067c2279511db3401bc419166113c31bed7a.
2019-01-23 11:47:10 +01:00
SBiOSoftWhare b3282603c0 Revert "Add CoordinatorDelegateQueuable protocol used by view models to handle coordinator delegation in an operation queue."
This reverts commit e3de3f899b631c28fee398222a0a7fdc1cab5b76.
2019-01-23 11:47:10 +01:00
SBiOSoftWhare df268cc16d Add CoordinatorDelegateQueuable protocol used by view models to handle coordinator delegation in an operation queue. 2019-01-23 10:49:54 +01:00
SBiOSoftWhare 044d6a2396 Add CoordinatorDelegateQueuable protocol used by view models to handle coordinator delegation in an operation queue. 2019-01-23 10:49:54 +01:00
SBiOSoftWhare 2a3896564f Update coordinator delegates in order to use coordinator protocol as parameter 2019-01-22 17:44:45 +01:00
SBiOSoftWhare 422cbbff1b Update coordinator delegates in order to use coordinator protocol as parameter 2019-01-22 17:44:45 +01:00
SBiOSoftWhare 2736189f8d Move coordinator delegates definitions in coordinator protocols definitions 2019-01-22 17:31:40 +01:00
SBiOSoftWhare c1435153eb Move coordinator delegates definitions in coordinator protocols definitions 2019-01-22 17:31:40 +01:00
SBiOSoftWhare 22f14de94b Update reveal password margin on KeyBackupSetupPassphraseViewController 2019-01-22 15:46:26 +01:00
SBiOSoftWhare a478663351 Update reveal password margin on KeyBackupSetupPassphraseViewController 2019-01-22 15:46:26 +01:00
SBiOSoftWhare 4511d06743 Implement key backup setup passphrase scene with view controller, view model, coordinator 2019-01-22 10:25:36 +01:00
SBiOSoftWhare 036fdeee53 Implement key backup setup passphrase scene with view controller, view model, coordinator 2019-01-22 10:25:36 +01:00