Merge pull request #28 from inloop/feature/uinavigationbar_large_titl…

…e_text_style FEAT: UINavigationBar - largeTitleTextStyle
inloop · Feb 19, 2018 · 7714f4d · 7714f4d
2 parents 55effe5 + eb8a18f
commit 7714f4d
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 13 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Styles (0.7.4)
+  - Styles (0.8.4)
 
 DEPENDENCIES:
   - Styles (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  Styles: e3fbab59f12faaac84c03a2942f8098a333e2270
+  Styles: 653c3a901bddf8b5416b610e95b638b165d86837
 
 PODFILE CHECKSUM: d955debdf2315159e98d47d1c3d294214ae453cf
 

diff --git a/Example/Pods/Local Podspecs/Styles.podspec.json b/Example/Pods/Local Podspecs/Styles.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/Styles/Info.plist b/Example/Pods/Target Support Files/Styles/Info.plist
diff --git a/Example/Styles/Resources/Base.lproj/Main.storyboard b/Example/Styles/Resources/Base.lproj/Main.storyboard
@@ -28,6 +28,9 @@
                                 <rect key="frame" x="139.5" y="195" width="96" height="30"/>
                                 <state key="normal" title="~~ Default ~~"/>
                                 <state key="highlighted" title="Highlighted"/>
+                                <connections>
+                                    <action selector="handleButtonAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="EsY-LT-jCG"/>
+                                </connections>
                             </button>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Here, type you can." minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="onp-1l-LkD">
                                 <rect key="frame" x="122.5" y="268" width="130" height="20"/>

diff --git a/Example/Styles/Sources/AppDelegate.swift b/Example/Styles/Sources/AppDelegate.swift
@@ -129,6 +129,12 @@ let magentaFootnote = TextStyle(
     .foregroundColor(.magenta)
 )
 
+let largeTitle = TextStyle(
+    .font(.preferredFont(forTextStyle: .largeTitle)),
+    .foregroundColor(.white),
+    .backgroundColor(.magenta)
+)
+
 let blueFootnote = magentaFootnote.updating(.foregroundColor(.blue))
 
 @UIApplicationMain
@@ -148,7 +154,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         UITextField.appearance().setViewStyle(blue, for: .inactive)
         UITextField.appearance().setPlaceholderStyle(greenHeadline, for: .inactive)
         UITextField.appearance().setPlaceholderStyle(magentaFootnote, for: .editing)
-        UINavigationBar.appearance().textStyle = h1
+        UINavigationBar.appearance().titleTextStyle = body
+        UINavigationBar.appearance().largeTitleTextStyle = largeTitle
         UINavigationBar.appearance().tintColor = .yellow
         UINavigationBar.appearance().barTintColor = .black
         UINavigationBar.appearance().barStyle = .black

diff --git a/Example/Styles/Sources/ViewController.swift b/Example/Styles/Sources/ViewController.swift
@@ -4,6 +4,12 @@ import UIKit
 
 class ExLabel: UILabel { }
 
+extension Bool {
+    mutating func toggle() {
+        self = !self
+    }
+}
+
 class ViewController: UIViewController {
     @IBOutlet var label: ExLabel!
     @IBOutlet var button: UIButton!
@@ -19,5 +25,9 @@ class ViewController: UIViewController {
     @IBAction func handleTap(_ sender: UITapGestureRecognizer) {
         textField.resignFirstResponder()
     }
+
+    @IBAction func handleButtonAction(_ sender: UIButton) {
+        navigationController?.navigationBar.prefersLargeTitles.toggle()
+    }
 }
 
diff --git a/Styles.podspec b/Styles.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Styles'
-  s.version          = '0.7.4'
+  s.version          = '0.8.4'
   s.summary          = 'UI Elements rapid styling'
   s.description      = <<-DESC
 UIElements styling made easy, declarative and rapid.

diff --git a/Styles/Classes/UIElement+Extensions/UINavigationBar+Styles.h b/Styles/Classes/UIElement+Extensions/UINavigationBar+Styles.h
@@ -4,6 +4,7 @@
 
 @class TextStyle;
 
-@interface UINavigationBar (Styles)
-@property (nonatomic, copy) TextStyle *textStyle UI_APPEARANCE_SELECTOR;
+@interface UINavigationBar (TextStyle)
+@property (nonatomic, copy) TextStyle *titleTextStyle UI_APPEARANCE_SELECTOR;
+@property (nonatomic, copy) TextStyle *largeTitleTextStyle UI_APPEARANCE_SELECTOR API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(tvos);
 @end
diff --git a/Styles/Classes/UIElement+Extensions/UINavigationBar+Styles.m b/Styles/Classes/UIElement+Extensions/UINavigationBar+Styles.m
@@ -8,11 +8,15 @@
 
 @implementation UINavigationBar (Styles)
 
-SYNTHESIZE_PROPERTY_OBJ(TextStyle, textStyle, TextStyle);
+SYNTHESIZE_PROPERTY_OBJ(TextStyle, titleTextStyle, TitleTextStyle);
+SYNTHESIZE_PROPERTY_OBJ(TextStyle, largeTitleTextStyle, LargeTitleTextStyle);
 
 - (void)applyStyle {
     [super applyStyle];
-    self.titleTextAttributes = [self.textStyle attributes];
+    self.titleTextAttributes = [self.titleTextStyle attributes];
+    if (@available(iOS 11.0, *)) {
+        self.largeTitleTextAttributes = [self.largeTitleTextStyle attributes];
+    }
 }
 
 @end