Merge pull request #3 from tichise/feature/icon

Add the icon color setting function.
tichise · Sep 19, 2020 · bb423bb · bb423bb
2 parents 8c03fff + 605eb71
commit bb423bb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/OMJoystick.podspec b/OMJoystick.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'OMJoystick'
-  s.version = '0.5.4'
+  s.version = '0.6.0'
   s.swift_versions = '5.0'
   s.license = 'MIT'
   s.summary = 'This is the Joystick UI library for SwiftUI.'

diff --git a/Sample/Sample.xcodeproj/project.pbxproj b/Sample/Sample.xcodeproj/project.pbxproj
@@ -186,7 +186,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1160;
-				LastUpgradeCheck = 1160;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = tichise;
 				TargetAttributes = {
 					B021BC402504B56E00BFB99E = {
@@ -350,6 +350,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;
@@ -410,6 +411,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;

diff --git a/Sample/Sample/ContentView.swift b/Sample/Sample/ContentView.swift
@@ -21,7 +21,7 @@ struct ContentView: View {
         downIcon: Image(systemSymbol: .arrowDown)
     )
 
-    let colorSetting = ColorSetting(subRingColor: .red, bigRingNormalBackgroundColor: .green, bigRingDarkBackgroundColor: .blue, bigRingStrokeColor: .yellow)
+    let colorSetting = ColorSetting(subRingColor: .red, bigRingNormalBackgroundColor: .green, bigRingDarkBackgroundColor: .blue, bigRingStrokeColor: .yellow, iconColor: .red)
 
     var body: some View {
         GeometryReader { geometry in
@@ -32,7 +32,7 @@ struct ContentView: View {
 
                 }.frame(width: geometry.size.width-40, height: geometry.size.width-40)
 
-                OMJoystick(isDebug: true, iconSetting: self.iconSetting,  colorSetting: ColorSetting(), smallRingRadius: 70, bigRingRadius: 120
+                OMJoystick(isDebug: true, iconSetting: self.iconSetting,  colorSetting: ColorSetting(iconColor: .orange), smallRingRadius: 70, bigRingRadius: 120
                 ) { (joyStickState, stickPosition)  in
                     TILogger().info(joyStickState.rawValue)
                     TILogger().info(stickPosition)

diff --git a/Sources/OMJoyStick.swift b/Sources/OMJoyStick.swift
@@ -71,21 +71,25 @@ public struct ColorSetting {
     var bigRingNormalBackgroundColor: Color
     var bigRingDarkBackgroundColor: Color
     var bigRingStrokeColor: Color
+    var iconColor: Color
 
     public init(subRingColor: Color = .primary,
     bigRingNormalBackgroundColor: Color = .white,
     bigRingDarkBackgroundColor: Color = .black,
-    bigRingStrokeColor: Color = Color.primary) {
+    bigRingStrokeColor: Color = Color.primary,
+    iconColor: Color = Color.primary) {
 
         self.subRingColor = subRingColor
         self.bigRingNormalBackgroundColor = bigRingNormalBackgroundColor
         self.bigRingDarkBackgroundColor = bigRingDarkBackgroundColor
         self.bigRingStrokeColor = bigRingStrokeColor
+        self.iconColor = iconColor
     }
 }
 
 public struct OMJoystick: View {
 
+    var iconColor: Color
     var subRingColor: Color
     var bigRingNormalBackgroundColor: Color
     var bigRingDarkBackgroundColor: Color
@@ -200,6 +204,7 @@ public struct OMJoystick: View {
 
         self.isDebug = isDebug
 
+        self.iconColor = colorSetting.iconColor
         self.subRingColor = colorSetting.subRingColor
         self.bigRingNormalBackgroundColor = colorSetting.bigRingNormalBackgroundColor
         self.bigRingDarkBackgroundColor = colorSetting.bigRingDarkBackgroundColor
@@ -234,11 +239,11 @@ public struct OMJoystick: View {
             }
 
             upIcon?.renderingMode(.template)
-                .foregroundColor(.secondary).padding(iconPadding)
+                .foregroundColor(iconColor).padding(iconPadding)
 
             HStack() {
                 leftIcon?.renderingMode(.template)
-                    .foregroundColor(.secondary).padding(iconPadding)
+                    .foregroundColor(iconColor).padding(iconPadding)
 
                 ZStack {
                     // 中央は直径280の場合は140:140
@@ -251,11 +256,11 @@ public struct OMJoystick: View {
                 }
 
                 rightIcon?.renderingMode(.template)
-                    .foregroundColor(.secondary).padding(iconPadding)
+                    .foregroundColor(iconColor).padding(iconPadding)
             }
 
             downIcon?.renderingMode(.template)
-                .foregroundColor(.secondary).padding(iconPadding)
+                .foregroundColor(iconColor).padding(iconPadding)
 
             if isDebug {                
                 HStack(spacing: 15) {