ABG
/
LunaMac
1
0
Fork 0
Code Issues Pull Requests project_board Releases 4 Wiki Activity
Browse Source

v1.4.2 - fixed window dupe bug, added emoji icons

master 1.4.2
Claire 2 years ago
parent
cfd1b6ea82
commit
b3a7843c22
35 changed files with 198 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 244
      LunaMac.xcodeproj/project.pbxproj
  2. 49
      LunaMac/AppDelegate.swift
  3. 8
      LunaMac/Info.plist
  4. 7
      LunaMac/changelog.txt
  5. 0
      LunaMac/png/dark/default-dark.png
  6. 0
      LunaMac/png/dark/firstq-dark.png
  7. 0
      LunaMac/png/dark/full-dark.png
  8. 0
      LunaMac/png/dark/lastq-dark.png
  9. 0
      LunaMac/png/dark/new-dark.png
  10. 0
      LunaMac/png/dark/wanc-dark.png
  11. 0
      LunaMac/png/dark/wang-dark.png
  12. 0
      LunaMac/png/dark/waxc-dark.png
  13. 0
      LunaMac/png/dark/waxg-dark.png
  14. 0
      LunaMac/png/darkalt/wanc-alt-dark.png
  15. 0
      LunaMac/png/darkalt/wang-alt-dark.png
  16. 0
      LunaMac/png/darkalt/waxc-alt-dark.png
  17. 0
      LunaMac/png/darkalt/waxg-alt-dark.png
  18. 0
      LunaMac/png/default/default.png
  19. 0
      LunaMac/png/default/firstq.png
  20. 0
      LunaMac/png/default/full.png
  21. 0
      LunaMac/png/default/lastq.png
  22. 0
      LunaMac/png/default/new.png
  23. 0
      LunaMac/png/default/wanc.png
  24. 0
      LunaMac/png/default/wang.png
  25. 0
      LunaMac/png/default/waxc.png
  26. 0
      LunaMac/png/default/waxg.png
  27. BIN
      LunaMac/png/emoji/default-emoji.png
  28. BIN
      LunaMac/png/emoji/firstq-emoji.png
  29. BIN
      LunaMac/png/emoji/full-emoji.png
  30. BIN
      LunaMac/png/emoji/lastq-emoji.png
  31. BIN
      LunaMac/png/emoji/new-emoji.png
  32. BIN
      LunaMac/png/emoji/wanc-emoji.png
  33. BIN
      LunaMac/png/emoji/wang-emoji.png
  34. BIN
      LunaMac/png/emoji/waxc-emoji.png
  35. BIN
      LunaMac/png/emoji/waxg-emoji.png

244
LunaMac.xcodeproj/project.pbxproj
unescape_control_characters View File

