Merge branch 'feature' into main

ruittenb · Oct 1, 2024 · 9131506 · 9131506
2 parents 585954c + 59d3acb
commit 9131506
Show file tree

Hide file tree

Showing 26 changed files with 74 additions and 53 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+1.6.12: Update name in preferences when it changes.
 1.6.11: Fix restart numbering by desktop
 1.6.10: More friendly error dialog
 1.6.9 : Fix corrupted installer disk image

diff --git a/Spaceman.xcodeproj/project.pbxproj b/Spaceman.xcodeproj/project.pbxproj
@@ -461,7 +461,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.11;
+				CURRENT_PROJECT_VERSION = 1.6.12;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -476,7 +476,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.11;
+				MARKETING_VERSION = 1.6.12;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -495,7 +495,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.11;
+				CURRENT_PROJECT_VERSION = 1.6.12;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -510,7 +510,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.11;
+				MARKETING_VERSION = 1.6.12;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.imageset/Contents.json b/Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SpaceIconBorderedNumInactive.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...xcassets/SpaceIconBorderedNumInactive.imageset/SpaceIconBorderedNumInactive.png b/...xcassets/SpaceIconBorderedNumInactive.imageset/SpaceIconBorderedNumInactive.png
diff --git a/Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.png b/Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.png
diff --git a/...ts/NamedFullActive.imageset/Contents.json → ...conNamedFullActive.imageset/Contents.json b/...ts/NamedFullActive.imageset/Contents.json → ...conNamedFullActive.imageset/Contents.json
diff --git a/...edFullActive.imageset/NamedFullActive.png → ...edFullActive.imageset/NamedFullActive.png b/...edFullActive.imageset/NamedFullActive.png → ...edFullActive.imageset/NamedFullActive.png
diff --git a/.../NamedFullInactive.imageset/Contents.json → ...nNamedFullInactive.imageset/Contents.json b/.../NamedFullInactive.imageset/Contents.json → ...nNamedFullInactive.imageset/Contents.json
diff --git a/...llInactive.imageset/NamedFullInactive.png → ...llInactive.imageset/NamedFullInactive.png b/...llInactive.imageset/NamedFullInactive.png → ...llInactive.imageset/NamedFullInactive.png
diff --git a/...paceManIconFullDis.imageset/Contents.json → ...nNamedNormalActive.imageset/Contents.json b/...paceManIconFullDis.imageset/Contents.json → ...nNamedNormalActive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Combined Shape.png",
+      "filename" : "NamedNormalActive.png",
       "idiom" : "mac"
     }
   ],

diff --git a/...sets/SpaceManIconWide.imageset/WideEn.png → ...rmalActive.imageset/NamedNormalActive.png b/...sets/SpaceManIconWide.imageset/WideEn.png → ...rmalActive.imageset/NamedNormalActive.png
diff --git a/Spaceman/Assets.xcassets/SpaceIconNamedNormalInactive.imageset/Contents.json b/Spaceman/Assets.xcassets/SpaceIconNamedNormalInactive.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "NamedNormalInactive.png",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...aceManIconBorderWide.imageset/WideDis.png → ...Inactive.imageset/NamedNormalInactive.png b/...aceManIconBorderWide.imageset/WideDis.png → ...Inactive.imageset/NamedNormalInactive.png
diff --git a/...ssets/SpaceManIcon.imageset/Contents.json → ...eIconNumFullActive.imageset/Contents.json b/...ssets/SpaceManIcon.imageset/Contents.json → ...eIconNumFullActive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Rectangle.png",
+      "filename" : "NumFullActive.png",
       "idiom" : "mac"
     }
   ],

diff --git a/...ManIconFullEn.imageset/Combined Shape.png → ...nNumFullActive.imageset/NumFullActive.png b/...ManIconFullEn.imageset/Combined Shape.png → ...nNumFullActive.imageset/NumFullActive.png
diff --git a/...SpaceManIconBorder.imageset/Contents.json → ...conNumFullInactive.imageset/Contents.json b/...SpaceManIconBorder.imageset/Contents.json → ...conNumFullInactive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Rectangle.png",
+      "filename" : "NumFullInactive.png",
       "idiom" : "mac"
     }
   ],

