Merge pull request #753 from cake-tech/mac-os-icons

Mac os icons

macos/Podfile.lock

@@ -111,6 +111,6 @@ SPEC CHECKSUMS:
   url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2
   wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
 
-PODFILE CHECKSUM: 95c2abf1742d9564d190610743847d385992e6cc
+PODFILE CHECKSUM: 63bac006751af51321f57697a4b72bbfa0947124
 
 COCOAPODS: 1.11.3

macos/Runner.xcodeproj/project.pbxproj

@@ -24,9 +24,9 @@
 		328F945957E1041662291EC5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C84AA35EA80D710889C68D81 /* Pods_Runner.framework */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
-		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		9F31AE4A2988022C00765327 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		9F3F7550298098120030A1D7 /* secRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3F754D298098120030A1D7 /* secRandom.swift */; };
 		9F3F7551298098120030A1D7 /* decrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3F754E298098120030A1D7 /* decrypt.swift */; };
 /* End PBXBuildFile section */
@@ -59,7 +59,7 @@
 		135D3AD0276D31F62BBEDDBF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* cake_wallet_new.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cake_wallet_new.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* Cake Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Cake Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -119,7 +119,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* cake_wallet_new.app */,
+				33CC10ED2044A3C60003C045 /* Cake Wallet.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -200,7 +200,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* cake_wallet_new.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* Cake Wallet.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -253,7 +253,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
+				9F31AE4A2988022C00765327 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -433,6 +433,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				ENABLE_ON_DEMAND_RESOURCES = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -563,6 +564,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				ENABLE_ON_DEMAND_RESOURCES = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -587,6 +589,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				ENABLE_ON_DEMAND_RESOURCES = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "cake_wallet_new.app"
+               BuildableName = "Cake Wallet.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "cake_wallet_new.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "cake_wallet_new.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "cake_wallet_new.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>

macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
-  "images" : [
+    "info": {
-    {
+        "version": 1,
-      "size" : "16x16",
+        "author": "xcode"
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
     },
-    {
+    "images": [
-      "size" : "16x16",
+        {
-      "idiom" : "mac",
+            "size": "16x16",
-      "filename" : "app_icon_32.png",
+            "idiom": "mac",
-      "scale" : "2x"
+            "filename": "app_icon_16.png",
-    },
+            "scale": "1x"
-    {
+        },
-      "size" : "32x32",
+        {
-      "idiom" : "mac",
+            "size": "16x16",
-      "filename" : "app_icon_32.png",
+            "idiom": "mac",
-      "scale" : "1x"
+            "filename": "app_icon_32.png",
-    },
+            "scale": "2x"
-    {
+        },
-      "size" : "32x32",
+        {
-      "idiom" : "mac",
+            "size": "32x32",
-      "filename" : "app_icon_64.png",
+            "idiom": "mac",
-      "scale" : "2x"
+            "filename": "app_icon_32.png",
-    },
+            "scale": "1x"
-    {
+        },
-      "size" : "128x128",
+        {
-      "idiom" : "mac",
+            "size": "32x32",
-      "filename" : "app_icon_128.png",
+            "idiom": "mac",
-      "scale" : "1x"
+            "filename": "app_icon_64.png",
-    },
+            "scale": "2x"
-    {
+        },
-      "size" : "128x128",
+        {
-      "idiom" : "mac",
+            "size": "128x128",
-      "filename" : "app_icon_256.png",
+            "idiom": "mac",
-      "scale" : "2x"
+            "filename": "app_icon_128.png",
-    },
+            "scale": "1x"
-    {
+        },
-      "size" : "256x256",
+        {
-      "idiom" : "mac",
+            "size": "128x128",
-      "filename" : "app_icon_256.png",
+            "idiom": "mac",
-      "scale" : "1x"
+            "filename": "app_icon_256.png",
-    },
+            "scale": "2x"
-    {
+        },
-      "size" : "256x256",
+        {
-      "idiom" : "mac",
+            "size": "256x256",
-      "filename" : "app_icon_512.png",
+            "idiom": "mac",
-      "scale" : "2x"
+            "filename": "app_icon_256.png",
-    },
+            "scale": "1x"
-    {
+        },
-      "size" : "512x512",
+        {
-      "idiom" : "mac",
+            "size": "256x256",
-      "filename" : "app_icon_512.png",
+            "idiom": "mac",
-      "scale" : "1x"
+            "filename": "app_icon_512.png",
-    },
+            "scale": "2x"
-    {
+        },
-      "size" : "512x512",
+        {
-      "idiom" : "mac",
+            "size": "512x512",
-      "filename" : "app_icon_1024.png",
+            "idiom": "mac",
-      "scale" : "2x"
+            "filename": "app_icon_512.png",
-    }
+            "scale": "1x"
-  ],
+        },
-  "info" : {
+        {
-    "version" : 1,
+            "size": "512x512",
-    "author" : "xcode"
+            "idiom": "mac",
-  }
+            "filename": "app_icon_1024.png",
-}
+            "scale": "2x"
+        }
+    ]
+}

macos/Runner/Configs/AppInfo.xcconfig

@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = cake_wallet_new
+PRODUCT_NAME = Cake Wallet
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakeWalletNew
+PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2022 com.fotolockr. All rights reserved.

pubspec_base.yaml

@@ -75,7 +75,7 @@ dev_dependencies:
   mobx_codegen: ^2.0.7
   build_resolvers: ^2.0.9
   hive_generator: ^1.1.3
-  flutter_launcher_icons: ^0.9.3
+  flutter_launcher_icons: ^0.11.0
   # check flutter_launcher_icons for usage
   pedantic: ^1.8.0
   # replace https://github.com/dart-lang/lints#migrating-from-packagepedantic
@@ -84,6 +84,9 @@ flutter_icons:
   image_path: "assets/images/app_logo.png"
   android: true
   ios: true
+  macos:
+    generate: true
+    image_path: "assets/images/app_logo.png"
 
 flutter:
   uses-material-design: true

scripts/macos/app_env.sh

@@ -17,7 +17,7 @@ fi
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="1.0.0"
 CAKEWALLET_BUILD_NUMBER=1
-CAKEWALLET_BUNDLE_ID="com.cakewallet.macos"
+CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
     echo "Wrong app type."