From c5b7c732b8915752448ff94d6e12643c5abb83af Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 1 Aug 2022 11:38:12 +0300 Subject: [PATCH 1/2] Update version --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ macos/Podfile.lock | 24 ++++++++++++++++++++++++ macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index df23668e08d..9a21d8d72de 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -376,7 +376,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -384,7 +384,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -508,7 +508,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -534,7 +534,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -542,7 +542,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 1b272758ed6..4cfe5eca6fc 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,4 +1,6 @@ PODS: + - bitsdojo_window_macos (0.0.1): + - FlutterMacOS - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) @@ -13,6 +15,8 @@ PODS: - FlutterMacOS - printing (1.0.0): - FlutterMacOS + - screen_retriever (0.0.1): + - FlutterMacOS - Sentry (7.11.0): - Sentry/Core (= 7.11.0) - Sentry/Core (7.11.0) @@ -22,23 +26,31 @@ PODS: - Sentry (~> 7.11.0) - shared_preferences_macos (0.0.1): - FlutterMacOS + - sign_in_with_apple (0.0.1): + - FlutterMacOS - sqflite (0.0.2): - FlutterMacOS - FMDB (>= 2.7.5) - url_launcher_macos (0.0.1): - FlutterMacOS + - window_manager (0.2.0): + - FlutterMacOS DEPENDENCIES: + - bitsdojo_window_macos (from `Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`) - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`) - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - printing (from `Flutter/ephemeral/.symlinks/plugins/printing/macos`) + - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`) - sentry_flutter (from `Flutter/ephemeral/.symlinks/plugins/sentry_flutter/macos`) - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) + - sign_in_with_apple (from `Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`) SPEC REPOS: trunk: @@ -46,6 +58,8 @@ SPEC REPOS: - Sentry EXTERNAL SOURCES: + bitsdojo_window_macos: + :path: Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos FlutterMacOS: :path: Flutter/ephemeral in_app_review: @@ -58,16 +72,23 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos printing: :path: Flutter/ephemeral/.symlinks/plugins/printing/macos + screen_retriever: + :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos sentry_flutter: :path: Flutter/ephemeral/.symlinks/plugins/sentry_flutter/macos shared_preferences_macos: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos + sign_in_with_apple: + :path: Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + window_manager: + :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos SPEC CHECKSUMS: + bitsdojo_window_macos: 44e3b8fe3dd463820e0321f6256c5b1c16bb6a00 FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0 @@ -75,11 +96,14 @@ SPEC CHECKSUMS: package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f printing: e4b7e232ff3d5d50a70b20d959aa71035a5c31f9 + screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341 sentry_flutter: efb3df2c203cd03aad255892a8d628a458656d14 shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 + sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index b4cd4dfe64f..84285963339 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -421,14 +421,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -551,14 +551,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -575,14 +575,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = NPC44Y2C98; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 5.0.88; + MARKETING_VERSION = 5.0.89; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; From 5a6fd72760418553b9f0f9fab68692a4089980af Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 1 Aug 2022 11:51:17 +0300 Subject: [PATCH 2/2] Fix for mobile --- lib/main.dart | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 7c732609981..e67a323a28d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -62,20 +62,23 @@ import 'package:window_manager/window_manager.dart'; void main({bool isTesting = false}) async { WidgetsFlutterBinding.ensureInitialized(); - await windowManager.ensureInitialized(); - final prefs = await SharedPreferences.getInstance(); - windowManager.waitUntilReadyToShow( - WindowOptions( - center: true, - size: Size( - prefs.getDouble(kSharedPrefWidth) ?? 800, - prefs.getDouble(kSharedPrefHeight) ?? 600, - ), - ), () async { - await windowManager.show(); - await windowManager.focus(); - }); + if (isDesktopOS()) { + await windowManager.ensureInitialized(); + + final prefs = await SharedPreferences.getInstance(); + windowManager.waitUntilReadyToShow( + WindowOptions( + center: true, + size: Size( + prefs.getDouble(kSharedPrefWidth) ?? 800, + prefs.getDouble(kSharedPrefHeight) ?? 600, + ), + ), () async { + await windowManager.show(); + await windowManager.focus(); + }); + } final store = Store(appReducer, initialState: await _initialState(isTesting),