Switch to neutral logo

Makefile

@@ -178,32 +178,46 @@ ${assets}/%.imageset/Contents.json: Misc/imageset.Contents.json
 	mkdir -p ${@D}
 	cp $< $@
 
+source=circle
+
 # Create a dimmed version of a image
 %-dim.png: %.png | ${convert}
 	${convert} $< -strip -channel A -evaluate Multiply 0.50 +channel $@
 
-# Extract the logo part from the banner, color it black and white
-Misc/logo.png: Misc/wireguard.png | ${convert}
-	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
-	${convert} $< -strip -crop 1251x1251+0+0 -colorspace gray +dither -colors 2 \
-		-floodfill +600+200 white -floodfill +600+400 white -floodfill +350+900 white \
-		-floodfill +400+200 black -floodfill +777+117 black\
-		$@
-
-# Extract the logo part from the banner, invert to keep only the dragon
-Misc/dragon.png: Misc/wireguard.png | ${convert}
-	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
-	${convert} $< -strip -colorspace gray +dither -colors 2 -crop 1251x1251+0+0\
-		-floodfill +600+200 black -floodfill +600+400 black -floodfill +350+900 black\
-		-floodfill +400+200 transparent -floodfill +777+117 transparent \
-		$@
-
-# Extract the logo part from the banner, but keep the dragon transparent
-Misc/silhouette.png: Misc/wireguard.png | ${convert}
-	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
-	${convert} $< -strip -colorspace gray +dither -colors 2 -crop 1251x1251+0+0 \
-		-floodfill +400+200 black -floodfill +777+117 black\
-		$@
+Misc/logo.png:
+	${convert} -background transparent -size 1000x1000 xc: -fill black  \
+    	-draw 'translate 500,500 circle 0,0 500,0' $@
+
+Misc/dragon.png:
+	${convert} -background transparent -size 1000x1000 xc: -fill transparent -stroke black -strokewidth 50  \
+    	-draw 'translate 500,500 circle 0,0 400,0' $@
+
+Misc/silhouette.png:
+	${convert} -background transparent -size 1000x1000 xc: -fill black  \
+    	-draw 'translate 500,500 circle 0,0 500,0' $@
+
+# # Extract the logo part from the banner, color it black and white
+# Misc/logo.png: Misc/${source}.png | ${convert}
+# 	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
+# 	${convert} $< -strip -crop 1251x1251+0+0 -colorspace gray +dither -colors 2 \
+# 		-floodfill +600+200 white -floodfill +600+400 white -floodfill +350+900 white \
+# 		-floodfill +400+200 black -floodfill +777+117 black\
+# 		$@
+
+# # Extract the logo part from the banner, invert to keep only the dragon
+# Misc/dragon.png: Misc/${source}.png | ${convert}
+# 	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
+# 	${convert} $< -strip -colorspace gray +dither -colors 2 -crop 1251x1251+0+0\
+# 		-floodfill +600+200 black -floodfill +600+400 black -floodfill +350+900 black\
+# 		-floodfill +400+200 transparent -floodfill +777+117 transparent \
+# 		$@
+
+# # Extract the logo part from the banner, but keep the dragon transparent
+# Misc/silhouette.png: Misc/${source}.png | ${convert}
+# 	${convert} --version | grep 7.0.8-9 || exit 1 	# versions 7.0.8-{15,16} have a bug breaking floodfill
+# 	${convert} $< -strip -colorspace gray +dither -colors 2 -crop 1251x1251+0+0 \
+# 		-floodfill +400+200 black -floodfill +777+117 black\
+# 		$@
 
 # Convert SVG wireguard banner to png
 Misc/%.png: Misc/%.svg | ${convert}
@@ -236,9 +250,11 @@ clean:
 		DerivedData/
 
 # cleanup most artifacts that could be generated by the Makefile
-mrproper: clean
+mrproper_images:
 	rm -rf \
 		Misc/{logo,dragon,wireguard,silhouette}.png  \
 		${tmp}/wireguard.png WireGuardStatusbar/Assets.xcassets/*.imageset/ \
 		WireGuardStatusbar/Assets.xcassets/AppIcon.appiconset/logo-*.png
+
+mrproper: clean mrproper_images
 	sudo rm -rf /etc/wireguard/test-localhost.conf

WireGuardStatusbar/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.23</string>
+	<string>1.24</string>
 	<key>CFBundleVersion</key>
-	<string>128</string>
+	<string>131</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>