Merge pull request #403 from tchapgouv/phlpro/theme

Replace Style by Theme

Btchap/Generated/InfoPlist.swift

@@ -38,6 +38,7 @@ internal enum InfoPlist {
   internal static let uiStatusBarTintParameters: [String: Any] = _document["UIStatusBarTintParameters"]
   internal static let uiSupportedInterfaceOrientations: [String] = _document["UISupportedInterfaceOrientations"]
   internal static let uiSupportedInterfaceOrientationsIpad: [String] = _document["UISupportedInterfaceOrientations~ipad"]
+  internal static let uiUserInterfaceStyle: String = _document["UIUserInterfaceStyle"]
   internal static let uiViewControllerBasedStatusBarAppearance: Bool = _document["UIViewControllerBasedStatusBarAppearance"]
   internal static let userDefaults: String = _document["UserDefaults"]
   internal static let applicationGroupIdentifier: String = _document["applicationGroupIdentifier"]

Btchap/SupportingFiles/Info.plist

@@ -79,6 +79,8 @@
 	<true/>
 	<key>UserDefaults</key>
 	<string>${PRODUCT_NAME}-Defaults</string>
+    <key>UIUserInterfaceStyle</key>
+    <string>Light</string>
 	<key>applicationGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
 	<key>baseBundleIdentifier</key>

BtchapShareExtension/target.yml

@@ -60,23 +60,24 @@ targets:
     - path: ../Riot/Utils/UserNameColorGenerator.swift
 
     # Tchap
-    - path: ../Btchap/Config/BuildSettings.swift
     - path: ../Tchap/Config/CommonConfiguration.swift
     - path: ../Tchap/Config/Configurable.swift
     - path: ../Tchap/Constants
     - path: ../Tchap/Extensions
-    - path: ../Btchap/Generated/InfoPlist.swift
     - path: ../Tchap/Generated/Strings.swift
     - path: ../Tchap/Managers/HomeServer
     - path: ../Tchap/Managers/Room
     - path: ../Tchap/Managers/ThirdPartyIDPlatformInfoResolver
     - path: ../Tchap/Managers/User
     - path: ../Tchap/Managers/DisplayName
-    - path: ../Tchap/Modules/Common/Style
     - path: ../Tchap/Modules/Rooms/Views
     - path: ../Tchap/Model
     - path: ../Tchap/Utils
 
+    # Btchap
+    - path: ../Btchap/Config/BuildSettings.swift
+    - path: ../Btchap/Generated/InfoPlist.swift
+
     # Resources
     - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.xib
       buildPhase: resources

Riot/Managers/Theme/Theme.swift

@@ -126,4 +126,9 @@ import UIKit
     ///
     /// - Parameter button: The button to customise.
     func applyStyle(onButton button: UIButton)
+
+    /// Apply the theme on a switch.
+    ///
+    /// - Parameter switch: The switch to customise.
+    func applyStyle(onSwitch uiSwitch: UISwitch)
 }

Riot/Managers/Theme/Themes/DarkTheme.swift

@@ -141,6 +141,10 @@ class DarkTheme: NSObject, Theme {
         button.setTitleColor(self.tintColor, for: .normal)
     }
 
