Develop - New app icon and branding, Device mappign updates, QS auto accept support for Android, Translations

AirSync.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		B94971692F62525800F59BC9 /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = B94971682F62525800F59BC9 /* SwiftProtobuf */; };
 		B949716B2F62525800F59BC9 /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = B949716A2F62525800F59BC9 /* SwiftProtobufPluginLibrary */; };
 		B995A3332E4D2B3F00FA7A41 /* AppIcon-uni.icon in Resources */ = {isa = PBXBuildFile; fileRef = B995A3322E4D2B3F00FA7A41 /* AppIcon-uni.icon */; };
+		B99B04C62F641E1400FF3E2D /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = B99B04C52F641E1400FF3E2D /* AppIcon.icon */; };
 		B9AEBC0A2E6235D3006BA027 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = B9AEBC092E6235D3006BA027 /* Sparkle */; };
 		B9B1C00D2E94E15D0005F6CB /* LottieUI in Frameworks */ = {isa = PBXBuildFile; productRef = B9B1C00C2E94E15D0005F6CB /* LottieUI */; };
 		B9C3181E2E37AA1D00367F16 /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = B9C3181D2E37AA1D00367F16 /* QRCode */; };
@@ -24,6 +25,7 @@
 /* Begin PBXFileReference section */
 		B9673B572E35A2A1006D284A /* AirSync.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AirSync.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B995A3322E4D2B3F00FA7A41 /* AppIcon-uni.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "AppIcon-uni.icon"; sourceTree = "<group>"; };
+		B99B04C52F641E1400FF3E2D /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -80,6 +82,7 @@
 				B9673B592E35A2A1006D284A /* airsync-mac */,
 				B9D263192F60D97900628704 /* Frameworks */,
 				B9673B582E35A2A1006D284A /* Products */,
+				B99B04C52F641E1400FF3E2D /* AppIcon.icon */,
 			);
 			sourceTree = "<group>";
 		};
@@ -184,6 +187,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B99B04C62F641E1400FF3E2D /* AppIcon.icon in Resources */,
 				B995A3332E4D2B3F00FA7A41 /* AppIcon-uni.icon in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -268,14 +272,14 @@
 			baseConfigurationReferenceAnchor = B9673B592E35A2A1006D284A /* airsync-mac */;
 			baseConfigurationReferenceRelativePath = Configs/SelfCompiled.xcconfig;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-uni";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				AUTOMATION_APPLE_EVENTS = NO;
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 25;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = WCB4HTANA6;
 				ENABLE_APP_SANDBOX = NO;
@@ -293,7 +297,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.5;
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sameerasw.airsync-mac";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -444,14 +448,14 @@
 			baseConfigurationReferenceAnchor = B9673B592E35A2A1006D284A /* airsync-mac */;
 			baseConfigurationReferenceRelativePath = Configs/Shared.xcconfig;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-uni";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				AUTOMATION_APPLE_EVENTS = NO;
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 25;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = WCB4HTANA6;
 				ENABLE_APP_SANDBOX = NO;
@@ -469,7 +473,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.5;
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sameerasw.airsync-mac";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -492,14 +496,14 @@
 			baseConfigurationReferenceAnchor = B9673B592E35A2A1006D284A /* airsync-mac */;
 			baseConfigurationReferenceRelativePath = Configs/Shared.xcconfig;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-uni";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				AUTOMATION_APPLE_EVENTS = NO;
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 25;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = WCB4HTANA6;
 				ENABLE_APP_SANDBOX = NO;
@@ -517,7 +521,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.5;
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sameerasw.airsync-mac";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

AppIcon.icon/icon.json

@@ -0,0 +1,38 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "Frame 2608031(3).svg",
+          "name" : "Frame 2608031(3)"
+        },
+        {
+          "image-name" : "Frame 2608031(2).svg",
+          "name" : "Frame 2608031(2)"
+        }
+      ],
+      "position" : {
+        "scale" : 1.44,
+        "translation-in-points" : [
+          0,
+          0
+        ]
+      },
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}

