From 3c3ca33cda681afcf38c16336cf4c090c8a743a0 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sat, 16 Sep 2023 21:43:31 +0800 Subject: [PATCH] opt.: `watch` app --- ios/Runner.xcodeproj/project.pbxproj | 40 ++++++++++-------- ios/WatchApp/PhoneConnMgr.swift | 2 - .../AccentColor.colorset/Contents.json | 20 +++++++++ .../AppIcon-1024.0x1024.0@1x.png | Bin 0 -> 26611 bytes .../AppIcon.appiconset/Contents.json | 14 ++++++ ios/WatchApp/Watch.xcassets/Contents.json | 6 +++ lib/data/res/build_data.dart | 6 +-- lib/view/page/setting/entry.dart | 2 +- macos/Runner.xcodeproj/project.pbxproj | 12 +++--- pubspec.lock | 22 +++++----- 10 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 ios/WatchApp/Watch.xcassets/AccentColor.colorset/Contents.json create mode 100644 ios/WatchApp/Watch.xcassets/AppIcon.appiconset/AppIcon-1024.0x1024.0@1x.png create mode 100644 ios/WatchApp/Watch.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios/WatchApp/Watch.xcassets/Contents.json diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d78300e4..ae8ec168 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ E39515D42AB5AD64003602C1 /* WatchApp.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = E39515C72AB5AD62003602C1 /* WatchApp.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; E39515DB2AB5AE7F003602C1 /* PhoneConnMgr.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39515DA2AB5AE7F003602C1 /* PhoneConnMgr.swift */; }; E39515DD2AB5AE9E003602C1 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39515DC2AB5AE9E003602C1 /* Store.swift */; }; + E39515E02AB5CF97003602C1 /* Watch.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E39515DF2AB5CF97003602C1 /* Watch.xcassets */; }; E3DB67ED2A31FE200027B8CB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E3DB67EB2A31FE200027B8CB /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ @@ -114,6 +115,7 @@ E39515CB2AB5AD62003602C1 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; E39515DA2AB5AE7F003602C1 /* PhoneConnMgr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneConnMgr.swift; sourceTree = ""; }; E39515DC2AB5AE9E003602C1 /* Store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = ""; }; + E39515DF2AB5CF97003602C1 /* Watch.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Watch.xcassets; sourceTree = ""; }; E398BF6A29BDB34500FE4FD5 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; E3DB67EC2A31FE200027B8CB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ @@ -236,6 +238,7 @@ E39515CB2AB5AD62003602C1 /* ContentView.swift */, E39515DA2AB5AE7F003602C1 /* PhoneConnMgr.swift */, E39515DC2AB5AE9E003602C1 /* Store.swift */, + E39515DF2AB5CF97003602C1 /* Watch.xcassets */, ); path = WatchApp; sourceTree = ""; @@ -371,6 +374,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E39515E02AB5CF97003602C1 /* Watch.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -574,7 +578,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -582,7 +586,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -706,7 +710,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -714,7 +718,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -732,7 +736,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -740,7 +744,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -761,7 +765,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -774,7 +778,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -800,7 +804,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -813,7 +817,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -836,7 +840,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -849,7 +853,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -872,7 +876,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -885,7 +889,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.558; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -914,7 +918,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -927,7 +931,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.558; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -953,7 +957,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 558; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -966,7 +970,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.558; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ios/WatchApp/PhoneConnMgr.swift b/ios/WatchApp/PhoneConnMgr.swift index ab552ff1..e361edf3 100644 --- a/ios/WatchApp/PhoneConnMgr.swift +++ b/ios/WatchApp/PhoneConnMgr.swift @@ -31,7 +31,6 @@ class PhoneConnMgr: NSObject, WCSessionDelegate, ObservableObject { session?.activate() ctx = Store.getCtx() - print("init", ctx) } func updateUrls(_ val: [String: Any]) { @@ -47,7 +46,6 @@ class PhoneConnMgr: NSObject, WCSessionDelegate, ObservableObject { // implement session:didReceiveApplicationContext: func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String : Any]) { ctx = applicationContext - print("update", ctx) } } diff --git a/ios/WatchApp/Watch.xcassets/AccentColor.colorset/Contents.json b/ios/WatchApp/Watch.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000..274babba --- /dev/null +++ b/ios/WatchApp/Watch.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/WatchApp/Watch.xcassets/AppIcon.appiconset/AppIcon-1024.0x1024.0@1x.png b/ios/WatchApp/Watch.xcassets/AppIcon.appiconset/AppIcon-1024.0x1024.0@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ed7bd1ae177bd1bc285efa517a044bb106b408 GIT binary patch literal 26611 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 y$;7{dqW`Nw(Z8?b-`6n>0RQ)&sF@I;2^&mL { final result = await AppRoute.editor( text: text, langCode: 'json', - title: 'Watch app config', + title: 'Watch app', ).go(context); if (result == null) { return; diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 44874021..981f70dc 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -476,9 +476,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -491,9 +491,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -506,9 +506,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 551; + CURRENT_PROJECT_VERSION = 558; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.551; + MARKETING_VERSION = 1.0.558; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/pubspec.lock b/pubspec.lock index 1f259e33..94ad6cde 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: "direct main" description: name: archive - sha256: "49b1fad315e57ab0bbc15bcbb874e83116a1d78f77ebd500a4af6c9407d6b28e" + sha256: e0902a06f0e00414e4e3438a084580161279f137aeb862274710f29ec10cf01e url: "https://pub.dev" source: hosted - version: "3.3.8" + version: "3.3.9" args: dependency: transitive description: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: build_resolvers - sha256: a7417cc44d9edb3f2c8760000270c99dba8c72ff66d0146772b8326565780745 + sha256: d912852cce27c9e80a93603db721c267716894462e7033165178b91138587972 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" build_runner: dependency: "direct dev" description: @@ -198,10 +198,10 @@ packages: dependency: "direct main" description: name: countly_flutter - sha256: "539bd14dcefc0e41a5ab3bd7a0298b86739bbaeea39d3b42cb3ad6f37e8b8201" + sha256: e6fcb88ff1dbfaf94cb73fe052e7cf3bac02b5fb4e7f82efb66874017a9201a1 url: "https://pub.dev" source: hosted - version: "23.8.0" + version: "23.8.1" cross_file: dependency: transitive description: @@ -230,10 +230,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.3" dartssh2: dependency: "direct main" description: @@ -254,10 +254,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: de4798a7069121aee12d5895315680258415de9b00e717723a1bd73d58f0126d + sha256: "96bff3df72e3d428bda2b874c7a521e8c86f592cae626ea594922fcc8d166e0c" url: "https://pub.dev" source: hosted - version: "1.6.6" + version: "1.6.7" easy_isolate: dependency: "direct main" description: @@ -1056,7 +1056,7 @@ packages: description: path: "." ref: master - resolved-ref: "56379d77955db89222f00ee18f5cae80b05ec13f" + resolved-ref: e3bc722f3a73aad24b314a6a19e43c205b1940e3 url: "https://github.com/lollipopkit/watch_connectivity" source: git version: "0.1.5"