Merge branch 'spaces' into gil/4498_Handle_space_link

This commit is contained in:
Gil Eluard
2021-09-23 15:26:29 +02:00
46 changed files with 1850 additions and 1780 deletions
@@ -70,10 +70,10 @@ class VersionCheckCoordinator: Coordinator, VersionCheckBannerViewDelegate, Vers
if Constants.hasOSVersionBeenDropped {
versionCheckBannerView.configureWithDetails(VersionCheckBannerViewDetails(title: VectorL10n.versionCheckBannerTitleDeprecated(String(Constants.osVersionToBeDropped)),
subtitle: VectorL10n.versionCheckBannerSubtitleDeprecated(String(Constants.osVersionToBeDropped))))
subtitle: VectorL10n.versionCheckBannerSubtitleDeprecated(AppInfo.current.displayName, String(Constants.osVersionToBeDropped), AppInfo.current.displayName)))
} else {
versionCheckBannerView.configureWithDetails(VersionCheckBannerViewDetails(title: VectorL10n.versionCheckBannerTitleSupported(String(Constants.osVersionToBeDropped)),
subtitle: VectorL10n.versionCheckBannerSubtitleSupported(String(Constants.osVersionToBeDropped))))
subtitle: VectorL10n.versionCheckBannerSubtitleSupported(AppInfo.current.displayName, String(Constants.osVersionToBeDropped), AppInfo.current.displayName)))
}
bannerPresenter.presentBannerView(versionCheckBannerView, animated: true)
@@ -93,11 +93,11 @@ class VersionCheckCoordinator: Coordinator, VersionCheckBannerViewDelegate, Vers
if Constants.hasOSVersionBeenDropped {
versionCheckAlertViewController.configureWithDetails(VersionCheckAlertViewControllerDetails(title: VectorL10n.versionCheckModalTitleDeprecated(String(Constants.osVersionToBeDropped)),
subtitle: VectorL10n.versionCheckModalSubtitleDeprecated,
subtitle: VectorL10n.versionCheckModalSubtitleDeprecated(AppInfo.current.displayName, AppInfo.current.displayName),
actionButtonTitle: VectorL10n.versionCheckModalActionTitleDeprecated))
} else {
versionCheckAlertViewController.configureWithDetails(VersionCheckAlertViewControllerDetails(title: VectorL10n.versionCheckModalTitleSupported(String(Constants.osVersionToBeDropped)),
subtitle: VectorL10n.versionCheckModalSubtitleSupported,
subtitle: VectorL10n.versionCheckModalSubtitleSupported(AppInfo.current.displayName, AppInfo.current.displayName),
actionButtonTitle: VectorL10n.versionCheckModalActionTitleSupported))
}