diff --git a/...anIconFullDis.imageset/Combined Shape.png → ...FullInactive.imageset/NumFullInactive.png b/...anIconFullDis.imageset/Combined Shape.png → ...FullInactive.imageset/NumFullInactive.png
diff --git a/...eManIconBorderWide.imageset/Contents.json → ...conNumNormalActive.imageset/Contents.json b/...eManIconBorderWide.imageset/Contents.json → ...conNumNormalActive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "WideDis.png",
+      "filename" : "NumNormalActive.png",
       "idiom" : "mac"
     }
   ],

diff --git a/...ssets/SpaceManIcon.imageset/Rectangle.png → ...NormalActive.imageset/NumNormalActive.png b/...ssets/SpaceManIcon.imageset/Rectangle.png → ...NormalActive.imageset/NumNormalActive.png
diff --git a/Spaceman/Assets.xcassets/SpaceIconNumNormalInactive.imageset/Contents.json b/Spaceman/Assets.xcassets/SpaceIconNumNormalInactive.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "NumNormalInactive.png",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...SpaceManIconBorder.imageset/Rectangle.png → ...alInactive.imageset/NumNormalInactive.png b/...SpaceManIconBorder.imageset/Rectangle.png → ...alInactive.imageset/NumNormalInactive.png
diff --git a/Spaceman/Assets.xcassets/SpaceManIconFullEn.imageset/Contents.json b/Spaceman/Assets.xcassets/SpaceManIconFullEn.imageset/Contents.json
diff --git a/Spaceman/Assets.xcassets/SpaceManIconWide.imageset/Contents.json b/Spaceman/Assets.xcassets/SpaceManIconWide.imageset/Contents.json
diff --git a/Spaceman/Helpers/IconCreator.swift b/Spaceman/Helpers/IconCreator.swift
@@ -35,19 +35,19 @@ class IconCreator {
             let iconResourceName: String
             switch (s.isCurrentSpace, s.isFullScreen, spacemanStyle) {
             case (true, true, .names):
-                iconResourceName = "NamedFullActive"
+                iconResourceName = "SpaceIconNamedFullActive"
             case (false, true, .names):
-                iconResourceName = "NamedFullInactive"
+                iconResourceName = "SpaceIconNamedFullInactive"
             case (true, true, .rects):
-                iconResourceName = "SpaceManIconFullEn"
+                iconResourceName = "SpaceIconNumFullActive"
             case (false, true, .rects):
-                iconResourceName = "SpaceManIconFullDis"
+                iconResourceName = "SpaceIconNumFullInactive"
             case (true, false, _):
-                iconResourceName = "SpaceManIcon"
+                iconResourceName = "SpaceIconNumNormalActive"
             default:
                 // (true, true, .numbersAndNames)
                 // (false, true, .numbersAndNames)
-                iconResourceName = "SpaceManIconBorder"
+                iconResourceName = "SpaceIconNumNormalInactive"
             }
 
             icons.append(NSImage(imageLiteralResourceName: iconResourceName))

diff --git a/Spaceman/View/PreferencesView.swift b/Spaceman/View/PreferencesView.swift
@@ -225,12 +225,13 @@ struct PreferencesView: View {
                 "Name (max 4 char.)",
                 text: Binding(
                     get: {prefsVM.spaceName},
-                    set: {prefsVM.spaceName = $0.prefix(4).trimmingCharacters(in: .whitespacesAndNewlines)}),
-                onCommit: {}) // removed `updateName` callback so as to avoid unwanted writes
-
-            Button("Update name") {
-                updateName()
-            }
+                    set: {
+                        prefsVM.spaceName = $0.prefix(4).trimmingCharacters(in: .whitespacesAndNewlines)
+                        updateName()
+                    }
+
+                )
+            )
         }
     }
 
@@ -277,8 +278,6 @@ struct PreferencesView: View {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ButtonPressed"), object: nil)
         }
     }
-
-
 }
 
 struct ContentView_Previews: PreviewProvider {

diff --git a/Spaceman/View/StatusBar.swift b/Spaceman/View/StatusBar.swift
@@ -161,7 +161,7 @@ class StatusBar: NSObject, NSMenuDelegate {
             shortcutKey = "0"
         }
 
-        let icon = NSImage(imageLiteralResourceName: "SpaceManIcon")
+        let icon = NSImage(imageLiteralResourceName: "SpaceIconNumNormalActive")
         let menuIcon = iconCreator.createRectWithNumberIcon(
             icons: [icon],
             index: 0,