MBL-3215: Propagate textColor changes to tokenTextStorage (#38)

prashant-bhargava-hs · web-flow · commit 6f17661911ad · 2020-12-03T14:29:39.000-08:00
* update to ios 12

* update to recommended xcode setting

* corectly update textcolor

* increment version

* update version to 6
diff --git a/Demo/Sources/ViewController.swift b/Demo/Sources/ViewController.swift
@@ -23,6 +23,7 @@ class ViewController: UIViewController {
         super.viewWillAppear(animated)
         tokenTextVC.font = UIFont(name: "HelveticaNeue", size: 19)!
         tokenTextVC.text = "Hello "
+        tokenTextVC.textColor = .black
         tokenTextVC.addToken(6, text: "Team")
     }
 
diff --git a/Sources/TokenTextViewController.swift b/Sources/TokenTextViewController.swift
@@ -241,6 +241,7 @@ open class TokenTextViewController: UIViewController, UITextViewDelegate, NSLayo
 
         set {
             viewAsTextView.textColor = newValue
+            tokenTextStorage.textColor = newValue
         }
     }
 
diff --git a/TokenUI.podspec b/TokenUI.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "TokenUI"
-  s.version      = "5.0"
-  s.ios.deployment_target = "11.0"
+  s.version      = "6.0"
+  s.ios.deployment_target = "12.0"
   s.summary      = "TokenUI is a swift Framework for creating and managing a text input component that allows to add 'tokens' rendered as pills."
   s.homepage     = "https://github.com/hootsuite/TokenUI"
   s.license      = { :type => "Apache", :file => "LICENSE.md" }
diff --git a/TokenUI.xcodeproj/project.pbxproj b/TokenUI.xcodeproj/project.pbxproj
@@ -263,7 +263,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = Hootsuite;
 				TargetAttributes = {
 					A8C8609A1DA5B1EF00F4B309 = {
@@ -422,6 +422,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -449,7 +450,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -488,6 +489,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -509,7 +511,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
diff --git a/TokenUI.xcodeproj/xcshareddata/xcschemes/TokenUI.xcscheme b/TokenUI.xcodeproj/xcshareddata/xcschemes/TokenUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A8C8609A1DA5B1EF00F4B309"
+            BuildableName = "TokenUI.framework"
+            BlueprintName = "TokenUI"
+            ReferencedContainer = "container:TokenUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8C8609A1DA5B1EF00F4B309"
-            BuildableName = "TokenUI.framework"
-            BlueprintName = "TokenUI"
-            ReferencedContainer = "container:TokenUI.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:TokenUI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/TokenUI.xcodeproj/xcshareddata/xcschemes/TokenUIDemo.xcscheme b/TokenUI.xcodeproj/xcshareddata/xcschemes/TokenUIDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A8C8610E1DA5B71700F4B309"
+            BuildableName = "TokenUIDemo.app"
+            BlueprintName = "TokenUIDemo"
+            ReferencedContainer = "container:TokenUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A8C8610E1DA5B71700F4B309"
-            BuildableName = "TokenUIDemo.app"
-            BlueprintName = "TokenUIDemo"
-            ReferencedContainer = "container:TokenUI.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:TokenUI.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class ViewController: UIViewController {`
`23`	`23`	`super.viewWillAppear(animated)`
`24`	`24`	`tokenTextVC.font = UIFont(name: "HelveticaNeue", size: 19)!`
`25`	`25`	`tokenTextVC.text = "Hello "`
	`26`	`+ tokenTextVC.textColor = .black`
`26`	`27`	`tokenTextVC.addToken(6, text: "Team")`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ open class TokenTextViewController: UIViewController, UITextViewDelegate, NSLayo`
`241`	`241`
`242`	`242`	`set {`
`243`	`243`	`viewAsTextView.textColor = newValue`
	`244`	`+ tokenTextStorage.textColor = newValue`
`244`	`245`	`}`
`245`	`246`	`}`
`246`	`247`