playground
/
menu-clock-macos
mirror of https://github.com/n0shake/Clocker.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Removing Add Image highlighted icon.

pull/113/head
Abhishek Banthia 3 years ago
parent
d660558195
commit
156441759e
3 changed files with 4 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      Clocker/Clocker/en.lproj/Panel.xib
  2. 7
      Clocker/ClockerUnitTests/ThemerTests.swift
  3. 4
      Clocker/Overall App/Themer.swift

9
Clocker/Clocker/en.lproj/Panel.xib
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
@ -43,7 +43,7 @@
<windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/> <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="1000" y="379" width="350" height="460"/> <rect key="contentRect" x="1000" y="379" width="350" height="460"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/> <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
<view key="contentView" focusRingType="none" id="6" customClass="BackgroundPanelView" customModule="Clocker" customModuleProvider="target"> <view key="contentView" focusRingType="none" id="6" customClass="BackgroundPanelView" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="370" height="450"/> <rect key="frame" x="0.0" y="0.0" width="370" height="450"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -222,7 +222,7 @@
<constraint firstAttribute="height" constant="80" id="bRv-Of-5l3"/> <constraint firstAttribute="height" constant="80" id="bRv-Of-5l3"/>
<constraint firstAttribute="width" constant="80" id="cRC-Fx-WLR"/> <constraint firstAttribute="width" constant="80" id="cRC-Fx-WLR"/>
</constraints> </constraints>
<buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Add Icon" imagePosition="only" alignment="center" alternateImage="Add Highlighted" imageScaling="proportionallyUpOrDown" inset="2" id="rwH-VF-f2V"> <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Add Icon" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="rwH-VF-f2V">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
@ -674,7 +674,6 @@
<userDefaultsController representsSharedInstance="YES" id="O3B-kK-4vm"/> <userDefaultsController representsSharedInstance="YES" id="O3B-kK-4vm"/>
</objects> </objects>
<resources> <resources>
<image name="Add Highlighted" width="700" height="700"/>
<image name="Add Icon" width="700" height="700"/> <image name="Add Icon" width="700" height="700"/>
<image name="CurrentLocation" width="350" height="350"/> <image name="CurrentLocation" width="350" height="350"/>
<image name="Extra" width="700" height="700"/> <image name="Extra" width="700" height="700"/>

7
Clocker/ClockerUnitTests/ThemerTests.swift
Unescape View File

