- Fix colors not appearing correctly when displaying weight change du…

…ring a workout
piscoTech · Sep 28, 2019 · 56ab148 · 56ab148
1 parent b38e629
commit 56ab148
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Gym Tracker watchOS/Base.lproj/Interface.storyboard b/Gym Tracker watchOS/Base.lproj/Interface.storyboard
@@ -76,11 +76,11 @@
                                 <group alignment="left" id="x8p-Jy-vRC">
                                     <items>
                                         <label alignment="left" verticalAlignment="bottom" text="80" id="8WJ-4H-ILz">
-                                            <color key="textColor" red="1" green="0.18823529411764706" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" name="Red Tint"/>
                                             <fontDescription key="font" type="system" pointSize="19"/>
                                         </label>
                                         <label alignment="left" verticalAlignment="bottom" text="BPM" id="jp2-oR-PiF">
-                                            <color key="textColor" red="1" green="0.18840348639455781" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" name="Red Tint"/>
                                             <fontDescription key="font" style="UICTFontTextStyleFootnote"/>
                                         </label>
                                     </items>
@@ -410,8 +410,8 @@
             <color red="0.0" green="0.75294117647058822" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="Red Tint">
-            <color red="1" green="0.11764705882352941" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.90196078431372551" green="0.078431372549019607" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.75686274509803919" green="0.92156862745098034" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+    <color key="tintColor" red="0.75686274509999996" green="0.92156862750000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/Gym Tracker.xcodeproj/project.pbxproj b/Gym Tracker.xcodeproj/project.pbxproj
@@ -15,6 +15,8 @@
 		7A2262851FE5853A00E16871 /* WorkoutIteratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2262841FE5853A00E16871 /* WorkoutIteratorTests.swift */; };
 		7A27276F1EA3536400E67F70 /* UpdateSecondaryInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A27276E1EA3536400E67F70 /* UpdateSecondaryInfoVC.swift */; };
 		7A278AF5213182AE00EFA791 /* Old Model Version Stores in Resources */ = {isa = PBXBuildFile; fileRef = 7A278AF2213182AE00EFA791 /* Old Model Version Stores */; };
+		7A2C8B2B233F50A900FCA6EE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A16CDD91FE03227008141D6 /* Assets.xcassets */; };
+		7A2C8B2C233F50AB00FCA6EE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A16CDD91FE03227008141D6 /* Assets.xcassets */; };
 		7A2D956B21257F8E008DECEC /* GTRepsSetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2D956A21257F8E008DECEC /* GTRepsSetTests.swift */; };
 		7A2D956F21258269008DECEC /* GTSimpleSetsExerciseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2D956E21258269008DECEC /* GTSimpleSetsExerciseTests.swift */; };
 		7A2D95712125A4F1008DECEC /* GTChoiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2D95702125A4F1008DECEC /* GTChoiceTests.swift */; };
@@ -104,7 +106,6 @@
 		7AB69FE0212336E50053E259 /* Main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2E103F1FBDD4C2004767D7 /* Main.swift */; };
 		7AB69FE1212337020053E259 /* GymTracker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7ADC03BB1E78A187005BDC25 /* GymTracker.xcdatamodeld */; };
 		7AB69FE2212337410053E259 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A16CDD91FE03227008141D6 /* Assets.xcassets */; };
-		7AB69FE3212337440053E259 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A16CDD91FE03227008141D6 /* Assets.xcassets */; };
 		7AB69FF521233A010053E259 /* GTWorkout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ADC03BF1E78A187005BDC25 /* GTWorkout.swift */; };
 		7AB69FF621233A010053E259 /* GTPart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AB943FB212174A500603CA3 /* GTPart.swift */; };
 		7AB69FF721233A010053E259 /* GTRest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AB943F8212174A500603CA3 /* GTRest.swift */; };
@@ -1349,7 +1350,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7AB69FE3212337440053E259 /* Assets.xcassets in Resources */,
+				7A2C8B2C233F50AB00FCA6EE /* Assets.xcassets in Resources */,
 				7AEE4D661E812A9200D843EB /* Interface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1358,6 +1359,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7A2C8B2B233F50A900FCA6EE /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1681,7 +1683,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 21;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1703,7 +1705,7 @@
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.1.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1747,7 +1749,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 21;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1763,7 +1765,7 @@
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.1.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

diff --git a/Shared/Assets.xcassets/Colors/Red Tint.colorset/Contents.json b/Shared/Assets.xcassets/Colors/Red Tint.colorset/Contents.json
@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "255",
+          "red" : "230",
           "alpha" : "1.000",
           "blue" : "0",
-          "green" : "30"
+          "green" : "20"
         }
       }
     }