diff --git a/LunaMac.xcodeproj/project.pbxproj b/LunaMac.xcodeproj/project.pbxproj index 6a62fbc..001e5f5 100644 --- a/LunaMac.xcodeproj/project.pbxproj +++ b/LunaMac.xcodeproj/project.pbxproj @@ -14,29 +14,38 @@ 7ECD0D7C28DD2A4100B90958 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECD0D7B28DD2A4100B90958 /* AppDelegate.swift */; }; 7ECD0D7E28DD2A4100B90958 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECD0D7D28DD2A4100B90958 /* ViewController.swift */; }; 7ECD26CC28E002A9000D5E2C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7ECD26CA28E002A9000D5E2C /* MainMenu.xib */; }; - 7EF1E35728E7FF5A006F8ED9 /* wang-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF1E35328E7FF59006F8ED9 /* wang-alt-dark.png */; }; - 7EF1E35828E7FF5A006F8ED9 /* wanc-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF1E35428E7FF59006F8ED9 /* wanc-alt-dark.png */; }; - 7EF1E35928E7FF5A006F8ED9 /* waxc-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF1E35528E7FF59006F8ED9 /* waxc-alt-dark.png */; }; - 7EF1E35A28E7FF5A006F8ED9 /* waxg-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF1E35628E7FF5A006F8ED9 /* waxg-alt-dark.png */; }; + 7ED5E25828E8AD0A00FF26EB /* wanc-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E23628E8AD0A00FF26EB /* wanc-alt-dark.png */; }; + 7ED5E25928E8AD0A00FF26EB /* wang-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E23728E8AD0A00FF26EB /* wang-alt-dark.png */; }; + 7ED5E25A28E8AD0A00FF26EB /* waxc-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E23828E8AD0A00FF26EB /* waxc-alt-dark.png */; }; + 7ED5E25B28E8AD0A00FF26EB /* waxg-alt-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E23928E8AD0A00FF26EB /* waxg-alt-dark.png */; }; + 7ED5E26528E8AD0A00FF26EB /* default-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24528E8AD0A00FF26EB /* default-dark.png */; }; + 7ED5E26628E8AD0A00FF26EB /* firstq-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24628E8AD0A00FF26EB /* firstq-dark.png */; }; + 7ED5E26728E8AD0A00FF26EB /* full-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24728E8AD0A00FF26EB /* full-dark.png */; }; + 7ED5E26828E8AD0A00FF26EB /* lastq-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24828E8AD0A00FF26EB /* lastq-dark.png */; }; + 7ED5E26928E8AD0A00FF26EB /* new-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24928E8AD0A00FF26EB /* new-dark.png */; }; + 7ED5E26A28E8AD0A00FF26EB /* wanc-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24A28E8AD0A00FF26EB /* wanc-dark.png */; }; + 7ED5E26B28E8AD0A00FF26EB /* wang-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24B28E8AD0A00FF26EB /* wang-dark.png */; }; + 7ED5E26C28E8AD0A00FF26EB /* waxc-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24C28E8AD0A00FF26EB /* waxc-dark.png */; }; + 7ED5E26D28E8AD0A00FF26EB /* waxg-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24D28E8AD0A00FF26EB /* waxg-dark.png */; }; + 7ED5E26E28E8AD0A00FF26EB /* default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E24F28E8AD0A00FF26EB /* default.png */; }; + 7ED5E26F28E8AD0A00FF26EB /* firstq.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25028E8AD0A00FF26EB /* firstq.png */; }; + 7ED5E27028E8AD0A00FF26EB /* full.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25128E8AD0A00FF26EB /* full.png */; }; + 7ED5E27128E8AD0A00FF26EB /* lastq.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25228E8AD0A00FF26EB /* lastq.png */; }; + 7ED5E27228E8AD0A00FF26EB /* new.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25328E8AD0A00FF26EB /* new.png */; }; + 7ED5E27328E8AD0A00FF26EB /* wanc.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25428E8AD0A00FF26EB /* wanc.png */; }; + 7ED5E27428E8AD0A00FF26EB /* wang.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25528E8AD0A00FF26EB /* wang.png */; }; + 7ED5E27528E8AD0A00FF26EB /* waxc.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25628E8AD0A00FF26EB /* waxc.png */; }; + 7ED5E27628E8AD0A00FF26EB /* waxg.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E25728E8AD0A00FF26EB /* waxg.png */; }; + 7ED5E28128E8ADCC00FF26EB /* default-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27828E8ADCC00FF26EB /* default-emoji.png */; }; + 7ED5E28228E8ADCC00FF26EB /* firstq-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27928E8ADCC00FF26EB /* firstq-emoji.png */; }; + 7ED5E28328E8ADCC00FF26EB /* full-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27A28E8ADCC00FF26EB /* full-emoji.png */; }; + 7ED5E28428E8ADCC00FF26EB /* lastq-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27B28E8ADCC00FF26EB /* lastq-emoji.png */; }; + 7ED5E28528E8ADCC00FF26EB /* new-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27C28E8ADCC00FF26EB /* new-emoji.png */; }; + 7ED5E28628E8ADCC00FF26EB /* wanc-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27D28E8ADCC00FF26EB /* wanc-emoji.png */; }; + 7ED5E28728E8ADCC00FF26EB /* wang-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27E28E8ADCC00FF26EB /* wang-emoji.png */; }; + 7ED5E28828E8ADCC00FF26EB /* waxc-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E27F28E8ADCC00FF26EB /* waxc-emoji.png */; }; + 7ED5E28928E8ADCC00FF26EB /* waxg-emoji.png in Resources */ = {isa = PBXBuildFile; fileRef = 7ED5E28028E8ADCC00FF26EB /* waxg-emoji.png */; }; 7EF79B3328DE1E4D00FF1F49 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */; }; - 7EF79BAE28DE395C00FF1F49 /* firstq-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */; }; - 7EF79BAF28DE395C00FF1F49 /* firstq.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B9F28DE395C00FF1F49 /* firstq.png */; }; - 7EF79BB028DE395C00FF1F49 /* full-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA028DE395C00FF1F49 /* full-dark.png */; }; - 7EF79BB128DE395C00FF1F49 /* full.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA128DE395C00FF1F49 /* full.png */; }; - 7EF79BB228DE395C00FF1F49 /* lastq-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA228DE395C00FF1F49 /* lastq-dark.png */; }; - 7EF79BB328DE395C00FF1F49 /* lastq.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA328DE395C00FF1F49 /* lastq.png */; }; - 7EF79BB428DE395C00FF1F49 /* new-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA428DE395C00FF1F49 /* new-dark.png */; }; - 7EF79BB528DE395C00FF1F49 /* new.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA528DE395C00FF1F49 /* new.png */; }; - 7EF79BB628DE395C00FF1F49 /* wanc-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA628DE395C00FF1F49 /* wanc-dark.png */; }; - 7EF79BB728DE395C00FF1F49 /* wanc.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA728DE395C00FF1F49 /* wanc.png */; }; - 7EF79BB828DE395C00FF1F49 /* wang-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA828DE395C00FF1F49 /* wang-dark.png */; }; - 7EF79BB928DE395C00FF1F49 /* wang.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BA928DE395C00FF1F49 /* wang.png */; }; - 7EF79BBA28DE395C00FF1F49 /* waxc-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BAA28DE395C00FF1F49 /* waxc-dark.png */; }; - 7EF79BBB28DE395C00FF1F49 /* waxc.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BAB28DE395C00FF1F49 /* waxc.png */; }; - 7EF79BBC28DE395C00FF1F49 /* waxg-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BAC28DE395C00FF1F49 /* waxg-dark.png */; }; - 7EF79BBD28DE395C00FF1F49 /* waxg.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BAD28DE395C00FF1F49 /* waxg.png */; }; - 7EF79BC028DE4D2400FF1F49 /* default-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BBE28DE4D2400FF1F49 /* default-dark.png */; }; - 7EF79BC128DE4D2400FF1F49 /* default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79BBF28DE4D2400FF1F49 /* default.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -50,29 +59,38 @@ 7ECD0D8428DD2A4200B90958 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7ECD0D8528DD2A4200B90958 /* LunaMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LunaMac.entitlements; sourceTree = ""; }; 7ECD26CB28E002A9000D5E2C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 7EF1E35328E7FF59006F8ED9 /* wang-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-alt-dark.png"; sourceTree = ""; }; - 7EF1E35428E7FF59006F8ED9 /* wanc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-alt-dark.png"; sourceTree = ""; }; - 7EF1E35528E7FF59006F8ED9 /* waxc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-alt-dark.png"; sourceTree = ""; }; - 7EF1E35628E7FF5A006F8ED9 /* waxg-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-alt-dark.png"; sourceTree = ""; }; + 7ED5E23628E8AD0A00FF26EB /* wanc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-alt-dark.png"; sourceTree = ""; }; + 7ED5E23728E8AD0A00FF26EB /* wang-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-alt-dark.png"; sourceTree = ""; }; + 7ED5E23828E8AD0A00FF26EB /* waxc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-alt-dark.png"; sourceTree = ""; }; + 7ED5E23928E8AD0A00FF26EB /* waxg-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-alt-dark.png"; sourceTree = ""; }; + 7ED5E24528E8AD0A00FF26EB /* default-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-dark.png"; sourceTree = ""; }; + 7ED5E24628E8AD0A00FF26EB /* firstq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-dark.png"; sourceTree = ""; }; + 7ED5E24728E8AD0A00FF26EB /* full-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-dark.png"; sourceTree = ""; }; + 7ED5E24828E8AD0A00FF26EB /* lastq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-dark.png"; sourceTree = ""; }; + 7ED5E24928E8AD0A00FF26EB /* new-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-dark.png"; sourceTree = ""; }; + 7ED5E24A28E8AD0A00FF26EB /* wanc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-dark.png"; sourceTree = ""; }; + 7ED5E24B28E8AD0A00FF26EB /* wang-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-dark.png"; sourceTree = ""; }; + 7ED5E24C28E8AD0A00FF26EB /* waxc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-dark.png"; sourceTree = ""; }; + 7ED5E24D28E8AD0A00FF26EB /* waxg-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-dark.png"; sourceTree = ""; }; + 7ED5E24F28E8AD0A00FF26EB /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = ""; }; + 7ED5E25028E8AD0A00FF26EB /* firstq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = firstq.png; sourceTree = ""; }; + 7ED5E25128E8AD0A00FF26EB /* full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = full.png; sourceTree = ""; }; + 7ED5E25228E8AD0A00FF26EB /* lastq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lastq.png; sourceTree = ""; }; + 7ED5E25328E8AD0A00FF26EB /* new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new.png; sourceTree = ""; }; + 7ED5E25428E8AD0A00FF26EB /* wanc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wanc.png; sourceTree = ""; }; + 7ED5E25528E8AD0A00FF26EB /* wang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wang.png; sourceTree = ""; }; + 7ED5E25628E8AD0A00FF26EB /* waxc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxc.png; sourceTree = ""; }; + 7ED5E25728E8AD0A00FF26EB /* waxg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxg.png; sourceTree = ""; }; + 7ED5E27828E8ADCC00FF26EB /* default-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-emoji.png"; sourceTree = ""; }; + 7ED5E27928E8ADCC00FF26EB /* firstq-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-emoji.png"; sourceTree = ""; }; + 7ED5E27A28E8ADCC00FF26EB /* full-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-emoji.png"; sourceTree = ""; }; + 7ED5E27B28E8ADCC00FF26EB /* lastq-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-emoji.png"; sourceTree = ""; }; + 7ED5E27C28E8ADCC00FF26EB /* new-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-emoji.png"; sourceTree = ""; }; + 7ED5E27D28E8ADCC00FF26EB /* wanc-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-emoji.png"; sourceTree = ""; }; + 7ED5E27E28E8ADCC00FF26EB /* wang-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-emoji.png"; sourceTree = ""; }; + 7ED5E27F28E8ADCC00FF26EB /* waxc-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-emoji.png"; sourceTree = ""; }; + 7ED5E28028E8ADCC00FF26EB /* waxg-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-emoji.png"; sourceTree = ""; }; 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-dark.png"; sourceTree = ""; }; - 7EF79B9F28DE395C00FF1F49 /* firstq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = firstq.png; sourceTree = ""; }; - 7EF79BA028DE395C00FF1F49 /* full-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-dark.png"; sourceTree = ""; }; - 7EF79BA128DE395C00FF1F49 /* full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = full.png; sourceTree = ""; }; - 7EF79BA228DE395C00FF1F49 /* lastq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-dark.png"; sourceTree = ""; }; - 7EF79BA328DE395C00FF1F49 /* lastq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lastq.png; sourceTree = ""; }; - 7EF79BA428DE395C00FF1F49 /* new-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-dark.png"; sourceTree = ""; }; - 7EF79BA528DE395C00FF1F49 /* new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new.png; sourceTree = ""; }; - 7EF79BA628DE395C00FF1F49 /* wanc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-dark.png"; sourceTree = ""; }; - 7EF79BA728DE395C00FF1F49 /* wanc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wanc.png; sourceTree = ""; }; - 7EF79BA828DE395C00FF1F49 /* wang-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-dark.png"; sourceTree = ""; }; - 7EF79BA928DE395C00FF1F49 /* wang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wang.png; sourceTree = ""; }; - 7EF79BAA28DE395C00FF1F49 /* waxc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-dark.png"; sourceTree = ""; }; - 7EF79BAB28DE395C00FF1F49 /* waxc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxc.png; sourceTree = ""; }; - 7EF79BAC28DE395C00FF1F49 /* waxg-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-dark.png"; sourceTree = ""; }; - 7EF79BAD28DE395C00FF1F49 /* waxg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxg.png; sourceTree = ""; }; - 7EF79BBE28DE4D2400FF1F49 /* default-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-dark.png"; sourceTree = ""; }; - 7EF79BBF28DE4D2400FF1F49 /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -120,31 +138,72 @@ path = LunaMac; sourceTree = ""; }; + 7ED5E23528E8AD0A00FF26EB /* darkalt */ = { + isa = PBXGroup; + children = ( + 7ED5E23628E8AD0A00FF26EB /* wanc-alt-dark.png */, + 7ED5E23728E8AD0A00FF26EB /* wang-alt-dark.png */, + 7ED5E23828E8AD0A00FF26EB /* waxc-alt-dark.png */, + 7ED5E23928E8AD0A00FF26EB /* waxg-alt-dark.png */, + ); + path = darkalt; + sourceTree = ""; + }; + 7ED5E24428E8AD0A00FF26EB /* dark */ = { + isa = PBXGroup; + children = ( + 7ED5E24528E8AD0A00FF26EB /* default-dark.png */, + 7ED5E24628E8AD0A00FF26EB /* firstq-dark.png */, + 7ED5E24728E8AD0A00FF26EB /* full-dark.png */, + 7ED5E24828E8AD0A00FF26EB /* lastq-dark.png */, + 7ED5E24928E8AD0A00FF26EB /* new-dark.png */, + 7ED5E24A28E8AD0A00FF26EB /* wanc-dark.png */, + 7ED5E24B28E8AD0A00FF26EB /* wang-dark.png */, + 7ED5E24C28E8AD0A00FF26EB /* waxc-dark.png */, + 7ED5E24D28E8AD0A00FF26EB /* waxg-dark.png */, + ); + path = dark; + sourceTree = ""; + }; + 7ED5E24E28E8AD0A00FF26EB /* default */ = { + isa = PBXGroup; + children = ( + 7ED5E24F28E8AD0A00FF26EB /* default.png */, + 7ED5E25028E8AD0A00FF26EB /* firstq.png */, + 7ED5E25128E8AD0A00FF26EB /* full.png */, + 7ED5E25228E8AD0A00FF26EB /* lastq.png */, + 7ED5E25328E8AD0A00FF26EB /* new.png */, + 7ED5E25428E8AD0A00FF26EB /* wanc.png */, + 7ED5E25528E8AD0A00FF26EB /* wang.png */, + 7ED5E25628E8AD0A00FF26EB /* waxc.png */, + 7ED5E25728E8AD0A00FF26EB /* waxg.png */, + ); + path = default; + sourceTree = ""; + }; + 7ED5E27728E8ADCC00FF26EB /* emoji */ = { + isa = PBXGroup; + children = ( + 7ED5E27828E8ADCC00FF26EB /* default-emoji.png */, + 7ED5E27928E8ADCC00FF26EB /* firstq-emoji.png */, + 7ED5E27A28E8ADCC00FF26EB /* full-emoji.png */, + 7ED5E27B28E8ADCC00FF26EB /* lastq-emoji.png */, + 7ED5E27C28E8ADCC00FF26EB /* new-emoji.png */, + 7ED5E27D28E8ADCC00FF26EB /* wanc-emoji.png */, + 7ED5E27E28E8ADCC00FF26EB /* wang-emoji.png */, + 7ED5E27F28E8ADCC00FF26EB /* waxc-emoji.png */, + 7ED5E28028E8ADCC00FF26EB /* waxg-emoji.png */, + ); + path = emoji; + sourceTree = ""; + }; 7EF79B9D28DE395C00FF1F49 /* png */ = { isa = PBXGroup; children = ( - 7EF1E35428E7FF59006F8ED9 /* wanc-alt-dark.png */, - 7EF1E35328E7FF59006F8ED9 /* wang-alt-dark.png */, - 7EF1E35528E7FF59006F8ED9 /* waxc-alt-dark.png */, - 7EF1E35628E7FF5A006F8ED9 /* waxg-alt-dark.png */, - 7EF79BBE28DE4D2400FF1F49 /* default-dark.png */, - 7EF79BBF28DE4D2400FF1F49 /* default.png */, - 7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */, - 7EF79B9F28DE395C00FF1F49 /* firstq.png */, - 7EF79BA028DE395C00FF1F49 /* full-dark.png */, - 7EF79BA128DE395C00FF1F49 /* full.png */, - 7EF79BA228DE395C00FF1F49 /* lastq-dark.png */, - 7EF79BA328DE395C00FF1F49 /* lastq.png */, - 7EF79BA428DE395C00FF1F49 /* new-dark.png */, - 7EF79BA528DE395C00FF1F49 /* new.png */, - 7EF79BA628DE395C00FF1F49 /* wanc-dark.png */, - 7EF79BA728DE395C00FF1F49 /* wanc.png */, - 7EF79BA828DE395C00FF1F49 /* wang-dark.png */, - 7EF79BA928DE395C00FF1F49 /* wang.png */, - 7EF79BAA28DE395C00FF1F49 /* waxc-dark.png */, - 7EF79BAB28DE395C00FF1F49 /* waxc.png */, - 7EF79BAC28DE395C00FF1F49 /* waxg-dark.png */, - 7EF79BAD28DE395C00FF1F49 /* waxg.png */, + 7ED5E24428E8AD0A00FF26EB /* dark */, + 7ED5E23528E8AD0A00FF26EB /* darkalt */, + 7ED5E24E28E8AD0A00FF26EB /* default */, + 7ED5E27728E8ADCC00FF26EB /* emoji */, ); path = png; sourceTree = ""; @@ -212,33 +271,42 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7ED5E28328E8ADCC00FF26EB /* full-emoji.png in Resources */, + 7ED5E27128E8AD0A00FF26EB /* lastq.png in Resources */, + 7ED5E28128E8ADCC00FF26EB /* default-emoji.png in Resources */, + 7ED5E27528E8AD0A00FF26EB /* waxc.png in Resources */, + 7ED5E26F28E8AD0A00FF26EB /* firstq.png in Resources */, + 7ED5E28828E8ADCC00FF26EB /* waxc-emoji.png in Resources */, + 7ED5E26E28E8AD0A00FF26EB /* default.png in Resources */, + 7ED5E26D28E8AD0A00FF26EB /* waxg-dark.png in Resources */, + 7ED5E27228E8AD0A00FF26EB /* new.png in Resources */, + 7ED5E28428E8ADCC00FF26EB /* lastq-emoji.png in Resources */, + 7ED5E26B28E8AD0A00FF26EB /* wang-dark.png in Resources */, 7E8188BB28DD423B0080C707 /* InfoBox.xib in Resources */, - 7EF79BBD28DE395C00FF1F49 /* waxg.png in Resources */, - 7EF79BAF28DE395C00FF1F49 /* firstq.png in Resources */, + 7ED5E28728E8ADCC00FF26EB /* wang-emoji.png in Resources */, + 7ED5E27028E8AD0A00FF26EB /* full.png in Resources */, + 7ED5E26528E8AD0A00FF26EB /* default-dark.png in Resources */, + 7ED5E26828E8AD0A00FF26EB /* lastq-dark.png in Resources */, + 7ED5E28528E8ADCC00FF26EB /* new-emoji.png in Resources */, + 7ED5E27628E8AD0A00FF26EB /* waxg.png in Resources */, + 7ED5E25828E8AD0A00FF26EB /* wanc-alt-dark.png in Resources */, + 7ED5E26C28E8AD0A00FF26EB /* waxc-dark.png in Resources */, + 7ED5E26928E8AD0A00FF26EB /* new-dark.png in Resources */, 7E0CBEA628DEBA80009967CD /* changelog.txt in Resources */, - 7EF79BB428DE395C00FF1F49 /* new-dark.png in Resources */, - 7EF79BB828DE395C00FF1F49 /* wang-dark.png in Resources */, - 7EF79BC028DE4D2400FF1F49 /* default-dark.png in Resources */, - 7EF79BB928DE395C00FF1F49 /* wang.png in Resources */, - 7EF1E35828E7FF5A006F8ED9 /* wanc-alt-dark.png in Resources */, - 7EF1E35728E7FF5A006F8ED9 /* wang-alt-dark.png in Resources */, - 7EF79BB628DE395C00FF1F49 /* wanc-dark.png in Resources */, - 7EF79BBB28DE395C00FF1F49 /* waxc.png in Resources */, - 7EF1E35A28E7FF5A006F8ED9 /* waxg-alt-dark.png in Resources */, - 7EF79BB528DE395C00FF1F49 /* new.png in Resources */, - 7EF1E35928E7FF5A006F8ED9 /* waxc-alt-dark.png in Resources */, - 7EF79BB228DE395C00FF1F49 /* lastq-dark.png in Resources */, - 7EF79BB328DE395C00FF1F49 /* lastq.png in Resources */, 7E0CBEA428DEB998009967CD /* Changelog.xib in Resources */, - 7EF79BB028DE395C00FF1F49 /* full-dark.png in Resources */, - 7EF79BB128DE395C00FF1F49 /* full.png in Resources */, - 7EF79BC128DE4D2400FF1F49 /* default.png in Resources */, - 7EF79BBC28DE395C00FF1F49 /* waxg-dark.png in Resources */, + 7ED5E28928E8ADCC00FF26EB /* waxg-emoji.png in Resources */, + 7ED5E25B28E8AD0A00FF26EB /* waxg-alt-dark.png in Resources */, + 7ED5E28228E8ADCC00FF26EB /* firstq-emoji.png in Resources */, + 7ED5E26728E8AD0A00FF26EB /* full-dark.png in Resources */, + 7ED5E27328E8AD0A00FF26EB /* wanc.png in Resources */, + 7ED5E25A28E8AD0A00FF26EB /* waxc-alt-dark.png in Resources */, + 7ED5E27428E8AD0A00FF26EB /* wang.png in Resources */, + 7ED5E28628E8ADCC00FF26EB /* wanc-emoji.png in Resources */, 7EF79B3328DE1E4D00FF1F49 /* Assets.xcassets in Resources */, - 7EF79BAE28DE395C00FF1F49 /* firstq-dark.png in Resources */, + 7ED5E26628E8AD0A00FF26EB /* firstq-dark.png in Resources */, 7E96D61628DD75BE00999EAE /* LunaMac.icns in Resources */, - 7EF79BB728DE395C00FF1F49 /* wanc.png in Resources */, - 7EF79BBA28DE395C00FF1F49 /* waxc-dark.png in Resources */, + 7ED5E25928E8AD0A00FF26EB /* wang-alt-dark.png in Resources */, + 7ED5E26A28E8AD0A00FF26EB /* wanc-dark.png in Resources */, 7ECD26CC28E002A9000D5E2C /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LunaMac/AppDelegate.swift b/LunaMac/AppDelegate.swift index 08368da..9c40b6a 100644 --- a/LunaMac/AppDelegate.swift +++ b/LunaMac/AppDelegate.swift @@ -17,7 +17,7 @@ import Foundation import CoreFoundation @NSApplicationMain -class AppDelegate: NSObject, NSApplicationDelegate { +class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { // static array of possible lunar values let phaseArray:[String:[String:NSString]] = [ @@ -89,9 +89,6 @@ class AppDelegate: NSObject, NSApplicationDelegate { // make sure applet stays in memory var statusBarItem: NSStatusItem? - // create a menu for the icon - let statusBarMenu = NSMenu(title: "LunaMac Menu") - // create empty timer for event loop var lunaTimer = Timer() @@ -121,10 +118,19 @@ class AppDelegate: NSObject, NSApplicationDelegate { RunLoop.current.add(lunaTimer, forMode: RunLoop.Mode.common) } + @objc func menuWillOpen(_ menu: NSMenu) { + lunaTimer.invalidate() + } + + @objc func menuDidClose(_ menu: NSMenu) { + startTimer() + } + @objc func buildMenu(key: String = "default") { - // clear the menu - statusBarMenu.removeAllItems() - statusBarItem?.isVisible = false + // create a menu for the icon + let statusBarMenu = NSMenu(title: "LunaMac Menu") + + statusBarMenu.delegate = self // get system-wide menu bar let statusBar = NSStatusBar.system @@ -132,22 +138,31 @@ class AppDelegate: NSObject, NSApplicationDelegate { // set icon size to square statusBarItem = statusBar.statusItem(withLength: NSStatusItem.squareLength) + // filename suffix + /* + -dark dark mode + -alt-dark dark mode inverted + -emoji emoji + */ + var suffix = "" + + // if key is new2, rename to new + var key2 = key.contains("2") ? "new" : key + // if iconPref is set to emoji if (defaults.string(forKey: "iconPref") == "emoji") { // change font size // still not aligned properly + /* let iconString = phaseArray[key]?["icon"] as String? ?? "⨂" let iconAttrib = [ NSAttributedString.Key.font: NSFont.menuFont(ofSize: 12.0) ] let iconAttrString = NSAttributedString(string: iconString, attributes: iconAttrib) statusBarItem?.button?.attributedTitle = iconAttrString + */ + suffix += "-emoji" } // otherwise use icons else { - var suffix = "" - - // if key is new2, rename to new - var key2 = key.contains("2") ? "new" : key - // check for dark mode and set the right image file if #available(OSX 10.14, *) { let darkMode = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") @@ -179,14 +194,12 @@ class AppDelegate: NSObject, NSApplicationDelegate { suffix += "-dark" } } - - // set image filename - let imgName = key2 + suffix + ".png" - - statusBarItem?.button?.image = NSImage(named: imgName) } - statusBarItem?.isVisible = true + // set image filename + let imgName = key2 + suffix + ".png" + + statusBarItem?.button?.image = NSImage(named: imgName) // add the menu to the menu bar icon statusBarItem?.menu = statusBarMenu diff --git a/LunaMac/Info.plist b/LunaMac/Info.plist index 3fb18da..d0dad0b 100644 --- a/LunaMac/Info.plist +++ b/LunaMac/Info.plist @@ -18,12 +18,12 @@ $(PRODUCT_NAME) CFBundlePackageType APPL + CFBundleDisplayName + LunaMac CFBundleShortVersionString - 1.4 + 1.4.1 CFBundleVersion - 1.4 - LSApplicationCategoryType - + 1.4.1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/LunaMac/changelog.txt b/LunaMac/changelog.txt index e14e335..15a59de 100644 --- a/LunaMac/changelog.txt +++ b/LunaMac/changelog.txt @@ -1,4 +1,11 @@ ====== Changelog ====== +v1.4.2 + - Fixed icon duplication bug + +v1.4.1 + - Emoji icons use images, so they're aligned properly + - Known bug with menu duplication and jumping in the status bar + v1.4 - Added user preference for icon style - Alt dark icons (inverted in dark mode to better represent phase) diff --git a/LunaMac/png/default-dark.png b/LunaMac/png/dark/default-dark.png similarity index 100% rename from LunaMac/png/default-dark.png rename to LunaMac/png/dark/default-dark.png diff --git a/LunaMac/png/firstq-dark.png b/LunaMac/png/dark/firstq-dark.png similarity index 100% rename from LunaMac/png/firstq-dark.png rename to LunaMac/png/dark/firstq-dark.png diff --git a/LunaMac/png/full-dark.png b/LunaMac/png/dark/full-dark.png similarity index 100% rename from LunaMac/png/full-dark.png rename to LunaMac/png/dark/full-dark.png diff --git a/LunaMac/png/lastq-dark.png b/LunaMac/png/dark/lastq-dark.png similarity index 100% rename from LunaMac/png/lastq-dark.png rename to LunaMac/png/dark/lastq-dark.png diff --git a/LunaMac/png/new-dark.png b/LunaMac/png/dark/new-dark.png similarity index 100% rename from LunaMac/png/new-dark.png rename to LunaMac/png/dark/new-dark.png diff --git a/LunaMac/png/wanc-dark.png b/LunaMac/png/dark/wanc-dark.png similarity index 100% rename from LunaMac/png/wanc-dark.png rename to LunaMac/png/dark/wanc-dark.png diff --git a/LunaMac/png/wang-dark.png b/LunaMac/png/dark/wang-dark.png similarity index 100% rename from LunaMac/png/wang-dark.png rename to LunaMac/png/dark/wang-dark.png diff --git a/LunaMac/png/waxc-dark.png b/LunaMac/png/dark/waxc-dark.png similarity index 100% rename from LunaMac/png/waxc-dark.png rename to LunaMac/png/dark/waxc-dark.png diff --git a/LunaMac/png/waxg-dark.png b/LunaMac/png/dark/waxg-dark.png similarity index 100% rename from LunaMac/png/waxg-dark.png rename to LunaMac/png/dark/waxg-dark.png diff --git a/LunaMac/png/wanc-alt-dark.png b/LunaMac/png/darkalt/wanc-alt-dark.png similarity index 100% rename from LunaMac/png/wanc-alt-dark.png rename to LunaMac/png/darkalt/wanc-alt-dark.png diff --git a/LunaMac/png/wang-alt-dark.png b/LunaMac/png/darkalt/wang-alt-dark.png similarity index 100% rename from LunaMac/png/wang-alt-dark.png rename to LunaMac/png/darkalt/wang-alt-dark.png diff --git a/LunaMac/png/waxc-alt-dark.png b/LunaMac/png/darkalt/waxc-alt-dark.png similarity index 100% rename from LunaMac/png/waxc-alt-dark.png rename to LunaMac/png/darkalt/waxc-alt-dark.png diff --git a/LunaMac/png/waxg-alt-dark.png b/LunaMac/png/darkalt/waxg-alt-dark.png similarity index 100% rename from LunaMac/png/waxg-alt-dark.png rename to LunaMac/png/darkalt/waxg-alt-dark.png diff --git a/LunaMac/png/default.png b/LunaMac/png/default/default.png similarity index 100% rename from LunaMac/png/default.png rename to LunaMac/png/default/default.png diff --git a/LunaMac/png/firstq.png b/LunaMac/png/default/firstq.png similarity index 100% rename from LunaMac/png/firstq.png rename to LunaMac/png/default/firstq.png diff --git a/LunaMac/png/full.png b/LunaMac/png/default/full.png similarity index 100% rename from LunaMac/png/full.png rename to LunaMac/png/default/full.png diff --git a/LunaMac/png/lastq.png b/LunaMac/png/default/lastq.png similarity index 100% rename from LunaMac/png/lastq.png rename to LunaMac/png/default/lastq.png diff --git a/LunaMac/png/new.png b/LunaMac/png/default/new.png similarity index 100% rename from LunaMac/png/new.png rename to LunaMac/png/default/new.png diff --git a/LunaMac/png/wanc.png b/LunaMac/png/default/wanc.png similarity index 100% rename from LunaMac/png/wanc.png rename to LunaMac/png/default/wanc.png diff --git a/LunaMac/png/wang.png b/LunaMac/png/default/wang.png similarity index 100% rename from LunaMac/png/wang.png rename to LunaMac/png/default/wang.png diff --git a/LunaMac/png/waxc.png b/LunaMac/png/default/waxc.png similarity index 100% rename from LunaMac/png/waxc.png rename to LunaMac/png/default/waxc.png diff --git a/LunaMac/png/waxg.png b/LunaMac/png/default/waxg.png similarity index 100% rename from LunaMac/png/waxg.png rename to LunaMac/png/default/waxg.png diff --git a/LunaMac/png/emoji/default-emoji.png b/LunaMac/png/emoji/default-emoji.png new file mode 100644 index 0000000..9e442ab Binary files /dev/null and b/LunaMac/png/emoji/default-emoji.png differ diff --git a/LunaMac/png/emoji/firstq-emoji.png b/LunaMac/png/emoji/firstq-emoji.png new file mode 100644 index 0000000..f3d3850 Binary files /dev/null and b/LunaMac/png/emoji/firstq-emoji.png differ diff --git a/LunaMac/png/emoji/full-emoji.png b/LunaMac/png/emoji/full-emoji.png new file mode 100644 index 0000000..f8a7a9f Binary files /dev/null and b/LunaMac/png/emoji/full-emoji.png differ diff --git a/LunaMac/png/emoji/lastq-emoji.png b/LunaMac/png/emoji/lastq-emoji.png new file mode 100644 index 0000000..1cb892f Binary files /dev/null and b/LunaMac/png/emoji/lastq-emoji.png differ diff --git a/LunaMac/png/emoji/new-emoji.png b/LunaMac/png/emoji/new-emoji.png new file mode 100644 index 0000000..6baf5c4 Binary files /dev/null and b/LunaMac/png/emoji/new-emoji.png differ diff --git a/LunaMac/png/emoji/wanc-emoji.png b/LunaMac/png/emoji/wanc-emoji.png new file mode 100644 index 0000000..203e5f9 Binary files /dev/null and b/LunaMac/png/emoji/wanc-emoji.png differ diff --git a/LunaMac/png/emoji/wang-emoji.png b/LunaMac/png/emoji/wang-emoji.png new file mode 100644 index 0000000..69cf747 Binary files /dev/null and b/LunaMac/png/emoji/wang-emoji.png differ diff --git a/LunaMac/png/emoji/waxc-emoji.png b/LunaMac/png/emoji/waxc-emoji.png new file mode 100644 index 0000000..9c272c8 Binary files /dev/null and b/LunaMac/png/emoji/waxc-emoji.png differ diff --git a/LunaMac/png/emoji/waxg-emoji.png b/LunaMac/png/emoji/waxg-emoji.png new file mode 100644 index 0000000..4e1cd29 Binary files /dev/null and b/LunaMac/png/emoji/waxg-emoji.png differ