+    func applyStyle(onSwitch uiSwitch: UISwitch) {
+        uiSwitch.onTintColor = self.headerBackgroundColor
+    }
+
     ///  MARK: - Theme v2
 
     lazy var colors: Colors = {

Riot/Managers/Theme/Themes/DefaultTheme.swift

@@ -95,7 +95,7 @@ class DefaultTheme: NSObject, Theme {
 
     // 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
         ]
@@ -108,30 +108,21 @@ class DefaultTheme: NSObject, Theme {
     }
 
     func applyStyle(onSearchBar searchBar: UISearchBar) {
-        searchBar.barStyle = .default
-        searchBar.tintColor = self.searchPlaceholderColor
-        searchBar.barTintColor = self.headerBackgroundColor
+        searchBar.searchBarStyle = .default
+        searchBar.barTintColor = self.baseColor
+        searchBar.isTranslucent = false
+        searchBar.backgroundImage = UIImage() // Remove top and bottom shadow
+        searchBar.tintColor = self.tintColor
 
-        if let searchBarTextField = searchBar.vc_searchTextField {
-            searchBarTextField.textColor = searchBar.tintColor
+        if #available(iOS 13.0, *) {
+            searchBar.searchTextField.backgroundColor = self.searchBackgroundColor
+            searchBar.searchTextField.textColor = self.searchPlaceholderColor
+        } else {
+            if let searchBarTextField = searchBar.vc_searchTextField {
+                searchBarTextField.textColor = self.searchPlaceholderColor
+            }
         }
     }
-//    func applyStyle(onSearchBar searchBar: UISearchBar) {
-//        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
-//        } else {
-//            if let searchBarTextField = searchBar.vc_searchTextField {
-//                searchBarTextField.textColor = self.searchPlaceholderColor
-//            }
-//        }
-//    }
 
     func applyStyle(onTextField texField: UITextField) {
         texField.textColor = self.textPrimaryColor
@@ -143,4 +134,8 @@ class DefaultTheme: NSObject, Theme {
         button.tintColor = self.tintColor
         button.setTitleColor(self.tintColor, for: .normal)
     }
+
+    func applyStyle(onSwitch uiSwitch: UISwitch) {
+        uiSwitch.onTintColor = self.headerBackgroundColor
+    }
 }

Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h

@@ -91,8 +91,8 @@ limitations under the License.
 - (void)userInterfaceThemeDidChange;
 
 /**
- Update the current style.
+ Update the current theme.
  */
-- (void)updateWithStyle:(id<Style>)style;
+- (void)updateTheme;
 
 @end

Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m

@@ -22,7 +22,7 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface SegmentedViewController () <Stylable>
+@interface SegmentedViewController ()
 {
     // Tell whether the segmented view is appeared (see viewWillAppear/viewWillDisappear).
     BOOL isViewAppeared;
@@ -50,8 +50,6 @@ @interface SegmentedViewController () <Stylable>
     id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
-@property (nonatomic, strong) id<Style> currentStyle;
-
 @end
 
 @implementation SegmentedViewController
@@ -68,7 +66,6 @@ + (instancetype)instantiate
 {
     SegmentedViewController *segmentedViewController = [[[self class] alloc] initWithNibName:NSStringFromClass([SegmentedViewController class])
                                           bundle:[NSBundle bundleForClass:[SegmentedViewController class]]];
-    segmentedViewController.currentStyle = Variant1Style.shared;
     return segmentedViewController;
 }
 
@@ -197,33 +194,37 @@ - (void)viewDidLoad
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-
-    self.sectionHeaderTintColor = style.barActionColor;
+    self.sectionHeaderTintColor = ThemeService.shared.theme.tintColor;
 
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
 
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
 
-    self.view.backgroundColor = style.backgroundColor;
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
 
     // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
+
+    for (UIView* subview in self.selectionContainer.subviews) {
+        [subview removeFromSuperview];
+    }
+
+    [self createSegmentedViews];
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -294,7 +295,7 @@ - (void)createSegmentedViews
         label.font = [UIFont systemFontOfSize:17];
         label.textAlignment = NSTextAlignmentCenter;
         label.textColor = _sectionHeaderTintColor;
-        label.backgroundColor = self.currentStyle.barBackgroundColor;
+        label.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
         label.accessibilityIdentifier = [NSString stringWithFormat:@"SegmentedVCSectionLabel%tu", index];
 
         // the constraint defines the label frame

Riot/Modules/Common/WebViewController/WebViewViewController.m

@@ -22,9 +22,7 @@
 
 #import "GeneratedInterface-Swift.h"
 
-@interface WebViewViewController () <Stylable>
-
-@property (nonatomic, strong) id<Style> currentStyle;
+@interface WebViewViewController ()
 
 // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
 @property (nonatomic, weak) id kThemeServiceDidChangeThemeNotificationObserver;
@@ -36,10 +34,6 @@ @implementation WebViewViewController
 - (instancetype)init
 {
     self = [super init];
-    if (self)
-    {
-        self.currentStyle = Variant1Style.shared;
-    }
     return self;
 }
 
@@ -75,37 +69,35 @@ - (void)viewWillAppear:(BOOL)animated
 
 - (void)userInterfaceThemeDidChange
 {
-    [self updateWithStyle:self.currentStyle];
+    [self updateTheme];
 }
 
 - (void)applyVariant2Style
 {
-    [self updateWithStyle:Variant2Style.shared];
+    [self updateTheme];
 }
 
-- (void)updateWithStyle:(id<Style>)style
+- (void)updateTheme
 {
-    self.currentStyle = style;
-
     UINavigationBar *navigationBar = self.navigationController.navigationBar;
 
     if (navigationBar)
     {
-        [style applyStyleOnNavigationBar:navigationBar];
+        [ThemeService.shared.theme applyStyleOnNavigationBar:navigationBar];
     }
 
     // @TODO Design the activvity indicator for Tchap
-    self.activityIndicator.backgroundColor = style.overlayBackgroundColor;
+    self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
 
-    self.view.backgroundColor = style.backgroundColor;
-    webView.backgroundColor = style.backgroundColor;
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    webView.backgroundColor = ThemeService.shared.theme.backgroundColor;
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
-    return self.currentStyle.statusBarStyle;
+    return ThemeService.shared.theme.statusBarStyle;
 }
 
 - (void)dealloc

Tchap/Generated/InfoPlist.swift

@@ -38,6 +38,7 @@ internal enum InfoPlist {
   internal static let uiStatusBarTintParameters: [String: Any] = _document["UIStatusBarTintParameters"]
   internal static let uiSupportedInterfaceOrientations: [String] = _document["UISupportedInterfaceOrientations"]
   internal static let uiSupportedInterfaceOrientationsIpad: [String] = _document["UISupportedInterfaceOrientations~ipad"]
+  internal static let uiUserInterfaceStyle: String = _document["UIUserInterfaceStyle"]
   internal static let uiViewControllerBasedStatusBarAppearance: Bool = _document["UIViewControllerBasedStatusBarAppearance"]
   internal static let userDefaults: String = _document["UserDefaults"]
   internal static let applicationGroupIdentifier: String = _document["applicationGroupIdentifier"]

Tchap/Modules/Application/AppDelegate.swift

@@ -60,9 +60,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, PushNotificationServiceDe
         self.appCoordinator = AppCoordinator(router: self.rootRouter)
         self.appCoordinator.start()
 
-        // Setup default UIAppearance
-        Appearance.setup()
-
         return true
     }
 

Tchap/Modules/Application/VersionUpdate/AppVersionUpdateViewController.swift

@@ -34,18 +34,16 @@ final class AppVersionUpdateViewController: UIViewController {
     // MARK: Private
 
     private var viewModel: AppVersionUpdateViewModelType!
-    private var style: Style!
 
     // MARK: Public
 
     weak var delegate: AppVersionUpdateViewControllerDelegate?
 
     // MARK: - Setup
 
-    class func instantiate(with viewModel: AppVersionUpdateViewModelType, style: Style = Variant2Style.shared) -> AppVersionUpdateViewController {
+    class func instantiate(with viewModel: AppVersionUpdateViewModelType) -> AppVersionUpdateViewController {
         let viewController = StoryboardScene.AppVersionUpdateViewController.initialScene.instantiate()
         viewController.viewModel = viewModel
-        viewController.style = style
         return viewController
     }
 
@@ -67,18 +65,16 @@ final class AppVersionUpdateViewController: UIViewController {
 
     // MARK: - Private
 
-    private func update(style: Style) {
-        self.style = style
+    private func updateTheme() {
+        self.view.backgroundColor = ThemeService.shared().theme.backgroundColor
 
-        self.view.backgroundColor = style.backgroundColor
-
-        self.messageLabel.textColor = self.style.primarySubTextColor
-        style.applyStyle(onButton: self.cancelButton)
-        style.applyStyle(onButton: self.appStoreButton)
+        self.messageLabel.textColor = ThemeService.shared().theme.textTertiaryColor
+        ThemeService.shared().theme.applyStyle(onButton: self.cancelButton)
+        ThemeService.shared().theme.applyStyle(onButton: self.appStoreButton)
     }
 
     private func themeDidChange() {
-        self.update(style: self.style)
+        self.updateTheme()
     }
 
     private func setupViews() {