Skip to content

Commit d4686b9

Browse files
dgrahamdgraham
committed
Define color asset for dark mode
1 parent 053b1e2 commit d4686b9

File tree

8 files changed

+65
-14
lines changed

8 files changed

+65
-14
lines changed

‎Ka-Block Content Blocker/iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.2</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

‎Ka-Block Content Blocker/macOS/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.2</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>3</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSMinimumSystemVersion</key>
2424
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2525
<key>NSExtension</key>

‎Ka-Block.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,13 @@
474474
CODE_SIGN_IDENTITY = "Mac Developer";
475475
CODE_SIGN_STYLE = Automatic;
476476
COMBINE_HIDPI_IMAGES = YES;
477+
CURRENT_PROJECT_VERSION = 4;
477478
DEVELOPMENT_TEAM = "";
478479
ENABLE_HARDENED_RUNTIME = YES;
479480
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block/macOS/Info.plist";
480481
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
481482
MACOSX_DEPLOYMENT_TARGET = 10.13;
483+
MARKETING_VERSION = 3.3;
482484
PRODUCT_BUNDLE_IDENTIFIER = com.kablock.macos;
483485
PRODUCT_NAME = "Ka-Block!";
484486
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -501,11 +503,13 @@
501503
CODE_SIGN_IDENTITY = "Mac Developer";
502504
CODE_SIGN_STYLE = Automatic;
503505
COMBINE_HIDPI_IMAGES = YES;
506+
CURRENT_PROJECT_VERSION = 4;
504507
DEVELOPMENT_TEAM = "";
505508
ENABLE_HARDENED_RUNTIME = YES;
506509
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block/macOS/Info.plist";
507510
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
508511
MACOSX_DEPLOYMENT_TARGET = 10.13;
512+
MARKETING_VERSION = 3.3;
509513
PRODUCT_BUNDLE_IDENTIFIER = com.kablock.macos;
510514
PRODUCT_NAME = "Ka-Block!";
511515
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -524,11 +528,13 @@
524528
CODE_SIGN_ENTITLEMENTS = "Ka-Block Content Blocker/macOS/Ka-Block Content Blocker.entitlements";
525529
CODE_SIGN_IDENTITY = "Mac Developer";
526530
CODE_SIGN_STYLE = Automatic;
531+
CURRENT_PROJECT_VERSION = 4;
527532
DEVELOPMENT_TEAM = "";
528533
ENABLE_HARDENED_RUNTIME = YES;
529534
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block Content Blocker/macOS/Info.plist";
530535
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
531536
MACOSX_DEPLOYMENT_TARGET = 10.13;
537+
MARKETING_VERSION = 3.3;
532538
PRODUCT_BUNDLE_IDENTIFIER = "com.kablock.macos.Ka-Block-Content-Blocker";
533539
PRODUCT_NAME = "$(TARGET_NAME)";
534540
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -549,11 +555,13 @@
549555
CODE_SIGN_ENTITLEMENTS = "Ka-Block Content Blocker/macOS/Ka-Block Content Blocker.entitlements";
550556
CODE_SIGN_IDENTITY = "Mac Developer";
551557
CODE_SIGN_STYLE = Automatic;
558+
CURRENT_PROJECT_VERSION = 4;
552559
DEVELOPMENT_TEAM = "";
553560
ENABLE_HARDENED_RUNTIME = YES;
554561
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block Content Blocker/macOS/Info.plist";
555562
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
556563
MACOSX_DEPLOYMENT_TARGET = 10.13;
564+
MARKETING_VERSION = 3.3;
557565
PRODUCT_BUNDLE_IDENTIFIER = "com.kablock.macos.Ka-Block-Content-Blocker";
558566
PRODUCT_NAME = "$(TARGET_NAME)";
559567
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -675,6 +683,7 @@
675683
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block/iOS/Info.plist";
676684
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
677685
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
686+
MARKETING_VERSION = 3.3;
678687
PRODUCT_BUNDLE_IDENTIFIER = com.kablock.ios;
679688
PRODUCT_NAME = "$(PRODUCT_NAME)";
680689
PROVISIONING_PROFILE = "";
@@ -695,6 +704,7 @@
695704
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block/iOS/Info.plist";
696705
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
697706
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
707+
MARKETING_VERSION = 3.3;
698708
PRODUCT_BUNDLE_IDENTIFIER = com.kablock.ios;
699709
PRODUCT_NAME = "$(PRODUCT_NAME)";
700710
PROVISIONING_PROFILE = "";
@@ -713,6 +723,7 @@
713723
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block Content Blocker/iOS/Info.plist";
714724
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
715725
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
726+
MARKETING_VERSION = 3.3;
716727
PRODUCT_BUNDLE_IDENTIFIER = "com.kablock.ios.Ka-Block-Content-Blocker";
717728
PRODUCT_NAME = "$(TARGET_NAME)";
718729
PROVISIONING_PROFILE = "";
@@ -732,6 +743,7 @@
732743
INFOPLIST_FILE = "$(SRCROOT)/Ka-Block Content Blocker/iOS/Info.plist";
733744
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
734745
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
746+
MARKETING_VERSION = 3.3;
735747
PRODUCT_BUNDLE_IDENTIFIER = "com.kablock.ios.Ka-Block-Content-Blocker";
736748
PRODUCT_NAME = "$(TARGET_NAME)";
737749
PROVISIONING_PROFILE = "";

