slightly improve visibility of progress indicator on dark backgrounds

yep · Nov 3, 2017 · 8fc120c · 8fc120c
1 parent 561fcc7
commit 8fc120c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/macosx/AntiRSI.xcodeproj/project.pbxproj b/macosx/AntiRSI.xcodeproj/project.pbxproj
@@ -373,7 +373,7 @@
 		03C29A060945B33D00639E3E /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_VERSION = 2.1.1;
+				APPLICATION_VERSION = 2.2.1;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -407,7 +407,7 @@
 		03C29A070945B33D00639E3E /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_VERSION = 2.1.1;
+				APPLICATION_VERSION = 2.2.1;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -439,7 +439,7 @@
 		03C29A080945B33D00639E3E /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_VERSION = 2.1.1;
+				APPLICATION_VERSION = 2.2.1;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/macosx/AntiRSIView.h b/macosx/AntiRSIView.h
@@ -6,10 +6,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface
-AntiRSIView: NSVisualEffectView {}
+@interface AntiRSIView: NSVisualEffectView
 @end
 
 @interface
-AntiRSIButton: NSButton {}
+AntiRSIButton: NSButton
 @end
+
diff --git a/macosx/AntiRSIView.m b/macosx/AntiRSIView.m
@@ -36,6 +36,7 @@ - (NSImage *)maskImageWithBounds:(NSRect)bounds
 
 @end
 
+// MARK: - AntiRSIButton
 
 @implementation AntiRSIButton
 

diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
diff --git a/macosx/English.lproj/Main.xib b/macosx/English.lproj/Main.xib
@@ -524,32 +524,38 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Work Break" id="492">
                         <font key="font" size="49" name="HelveticaNeue-UltraLight"/>
-                        <color key="textColor" white="0.0" alpha="0.6991692341549296" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" misplaced="YES" id="370">
-                    <rect key="frame" x="6" y="101" width="288" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="next break in 0 minutes" id="483">
-                        <font key="font" size="15" name="HelveticaNeue-Light"/>
-                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" misplaced="YES" id="279">
                     <rect key="frame" x="6" y="155" width="288" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="0:00" id="482">
+                        <font key="font" size="15" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <visualEffectView misplaced="YES" blendingMode="behindWindow" material="popover" state="inactive" id="SM1-KR-6HZ">
+                    <rect key="frame" x="19" y="132" width="268" height="3"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <subviews>
+                        <progressIndicator wantsLayer="YES" verticalHuggingPriority="750" misplaced="YES" maxValue="1" bezeled="NO" controlSize="small" style="bar" id="260">
+                            <rect key="frame" x="-2" y="-5" width="272" height="12"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        </progressIndicator>
+                    </subviews>
+                </visualEffectView>
+                <textField verticalHuggingPriority="750" misplaced="YES" id="370">
+                    <rect key="frame" x="6" y="101" width="288" height="20"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="next break in 0 minutes" id="483">
                         <font key="font" size="15" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <progressIndicator wantsLayer="YES" verticalHuggingPriority="750" misplaced="YES" maxValue="1" bezeled="NO" style="bar" id="260">
-                    <rect key="frame" x="20" y="128" width="260" height="20"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                </progressIndicator>
                 <button verticalHuggingPriority="750" misplaced="YES" imageHugsTitle="YES" id="261" customClass="AntiRSIButton">
                     <rect key="frame" x="103" y="64" width="95" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
@@ -562,6 +568,9 @@
                     </connections>
                 </button>
             </subviews>
+            <connections>
+                <outlet property="progress" destination="260" id="UaE-Kk-304"/>
+            </connections>
             <point key="canvasLocation" x="5" y="210"/>
         </customView>
         <menu title="Menu" id="343" userLabel="DockMenu">
@@ -601,7 +610,7 @@
                     <textField verticalHuggingPriority="750" misplaced="YES" id="437">
                         <rect key="frame" x="0.0" y="80" width="263" height="13"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Version 2.2" id="486">
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Version 2.2.1" id="486">
                             <font key="font" metaFont="label"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

diff --git a/macosx/Info.plist b/macosx/Info.plist
@@ -14,10 +14,12 @@
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${APPLICATION_VERSION}</string>
 	<key>CFBundleSignature</key>
 	<string>ONNE</string>
 	<key>CFBundleVersion</key>
-	<string>${APPLICATION_VERSION}</string>
+	<string>1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSMainNibFile</key>