airsync-mac/Components/Custom/DropTargetModifier.swift

@@ -107,8 +107,8 @@ struct QuickShareDropDelegate: DropDelegate {
                 let connectedDeviceName = appState.device?.name
                 let targetName = (!optionPressed) ? connectedDeviceName : nil
 
-                QuickShareManager.shared.startDiscovery(autoTargetName: targetName)
                 QuickShareManager.shared.transferURLs = urls
+                QuickShareManager.shared.startDiscovery(autoTargetName: targetName)
                 appState.showingQuickShareTransfer = true
             } else if let text = text {
                 appState.sendClipboardToAndroid(text: text)

airsync-mac/Constants/MacDeviceMappings.json

@@ -1,91 +1,104 @@
 {
   "MacBook Air": {
-    "MacBookAir8,1": "MacBook Air (13-inch, 2018)",
+    "MacBookAir8,1": "MacBook Air (2018)",
     "MacBookAir8,1_icon": "macbook.gen1",
-    "MacBookAir8,2": "MacBook Air (13-inch, 2019)",
+    "MacBookAir8,2": "MacBook Air (2019)",
     "MacBookAir8,2_icon": "macbook.gen1",
-    "MacBookAir10,1": "MacBook Air (13-inch, M1, 2020)",
+    "MacBookAir10,1": "MacBook Air (M1, 2020)",
     "MacBookAir10,1_icon": "macbook.gen1",
-    "MacBookAir9,1": "MacBook Air (13-inch, M1, 2021)",
+    "MacBookAir9,1": "MacBook Air (2020)",
     "MacBookAir9,1_icon": "macbook.gen1",
-    "Mac14,2": "MacBook Air (13-inch, M2, 2022)",
+    "Mac14,2": "MacBook Air (M2, 2022)",
     "Mac14,5": "MacBook Air (15-inch, M2, 2023)",
     "Mac15,12": "MacBook Air (13-inch, M3, 2024)",
     "Mac15,13": "MacBook Air (15-inch, M3, 2024)",
     "Mac16,12": "MacBook Air (13-inch, M4, 2025)",
-    "Mac16,13": "MacBook Air (15-inch, M4, 2025)"
+    "Mac16,13": "MacBook Air (15-inch, M4, 2025)",
+    "Mac17,3": "MacBook Air (13-inch, M5, 2026)",
+    "Mac17,4": "MacBook Air (15-inch, M5, 2026)"
+  },
+  "MacBook Neo": {
+    "Mac17,5": "MacBook Neo (13-inch, 2026)",
+    "Mac17,5_icon": "macbook.gen1"
   },
   "MacBook Pro": {
-    "MacBookPro15,1": "MacBook Pro (13-inch, 2018)",
+    "MacBookPro15,1": "MacBook Pro (15-inch, 2018/2019)",
     "MacBookPro15,1_icon": "macbook.gen1",
-    "MacBookPro15,2": "MacBook Pro (15-inch, 2018)",
+    "MacBookPro15,2": "MacBook Pro (13-inch, 2018/2019, Four Thunderbolt 3 ports)",
     "MacBookPro15,2_icon": "macbook.gen1",
-    "MacBookPro15,4": "MacBook Pro (13-inch, 2019)",
+    "MacBookPro15,3": "MacBook Pro (15-inch, 2019)",
+    "MacBookPro15,4": "MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)",
     "MacBookPro15,4_icon": "macbook.gen1",
     "MacBookPro16,1": "MacBook Pro (16-inch, 2019)",
     "MacBookPro16,1_icon": "macbook.gen1",
+    "MacBookPro16,2": "MacBook Pro (13-inch, 2020, Four Thunderbolt 3 ports)",
+    "MacBookPro16,3": "MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)",
+    "MacBookPro16,4": "MacBook Pro (16-inch, 2019)",
+    "MacBookPro16,4_icon": "macbook.gen1",
     "MacBookPro17,1": "MacBook Pro (13-inch, M1, 2020)",
     "MacBookPro17,1_icon": "macbook.gen1",
-    "MacBookPro16,4": "MacBook Pro (16-inch, 2020)",
-    "MacBookPro16,4_icon": "macbook.gen1",
-    "MacBookPro18,1": "MacBook Pro (14-inch, M1 Pro, 2021)",
-    "MacBookPro18,2": "MacBook Pro (14-inch, M1 Max, 2021)",
-    "MacBookPro18,3": "MacBook Pro (16-inch, M1 Pro, 2021)",
-    "MacBookPro18,4": "MacBook Pro (16-inch, M1 Max, 2021)",
-    "MacBookPro19,1": "MacBook Pro (14-inch, M1 Pro, 2022)",
-    "MacBookPro19,2": "MacBook Pro (16-inch, M1 Pro, 2022)",
+    "MacBookPro18,1": "MacBook Pro (16-inch, 2021)",
+    "MacBookPro18,2": "MacBook Pro (16-inch, 2021)",
+    "MacBookPro18,3": "MacBook Pro (14-inch, 2021)",
+    "MacBookPro18,4": "MacBook Pro (14-inch, 2021)",
+    "Mac14,5": "MacBook Pro (14-inch, 2023)",
+    "Mac14,6": "MacBook Pro (16-inch, 2023)",
     "Mac14,7": "MacBook Pro (13-inch, M2, 2022)",
-    "Mac14,9": "MacBook Pro (14-inch, M2 Pro, 2023)",
-    "Mac14,10": "MacBook Pro (16-inch, M2 Pro, 2023)",
+    "Mac14,9": "MacBook Pro (14-inch, 2023)",
+    "Mac14,10": "MacBook Pro (16-inch, 2023)",
     "Mac15,3": "MacBook Pro (14-inch, M3, 2023)",
-    "Mac15,6": "MacBook Pro (14-inch, M3 Pro, 2023)",
-    "Mac15,7": "MacBook Pro (16-inch, M3 Pro, 2023)",
-    "Mac15,8": "MacBook Pro (14-inch, M3 Max, 2023)",
-    "Mac15,9": "MacBook Pro (16-inch, M3 Max, 2023)",
-    "Mac15,10": "MacBook Pro (14-inch, M3 Max, 2023)",
-    "Mac15,11": "MacBook Pro (16-inch, M3 Max, 2023)",
+    "Mac15,6": "MacBook Pro (14-inch, M3 Pro/Max, 2023)",
+    "Mac15,7": "MacBook Pro (16-inch, M3 Pro/Max, 2023)",
+    "Mac15,8": "MacBook Pro (14-inch, M3 Pro/Max, 2023)",
+    "Mac15,9": "MacBook Pro (16-inch, M3 Pro/Max, 2023)",
+    "Mac15,10": "MacBook Pro (14-inch, M3 Pro/Max, 2023)",
+    "Mac15,11": "MacBook Pro (16-inch, M3 Pro/Max, 2023)",
     "Mac16,1": "MacBook Pro (14-inch, M4, 2024)",
-    "Mac16,2": "MacBook Pro (16-inch, M4, 2024)",
-    "Mac16,8": "MacBook Pro (14-inch, M4 Pro, 2024)",
-    "Mac16,7": "MacBook Pro (16-inch, M4 Pro, 2024)",
-    "Mac16,6": "MacBook Pro (14-inch, M4 Max, 2024)",
-    "Mac16,5": "MacBook Pro (16-inch, M4 Max, 2024)"
+    "Mac16,5": "MacBook Pro (16-inch, M4 Pro/Max, 2024)",
+    "Mac16,6": "MacBook Pro (14-inch, M4 Pro/Max, 2024)",
+    "Mac16,7": "MacBook Pro (16-inch, M4 Pro/Max, 2024)",
+    "Mac16,8": "MacBook Pro (14-inch, M4 Pro/Max, 2024)",
+    "Mac17,2": "MacBook Pro (14-inch, M5, 2025)",
+    "Mac17,6": "MacBook Pro (16-inch, M5 Pro/Max, 2026)",
+    "Mac17,7": "MacBook Pro (14-inch, M5 Pro/Max, 2026)",
+    "Mac17,8": "MacBook Pro (16-inch, M5 Pro/Max, 2026)",
+    "Mac17,9": "MacBook Pro (14-inch, M5 Pro/Max, 2026)"
   },
   "Mac mini": {
     "Macmini8,1": "Mac mini (2018)",
     "Macmini8,1_icon": "macmini.gen2",
     "Macmini9,1": "Mac mini (M1, 2020)",
     "Macmini9,1_icon": "macmini.gen2",
-    "Macmini10,1": "Mac mini (M1, 2021)",
-    "Macmini10,1_icon": "macmini.gen2",
-    "Mac14,3": "Mac mini (M2, 2022)",
+    "Mac14,3": "Mac mini (M2, 2023)",
     "Mac14,3_icon": "macmini.gen2",
-    "Mac14,12": "Mac mini (M2 Pro, 2022)",
+    "Mac14,12": "Mac mini (M2 Pro, 2023)",
     "Mac14,12_icon": "macmini.gen2",
-    "Mac16,10": "Mac mini (M4, 2024)",
-    "Mac16,11": "Mac mini (M4 Pro, 2024)"
+    "Mac16,10": "Mac mini (2024)",
+    "Mac16,11": "Mac mini (2024)"
   },
   "iMac": {
-    "iMac19,1": "iMac (21.5-inch, 2018)",
-    "iMac19,2": "iMac (27-inch, 2018)",
-    "iMac19,3": "iMac (21.5-inch, 2019)",
-    "iMac19,4": "iMac (27-inch, 2019)",
-    "iMac21,1": "iMac (24-inch, M1, 2020)",
-    "iMac20,1": "iMac (27-inch, 2020)",
+    "iMacPro1,1": "iMac Pro (2017)",
+    "iMac19,1": "iMac (Retina 5K, 27-inch, 2019)",
+    "iMac19,2": "iMac (Retina 4K, 21.5-inch, 2019)",
+    "iMac20,1": "iMac (Retina 5K, 27-inch, 2020)",
+    "iMac20,2": "iMac (Retina 5K, 27-inch, 2020)",
+    "iMac21,1": "iMac (24-inch, M1, 2021)",
     "iMac21,2": "iMac (24-inch, M1, 2021)",
-    "iMac21,3": "iMac (24-inch, M3, 2023)",
-    "iMac21,4": "iMac (24-inch, M4, 2024)"
+    "Mac15,4": "iMac (24-inch, 2023)",
+    "Mac15,5": "iMac (24-inch, 2023)",
+    "Mac16,2": "iMac (24-inch, 2024)",
+    "Mac16,3": "iMac (24-inch, 2024)"
   },
   "Mac Studio": {
-    "Mac13,1": "Mac Studio (M1 Max, 2021)",
-    "Mac13,2": "Mac Studio (M1 Ultra, 2021)",
+    "Mac13,1": "Mac Studio (M1 Max, 2022)",
+    "Mac13,2": "Mac Studio (M1 Ultra, 2022)",
     "Mac14,13": "Mac Studio (M2 Max, 2023)",
     "Mac14,14": "Mac Studio (M2 Ultra, 2023)",
-    "Mac16,15": "Mac Studio (M4 Max, 2024)",
-    "Mac16,14": "Mac Studio (M4 Ultra, 2024)"
+    "Mac15,14": "Mac Studio (M3 Ultra, 2025)",
+    "Mac16,9": "Mac Studio (M4 Max, 2025)"
   },
   "Mac Pro": {
     "MacPro7,1": "Mac Pro (2019)",
-    "MacPro7,3": "Mac Pro (2022)"
+    "Mac14,8": "Mac Pro (2023)"
   }
 }