‎Ka-Block/iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.2</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

‎Ka-Block/macOS/Assets.xcassets/Background Color.colorset/Contents.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "extended-gray",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"white" : "0.980"
9+
}
10+
},
11+
"idiom" : "universal"
12+
},
13+
{
14+
"appearances" : [
15+
{
16+
"appearance" : "luminosity",
17+
"value" : "dark"
18+
}
19+
],
20+
"color" : {
21+
"color-space" : "extended-gray",
22+
"components" : {
23+
"alpha" : "1.000",
24+
"white" : "0.132"
25+
}
26+
},
27+
"idiom" : "universal"
28+
}
29+
],
30+
"info" : {
31+
"author" : "xcode",
32+
"version" : 1
33+
}
34+
}

‎Ka-Block/macOS/Assets.xcassets/Contents.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info" : {
3-
"version" : 1,
4-
"author" : "xcode"
3+
"author" : "xcode",
4+
"version" : 1
55
}
6-
}
6+
}

‎Ka-Block/macOS/Base.lproj/Main.storyboard‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17132"/>
6+
<capability name="Named colors" minToolsVersion="9.0"/>
57
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
68
</dependencies>
79
<scenes>
@@ -44,8 +46,8 @@
4446
<!--Window Controller-->
4547
<scene sceneID="R2V-B0-nI4">
4648
<objects>
47-
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
48-
<window key="window" title="Ka-Block!" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="IQv-IB-iLA">
49+
<windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" sceneMemberID="viewController">
50+
<window key="window" title="Ka-Block!" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="IQv-IB-iLA">
4951
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" fullSizeContentView="YES"/>
5052
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
5153
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
@@ -84,7 +86,7 @@
8486
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="eiV-Ry-IPy">
8587
<font key="font" metaFont="system"/>
8688
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
87-
<color key="backgroundColor" red="0.98069138601036265" green="0.98069138601036265" blue="0.98069138601036265" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
89+
<color key="backgroundColor" name="Background Color"/>
8890
</textFieldCell>
8991
</textField>
9092
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="blp-Lr-NFe" userLabel="Disabled Label">
@@ -133,5 +135,8 @@
133135
<resources>
134136
<image name="Status Disabled" width="866" height="866"/>
135137
<image name="Status Enabled" width="864" height="864"/>
138+
<namedColor name="Background Color">
139+
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
140+
</namedColor>
136141
</resources>
137142
</document>

‎Ka-Block/macOS/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.2</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>3</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSMinimumSystemVersion</key>

0 commit comments

Comments
 (0)