@ -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 = "<group>"; };
7ECD0D8528DD2A4200B90958 /* LunaMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LunaMac.entitlements; sourceTree = "<group>"; };
7ECD26CB28E002A9000D5E2C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
7EF1E35328E7FF59006F8ED9 /* wang-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-alt-dark.png"; sourceTree = "<group>"; };
7EF1E35428E7FF59006F8ED9 /* wanc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-alt-dark.png"; sourceTree = "<group>"; };
7EF1E35528E7FF59006F8ED9 /* waxc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-alt-dark.png"; sourceTree = "<group>"; };
7EF1E35628E7FF5A006F8ED9 /* waxg-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-alt-dark.png"; sourceTree = "<group>"; };
7ED5E23628E8AD0A00FF26EB /* wanc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-alt-dark.png"; sourceTree = "<group>"; };
7ED5E23728E8AD0A00FF26EB /* wang-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-alt-dark.png"; sourceTree = "<group>"; };
7ED5E23828E8AD0A00FF26EB /* waxc-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-alt-dark.png"; sourceTree = "<group>"; };
7ED5E23928E8AD0A00FF26EB /* waxg-alt-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-alt-dark.png"; sourceTree = "<group>"; };
7ED5E24528E8AD0A00FF26EB /* default-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-dark.png"; sourceTree = "<group>"; };
7ED5E24628E8AD0A00FF26EB /* firstq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-dark.png"; sourceTree = "<group>"; };
7ED5E24728E8AD0A00FF26EB /* full-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-dark.png"; sourceTree = "<group>"; };
7ED5E24828E8AD0A00FF26EB /* lastq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-dark.png"; sourceTree = "<group>"; };
7ED5E24928E8AD0A00FF26EB /* new-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-dark.png"; sourceTree = "<group>"; };
7ED5E24A28E8AD0A00FF26EB /* wanc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-dark.png"; sourceTree = "<group>"; };
7ED5E24B28E8AD0A00FF26EB /* wang-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-dark.png"; sourceTree = "<group>"; };
7ED5E24C28E8AD0A00FF26EB /* waxc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-dark.png"; sourceTree = "<group>"; };
7ED5E24D28E8AD0A00FF26EB /* waxg-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-dark.png"; sourceTree = "<group>"; };
7ED5E24F28E8AD0A00FF26EB /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = "<group>"; };
7ED5E25028E8AD0A00FF26EB /* firstq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = firstq.png; sourceTree = "<group>"; };
7ED5E25128E8AD0A00FF26EB /* full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = full.png; sourceTree = "<group>"; };
7ED5E25228E8AD0A00FF26EB /* lastq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lastq.png; sourceTree = "<group>"; };
7ED5E25328E8AD0A00FF26EB /* new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new.png; sourceTree = "<group>"; };
7ED5E25428E8AD0A00FF26EB /* wanc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wanc.png; sourceTree = "<group>"; };
7ED5E25528E8AD0A00FF26EB /* wang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wang.png; sourceTree = "<group>"; };
7ED5E25628E8AD0A00FF26EB /* waxc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxc.png; sourceTree = "<group>"; };
7ED5E25728E8AD0A00FF26EB /* waxg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxg.png; sourceTree = "<group>"; };
7ED5E27828E8ADCC00FF26EB /* default-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-emoji.png"; sourceTree = "<group>"; };
7ED5E27928E8ADCC00FF26EB /* firstq-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-emoji.png"; sourceTree = "<group>"; };
7ED5E27A28E8ADCC00FF26EB /* full-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-emoji.png"; sourceTree = "<group>"; };
7ED5E27B28E8ADCC00FF26EB /* lastq-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-emoji.png"; sourceTree = "<group>"; };
7ED5E27C28E8ADCC00FF26EB /* new-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-emoji.png"; sourceTree = "<group>"; };
7ED5E27D28E8ADCC00FF26EB /* wanc-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-emoji.png"; sourceTree = "<group>"; };
7ED5E27E28E8ADCC00FF26EB /* wang-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-emoji.png"; sourceTree = "<group>"; };
7ED5E27F28E8ADCC00FF26EB /* waxc-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-emoji.png"; sourceTree = "<group>"; };
7ED5E28028E8ADCC00FF26EB /* waxg-emoji.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-emoji.png"; sourceTree = "<group>"; };
7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-dark.png"; sourceTree = "<group>"; };
7EF79B9F28DE395C00FF1F49 /* firstq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = firstq.png; sourceTree = "<group>"; };
7EF79BA028DE395C00FF1F49 /* full-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "full-dark.png"; sourceTree = "<group>"; };
7EF79BA128DE395C00FF1F49 /* full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = full.png; sourceTree = "<group>"; };
7EF79BA228DE395C00FF1F49 /* lastq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lastq-dark.png"; sourceTree = "<group>"; };
7EF79BA328DE395C00FF1F49 /* lastq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lastq.png; sourceTree = "<group>"; };
7EF79BA428DE395C00FF1F49 /* new-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new-dark.png"; sourceTree = "<group>"; };
7EF79BA528DE395C00FF1F49 /* new.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new.png; sourceTree = "<group>"; };
7EF79BA628DE395C00FF1F49 /* wanc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wanc-dark.png"; sourceTree = "<group>"; };
7EF79BA728DE395C00FF1F49 /* wanc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wanc.png; sourceTree = "<group>"; };
7EF79BA828DE395C00FF1F49 /* wang-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wang-dark.png"; sourceTree = "<group>"; };
7EF79BA928DE395C00FF1F49 /* wang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wang.png; sourceTree = "<group>"; };
7EF79BAA28DE395C00FF1F49 /* waxc-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxc-dark.png"; sourceTree = "<group>"; };
7EF79BAB28DE395C00FF1F49 /* waxc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxc.png; sourceTree = "<group>"; };
7EF79BAC28DE395C00FF1F49 /* waxg-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waxg-dark.png"; sourceTree = "<group>"; };
7EF79BAD28DE395C00FF1F49 /* waxg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waxg.png; sourceTree = "<group>"; };
7EF79BBE28DE4D2400FF1F49 /* default-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-dark.png"; sourceTree = "<group>"; };
7EF79BBF28DE4D2400FF1F49 /* default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default.png; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -120,31 +138,72 @@
path = LunaMac;
sourceTree = "<group>";
};
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 = "<group>";
};
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 = "<group>";
};
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 = "<group>";
};
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 = "<group>";
};
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 = "<group>";
@ -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;

49
LunaMac/AppDelegate.swift
unescape_control_characters View File

@ -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

8
LunaMac/Info.plist
unescape_control_characters View File

@ -18,12 +18,12 @@
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleDisplayName</key>
<string>LunaMac</string>
<key>CFBundleShortVersionString</key>
<string>1.4</string>
<string>1.4.1</string>
<key>CFBundleVersion</key>
<string>1.4</string>
<key>LSApplicationCategoryType</key>
<string></string>
<string>1.4.1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

7
LunaMac/changelog.txt
unescape_control_characters View File

@ -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)

0
LunaMac/png/default-dark.png → LunaMac/png/dark/default-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/firstq-dark.png → LunaMac/png/dark/firstq-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/full-dark.png → LunaMac/png/dark/full-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/lastq-dark.png → LunaMac/png/dark/lastq-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/new-dark.png → LunaMac/png/dark/new-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wanc-dark.png → LunaMac/png/dark/wanc-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wang-dark.png → LunaMac/png/dark/wang-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxc-dark.png → LunaMac/png/dark/waxc-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxg-dark.png → LunaMac/png/dark/waxg-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wanc-alt-dark.png → LunaMac/png/darkalt/wanc-alt-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wang-alt-dark.png → LunaMac/png/darkalt/wang-alt-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxc-alt-dark.png → LunaMac/png/darkalt/waxc-alt-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxg-alt-dark.png → LunaMac/png/darkalt/waxg-alt-dark.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/default.png → LunaMac/png/default/default.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/firstq.png → LunaMac/png/default/firstq.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/full.png → LunaMac/png/default/full.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/lastq.png → LunaMac/png/default/lastq.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/new.png → LunaMac/png/default/new.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wanc.png → LunaMac/png/default/wanc.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/wang.png → LunaMac/png/default/wang.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxc.png → LunaMac/png/default/waxc.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
LunaMac/png/waxg.png → LunaMac/png/default/waxg.png
unescape_control_characters View File

diff.image.side_by_side diff.image.swipe diff.image.overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
LunaMac/png/emoji/default-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
LunaMac/png/emoji/firstq-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
LunaMac/png/emoji/full-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
LunaMac/png/emoji/lastq-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
LunaMac/png/emoji/new-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
LunaMac/png/emoji/wanc-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
LunaMac/png/emoji/wang-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
LunaMac/png/emoji/waxc-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
LunaMac/png/emoji/waxg-emoji.png
View File

diff.bin_not_shown
diff.image.side_by_side

After

Width:  |  Height:  |  Size: 1.7 KiB

Write Preview
Loading…
Cancel
Save