@ -27,7 +27,6 @@ class ThemerTests: XCTestCase {
let expectedSharingImage: String let expectedSharingImage: String
let expectedCurrentLocationImage: String let expectedCurrentLocationImage: String
let expectedAddImage: String let expectedAddImage: String
let expectedAddImageHighlighted: String
let expectedPrivacyTabImage: String let expectedPrivacyTabImage: String
let expectedAppearanceTabImage: String let expectedAppearanceTabImage: String
let expectedCalendarTabImage: String let expectedCalendarTabImage: String
@ -74,7 +73,6 @@ class ThemerTests: XCTestCase {
expectedSharingImage: "square.and.arrow.up.on.square.fill", expectedSharingImage: "square.and.arrow.up.on.square.fill",
expectedCurrentLocationImage: "location.fill", expectedCurrentLocationImage: "location.fill",
expectedAddImage: "plus", expectedAddImage: "plus",
expectedAddImageHighlighted: "Add Highlighted",
expectedPrivacyTabImage: "lock", expectedPrivacyTabImage: "lock",
expectedAppearanceTabImage: "eye", expectedAppearanceTabImage: "eye",
expectedCalendarTabImage: "calendar", expectedCalendarTabImage: "calendar",
@ -108,7 +106,6 @@ class ThemerTests: XCTestCase {
expectedSharingImage: "square.and.arrow.up.on.square.fill", expectedSharingImage: "square.and.arrow.up.on.square.fill",
expectedCurrentLocationImage: "location.fill", expectedCurrentLocationImage: "location.fill",
expectedAddImage: "plus", expectedAddImage: "plus",
expectedAddImageHighlighted: "Add White",
expectedPrivacyTabImage: "lock", expectedPrivacyTabImage: "lock",
expectedAppearanceTabImage: "eye", expectedAppearanceTabImage: "eye",
expectedCalendarTabImage: "calendar", expectedCalendarTabImage: "calendar",
@ -150,7 +147,6 @@ class ThemerTests: XCTestCase {
expectedSharingImage: "square.and.arrow.up.on.square.fill", expectedSharingImage: "square.and.arrow.up.on.square.fill",
expectedCurrentLocationImage: "location.fill", expectedCurrentLocationImage: "location.fill",
expectedAddImage: "plus", expectedAddImage: "plus",
expectedAddImageHighlighted: "Add White",
expectedPrivacyTabImage: "lock", expectedPrivacyTabImage: "lock",
expectedAppearanceTabImage: "eye", expectedAppearanceTabImage: "eye",
expectedCalendarTabImage: "calendar", expectedCalendarTabImage: "calendar",
@ -185,7 +181,6 @@ class ThemerTests: XCTestCase {
expectedSharingImage: "square.and.arrow.up.on.square.fill", expectedSharingImage: "square.and.arrow.up.on.square.fill",
expectedCurrentLocationImage: "location.fill", expectedCurrentLocationImage: "location.fill",
expectedAddImage: "plus", expectedAddImage: "plus",
expectedAddImageHighlighted: "Add White",
expectedPrivacyTabImage: "lock", expectedPrivacyTabImage: "lock",
expectedAppearanceTabImage: "eye", expectedAppearanceTabImage: "eye",
expectedCalendarTabImage: "calendar", expectedCalendarTabImage: "calendar",
@ -219,7 +214,6 @@ class ThemerTests: XCTestCase {
expectedSharingImage: "square.and.arrow.up.on.square.fill", expectedSharingImage: "square.and.arrow.up.on.square.fill",
expectedCurrentLocationImage: "location.fill", expectedCurrentLocationImage: "location.fill",
expectedAddImage: "plus", expectedAddImage: "plus",
expectedAddImageHighlighted: "Add White",
expectedPrivacyTabImage: "lock", expectedPrivacyTabImage: "lock",
expectedAppearanceTabImage: "eye", expectedAppearanceTabImage: "eye",
expectedCalendarTabImage: "calendar", expectedCalendarTabImage: "calendar",
@ -252,7 +246,6 @@ class ThemerTests: XCTestCase {
XCTAssertEqual(subject.currentLocationImage().accessibilityDescription, expectations.expectedCurrentLocationImage) XCTAssertEqual(subject.currentLocationImage().accessibilityDescription, expectations.expectedCurrentLocationImage)
XCTAssertEqual(subject.popoverAppearance(), expectations.expectedPopoverApperarance) XCTAssertEqual(subject.popoverAppearance(), expectations.expectedPopoverApperarance)
XCTAssertEqual(subject.addImage().accessibilityDescription, expectations.expectedAddImage) XCTAssertEqual(subject.addImage().accessibilityDescription, expectations.expectedAddImage)
XCTAssertEqual(subject.addImageHighlighted().name(), expectations.expectedAddImageHighlighted)
XCTAssertEqual(subject.privacyTabImage().accessibilityDescription, expectations.expectedPrivacyTabImage) XCTAssertEqual(subject.privacyTabImage().accessibilityDescription, expectations.expectedPrivacyTabImage)
XCTAssertEqual(subject.appearanceTabImage().accessibilityDescription, expectations.expectedAppearanceTabImage) XCTAssertEqual(subject.appearanceTabImage().accessibilityDescription, expectations.expectedAppearanceTabImage)
XCTAssertEqual(subject.calendarTabImage().accessibilityDescription, expectations.expectedCalendarTabImage) XCTAssertEqual(subject.calendarTabImage().accessibilityDescription, expectations.expectedCalendarTabImage)

4
Clocker/Overall App/Themer.swift
Unescape View File

@ -329,10 +329,6 @@ extension Themer {
NSImage(named: NSImage.Name("Add White"))!) NSImage(named: NSImage.Name("Add White"))!)
} }
func addImageHighlighted() -> NSImage {
return themeIndex == .light ? NSImage(named: NSImage.Name("Add Highlighted"))! : NSImage(named: NSImage.Name("Add White"))!
}
func privacyTabImage() -> NSImage { func privacyTabImage() -> NSImage {
if let privacyTabSFImage = symbolImage(for: "lock") { if let privacyTabSFImage = symbolImage(for: "lock") {
return privacyTabSFImage return privacyTabSFImage

Write Preview
Loading…
Cancel
Save