diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png index ee3a257c..abf123ed 100644 Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png index 4def105f..89ad08bc 100644 Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-hdpi/splash.png b/android/app/src/main/res/drawable-night-hdpi/splash.png deleted file mode 100644 index ee3a257c..00000000 Binary files a/android/app/src/main/res/drawable-night-hdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night-mdpi/splash.png b/android/app/src/main/res/drawable-night-mdpi/splash.png deleted file mode 100644 index 4def105f..00000000 Binary files a/android/app/src/main/res/drawable-night-mdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png index f73d98ed..bb72a799 100644 Binary files a/android/app/src/main/res/drawable-night-v21/background.png and b/android/app/src/main/res/drawable-night-v21/background.png differ diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml index 3fe6b2e8..3cc4948a 100644 --- a/android/app/src/main/res/drawable-night-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable-night-xhdpi/splash.png b/android/app/src/main/res/drawable-night-xhdpi/splash.png deleted file mode 100644 index 9f500d5c..00000000 Binary files a/android/app/src/main/res/drawable-night-xhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxhdpi/splash.png deleted file mode 100644 index e31afb6a..00000000 Binary files a/android/app/src/main/res/drawable-night-xxhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png deleted file mode 100644 index c025749a..00000000 Binary files a/android/app/src/main/res/drawable-night-xxxhdpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png index f73d98ed..bb72a799 100644 Binary files a/android/app/src/main/res/drawable-night/background.png and b/android/app/src/main/res/drawable-night/background.png differ diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml index 3fe6b2e8..3cc4948a 100644 --- a/android/app/src/main/res/drawable-night/launch_background.xml +++ b/android/app/src/main/res/drawable-night/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png index e29b3b59..3107d37f 100644 Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml index 3fe6b2e8..3cc4948a 100644 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png index 9f500d5c..0ca0b444 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png index e31afb6a..f84d678b 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png index c025749a..63cfa485 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png index e29b3b59..3107d37f 100644 Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 3fe6b2e8..3cc4948a 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml deleted file mode 100644 index 0a26926d..00000000 --- a/android/app/src/main/res/values-night-v31/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index 0398fe49..7b20e158 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -7,6 +7,8 @@ @drawable/launch_background false false + false + shortEdges - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 874a500e..f86ecf4a 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -7,6 +7,8 @@ @drawable/launch_background false false + false + shortEdges @@ -14,13 +16,14 @@ - + - + + diff --git a/ios/Runner/Info-Debug.plist b/ios/Runner/Info-Debug.plist index c25f36dc..0de86afe 100644 --- a/ios/Runner/Info-Debug.plist +++ b/ios/Runner/Info-Debug.plist @@ -1,68 +1,68 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLocalizations - - en - zh - - CFBundleName - ServerBox - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - ITSAppUsesNonExemptEncryption - - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - UIApplicationSupportsIndirectInputEvents - - UIBackgroundModes - - fetch - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NSBonjourServices - - _dartobservatory._tcp - - NSLocalNetworkUsageDescription - ServerBox needs to access your local network to discover and connect to your server. - + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + en + zh + + CFBundleName + ServerBox + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + + LSRequiresIPhoneOS + + LSSupportsOpeningDocumentsInPlace + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + fetch + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + NSBonjourServices + + _dartobservatory._tcp + + NSLocalNetworkUsageDescription + ServerBox needs to access your local network to discover and connect to your server. + diff --git a/ios/Runner/Info-Profile.plist b/ios/Runner/Info-Profile.plist index c25f36dc..0de86afe 100644 --- a/ios/Runner/Info-Profile.plist +++ b/ios/Runner/Info-Profile.plist @@ -1,68 +1,68 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLocalizations - - en - zh - - CFBundleName - ServerBox - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - ITSAppUsesNonExemptEncryption - - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - UIApplicationSupportsIndirectInputEvents - - UIBackgroundModes - - fetch - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NSBonjourServices - - _dartobservatory._tcp - - NSLocalNetworkUsageDescription - ServerBox needs to access your local network to discover and connect to your server. - + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + en + zh + + CFBundleName + ServerBox + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + + LSRequiresIPhoneOS + + LSSupportsOpeningDocumentsInPlace + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + fetch + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + NSBonjourServices + + _dartobservatory._tcp + + NSLocalNetworkUsageDescription + ServerBox needs to access your local network to discover and connect to your server. + diff --git a/ios/Runner/Info-Release.plist b/ios/Runner/Info-Release.plist index 45df8c42..4e13b6d1 100644 --- a/ios/Runner/Info-Release.plist +++ b/ios/Runner/Info-Release.plist @@ -1,62 +1,62 @@ - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLocalizations - - en - zh - - CFBundleName - ServerBox - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - ITSAppUsesNonExemptEncryption - - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - UIApplicationSupportsIndirectInputEvents - - UIBackgroundModes - - fetch - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + en + zh + + CFBundleName + ServerBox + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + + LSRequiresIPhoneOS + + LSSupportsOpeningDocumentsInPlace + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + fetch + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + diff --git a/lib/core/utils/misc.dart b/lib/core/utils/misc.dart index 3e69dd3a..e66978de 100644 --- a/lib/core/utils/misc.dart +++ b/lib/core/utils/misc.dart @@ -28,7 +28,7 @@ Future shareFiles(BuildContext context, List filePaths) async { } _app.setCanMoveBg(false); // ignore: deprecated_member_use - await Share.shareFiles(filePaths, text: 'ServerBox -> $text'); + await Share.shareFiles(filePaths, subject: 'ServerBox -> $text'); _app.setCanMoveBg(true); return filePaths.isNotEmpty; } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index cfb020b4..6ca7c2e7 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 353; - static const String engine = "3.10.3"; - static const String buildAt = "2023-06-05 17:15:25.298942"; - static const int modifications = 6; + static const int build = 354; + static const String engine = "3.10.0"; + static const String buildAt = "2023-06-08 19:29:06.373509"; + static const int modifications = 80; } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 50f03a4b..316aa366 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 353; + CURRENT_PROJECT_VERSION = 354; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.353; + MARKETING_VERSION = 1.0.354; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 353; + CURRENT_PROJECT_VERSION = 354; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.353; + MARKETING_VERSION = 1.0.354; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 353; + CURRENT_PROJECT_VERSION = 354; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.353; + MARKETING_VERSION = 1.0.354; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/pubspec.lock b/pubspec.lock index d1c54e14..ec4a60a1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,9 +173,10 @@ packages: code_text_field: dependency: "direct main" description: - path: "../code_field" - relative: true - source: path + name: code_text_field + sha256: "0cbffbb2932cf82e1d022996388041de3493a476acad3fbb13e5917cac0fc5f2" + url: "https://pub.dev" + source: hosted version: "1.1.0" collection: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index 10e468c3..48a2453f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,8 +65,7 @@ dependencies: plain_notification_token: ^0.0.4 highlight: ^0.7.0 flutter_highlight: ^0.7.0 - code_text_field: - path: ../code_field + code_text_field: ^1.1.0 dev_dependencies: flutter_native_splash: ^2.1.6 @@ -179,8 +178,9 @@ flutter_native_splash: # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s) # with the info_plist_files parameter. Remove only the # characters in the three lines below, # do not remove any spaces: - #info_plist_files: - # - 'ios/Runner/Info-Debug.plist' - # - 'ios/Runner/Info-Release.plist' + info_plist_files: + - 'ios/Runner/Info-Debug.plist' + - 'ios/Runner/Info-Profile.plist' + - 'ios/Runner/Info-Release.plist' # To enable support for Android 12, set the following parameter to true. Defaults to false. #android12: true diff --git a/web/index.html b/web/index.html index e4514faf..0ef17a34 100644 --- a/web/index.html +++ b/web/index.html @@ -1,6 +1,4 @@ - - - + @@ -100,10 +102,6 @@ loadMainDartJs(); } - - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png index 4def105f..89ad08bc 100644 Binary files a/web/splash/img/dark-1x.png and b/web/splash/img/dark-1x.png differ diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png index 9f500d5c..0ca0b444 100644 Binary files a/web/splash/img/dark-2x.png and b/web/splash/img/dark-2x.png differ diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png index e31afb6a..f84d678b 100644 Binary files a/web/splash/img/dark-3x.png and b/web/splash/img/dark-3x.png differ diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png index c025749a..63cfa485 100644 Binary files a/web/splash/img/dark-4x.png and b/web/splash/img/dark-4x.png differ diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png index 4def105f..89ad08bc 100644 Binary files a/web/splash/img/light-1x.png and b/web/splash/img/light-1x.png differ diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png index 9f500d5c..0ca0b444 100644 Binary files a/web/splash/img/light-2x.png and b/web/splash/img/light-2x.png differ diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png index e31afb6a..f84d678b 100644 Binary files a/web/splash/img/light-3x.png and b/web/splash/img/light-3x.png differ diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png index c025749a..63cfa485 100644 Binary files a/web/splash/img/light-4x.png and b/web/splash/img/light-4x.png differ diff --git a/web/splash/splash.js b/web/splash/splash.js index 898c454f..3b6ed11f 100644 --- a/web/splash/splash.js +++ b/web/splash/splash.js @@ -1,7 +1,5 @@ function removeSplashFromWeb() { - const elem = document.getElementById("splash"); - if (elem) { - elem.remove(); - } + document.getElementById("splash")?.remove(); + document.getElementById("splash-branding")?.remove(); document.body.style.background = "transparent"; } diff --git a/web/splash/style.css b/web/splash/style.css index d5ba049a..e7514f17 100644 --- a/web/splash/style.css +++ b/web/splash/style.css @@ -1,8 +1,11 @@ +html { + height: 100% +} + body { - margin:0; - height:100%; - background: #ffffff; - + margin: 0; + min-height: 100%; + background-color: #ffffff; background-size: 100% 100%; } @@ -32,12 +35,28 @@ body { object-fit: cover; } +.bottom { + position: absolute; + bottom: 0; + left: 50%; + -ms-transform: translate(-50%, 0); + transform: translate(-50%, 0); +} + +.bottomLeft { + position: absolute; + bottom: 0; + left: 0; +} + +.bottomRight { + position: absolute; + bottom: 0; + right: 0; +} + @media (prefers-color-scheme: dark) { body { - margin:0; - height:100%; - background: #121212; - - background-size: 100% 100%; + background-color: #121212; } }