Merge pull request #50 from inloop/bugfix/round_corners

FEAT: ViewStyle cornerRadius
inloop · Mar 7, 2018 · 6b4de73 · 6b4de73
2 parents 3c713e8 + d669557
commit 6b4de73
Show file tree

Hide file tree

Showing 15 changed files with 200 additions and 291 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  Styles: 4764bafc66c398f3125f8fbcc0ad0a0121a7f572
+  Styles: 279ecbbfed51efad94db005e32089f9c7f9c485a
 
 PODFILE CHECKSUM: f5341d1bc44d76e5ca1e0d50940004053970d8dc
 

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/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
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.xcodeproj/project.pbxproj b/Example/Styles.xcodeproj/project.pbxproj
@@ -330,7 +330,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -376,7 +376,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -390,7 +390,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Styles/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
@@ -406,7 +406,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Styles/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";

diff --git a/Example/Styles/Sources/AppDelegate.swift b/Example/Styles/Sources/AppDelegate.swift
@@ -91,7 +91,7 @@ let styleWithEffects = TextStyle(
 )
 
 let rounded = ViewStyle(
-        .roundCorners([.topLeft, .bottomRight], radius: 10),
+        .cornerRadius(10),
         .borderWidth(3),
         .borderColor(.red),
         .opacity(0.8)
@@ -114,12 +114,12 @@ let textFieldColorStyle = ViewStyle(
 let red = ViewStyle(
     .borderColor(.red),
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 0)
+    .cornerRadius(0)
 )
 
 let blue = red.updating(
     .borderColor(.blue),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(10)
 )
 
 let greenHeadline = TextStyle(

diff --git a/README.md b/README.md
@@ -233,7 +233,7 @@ let styleWithEffects = TextStyle(
 
 ```swift
 let pill = ViewStyle(
-     .roundCorners(.allCorners, radius: 10),
+     .cornerRadius(10),
      .borderWidth(3),
      .borderColor(.red),
      .opacity(0.8)
@@ -263,7 +263,7 @@ UITextView.appearance().setViewStyle(blue, for: .inactive)
 let blue = ViewStyle(
     .borderColor(.blue),
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(10)
 )
 
 myButton.viewStyle = blue
@@ -274,15 +274,15 @@ myButton.viewStyle = blue
 ```swift
 let app = ViewStyle(
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(10)
 )
 
 let blue = app.updating(.borderColor(.blue))
 ```
 ```swift
 let app = ViewStyle(
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(radius: 10)
 )
 
 let thick = app.updating(.borderWidth(3))
@@ -293,7 +293,7 @@ let thick = app.updating(.borderWidth(3))
 ```swift
 let app = ViewStyle(
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(10)
 )
 
 let semiVisible = ViewStyle(
@@ -306,7 +306,7 @@ myLabel.viewStyle = app + semiVisible
 ```swift
 let app = ViewStyle(
     .borderWidth(0.5),
-    .roundCorners(.allCorners, radius: 10)
+    .cornerRadius(10)
 )
 
 let semiVisible = ViewStyle(

diff --git a/Styles.podspec b/Styles.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Styles'
-  s.version          = '0.15.10'
+  s.version          = '0.15.11'
   s.summary          = 'UI Elements rapid styling'
   s.description      = <<-DESC
 UIElements styling made easy, declarative and rapid.
@@ -18,7 +18,7 @@ UIElements styling made easy, declarative and rapid.
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Radim Halfar' => '[email protected]', 'Jakub Petrik' => '[email protected]' }
   s.source           = { :git => 'https://github.com/inloop/Styles.git', :tag => s.version.to_s }
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '10.0'
   s.swift_version    = '4.1'
   s.source_files = 'Styles/Classes/**/*'
   s.test_spec 'Tests' do |test_spec|

diff --git a/Styles/Classes/UIElement+Extensions/UILabel+Styles.m b/Styles/Classes/UIElement+Extensions/UILabel+Styles.m
@@ -23,8 +23,7 @@ - (void)applyStyle {
     [self updateText];
 }
 
-- (void)swizzle_setText:(NSString *)text
-{
+- (void)swizzle_setText:(NSString *)text {
     [self swizzle_setText:text];
     [self updateText];
 }

diff --git a/Styles/Classes/UIElement+Extensions/UITextField+Styles.m b/Styles/Classes/UIElement+Extensions/UITextField+Styles.m
@@ -76,7 +76,7 @@ - (BOOL)swizzle_resignFirstResponder {
 - (void)swizzle_awakeFromNib {
     [self swizzle_awakeFromNib];
     [self addTarget:self
-             action:@selector(applyStyle)
+             action:@selector(applyStyleForCurrentState)
    forControlEvents:UIControlEventEditingChanged];
 }
 

diff --git a/Styles/Classes/UIElement+Extensions/UITextView+Styles.m b/Styles/Classes/UIElement+Extensions/UITextView+Styles.m
@@ -73,12 +73,12 @@ - (void)swizzle_awakeFromNib {
 
 - (void)setTextStyle:(TextStyle *)style forState:(TextInputState)state {
     self.textStyles[@(state)] = style;
-    [self applyStyle];
+    [self applyStylesForCurrentState];
 }
 
 - (void)setViewStyle:(ViewStyle *)style forState:(TextInputState)state {
     self.viewStyles[@(state)] = style;
-    [self applyStyle];
+    [self applyStylesForCurrentState];
 }
 
 - (void)applyStylesForState:(TextInputState)state {
@@ -90,6 +90,12 @@ - (void)applyStylesForState:(TextInputState)state {
     [self applyViewStyle:viewSyle];
 }
 
+- (void)applyStylesForCurrentState {
+    TextInputState state = self.isFirstResponder ? kEditing : kInactive;
+    [self applyStyle];
+    [self applyStylesForState:state];
+}
+
 - (void)checkEqualLayerInStyles {
     ViewStyle *editing = self.viewStyles[@(kEditing)];
     ViewStyle *inactive = self.viewStyles[@(kInactive)];

diff --git a/Styles/Classes/UIElement+Extensions/UIView+Styles.m b/Styles/Classes/UIElement+Extensions/UIView+Styles.m
@@ -9,19 +9,6 @@ @implementation UIView (Styles)
 
 SYNTHESIZE_PROPERTY_OBJ(ViewStyle, viewStyle, ViewStyle);
 
-+ (void)load {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        Class class = [self class];
-        swizzle_instance_method(class, @selector(layoutSubviews), @selector(swizzle_layoutSubviews));
-    });
-}
-
-- (void)swizzle_layoutSubviews {
-    [self swizzle_layoutSubviews];
-    [self.viewStyle applyLayoutTo:self];
-}
-
 - (void)applyStyle {
     [self.viewStyle applyTo:self];
 }