diff --git a/packages/dart/npt_flutter/android/app/src/main/AndroidManifest.xml b/packages/dart/npt_flutter/android/app/src/main/AndroidManifest.xml index a74d979db..c8f27050b 100644 --- a/packages/dart/npt_flutter/android/app/src/main/AndroidManifest.xml +++ b/packages/dart/npt_flutter/android/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:icon="@mipmap/launcher_icon"> + + diff --git a/packages/dart/npt_flutter/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-hdpi/launcher_icon.png new file mode 100644 index 000000000..ed63ffe92 Binary files /dev/null and b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/packages/dart/npt_flutter/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-mdpi/launcher_icon.png new file mode 100644 index 000000000..cfb11a9cc Binary files /dev/null and b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png new file mode 100644 index 000000000..143904e70 Binary files /dev/null and b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png new file mode 100644 index 000000000..74f8e9a6a Binary files /dev/null and b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png new file mode 100644 index 000000000..a97ee6465 Binary files /dev/null and b/packages/dart/npt_flutter/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/packages/dart/npt_flutter/assets/logo.png b/packages/dart/npt_flutter/assets/logo.png new file mode 100644 index 000000000..12ee8fd09 Binary files /dev/null and b/packages/dart/npt_flutter/assets/logo.png differ diff --git a/packages/dart/npt_flutter/ios/Runner.xcodeproj/project.pbxproj b/packages/dart/npt_flutter/ios/Runner.xcodeproj/project.pbxproj index d91aa6e47..20fd7b21f 100644 --- a/packages/dart/npt_flutter/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/dart/npt_flutter/ios/Runner.xcodeproj/project.pbxproj @@ -558,7 +558,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -615,7 +615,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fab2..d0d98aa17 100644 --- a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}} \ No newline at end of file diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada472..e369c3257 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41ec..ed351b9bf 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452e4..af6437e01 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d933e..8469b0f5a 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b0099..4b6d11f61 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe730945a..37b28800c 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773cd8..c4ae6d4ed 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452e4..af6437e01 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463a9..251ea6821 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec303439..175d68616 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 000000000..1ac0535c6 Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 000000000..e3a756044 Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 000000000..9c09c479d Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 000000000..de14691f3 Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec303439..175d68616 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea27..c4000a37d 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 000000000..c8a72e574 Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 000000000..633dae813 Binary files /dev/null and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32ae7..0deaded73 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba09..d86a8b6f5 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf12a..27a6387c2 100644 Binary files a/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/packages/dart/npt_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/packages/dart/npt_flutter/lib/constants.dart b/packages/dart/npt_flutter/lib/constants.dart index b238ec8b5..2adbfd12b 100644 --- a/packages/dart/npt_flutter/lib/constants.dart +++ b/packages/dart/npt_flutter/lib/constants.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - class Constants { static String? get namespace => 'noports'; // TODO: issue & secure API key properly @@ -17,4 +16,6 @@ class Constants { return {'root.atsign.org': strings.rootDomainDefault, 'vip.ve.atsign.zone': strings.rootDomainDemo}; } + + static const kWindowsMinWindowSize = Size(1053, 691); } diff --git a/packages/dart/npt_flutter/lib/main.dart b/packages/dart/npt_flutter/lib/main.dart index a4dfdd900..9386dd950 100644 --- a/packages/dart/npt_flutter/lib/main.dart +++ b/packages/dart/npt_flutter/lib/main.dart @@ -1,15 +1,18 @@ import 'package:flutter/material.dart'; +import 'package:npt_flutter/constants.dart'; import 'package:window_manager/window_manager.dart'; import 'app.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); - windowManager.ensureInitialized(); + var windowOptions = const WindowOptions( title: "NoPorts Desktop", + minimumSize: Constants.kWindowsMinWindowSize, skipTaskbar: true, ); + windowManager.ensureInitialized(); windowManager.waitUntilReadyToShow(windowOptions); runApp(const App()); } diff --git a/packages/dart/npt_flutter/macos/Runner.xcodeproj/project.pbxproj b/packages/dart/npt_flutter/macos/Runner.xcodeproj/project.pbxproj index 5e69fcf9d..b1ecde128 100644 --- a/packages/dart/npt_flutter/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/dart/npt_flutter/macos/Runner.xcodeproj/project.pbxproj @@ -68,7 +68,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* npt_flutter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = npt_flutter.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* NoPorts Desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NoPorts Desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -144,7 +144,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* npt_flutter.app */, + 33CC10ED2044A3C60003C045 /* NoPorts Desktop.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -248,7 +248,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* npt_flutter.app */; + productReference = 33CC10ED2044A3C60003C045 /* NoPorts Desktop.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -574,11 +574,13 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "SSH NPT"; + INFOPLIST_KEY_CFBundleDisplayName = "Noports Desktop"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + PRODUCT_NAME = "NoPorts Desktop"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -707,11 +709,13 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "SSH NPT"; + INFOPLIST_KEY_CFBundleDisplayName = "Noports Desktop"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + PRODUCT_NAME = "NoPorts Desktop"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -728,11 +732,13 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "SSH NPT"; + INFOPLIST_KEY_CFBundleDisplayName = "Noports Desktop"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + PRODUCT_NAME = "NoPorts Desktop"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/packages/dart/npt_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/dart/npt_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a83d492c7..b1ee17d04 100644 --- a/packages/dart/npt_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/dart/npt_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index a2ec33f19..96d3fee1a 100644 --- a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,68 @@ { - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" + "info": { + "version": 1, + "author": "xcode" }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_64.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_1024.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} + "images": [ + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_16.png", + "scale": "1x" + }, + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "2x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "1x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_64.png", + "scale": "2x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_128.png", + "scale": "1x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "2x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "1x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "2x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "1x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_1024.png", + "scale": "2x" + } + ] +} \ No newline at end of file diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 82b6f9d9a..260926d79 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 13b35eba5..538af52be 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 0a3f5fa40..18ab87326 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bdb57226d..40580666a 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index f083318e0..2a88889c2 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 326c0e72c..5b797ade6 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 2f1632cfd..bb7f5e50a 100644 Binary files a/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/packages/dart/npt_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/packages/dart/npt_flutter/macos/Runner/Base.lproj/MainMenu.xib b/packages/dart/npt_flutter/macos/Runner/Base.lproj/MainMenu.xib index 202b19c1e..8c4094dbf 100644 --- a/packages/dart/npt_flutter/macos/Runner/Base.lproj/MainMenu.xib +++ b/packages/dart/npt_flutter/macos/Runner/Base.lproj/MainMenu.xib @@ -13,7 +13,7 @@ - + @@ -330,13 +330,13 @@ - + - + - + diff --git a/packages/dart/npt_flutter/pubspec.lock b/packages/dart/npt_flutter/pubspec.lock index 8a461d80d..6da893626 100644 --- a/packages/dart/npt_flutter/pubspec.lock +++ b/packages/dart/npt_flutter/pubspec.lock @@ -344,6 +344,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + url: "https://pub.dev" + source: hosted + version: "0.4.1" clock: dependency: transitive description: @@ -368,6 +376,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + console: + dependency: transitive + description: + name: console + sha256: e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a + url: "https://pub.dev" + source: hosted + version: "4.1.0" convert: dependency: transitive description: @@ -622,6 +638,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.5.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + url: "https://pub.dev" + source: hosted + version: "0.14.1" flutter_lints: dependency: "direct overridden" description: @@ -677,6 +701,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + get_it: + dependency: transitive + description: + name: get_it + sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1 + url: "https://pub.dev" + source: hosted + version: "7.7.0" glob: dependency: transitive description: @@ -869,6 +901,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" + msix: + dependency: "direct dev" + description: + name: msix + sha256: c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33 + url: "https://pub.dev" + source: hosted + version: "3.16.8" mutex: dependency: transitive description: @@ -1509,10 +1549,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: transitive description: diff --git a/packages/dart/npt_flutter/pubspec.yaml b/packages/dart/npt_flutter/pubspec.yaml index e698155a1..a18dd435c 100644 --- a/packages/dart/npt_flutter/pubspec.yaml +++ b/packages/dart/npt_flutter/pubspec.yaml @@ -61,7 +61,9 @@ dependencies: yaml: ^3.1.2 yaml_writer: ^2.0.0 dev_dependencies: + msix: ^3.16.8 build_runner: ^2.4.12 + flutter_launcher_icons: "^0.14.1" flutter_test: sdk: flutter @@ -122,3 +124,25 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/to/font-from-package + +msix_config: + display_name: "NoPorts Desktop" + publisher_display_name: Atsign + identity_name: TheCompany.NoPortsDesktop + publisher: CN=BBFE1D0B-F713-4C7F-B375-5EA851CBB1FF + msix_version: 1.0.0.0 + logo_path: "assets/logo.png" + capabilities: internetClient + store: true + +flutter_launcher_icons: + android: "launcher_icon" + ios: true + remove_alpha_ios: true + image_path: "assets/logo.png" + macos: + generate: true + image_path: "assets/logo.png" + windows: + generate: true + image_path: "assets/logo.png" \ No newline at end of file diff --git a/packages/dart/npt_flutter/windows/runner/Runner.rc b/packages/dart/npt_flutter/windows/runner/Runner.rc index 1774aee79..61fff3225 100644 --- a/packages/dart/npt_flutter/windows/runner/Runner.rc +++ b/packages/dart/npt_flutter/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "npt_flutter" "\0" + VALUE "FileDescription", "NoPorts Desktop" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "npt_flutter" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.atsign. All rights reserved." "\0" VALUE "OriginalFilename", "npt_flutter.exe" "\0" - VALUE "ProductName", "npt_flutter" "\0" + VALUE "ProductName", "NoPorts Desktop" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/packages/dart/npt_flutter/windows/runner/resources/app_icon.ico b/packages/dart/npt_flutter/windows/runner/resources/app_icon.ico index c04e20caf..b90b0225e 100644 Binary files a/packages/dart/npt_flutter/windows/runner/resources/app_icon.ico and b/packages/dart/npt_flutter/windows/runner/resources/app_icon.ico differ