diff --git a/rework_experiments/.gitignore b/rework_experiments/.gitignore new file mode 100644 index 00000000..24476c5d --- /dev/null +++ b/rework_experiments/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/rework_experiments/.metadata b/rework_experiments/.metadata new file mode 100644 index 00000000..a778330b --- /dev/null +++ b/rework_experiments/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "d211f42860350d914a5ad8102f9ec32764dc6d06" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: android + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: ios + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: linux + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: macos + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: web + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: windows + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/rework_experiments/README.md b/rework_experiments/README.md new file mode 100644 index 00000000..d8e64ef7 --- /dev/null +++ b/rework_experiments/README.md @@ -0,0 +1,16 @@ +# rework_experiments + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/rework_experiments/analysis_options.yaml b/rework_experiments/analysis_options.yaml new file mode 100644 index 00000000..0d290213 --- /dev/null +++ b/rework_experiments/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/rework_experiments/android/.gitignore b/rework_experiments/android/.gitignore new file mode 100644 index 00000000..6f568019 --- /dev/null +++ b/rework_experiments/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/rework_experiments/android/app/build.gradle b/rework_experiments/android/app/build.gradle new file mode 100644 index 00000000..e584cdaa --- /dev/null +++ b/rework_experiments/android/app/build.gradle @@ -0,0 +1,67 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +android { + namespace "com.example.rework_experiments" + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.rework_experiments" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies {} diff --git a/rework_experiments/android/app/src/debug/AndroidManifest.xml b/rework_experiments/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/rework_experiments/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/rework_experiments/android/app/src/main/AndroidManifest.xml b/rework_experiments/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..ddd0c6c0 --- /dev/null +++ b/rework_experiments/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/rework_experiments/android/app/src/main/kotlin/com/example/rework_experiments/MainActivity.kt b/rework_experiments/android/app/src/main/kotlin/com/example/rework_experiments/MainActivity.kt new file mode 100644 index 00000000..cee89f51 --- /dev/null +++ b/rework_experiments/android/app/src/main/kotlin/com/example/rework_experiments/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.rework_experiments + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/rework_experiments/android/app/src/main/res/drawable-v21/launch_background.xml b/rework_experiments/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/rework_experiments/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/rework_experiments/android/app/src/main/res/drawable/launch_background.xml b/rework_experiments/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/rework_experiments/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/rework_experiments/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/rework_experiments/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..db77bb4b Binary files /dev/null and b/rework_experiments/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/rework_experiments/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/rework_experiments/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..17987b79 Binary files /dev/null and b/rework_experiments/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/rework_experiments/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/rework_experiments/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..09d43914 Binary files /dev/null and b/rework_experiments/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/rework_experiments/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/rework_experiments/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..d5f1c8d3 Binary files /dev/null and b/rework_experiments/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/rework_experiments/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/rework_experiments/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..4d6372ee Binary files /dev/null and b/rework_experiments/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/rework_experiments/android/app/src/main/res/values-night/styles.xml b/rework_experiments/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..06952be7 --- /dev/null +++ b/rework_experiments/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/rework_experiments/android/app/src/main/res/values/styles.xml b/rework_experiments/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..cb1ef880 --- /dev/null +++ b/rework_experiments/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/rework_experiments/android/app/src/profile/AndroidManifest.xml b/rework_experiments/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..399f6981 --- /dev/null +++ b/rework_experiments/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/rework_experiments/android/build.gradle b/rework_experiments/android/build.gradle new file mode 100644 index 00000000..f7eb7f63 --- /dev/null +++ b/rework_experiments/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.7.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.3.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/rework_experiments/android/gradle.properties b/rework_experiments/android/gradle.properties new file mode 100644 index 00000000..94adc3a3 --- /dev/null +++ b/rework_experiments/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/rework_experiments/android/gradle/wrapper/gradle-wrapper.properties b/rework_experiments/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..3c472b99 --- /dev/null +++ b/rework_experiments/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/rework_experiments/android/settings.gradle b/rework_experiments/android/settings.gradle new file mode 100644 index 00000000..55c4ca8b --- /dev/null +++ b/rework_experiments/android/settings.gradle @@ -0,0 +1,20 @@ +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() + + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} + +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/rework_experiments/ios/.gitignore b/rework_experiments/ios/.gitignore new file mode 100644 index 00000000..7a7f9873 --- /dev/null +++ b/rework_experiments/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/rework_experiments/ios/Flutter/AppFrameworkInfo.plist b/rework_experiments/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 00000000..7c569640 --- /dev/null +++ b/rework_experiments/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/rework_experiments/ios/Flutter/Debug.xcconfig b/rework_experiments/ios/Flutter/Debug.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/rework_experiments/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/rework_experiments/ios/Flutter/Release.xcconfig b/rework_experiments/ios/Flutter/Release.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/rework_experiments/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/rework_experiments/ios/Runner.xcodeproj/project.pbxproj b/rework_experiments/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..a37fe0f9 --- /dev/null +++ b/rework_experiments/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,614 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807E294A63A400263BE5 /* Frameworks */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/rework_experiments/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/rework_experiments/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/rework_experiments/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..8e3ca5df --- /dev/null +++ b/rework_experiments/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rework_experiments/ios/Runner.xcworkspace/contents.xcworkspacedata b/rework_experiments/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/rework_experiments/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/rework_experiments/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/rework_experiments/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/rework_experiments/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/rework_experiments/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/rework_experiments/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/rework_experiments/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/rework_experiments/ios/Runner/AppDelegate.swift b/rework_experiments/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..b6363034 --- /dev/null +++ b/rework_experiments/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d36b1fab --- /dev/null +++ b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "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" + } +} diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 00000000..dc9ada47 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 00000000..7353c41e Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 00000000..797d452e Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 00000000..6ed2d933 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 00000000..4cd7b009 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 00000000..fe730945 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 00000000..321773cd Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 00000000..797d452e Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 00000000..502f463a Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 00000000..0ec30343 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 00000000..0ec30343 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 00000000..e9f5fea2 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 00000000..84ac32ae Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 00000000..8953cba0 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 00000000..0467bf12 Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 00000000..0bedcf2f --- /dev/null +++ b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 00000000..89c2725b --- /dev/null +++ b/rework_experiments/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/rework_experiments/ios/Runner/Base.lproj/LaunchScreen.storyboard b/rework_experiments/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..f2e259c7 --- /dev/null +++ b/rework_experiments/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rework_experiments/ios/Runner/Base.lproj/Main.storyboard b/rework_experiments/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f3c28516 --- /dev/null +++ b/rework_experiments/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rework_experiments/ios/Runner/Info.plist b/rework_experiments/ios/Runner/Info.plist new file mode 100644 index 00000000..b04c1ab1 --- /dev/null +++ b/rework_experiments/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Rework Experiments + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + rework_experiments + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/rework_experiments/ios/Runner/Runner-Bridging-Header.h b/rework_experiments/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..308a2a56 --- /dev/null +++ b/rework_experiments/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/rework_experiments/ios/RunnerTests/RunnerTests.swift b/rework_experiments/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..86a7c3b1 --- /dev/null +++ b/rework_experiments/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/rework_experiments/lib/different_examples.dart b/rework_experiments/lib/different_examples.dart new file mode 100644 index 00000000..c98356d7 --- /dev/null +++ b/rework_experiments/lib/different_examples.dart @@ -0,0 +1,381 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart'; +import 'package:rework_experiments/wolt_page_layout_experiment/wolt_page_layout.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Example', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + home: const _HomeScreen(), + ); + } +} + +class _HomeScreen extends StatelessWidget { + const _HomeScreen(); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ElevatedButton( + onPressed: () { + // Function call for declarative use of navigation. + showWoltModalSheet( + supportedPaths: supportedPaths.values.toList(), + context: context, + initialPath: initialPath, + useRootNavigator: false, + ); + }, + child: const Text('Open with default WoltModalSheetDelegate'), + ), + const SizedBox(height: 40.0), + ElevatedButton( + onPressed: () { + // Function call for declarative use of navigation. + showWoltModalSheet( + supportedPaths: supportedPaths.values.toList(), + context: context, + initialPath: initialPath, + useRootNavigator: false, + woltModalSheetDelegate: _AlwaysBottomSheetDelegate(), + ); + }, + child: const Text('Open with custom BottomSheetTypeDelegate'), + ), + const SizedBox(height: 40.0), + ElevatedButton( + onPressed: () { + // Function call for declarative use of navigation. + showWoltModalSheet( + supportedPaths: supportedPaths.values.toList(), + context: context, + initialPath: initialPath, + useRootNavigator: false, + woltModalSheetDelegate: _AlwaysAlertDialogDelegate(), + ); + }, + child: const Text('Open with custom AlertDialogTypeDelegate'), + ), + ], + ), + ), + ); + } +} + +class _AlwaysBottomSheetDelegate extends WoltModalSheetDelegate { + @override + WoltModalType getWoltModalSheetType(BuildContext context) { + return WoltModalType.bottomSheet; + } +} + +class _AlwaysAlertDialogDelegate extends WoltModalSheetDelegate { + @override + WoltModalType getWoltModalSheetType(BuildContext context) { + return WoltModalType.dialog; + } +} + +const initialPath = [ + WoltModalSheetPath(path: 'firstScreen', arguments: Colors.pinkAccent), +]; + +final supportedPaths = { + 'firstScreen': WoltModalSheetPathSettings( + path: 'firstScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: FirstScreen(color: color as Color), + ), + ), + 'secondScreen': WoltModalSheetPathSettings( + path: 'secondScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: SecondScreen( + color: color as Color, + ), + ), + ), + 'thirdScreen': WoltModalSheetPathSettings( + path: 'thirdScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: ThirdScreen( + color: color as Color, + ), + ), + ), + 'testScreen': WoltModalSheetPathSettings( + path: 'testScreen', + pageBuilder: (_) => const WoltModalInternalPage( + child: _TestScreen(), + ), + ), +}; + +class FirstScreen extends StatelessWidget { + final Color color; + + const FirstScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + color: color, + child: SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const SizedBox(height: 40), + const Text( + 'First Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // The default navigator is used here to close the WoltModalSheet. + Navigator.of( + context, + rootNavigator: true, + ).pop(); + }, + child: const Text('Close WoltModalBottomSheet'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context) + .pushNamed('secondScreen', Colors.blue); + }, + child: const Text('Go to SecondScreen'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + const SizedBox(height: 40), + ], + ), + ), + ); + } +} + +class SecondScreen extends StatelessWidget { + final Color color; + + const SecondScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + height: 300, + color: color, + child: Column( + //mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Second Screen', + style: TextStyle(fontSize: 30), + ), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context) + .pushNamed('thirdScreen', Colors.orange); + }, + child: const Text('Go to ThirdPage'), + ), + const SizedBox(height: 20), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ); + } +} + +class ThirdScreen extends StatelessWidget { + final Color color; + + const ThirdScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + color: color, + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const SizedBox(height: 40), + const Text( + 'Third Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pushNamed( + 'testScreen', + ); + }, + child: const Text('Go to Test Screen'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ), + ); + } +} + +class _TestScreen extends StatelessWidget { + const _TestScreen(); + + @override + Widget build(BuildContext context) { + return Container( + height: 600, + color: Colors.red, + child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: WoltPageLayout( + header: const _CollapsedContent('header', Colors.blue), + footer: const _CollapsedContent('footer', Colors.green), + slivers: [ + SliverList.builder( + itemBuilder: (context, index) { + debugPrint('1st seq $index'); + return _Slice(index); + }, + itemCount: 10, + ), + ], + ), + ), + const SizedBox(height: 10), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pushNamed( + 'firstScreen', + Colors.blueGrey, + ); + }, + child: const Text('Go to First Screen'), + ), + const SizedBox(height: 20), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + const SizedBox(height: 10), + ], + ), + ); + } +} + +class _CollapsedContent extends StatefulWidget { + final String title; + final Color color; + + const _CollapsedContent(this.title, this.color); + + @override + State<_CollapsedContent> createState() => _CollapsedContentState(); +} + +class _CollapsedContentState extends State<_CollapsedContent> { + bool _isExpanded = false; + + @override + Widget build(BuildContext context) { + return AnimatedContainer( + duration: const Duration(milliseconds: 300), + color: widget.color, + height: _isExpanded ? 300 : 100, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Center(child: Text(widget.title)), + Checkbox( + value: _isExpanded, + onChanged: (value) => setState(() => _isExpanded = value!), + ), + ], + ), + ); + } +} + +class _Slice extends StatelessWidget { + final int index; + + const _Slice(this.index); + + @override + Widget build(BuildContext context) { + return Container( + color: Colors.red, + margin: const EdgeInsets.all(8), + height: 25, + child: Text('Item $index'), + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/example.dart b/rework_experiments/lib/navigation_experiment/example.dart new file mode 100644 index 00000000..d12fc08e --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/example.dart @@ -0,0 +1,333 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart'; +import 'package:rework_experiments/wolt_page_layout_experiment/wolt_page_layout.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Example', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + home: const _HomeScreen(), + ); + } +} + +class _HomeScreen extends StatelessWidget { + const _HomeScreen(); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: ElevatedButton( + onPressed: () { + // Function call for declarative use of navigation. + showWoltModalSheet( + supportedPaths: supportedPaths.values.toList(), + context: context, + initialPath: initialPath, + useRootNavigator: false, + ); + }, + child: const Text('Open WoltModalBottomSheet'), + ), + ), + ); + } +} + +const initialPath = [ + WoltModalSheetPath(path: 'firstScreen', arguments: Colors.pinkAccent), +]; + +final supportedPaths = { + 'firstScreen': WoltModalSheetPathSettings( + path: 'firstScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: FirstScreen(color: color as Color), + ), + ), + 'secondScreen': WoltModalSheetPathSettings( + path: 'secondScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: SecondScreen( + color: color as Color, + ), + ), + ), + 'thirdScreen': WoltModalSheetPathSettings( + path: 'thirdScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: ThirdScreen( + color: color as Color, + ), + ), + ), + 'testScreen': WoltModalSheetPathSettings( + path: 'testScreen', + pageBuilder: (_) => const WoltModalInternalPage( + child: _TestScreen(), + ), + ), +}; + +class FirstScreen extends StatelessWidget { + final Color color; + + const FirstScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + color: color, + child: SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const SizedBox(height: 40), + const Text( + 'First Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // The default navigator is used here to close the WoltModalSheet. + Navigator.of( + context, + rootNavigator: true, + ).pop(); + }, + child: const Text('Close WoltModalBottomSheet'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context) + .pushNamed('secondScreen', Colors.blue); + }, + child: const Text('Go to SecondScreen'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + const SizedBox(height: 40), + ], + ), + ), + ); + } +} + +class SecondScreen extends StatelessWidget { + final Color color; + + const SecondScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + height: 300, + color: color, + child: Column( + //mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Second Screen', + style: TextStyle(fontSize: 30), + ), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context) + .pushNamed('thirdScreen', Colors.orange); + }, + child: const Text('Go to ThirdPage'), + ), + const SizedBox(height: 20), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ); + } +} + +class ThirdScreen extends StatelessWidget { + final Color color; + + const ThirdScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + return Container( + color: color, + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const SizedBox(height: 40), + const Text( + 'Third Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pushNamed( + 'testScreen', + ); + }, + child: const Text('Go to Test Screen'), + ), + const SizedBox(height: 40), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ), + ); + } +} + +class _TestScreen extends StatelessWidget { + const _TestScreen(); + + @override + Widget build(BuildContext context) { + return Container( + height: 600, + color: Colors.red, + child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: WoltPageLayout( + header: const _CollapsedContent('header', Colors.blue), + footer: const _CollapsedContent('footer', Colors.green), + slivers: [ + SliverList.builder( + itemBuilder: (context, index) { + debugPrint('1st seq $index'); + return _Slice(index); + }, + itemCount: 10, + ), + ], + ), + ), + const SizedBox(height: 10), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pushNamed( + 'firstScreen', + Colors.blueGrey, + ); + }, + child: const Text('Go to First Screen'), + ), + const SizedBox(height: 20), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + const SizedBox(height: 10), + ], + ), + ); + } +} + +class _CollapsedContent extends StatefulWidget { + final String title; + final Color color; + + const _CollapsedContent(this.title, this.color); + + @override + State<_CollapsedContent> createState() => _CollapsedContentState(); +} + +class _CollapsedContentState extends State<_CollapsedContent> { + bool _isExpanded = false; + + @override + Widget build(BuildContext context) { + return AnimatedContainer( + duration: const Duration(milliseconds: 300), + color: widget.color, + height: _isExpanded ? 300 : 100, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Center(child: Text(widget.title)), + Checkbox( + value: _isExpanded, + onChanged: (value) => setState(() => _isExpanded = value!), + ), + ], + ), + ); + } +} + +class _Slice extends StatelessWidget { + final int index; + + const _Slice(this.index); + + @override + Widget build(BuildContext context) { + return Container( + color: Colors.red, + margin: const EdgeInsets.all(8), + height: 25, + child: Text('Item $index'), + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/example_with_hero.dart b/rework_experiments/lib/navigation_experiment/example_with_hero.dart new file mode 100644 index 00000000..781a72f8 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/example_with_hero.dart @@ -0,0 +1,209 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart'; +import 'package:rework_experiments/wolt_page_layout_experiment/wolt_page_layout.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Navigation Example', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + home: const _HomeScreen(), + ); + } +} + +class _HomeScreen extends StatelessWidget { + const _HomeScreen(); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: ElevatedButton( + onPressed: () { + // Function call for declarative use of navigation. + showWoltModalSheet( + supportedPaths: supportedPaths.values.toList(), + context: context, + initialPath: initialPath, + useRootNavigator: false, + ); + }, + child: const Text('Open WoltModalBottomSheet'), + ), + ), + ); + } +} + +const initialPath = [ + WoltModalSheetPath(path: 'firstScreen', arguments: Colors.pinkAccent), +]; + +final supportedPaths = { + 'firstScreen': WoltModalSheetPathSettings( + path: 'firstScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: FirstScreen(color: color as Color), + ), + ), + 'secondScreen': WoltModalSheetPathSettings( + path: 'secondScreen', + pageBuilder: (color) => WoltModalInternalPage( + child: SecondScreen( + color: color as Color, + ), + ), + ), +}; + +class FirstScreen extends StatelessWidget { + final Color color; + + const FirstScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + final headerListenable = ValueNotifier(false); + final footerListenable = ValueNotifier(false); + + return WoltPageLayout( + header: _CollapsedContent('header', Colors.blue, headerListenable), + footer: _CollapsedContent('footer', Colors.green, footerListenable), + slivers: [ + SliverToBoxAdapter( + child: ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context) + .pushNamed('secondScreen', Colors.blue); + }, + child: const Text('Go to SecondScreen'), + ), + ), + SliverList.builder( + itemBuilder: (context, index) { + debugPrint('1st seq $index'); + return _Slice(index); + }, + itemCount: 10, + ), + ], + ); + } +} + +class SecondScreen extends StatelessWidget { + final Color color; + + const SecondScreen({ + super.key, + required this.color, + }); + + @override + Widget build(BuildContext context) { + final headerListenable = ValueNotifier(false); + final ValueNotifier footerListenable = ValueNotifier(false); + + return WoltPageLayout( + header: _CollapsedContent('header', Colors.blue, headerListenable), + footer: _CollapsedContent('footer', Colors.green, footerListenable), + slivers: [ + SliverToBoxAdapter( + child: ElevatedButton( + onPressed: () { + // The default navigator is used here to close the WoltModalSheet. + WoltModalSheetNavigator.of( + context, + ).pop(); + }, + child: const Text('POP'), + ), + ), + SliverList.builder( + itemBuilder: (context, index) { + debugPrint('1st seq $index'); + return _Slice(index); + }, + itemCount: 10, + ), + ], + ); + } +} + +class _CollapsedContent extends StatefulWidget { + final ValueNotifier isExpandedListener; + final String title; + final Color color; + + const _CollapsedContent( + this.title, + this.color, + this.isExpandedListener, + ); + + @override + State<_CollapsedContent> createState() => _CollapsedContentState(); +} + +class _CollapsedContentState extends State<_CollapsedContent> { + @override + Widget build(BuildContext context) { + return ValueListenableBuilder( + valueListenable: widget.isExpandedListener, + builder: (BuildContext context, bool value, Widget? child) { + return AnimatedContainer( + duration: const Duration(milliseconds: 300), + color: widget.color, + height: value ? 300 : 100, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Center(child: Text(widget.title)), + Checkbox( + value: value, + onChanged: (value) { + widget.isExpandedListener.value = value!; + }), + ], + ), + ); + }, + ); + } +} + +class _Slice extends StatelessWidget { + final int index; + + const _Slice(this.index); + + @override + Widget build(BuildContext context) { + return Container( + color: Colors.red, + margin: const EdgeInsets.all(8), + height: 25, + child: Text('Item $index'), + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/example_with_navigation2.dart b/rework_experiments/lib/navigation_experiment/example_with_navigation2.dart new file mode 100644 index 00000000..f7f7a74d --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/example_with_navigation2.dart @@ -0,0 +1,333 @@ +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp.router( + routerConfig: _router, + title: 'Navigator 2.0 example', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + ); + } +} + +class _HomeScreen extends StatefulWidget { + const _HomeScreen(); + + @override + State<_HomeScreen> createState() => _HomeScreenState(); +} + +class _HomeScreenState extends State<_HomeScreen> { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.cyanAccent, + body: Center( + child: ElevatedButton( + onPressed: () { + GoRouter.of(context).goNamed('bottom_sheet', + pathParameters: {'pages': 'firstScreen'}); + }, + child: const Text('Open WoltModalSheet'), + ), + ), + ); + } +} + +/// The route configuration. +final GoRouter _router = GoRouter( + routes: [ + GoRoute( + path: '/', + builder: (BuildContext context, GoRouterState state) { + return const _HomeScreen(); + }, + routes: [ + GoRoute( + name: 'bottom_sheet', + path: 'bottom_sheet/:pages', + pageBuilder: (BuildContext context, GoRouterState state) { + // Here can be an implementation of any complexity of working with + // parameters. It does not depend on how wolt_modal_sheet works, + // and more related to operating with a concrete chosen navigation. + // + // This particular implementation is a simple straightforward + // way provided as an example. + final requestedPages = state.uri.pathSegments.toList(); + requestedPages.removeAt(0); + final listRequestedPages = requestedPages[0].split(','); + final pages = []; + for (var path in listRequestedPages) { + if (path.contains('..')) { + final pageAndParams = path.split('..'); + final pageName = pageAndParams[0]; + final params = pageAndParams.length > 1 ? pageAndParams[1] : ''; + if (params.isNotEmpty) { + pages.add(WoltModalSheetPath( + path: pageName, arguments: params == 'true')); + } + } else if (path.isNotEmpty) { + pages.add(WoltModalSheetPath(path: path)); + } + } + return WoltModalSheetPage( + supportedPaths: supportedPaths.values.toList(), + initialPath: pages, + constraints: const BoxConstraints(maxHeight: 500), + onPathChangedInternal: (currentWoltModalSheetPaths) => + onPathChangedInternal(context, currentWoltModalSheetPaths), + ); + }, + ), + ], + ), + ], +); + +/// Callback on internal changing path. +void onPathChangedInternal( + BuildContext context, + List currentWoltModalSheetPaths, +) { + // Here can be an implementation of any complexity of working with + // parameters. It does not depend on how wolt_modal_sheet works, + // and more related to operating with a concrete chosen navigation. + // + // This particular implementation is a simple straightforward + // way provided as an example. + List currentWoltModalSheetPath = []; + for (WoltModalSheetPath path in currentWoltModalSheetPaths) { + if (path.arguments != null) { + currentWoltModalSheetPath.add('${path.path}..${path.arguments},'); + } else { + currentWoltModalSheetPath.add('${path.path},'); + } + } + String pages = ''; + currentWoltModalSheetPath.map((path) { + pages = '$pages$path'; + }).toList(); + + GoRouter.of(context) + .goNamed('bottom_sheet', pathParameters: {'pages': pages}); +} + +final Map supportedPaths = + { + 'firstScreen': WoltModalSheetPathSettings( + path: 'firstScreen', + pageBuilder: (arguments) => WoltModalInternalPage( + arguments: arguments, + child: const _FirstScreen(), + name: 'firstScreen', + ), + ), + 'secondScreen': WoltModalSheetPathSettings( + path: 'secondScreen', + pageBuilder: (arguments) { + return WoltModalInternalPage( + arguments: arguments, + child: _SecondScreen( + isChecked: arguments as bool, + ), + name: 'secondScreen', + ); + }, + ), + 'thirdScreen': WoltModalSheetPathSettings( + path: 'thirdScreen', + pageBuilder: (arguments) => WoltModalInternalPage( + arguments: arguments, + child: const _ThirdScreen(), + name: 'thirdScreen', + ), + ), +}; + +class _FirstScreen extends StatefulWidget { + const _FirstScreen(); + + @override + State<_FirstScreen> createState() => _FirstScreenState(); +} + +class _FirstScreenState extends State<_FirstScreen> { + @override + Widget build(BuildContext context) { + return Container( + color: Colors.pinkAccent, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'First Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + // The GoRouter is used here to close the WoltModalSheet. + GoRouter.of(context).pop(); + }, + child: const Text('Close WoltModalBottomSheet'), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pushNamed( + 'secondScreen', + false, + ); + }, + child: const Text('Go to SecondScreen'), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + // This uses WoltModalSheetNavigator to navigate within the WoltModalSheet. + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ); + } +} + +class _SecondScreen extends StatefulWidget { + final bool isChecked; + + const _SecondScreen({ + required this.isChecked, + }); + + @override + State<_SecondScreen> createState() => _SecondScreenState(); +} + +class _SecondScreenState extends State<_SecondScreen> { + late final _isCheckedState = ValueNotifier(widget.isChecked); + + @override + void didUpdateWidget(_SecondScreen oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.isChecked != widget.isChecked) { + _isCheckedState.value = widget.isChecked; + } + } + + @override + Widget build(BuildContext context) { + return Container( + height: 300, + color: Colors.lightBlueAccent, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Second Screen', + style: TextStyle(fontSize: 30), + ), + ValueListenableBuilder( + valueListenable: _isCheckedState, + builder: (_, isChecked, __) => Checkbox( + value: isChecked, + onChanged: (value) { + if (value != null) { + _isCheckedState.value = value; + } + }, + ), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + WoltModalSheetNavigator.of(context).pushNamed( + 'thirdScreen', + ); + }, + child: const Text('Go to ThirdPage'), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ); + } +} + +class _ThirdScreen extends StatelessWidget { + const _ThirdScreen(); + + @override + Widget build(BuildContext context) { + return Container( + color: Colors.greenAccent, + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Third Screen', + style: TextStyle(fontSize: 30), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + WoltModalSheetNavigator.of(context).pushNamed( + 'firstScreen', + ); + }, + child: const Text('Go to First Screen'), + ), + const SizedBox( + height: 40.0, + ), + ElevatedButton( + onPressed: () { + WoltModalSheetNavigator.of(context).pop(); + }, + child: const Text('POP'), + ), + ], + ), + ), + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/README.md b/rework_experiments/lib/navigation_experiment/lib/README.md new file mode 100644 index 00000000..e73ebfbe --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/README.md @@ -0,0 +1,3 @@ +# rework_experiments + +These files should be added to the library. diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/external/README.md b/rework_experiments/lib/navigation_experiment/lib/navigation/external/README.md new file mode 100644 index 00000000..551b19fc --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/external/README.md @@ -0,0 +1 @@ +This folder contains entities responsible for external navigation, such as showing modal sheet. \ No newline at end of file diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart new file mode 100644 index 00000000..79586daf --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/external/wolt_modal_sheet_route.dart @@ -0,0 +1,172 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart'; +import 'package:rework_experiments/navigation_experiment/lib/wolt_modal_sheet.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; + +/// An imperative way to show [WoltModalSheet]. +Future showWoltModalSheet({ + required List supportedPaths, + required BuildContext context, + required List initialPath, + bool isDismissible = true, + bool useRootNavigator = false, + Color? modalBarrierColor, + Duration? transitionDuration, + String? barrierLabel, + RouteSettings? settings, + WoltModalSheetDelegate? woltModalSheetDelegate, +}) { + final NavigatorState navigator = Navigator.of( + context, + rootNavigator: useRootNavigator, + ); + + return navigator.push( + WoltModalSheetRoute( + supportedPaths: supportedPaths, + initialPath: initialPath, + modalBarrierColor: modalBarrierColor, + isDismissible: isDismissible, + transitionDuration: transitionDuration, + barrierLabel: barrierLabel, + settings: settings, + woltModalSheetDelegate: woltModalSheetDelegate, + ), + ); +} + +/// Route for displaying the [WoltModalSheet]. +class WoltModalSheetRoute extends PopupRoute { + /// All the pages that the bottom tire can display. + final List supportedPaths; + + /// Initial page, or set of initial paths. + final List initialPath; + + /// Specifies whether the bottom sheet will be dismissed + /// when user taps on the scrim. + /// + /// If true, the bottom sheet will be dismissed when user taps on the scrim. + /// + /// Defaults to true. + final bool isDismissible; + + /// Specifies the color of the modal barrier that darkens everything below the + /// bottom sheet. + /// + /// Defaults to `Colors.black54` if not provided. + final Color? modalBarrierColor; + + final WoltModalSheetDelegate? woltModalSheetDelegate; + + /// Callback function that is triggered whenever there is a change in navigation + /// within the [WoltModalSheet]. + /// The function receives a list of the current active routes as a parameter, allowing + /// you to track and respond to navigation changes. + final Function(List)? onPathChangedInternal; + + late final Duration _transitionDuration; + + late final String? _barrierLabel; + + late final BoxConstraints _constraints; + + WoltModalSheetRoute({ + required this.supportedPaths, + required this.initialPath, + this.isDismissible = true, + this.modalBarrierColor, + this.onPathChangedInternal, + this.woltModalSheetDelegate, + Duration? transitionDuration, + String? barrierLabel, + BoxConstraints? constraints, + super.settings, + }) { + _transitionDuration = + transitionDuration ?? const Duration(milliseconds: 300); + _barrierLabel = barrierLabel ?? 'Modal barrier'; + _constraints = constraints ?? const BoxConstraints(maxHeight: 300); + } + + @override + Color? get barrierColor => modalBarrierColor ?? Colors.black54; + + @override + String? get barrierLabel => _barrierLabel; + + @override + Widget buildPage( + BuildContext context, + Animation animation, + Animation secondaryAnimation, + ) { + final routeController = controller; + return WoltModalSheet( + constraints: _constraints, + supportedPaths: supportedPaths, + initialPath: initialPath, + appearingAnimationController: routeController, + onPathChangedInternal: onPathChangedInternal, + woltModalSheetDelegate: woltModalSheetDelegate, + ); + } + + @override + Duration get transitionDuration => _transitionDuration; + + @override + bool get barrierDismissible => isDismissible; +} + +/// A page that creates a [WoltModalSheet] style [PageRoute]. +/// +/// Example of usage with GoRouter: +/// +/// GoRoute( +/// name: 'bottom_sheet', +/// path: 'bottom_sheet/:pages', +/// pageBuilder: (BuildContext context, GoRouterState state) { +/// return WoltModalSheetPage( +/// supportedPaths: supportedPaths, +/// initialPath: pages, +/// ), +/// } +class WoltModalSheetPage extends Page { + /// All the pages that the bottom tire can display. + final List supportedPaths; + + /// Initial page, or set of initial pages. + final List initialPath; + + /// Data that might be useful in constructing a [Route]. + final RouteSettings? settings; + + final BoxConstraints? constraints; + + /// Callback function that is triggered whenever there is a change in navigation + /// within the [WoltModalSheet]. + /// The function receives a list of the current active routes as a parameter, allowing + /// you to track and respond to navigation changes. + final Function(List)? onPathChangedInternal; + + const WoltModalSheetPage({ + required this.supportedPaths, + required this.initialPath, + this.settings, + this.constraints, + this.onPathChangedInternal, + }); + + @override + Route createRoute(BuildContext context) { + return WoltModalSheetRoute( + initialPath: initialPath, + supportedPaths: supportedPaths, + settings: settings ?? this, + onPathChangedInternal: onPathChangedInternal, + constraints: constraints, + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/README.md b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/README.md new file mode 100644 index 00000000..0359dc8f --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/README.md @@ -0,0 +1 @@ +This folder contains entities responsible for internal navigation (navigation of content). \ No newline at end of file diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_coordinator.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_coordinator.dart new file mode 100644 index 00000000..b232c55e --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_coordinator.dart @@ -0,0 +1,109 @@ +import 'package:collection/collection.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; + +/// Coordinator for managing the navigation stack of modal sheets. +/// This class is responsible for handling navigation change intents, +/// both internal and external, resolving them, and publishing the resulting +/// list of pages that should be displayed based on the most recent intent. +class WoltModalSheetCoordinator { + final void Function(List) _onPathChangedInternal; + final VoidCallback _onStackEmpty; + + final _pages = ValueNotifier>([]); + + ValueListenable> get pagesPublisher => _pages; + final _supportedPaths = {}; + final _currentPaths = []; + + WoltModalSheetCoordinator( + this._onPathChangedInternal, + this._onStackEmpty, + ); + + /// Makes initialization of the coordinator. + /// Register available routes and initial state of the navigation stack. + void init( + List supportedPaths, + List initialPath, + ) { + _supportedPaths.clear(); + _supportedPaths.addAll(supportedPaths); + _currentPaths.clear(); + _currentPaths.addAll(initialPath); + + final initialPages = []; + for (WoltModalSheetPath path in _currentPaths) { + initialPages.add(_buildPage(path)); + } + + _pages.value = initialPages; + } + + void push(WoltModalSheetPath path) { + if (!_isPathSupported(path)) { + throw Exception( + 'Unregistered path ${path.path}. Please register the path to the list of supported pages'); + } + _currentPaths.add(path); + + final currentListPages = _pages.value.toList(); + currentListPages.add(_buildPage(path)); + + _pages.value = currentListPages; + _onPathChangedInternal(_currentPaths); + } + + void pop() { + if (_pages.value.length > 1) { + final currentListPages = _pages.value.toList()..removeLast(); + _currentPaths.removeLast(); + _pages.value = currentListPages; + _onPathChangedInternal(_currentPaths); + } else { + _onStackEmpty(); + } + } + + void replaceAll(List paths) { + final currentListPages = []; + for (WoltModalSheetPath path in paths) { + if (!_isPathSupported(path)) { + throw Exception( + 'Unregistered path ${path.path}. Please register the path to the list of supported pages'); + } + + currentListPages.add(_buildPage(path)); + } + + _pages.value = currentListPages; + } + + void actualizeNavigationStack(List updatedPaths) { + _currentPaths.clear(); + _currentPaths.addAll(updatedPaths); + + final currentPages = []; + for (WoltModalSheetPath path in _currentPaths) { + currentPages.add(_buildPage(path)); + } + + _pages.value = currentPages; + } + + Page _buildPage(WoltModalSheetPath path) { + return _supportedPaths + .firstWhere((page) => page.path == path.path) + .pageBuilder(path.arguments); + } + + bool _isPathSupported(WoltModalSheetPath path) { + final supportedPath = _supportedPaths + .firstWhereOrNull((checking) => path.path == checking.path); + + return supportedPath != null; + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart new file mode 100644 index 00000000..5de5dd72 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart @@ -0,0 +1,55 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_coordinator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/wolt_modal_sheet.dart'; + +/// Point of interaction with [WoltModalSheet]s navigation internally +/// (from the shown content). +/// WoltModalSheetNavigator.of(context) is the way to reach it. +class WoltModalSheetNavigator extends InheritedWidget { + final WoltModalSheetCoordinator _coordinator; + + const WoltModalSheetNavigator({ + super.key, + required super.child, + required WoltModalSheetCoordinator coordinator, + }) : _coordinator = coordinator; + + @override + bool updateShouldNotify(WoltModalSheetNavigator oldWidget) { + return _coordinator != oldWidget._coordinator; + } + + static WoltModalSheetNavigator of(BuildContext context) { + final result = context + .getElementForInheritedWidgetOfExactType(); + + assert(result != null, 'No WoltNavigator found in context'); + + return result!.widget as WoltModalSheetNavigator; + } + + void push(WoltModalSheetPath path) { + _coordinator.push(path); + } + + void pushNamed( + String name, [ + Object? arguments, + ]) { + _coordinator.push( + WoltModalSheetPath( + path: name, + arguments: arguments, + ), + ); + } + + void pop() { + _coordinator.pop(); + } + + void replaceAll(List paths) { + _coordinator.replaceAll(paths); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart new file mode 100644 index 00000000..d7791cad --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart @@ -0,0 +1,183 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_type_adapter.dart'; + +/// An interface for pages in modal sheet that can be use to decide size of +/// modal sheet. +abstract interface class WoltModalPageRoute { + GlobalKey get contentKey; +} + +/// Page with Wolt animation for internal pages. +class WoltModalInternalPage extends Page { + final Widget child; + + /// {flutter.widgets.ModalRoute.maintainState} + final bool maintainState; + + const WoltModalInternalPage({ + super.key, + super.name, + super.arguments, + this.maintainState = true, + required this.child, + }); + + @override + Route createRoute(BuildContext context) { + return _WoltModalInternalPageRoute(page: this); + } +} + +class _WoltModalInternalPageRoute extends PageRoute + with _WoltModalRouteTransitionMixin + implements WoltModalPageRoute { + // + _WoltModalInternalPageRoute({ + required WoltModalInternalPage page, + }) : super(settings: page); + + WoltModalInternalPage get _page => settings as WoltModalInternalPage; + + final _contentKey = GlobalKey(); + + @override + GlobalKey get contentKey => _contentKey; + + @override + Widget buildContent(BuildContext context) { + final constraints = ConstraintsProvider.of(context).constraints; + + return Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: constraints, + key: contentKey, + child: _page.child, + ), + ); + } + + @override + String get debugLabel => '${super.debugLabel}(${_page.name})'; + + @override + bool get maintainState => _page.maintainState; +} + +mixin _WoltModalRouteTransitionMixin on PageRoute { + // Builds the primary contents of the route. + @protected + Widget buildContent(BuildContext context); + + @override + Duration get transitionDuration => const Duration(milliseconds: 300); + + @override + Color? get barrierColor => null; + + @override + String? get barrierLabel => null; + + @override + Widget buildPage( + BuildContext context, + Animation animation, + Animation secondaryAnimation, + ) { + final Widget result = buildContent(context); + return Semantics( + scopesRoute: true, + explicitChildNodes: true, + child: result, + ); + } + + @override + Widget buildTransitions(context, animation, secondaryAnimation, child) { + final incomingAnimation = _InAnimation(parent: animation); + final outAnimation = _OutAnimation(parent: secondaryAnimation); + + return SlideTransition( + position: outAnimation.translationAnimation, + child: FadeTransition( + opacity: outAnimation.alphaAnimation, + child: SlideTransition( + position: incomingAnimation.translationAnimation, + child: FadeTransition( + opacity: incomingAnimation.alphaAnimation, + child: child, + ), + ), + ), + ); + } +} + +abstract class _PageTransitionAnimation { + static const animationDuration = Duration(milliseconds: 300); + final _animationDuration = _PageTransitionAnimation.animationDuration; +} + +class _InAnimation extends _PageTransitionAnimation { + final _alphaDuration = const Duration(milliseconds: 200); + + late final Animation _translationAnimation; + late final Animation _alphaAnimation; + + Animation get translationAnimation => _translationAnimation; + + Animation get alphaAnimation => _alphaAnimation; + + _InAnimation({required Animation parent}) { + _translationAnimation = Tween( + begin: const Offset(1, 0), + end: Offset.zero, + ).chain(CurveTween(curve: Curves.fastOutSlowIn)).animate(parent); + + _alphaAnimation = TweenSequence( + >[ + TweenSequenceItem( + tween: ConstantTween(0), + weight: + (_animationDuration - _alphaDuration).inMilliseconds.toDouble(), + ), + TweenSequenceItem( + tween: Tween(begin: 0, end: 1), + weight: _alphaDuration.inMilliseconds.toDouble(), + ), + ], + ).animate(parent); + } +} + +class _OutAnimation extends _PageTransitionAnimation { + final _alphaDuration = const Duration(milliseconds: 100); + + late final Animation _translationAnimation; + late final Animation _alphaAnimation; + + Animation get translationAnimation => _translationAnimation; + + Animation get alphaAnimation => _alphaAnimation; + + _OutAnimation({required Animation parent}) { + _translationAnimation = Tween( + begin: Offset.zero, + end: const Offset(-1, 0), + ).chain(CurveTween(curve: Curves.fastOutSlowIn)).animate(parent); + + _alphaAnimation = TweenSequence( + >[ + TweenSequenceItem( + tween: Tween(begin: 1, end: 0), + weight: _alphaDuration.inMilliseconds.toDouble(), + ), + TweenSequenceItem( + tween: ConstantTween(0), + weight: + (_animationDuration - _alphaDuration).inMilliseconds.toDouble(), + ), + ], + ).animate(parent); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart new file mode 100644 index 00000000..1b38873a --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart @@ -0,0 +1,16 @@ +/// Class describing the path to navigate inside modal sheet. +/// An every instance of this class means a concrete intent to show a +/// corresponding page for the [path] with passed [arguments] to it. +class WoltModalSheetPath { + /// The name of the path (e.g., "/settings"). + final String path; + + /// The arguments should be used within the path. + final Object? arguments; + + /// Creates an instance of [WoltModalSheetPath]. + const WoltModalSheetPath({ + required this.path, + this.arguments, + }); +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart new file mode 100644 index 00000000..905f8c66 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart @@ -0,0 +1,32 @@ +import 'package:flutter/material.dart'; + +/// A function returns [Page] built with arguments from the concrete intent to +/// show a page. +typedef WoltModalSheetPageBuilder = Page Function(Object? data); + +/// An object describes relations between the [path] and a corresponding +/// [Page] for it. +/// +/// Example: +/// +/// With settings +/// WoltModalSheetPathSettings( +/// path: 'first', +/// pageBuilder: (_) => WoltModalSheetPage( +/// child: const First(), +/// ), +/// ) +/// +/// and the path '/first/first/second/first' +/// +/// for every part of the path that matched with 'first' should be created +/// a page with WoltModalSheet transition style, that shows the 'First' widget. +class WoltModalSheetPathSettings { + final String path; + final WoltModalSheetPageBuilder pageBuilder; + + const WoltModalSheetPathSettings({ + required this.path, + required this.pageBuilder, + }); +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_size_adapter.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_size_adapter.dart new file mode 100644 index 00000000..4f227c45 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_size_adapter.dart @@ -0,0 +1,185 @@ +part of '../wolt_modal_sheet.dart'; + +class _NavigationSizeAdapter extends StatefulWidget { + final WoltModalSheetCoordinator coordinator; + + const _NavigationSizeAdapter({ + super.key, + required this.coordinator, + }); + + @override + State<_NavigationSizeAdapter> createState() => _NavigationSizeAdapterState(); +} + +class _NavigationSizeAdapterState extends State<_NavigationSizeAdapter> + with SingleTickerProviderStateMixin { + late final ValueNotifier _sizeChangedNotifier; + late final AnimationController _sizeAnimationController; + late Animation _heightAnimation; + + GlobalKey? _topPageKey; + bool _isInitialized = false; + + @override + void initState() { + super.initState(); + + _sizeChangedNotifier = ValueNotifier(0); + _sizeAnimationController = AnimationController( + vsync: this, + duration: const Duration(milliseconds: 300), + ); + _heightAnimation = _createAnimation(0, 0); + _sizeAnimationController.forward(from: 1); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + + // Subscribe on constraints changing. + _actualizeConstraints(ConstraintsProvider.of(context).constraints); + } + + @override + void dispose() { + _sizeAnimationController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final constraints = ConstraintsProvider.of(context).constraints; + + return ConstrainedBox( + constraints: constraints, + child: ValueListenableBuilder( + valueListenable: _sizeChangedNotifier, + builder: (context, height, child) => _AnimatedSizeWidget( + heightAnimation: _heightAnimation, + child: ClipRRect( + child: Stack( + fit: StackFit.expand, + children: [ + Positioned( + top: 0, + left: 0, + right: 0, + child: Builder(builder: (context) { + return ConstrainedBox( + constraints: constraints, + child: _NavigationStack( + changePagesNotifier: widget.coordinator.pagesPublisher, + onTopPageChanged: _onTopPageChanged, + ), + ); + }), + ) + ], + ), + ), + ), + ), + ); + } + + Animation _createAnimation(double begin, double end) { + return Tween(begin: begin, end: end) + .chain(CurveTween(curve: Curves.fastOutSlowIn)) + .animate(_sizeAnimationController); + } + + void _actualizeConstraints(BoxConstraints constraints) { + if (!_isInitialized) { + // postpone for the first call of _onTopPageChanged; + return; + } + + _updateSize(isAnimated: false); + } + + void _onTopPageChanged(GlobalKey? topPageKey) { + _topPageKey = topPageKey; + + if (!_isInitialized) { + // first time handled; + _isInitialized = true; + _updateSize(isAnimated: false); + } else { + _updateSize(isAnimated: true); + } + } + + void _updateSize({bool isAnimated = true}) { + final topPageKey = _topPageKey; + + if (topPageKey != null) { + _waitForLayoutAndUpdateConstraints(topPageKey, isAnimated: isAnimated); + } else { + final currentHeight = _sizeChangedNotifier.value; + final targetHeight = + ConstraintsProvider.of(context).constraints.maxHeight; + + if (currentHeight == targetHeight) { + return; + } + + _sizeChangedNotifier.value = targetHeight; + _heightAnimation = _createAnimation(currentHeight, targetHeight); + _sizeAnimationController.forward(from: isAnimated ? 0 : 1); + } + } + + void _waitForLayoutAndUpdateConstraints( + GlobalKey key, { + bool isAnimated = true, + }) { + WidgetsBinding.instance.addPostFrameCallback( + (_) { + if (mounted) { + final size = key.currentContext?.size; + if (size != null) { + final currentHeight = _sizeChangedNotifier.value; + final targetHeight = size.height; + final minHeight = + ConstraintsProvider.of(context).constraints.minHeight; + + if (currentHeight == targetHeight) { + return; + } + + if (targetHeight < minHeight) { + _sizeChangedNotifier.value = minHeight; + _heightAnimation = _createAnimation(currentHeight, minHeight); + } else { + _sizeChangedNotifier.value = targetHeight; + _heightAnimation = _createAnimation(currentHeight, targetHeight); + } + + _sizeAnimationController.forward(from: isAnimated ? 0 : 1); + } + } + }, + ); + } +} + +class _AnimatedSizeWidget extends AnimatedWidget { + final Widget child; + final Animation heightAnimation; + + const _AnimatedSizeWidget({ + Key? key, + required this.child, + required this.heightAnimation, + }) : super(key: key, listenable: heightAnimation); + + @override + Widget build(BuildContext context) { + return SizedBox( + height: heightAnimation.value, + child: child, + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_stack.dart b/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_stack.dart new file mode 100644 index 00000000..3d74ab0f --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/navigation/navigation_stack.dart @@ -0,0 +1,72 @@ +part of '../wolt_modal_sheet.dart'; + +class _NavigationStack extends StatefulWidget { + final ValueListenable> changePagesNotifier; + final Function(GlobalKey?) onTopPageChanged; + + const _NavigationStack({ + required this.changePagesNotifier, + required this.onTopPageChanged, + }); + + @override + State<_NavigationStack> createState() => _NavigationStackState(); +} + +// TODO: hide the navigator from the user, there should be only 1 +// way to interact - WoltModalSheetNavigator, otherwise things can be broken. +class _NavigationStackState extends State<_NavigationStack> { + final GlobalKey _navigatorKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + return ValueListenableBuilder( + valueListenable: widget.changePagesNotifier, + builder: (context, listPages, child) => Navigator( + key: _navigatorKey, + pages: listPages, + clipBehavior: Clip.none, + observers: [ + _WoltNavigatorObserver( + context, + widget.onTopPageChanged, + ), + HeroController(), + ], + onDidRemovePage: (page) {}, + ), + ); + } +} + +class _WoltNavigatorObserver extends NavigatorObserver { + final BuildContext context; + final Function(GlobalKey?) onTopPageChanged; + + _WoltNavigatorObserver( + this.context, + this.onTopPageChanged, + ); + + @override + void didPush(Route route, Route? previousRoute) { + if (route is WoltModalPageRoute) { + onTopPageChanged((route as WoltModalPageRoute).contentKey); + } else { + onTopPageChanged(null); + } + + super.didPush(route, previousRoute); + } + + @override + void didPop(Route route, Route? previousRoute) { + if (previousRoute is WoltModalPageRoute) { + onTopPageChanged((previousRoute as WoltModalPageRoute).contentKey); + } else { + onTopPageChanged(null); + } + + super.didPop(route, previousRoute); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/theme/theme_resolver.dart b/rework_experiments/lib/navigation_experiment/lib/theme/theme_resolver.dart new file mode 100644 index 00000000..b33c2a20 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/theme/theme_resolver.dart @@ -0,0 +1,69 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart'; + +/// A widget that resolves the theme for the [WoltModalSheet] widget. +/// Priority of resolving: +/// Theme of the concrete modal sheet, see [WoltModalSheet.style] -> +/// Global theme of modal sheet, see [WoltModalSheetTheme] -> +/// fallback default scheme. +class ThemeResolver extends StatefulWidget { + final Widget child; + final WoltModalSheetStyle? styleOverride; + + const ThemeResolver({ + super.key, + required this.child, + this.styleOverride, + }); + + @override + State createState() => _ThemeResolverState(); +} + +class _ThemeResolverState extends State { + late ThemeData _themeData; + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + + _resolveTheme(); + } + + @override + Widget build(BuildContext context) { + return Theme( + data: _themeData, + child: widget.child, + ); + } + + void _resolveTheme() { + final theme = Theme.of(context); + final woltModalSheetTheme = theme.extension(); + final styleOverride = widget.styleOverride; + + if (styleOverride != null) { + final extensions = theme.extensions.values; + + _themeData = theme.copyWith( + extensions: [ + ...extensions.where((e) => e is! WoltModalSheetTheme), + WoltModalSheetTheme(style: styleOverride), + ], + ); + } else { + if (woltModalSheetTheme != null) { + _themeData = theme; + } else { + final extensions = theme.extensions.values; + _themeData = theme.copyWith( + extensions: [ + ...extensions, + WoltModalSheetTheme(), + ], + ); + } + } + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart b/rework_experiments/lib/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart new file mode 100644 index 00000000..b5c657e2 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart @@ -0,0 +1,324 @@ +import 'dart:ui'; +import 'package:flutter/material.dart'; + +/// A theme extension for the [WoltModalSheet] widget. +class WoltModalSheetTheme extends ThemeExtension { + final WoltModalSheetStyle style; + + WoltModalSheetTheme({ + WoltModalSheetStyle? style, + }) : style = style ?? WoltModalSheetStyle(); + + @override + ThemeExtension copyWith({ + WoltModalSheetStyle? style, + }) { + return WoltModalSheetTheme( + style: style ?? this.style, + ); + } + + @override + ThemeExtension lerp( + WoltModalSheetTheme? other, double t) { + if (other == null) return this; + + return WoltModalSheetTheme( + style: style.lerp(other.style, t), + ); + } +} + +/// Style of the modal sheet. +class WoltModalSheetStyle { + final WoltModalBottomSheetStyle bottomSheetStyle; + final WoltModalDialogStyle dialogStyle; + + WoltModalSheetStyle({ + WoltModalBottomSheetStyle? bottomSheetStyle, + WoltModalDialogStyle? dialogStyle, + }) : bottomSheetStyle = + bottomSheetStyle ?? const WoltModalBottomSheetStyle(), + dialogStyle = dialogStyle ?? const WoltModalDialogStyle(); + + WoltModalSheetStyle copyWith({ + WoltModalBottomSheetStyle? bottomSheetStyle, + WoltModalDialogStyle? dialogStyle, + }) { + return WoltModalSheetStyle( + bottomSheetStyle: bottomSheetStyle ?? this.bottomSheetStyle, + dialogStyle: dialogStyle ?? this.dialogStyle, + ); + } + + WoltModalSheetStyle lerp(WoltModalSheetStyle? other, double t) { + if (other == null) return this; + + return WoltModalSheetStyle( + bottomSheetStyle: bottomSheetStyle.lerp(other.bottomSheetStyle, t), + dialogStyle: dialogStyle.lerp(other.dialogStyle, t), + ); + } +} + +class WoltModalBottomSheetStyle { + const WoltModalBottomSheetStyle({ + this.backgroundColor, + this.surfaceTintColor, + double? elevation, + Color? shadowColor, + ShapeBorder? shape, + bool? showDragHandle, + this.dragHandleColor, + Size? dragHandleSize, + Clip? clipBehavior, + bool? enableDrag, + double? maxHeight, + double? minHeight, + bool? resizeToAvoidBottomInset, + }) : elevation = elevation ?? 1.0, + shape = shape ?? + const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical(top: Radius.circular(16.0)), + ), + dragHandleSize = dragHandleSize ?? const Size(36, 4), + clipBehavior = clipBehavior ?? Clip.antiAliasWithSaveLayer, + enableDrag = enableDrag ?? true, + showDragHandle = showDragHandle ?? true, + shadowColor = shadowColor ?? Colors.transparent, + maxHeight = maxHeight ?? 640.0, + minHeight = minHeight ?? 300, + resizeToAvoidBottomInset = resizeToAvoidBottomInset ?? false; + + factory WoltModalBottomSheetStyle.fromTheme( + ThemeData themeData, { + double? elevation, + bool? showDragHandle, + Size? dragHandleSize, + Clip? clipBehavior, + double? maxHeight, + double? minHeight, + bool? enableDrag, + Color? shadowColor, + ShapeBorder? shape, + bool? resizeToAvoidBottomInset, + }) { + final colorsScheme = themeData.colorScheme; + return WoltModalBottomSheetStyle( + backgroundColor: colorsScheme.surface, + surfaceTintColor: colorsScheme.surfaceTint, + elevation: elevation, + showDragHandle: showDragHandle, + dragHandleColor: colorsScheme.onSurfaceVariant.withOpacity(0.4), + dragHandleSize: dragHandleSize, + clipBehavior: clipBehavior, + maxHeight: maxHeight, + minHeight: minHeight, + enableDrag: enableDrag, + shadowColor: shadowColor, + shape: shape ?? + const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical(top: Radius.circular(16.0)), + ), + resizeToAvoidBottomInset: resizeToAvoidBottomInset, + ); + } + + final Color? backgroundColor; + + final Color? surfaceTintColor; + + final double elevation; + + final Color shadowColor; + + final ShapeBorder shape; + + final bool showDragHandle; + + final Color? dragHandleColor; + + final Size dragHandleSize; + + final Clip clipBehavior; + + final double maxHeight; + + final double minHeight; + + final bool enableDrag; + + final bool resizeToAvoidBottomInset; + + WoltModalBottomSheetStyle copyWith({ + Color? backgroundColor, + Color? surfaceTintColor, + double? elevation, + Color? modalBackgroundColor, + Color? shadowColor, + double? modalElevation, + ShapeBorder? shape, + bool? showDragHandle, + Color? dragHandleColor, + Size? dragHandleSize, + Clip? clipBehavior, + double? maxHeight, + double? minHeight, + bool? enableDrag, + bool? resizeToAvoidBottomInset, + }) { + return WoltModalBottomSheetStyle( + backgroundColor: backgroundColor ?? this.backgroundColor, + surfaceTintColor: surfaceTintColor ?? this.surfaceTintColor, + elevation: elevation ?? this.elevation, + shadowColor: shadowColor ?? this.shadowColor, + shape: shape ?? this.shape, + showDragHandle: showDragHandle ?? this.showDragHandle, + dragHandleColor: dragHandleColor ?? this.dragHandleColor, + dragHandleSize: dragHandleSize ?? this.dragHandleSize, + clipBehavior: clipBehavior ?? this.clipBehavior, + maxHeight: maxHeight ?? this.maxHeight, + minHeight: minHeight ?? this.minHeight, + enableDrag: enableDrag ?? this.enableDrag, + resizeToAvoidBottomInset: + resizeToAvoidBottomInset ?? this.resizeToAvoidBottomInset, + ); + } + + WoltModalBottomSheetStyle lerp(WoltModalBottomSheetStyle? other, double t) { + if (other == null) return this; + + return WoltModalBottomSheetStyle( + backgroundColor: Color.lerp(backgroundColor, other.backgroundColor, t), + surfaceTintColor: Color.lerp(surfaceTintColor, other.surfaceTintColor, t), + elevation: lerpDouble(elevation, other.elevation, t), + shadowColor: Color.lerp(shadowColor, other.shadowColor, t), + shape: ShapeBorder.lerp(shape, other.shape, t), + showDragHandle: t < 0.5 ? showDragHandle : other.showDragHandle, + dragHandleColor: Color.lerp(dragHandleColor, other.dragHandleColor, t), + dragHandleSize: Size.lerp(dragHandleSize, other.dragHandleSize, t), + clipBehavior: t < 0.5 ? clipBehavior : other.clipBehavior, + maxHeight: t < 0.5 ? maxHeight : other.maxHeight, + minHeight: t < 0.5 ? minHeight : other.minHeight, + ); + } +} + +class WoltModalDialogStyle extends ThemeExtension { + /// Creates a dialog theme that can be used for [ThemeData.dialogTheme]. + const WoltModalDialogStyle({ + this.backgroundColor, + double? elevation, + this.surfaceTintColor, + ShapeBorder? shape, + AlignmentGeometry? alignment, + EdgeInsets? insetPadding, + Clip? clipBehavior, + double? maxHeight, + double? minHeight, + double? width, + }) : elevation = elevation ?? 1.0, + shape = shape ?? + const RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(16)), + ), + alignment = alignment ?? Alignment.center, + insetPadding = insetPadding ?? EdgeInsets.zero, + clipBehavior = clipBehavior ?? Clip.antiAliasWithSaveLayer, + maxHeight = maxHeight ?? 640.0, + minHeight = minHeight ?? 300.0, + width = width ?? 500.0; + + factory WoltModalDialogStyle.fromTheme( + ThemeData themeData, { + double? elevation, + Clip? clipBehavior, + double? maxHeight, + double? minHeight, + double? width, + ShapeBorder? shape, + AlignmentGeometry? alignment, + EdgeInsets? insetPadding, + }) { + final colorsScheme = themeData.colorScheme; + return WoltModalDialogStyle( + maxHeight: maxHeight, + minHeight: minHeight, + width: width, + backgroundColor: colorsScheme.surface, + surfaceTintColor: colorsScheme.surfaceTint, + elevation: elevation, + clipBehavior: clipBehavior, + shape: shape, + alignment: alignment, + insetPadding: insetPadding, + ); + } + + final Color? backgroundColor; + + final double elevation; + + final Color? surfaceTintColor; + + final ShapeBorder shape; + + final AlignmentGeometry alignment; + + final EdgeInsets insetPadding; + + final Clip clipBehavior; + + final double maxHeight; + + final double minHeight; + + final double width; + + /// Creates a copy of this object but with the given fields replaced with the + /// new values. + @override + WoltModalDialogStyle copyWith({ + Color? backgroundColor, + double? elevation, + Color? surfaceTintColor, + ShapeBorder? shape, + AlignmentGeometry? alignment, + EdgeInsets? insetPadding, + Clip? clipBehavior, + double? maxHeight, + double? minHeight, + double? width, + }) { + return WoltModalDialogStyle( + backgroundColor: backgroundColor ?? this.backgroundColor, + elevation: elevation ?? this.elevation, + surfaceTintColor: surfaceTintColor ?? this.surfaceTintColor, + shape: shape ?? this.shape, + alignment: alignment ?? this.alignment, + insetPadding: insetPadding ?? this.insetPadding, + clipBehavior: clipBehavior ?? this.clipBehavior, + maxHeight: maxHeight ?? this.maxHeight, + minHeight: minHeight ?? this.minHeight, + width: width ?? this.width, + ); + } + + @override + WoltModalDialogStyle lerp(WoltModalDialogStyle? other, double t) { + if (other == null) return this; + + return WoltModalDialogStyle( + backgroundColor: Color.lerp(backgroundColor, other.backgroundColor, t), + surfaceTintColor: Color.lerp(surfaceTintColor, other.surfaceTintColor, t), + elevation: lerpDouble(elevation, other.elevation, t), + shape: ShapeBorder.lerp(shape, other.shape, t), + alignment: AlignmentGeometry.lerp(alignment, other.alignment, t), + clipBehavior: t < 0.5 ? clipBehavior : other.clipBehavior, + insetPadding: EdgeInsets.lerp(insetPadding, other.insetPadding, t), + maxHeight: t < 0.5 ? maxHeight : other.maxHeight, + minHeight: t < 0.5 ? minHeight : other.minHeight, + width: t < 0.5 ? width : other.width, + ); + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart b/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart new file mode 100644 index 00000000..1f619998 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart @@ -0,0 +1,31 @@ +import 'package:flutter/cupertino.dart'; + +const defaultModalTypeBreakPoint = 768.0; + +/// A delegate that determines the type of the modal sheet to be used. +abstract class WoltModalSheetDelegate { + WoltModalType getWoltModalSheetType(BuildContext context); +} + +/// Default implementation of the [WoltModalSheetDelegate]. +/// This class determines the type of ModalSheet to be used based on the device +/// size. +class DefaultWoltModalSheetDelegate implements WoltModalSheetDelegate { + const DefaultWoltModalSheetDelegate(); + + @override + WoltModalType getWoltModalSheetType(BuildContext context) { + final deviceWidth = MediaQuery.sizeOf(context).width; + if (deviceWidth < defaultModalTypeBreakPoint) { + return WoltModalType.bottomSheet; + } else { + return WoltModalType.dialog; + } + } +} + +/// Enum of possible types of the modal sheet. +enum WoltModalType { + bottomSheet, + dialog; +} diff --git a/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_type_adapter.dart b/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_type_adapter.dart new file mode 100644 index 00000000..ffd147bd --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/type/wolt_modal_type_adapter.dart @@ -0,0 +1,215 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart'; + +/// An entity responsible for creating all necessary wrappers to form a content +/// of modal sheet in appropriate form, for examle bottom sheet, +/// alert dialog, etc. +/// +/// The [WoltModalSheetDelegate] is responsible for desision which +/// form it should be. +/// +/// See also: [WoltModalSheetDelegate], [BottomSheet], [AlertDialog]. +class WoltModalTypeAdapter extends StatefulWidget { + final Widget child; + final WoltModalSheetDelegate _woltModalSheetDelegate; + final AnimationController? _routeAnimationController; + + const WoltModalTypeAdapter({ + required this.child, + WoltModalSheetDelegate? woltModalSheetDelegate, + AnimationController? bottomSheetController, + super.key, + }) : _woltModalSheetDelegate = + woltModalSheetDelegate ?? const DefaultWoltModalSheetDelegate(), + _routeAnimationController = bottomSheetController; + + @override + State createState() => _WoltModalTypeAdapterState(); +} + +class _WoltModalTypeAdapterState extends State + with SingleTickerProviderStateMixin { + // Theoretically can be improved for support updating widgets with changing + // passed controller, but for beginning we keep it simple. + late final AnimationController _routeAnimationController; + + @override + void initState() { + super.initState(); + + _routeAnimationController = widget._routeAnimationController ?? + (AnimationController( + vsync: this, + duration: const Duration(milliseconds: 300), + )..forward()); + } + + @override + void dispose() { + if (widget._routeAnimationController == null) { + _routeAnimationController.dispose(); + } + + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final size = MediaQuery.sizeOf(context); + final availableHeight = size.height; + final woltModalType = + widget._woltModalSheetDelegate.getWoltModalSheetType(context); + final style = Theme.of(context).extension()!.style; + BoxConstraints constraints; + Widget child; + + switch (woltModalType) { + case WoltModalType.bottomSheet: + final bottomSheetStyle = style.bottomSheetStyle; + final styleMaxHeight = bottomSheetStyle.maxHeight; + final styleMinHeight = bottomSheetStyle.minHeight; + final maxHeight = + styleMaxHeight > availableHeight ? availableHeight : styleMaxHeight; + final minHeight = + styleMinHeight > availableHeight ? availableHeight : styleMinHeight; + constraints = BoxConstraints( + maxHeight: maxHeight, + minHeight: minHeight, + minWidth: double.infinity, + maxWidth: double.infinity, + ); + + child = _BottomSheet( + routeAnimationController: _routeAnimationController, + style: bottomSheetStyle, + child: widget.child, + ); + case WoltModalType.dialog: + final dialogStyle = style.dialogStyle; + final styleMaxHeight = dialogStyle.maxHeight; + final styleMinHeight = dialogStyle.minHeight; + final maxHeight = + styleMaxHeight > availableHeight ? availableHeight : styleMaxHeight; + final minHeight = + styleMinHeight > availableHeight ? availableHeight : styleMinHeight; + + constraints = BoxConstraints( + maxHeight: maxHeight, + minHeight: minHeight, + maxWidth: dialogStyle.width, + minWidth: dialogStyle.width, + ); + child = _Dialog(style: dialogStyle, child: widget.child); + } + + return ConstraintsProvider(constraints: constraints, child: child); + } +} + +class _Dialog extends StatelessWidget { + final Widget child; + final WoltModalDialogStyle style; + + const _Dialog({ + required this.child, + required this.style, + }); + + @override + Widget build(BuildContext context) { + return Dialog( + backgroundColor: style.backgroundColor, + elevation: style.elevation, + surfaceTintColor: style.surfaceTintColor, + shape: style.shape, + alignment: style.alignment, + insetPadding: style.insetPadding, + clipBehavior: style.clipBehavior, + child: child, + ); + } +} + +class _BottomSheet extends StatefulWidget { + final Widget child; + final AnimationController routeAnimationController; + final WoltModalBottomSheetStyle style; + + const _BottomSheet({ + required this.child, + required this.routeAnimationController, + required this.style, + }); + + @override + State<_BottomSheet> createState() => _BottomSheetState(); +} + +class _BottomSheetState extends State<_BottomSheet> { + late final Animation _incomingAnimation; + + @override + void initState() { + super.initState(); + + _incomingAnimation = + Tween(begin: const Offset(0.0, 1.0), end: const Offset(0.0, 0.0)) + .chain(CurveTween(curve: Curves.fastOutSlowIn)) + .animate(widget.routeAnimationController); + } + + @override + Widget build(BuildContext context) { + final bottomSheetThemeData = widget.style; + + return SlideTransition( + position: _incomingAnimation, + child: BottomSheet( + backgroundColor: bottomSheetThemeData.backgroundColor, + shadowColor: bottomSheetThemeData.shadowColor, + elevation: bottomSheetThemeData.elevation, + shape: bottomSheetThemeData.shape, + clipBehavior: bottomSheetThemeData.clipBehavior, + animationController: widget.routeAnimationController, + showDragHandle: bottomSheetThemeData.enableDrag, + dragHandleColor: bottomSheetThemeData.dragHandleColor, + dragHandleSize: bottomSheetThemeData.dragHandleSize, + enableDrag: bottomSheetThemeData.enableDrag, + onClosing: () { + Navigator.pop(context); + }, + builder: (context) => Padding( + padding: EdgeInsets.only( + bottom: bottomSheetThemeData.resizeToAvoidBottomInset + ? MediaQuery.of(context).viewInsets.bottom + : 0.0), + child: widget.child, + )), + ); + } +} + +class ConstraintsProvider extends InheritedWidget { + final BoxConstraints constraints; + + const ConstraintsProvider({ + super.key, + required super.child, + required this.constraints, + }); + + @override + bool updateShouldNotify(ConstraintsProvider oldWidget) { + return constraints != oldWidget.constraints; + } + + static ConstraintsProvider of(BuildContext context) { + final result = + context.dependOnInheritedWidgetOfExactType(); + + assert(result != null, 'No ConstraintsProvider found in context'); + + return result!; + } +} diff --git a/rework_experiments/lib/navigation_experiment/lib/wolt_modal_sheet.dart b/rework_experiments/lib/navigation_experiment/lib/wolt_modal_sheet.dart new file mode 100644 index 00000000..7fb3b0d2 --- /dev/null +++ b/rework_experiments/lib/navigation_experiment/lib/wolt_modal_sheet.dart @@ -0,0 +1,113 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:rework_experiments/navigation_experiment/lib/theme/theme_resolver.dart'; +import 'package:rework_experiments/navigation_experiment/lib/theme/wolt_modal_sheet_theme_data.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_coordinator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_sheet_type_delegate.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_navigator.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_page.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path_settings.dart'; +import 'package:rework_experiments/navigation_experiment/lib/navigation/internal/wolt_modal_sheet_path.dart'; +import 'package:rework_experiments/navigation_experiment/lib/type/wolt_modal_type_adapter.dart'; + +part 'navigation/navigation_stack.dart'; +part 'navigation/navigation_size_adapter.dart'; + +/// Main widget for displaying the [WoltModalSheet] and using the [WoltModalSheetNavigator]. +/// It is important to pass all the supported pages that can be displayed +/// in the [WoltModalSheet]. +/// +/// If you want to receive updates from the [WoltModalSheet] about navigation +/// changes, pass the [onPathChangedInternal] function. It will provide you +/// a list of active routes, allowing you to process them as needed. +class WoltModalSheet extends StatefulWidget { + /// All the pages that the modal sheet can display. + final List supportedPaths; + + /// Initial paths, that are shown on modal sheet appears. + final List initialPath; + + final BoxConstraints constraints; + + /// Callback function that is triggered whenever there is a change in navigation + /// within the [WoltModalSheet]. + /// The function receives a list of the current active routes as a parameter, allowing + /// you to track and respond to navigation changes. + final Function(List)? onPathChangedInternal; + + final VoidCallback? closeModalSheetDelegate; + + final AnimationController? appearingAnimationController; + + final WoltModalSheetDelegate? woltModalSheetDelegate; + + final WoltModalSheetStyle? style; + + const WoltModalSheet({ + super.key, + required this.supportedPaths, + required this.initialPath, + required this.constraints, + this.onPathChangedInternal, + this.closeModalSheetDelegate, + this.appearingAnimationController, + this.woltModalSheetDelegate, + this.style, + }); + + @override + State createState() => _WoltModalSheetState(); +} + +class _WoltModalSheetState extends State { + final _navigationContentKey = GlobalKey(); + late final WoltModalSheetCoordinator _coordinator; + + @override + void initState() { + super.initState(); + _coordinator = + WoltModalSheetCoordinator(_onPathChanged, _onModalSheetEmpty); + _coordinator.init(widget.supportedPaths, widget.initialPath); + } + + @override + void didUpdateWidget(WoltModalSheet oldWidget) { + super.didUpdateWidget(oldWidget); + + if (oldWidget.initialPath != widget.initialPath) { + _coordinator.actualizeNavigationStack(widget.initialPath); + } + } + + @override + Widget build(BuildContext context) { + return WoltModalSheetNavigator( + coordinator: _coordinator, + child: ThemeResolver( + styleOverride: widget.style, + child: WoltModalTypeAdapter( + bottomSheetController: widget.appearingAnimationController, + woltModalSheetDelegate: widget.woltModalSheetDelegate, + child: _NavigationSizeAdapter( + key: _navigationContentKey, + coordinator: _coordinator, + ), + ), + ), + ); + } + + void _onPathChanged(List path) { + widget.onPathChangedInternal?.call(path); + } + + void _onModalSheetEmpty() { + final closeDelegate = widget.closeModalSheetDelegate; + if (closeDelegate != null) { + closeDelegate.call(); + } else { + Navigator.of(context).pop(); + } + } +} diff --git a/rework_experiments/lib/wolt_page_layout_experiment/main.dart b/rework_experiments/lib/wolt_page_layout_experiment/main.dart new file mode 100644 index 00000000..a296fdae --- /dev/null +++ b/rework_experiments/lib/wolt_page_layout_experiment/main.dart @@ -0,0 +1,107 @@ +import 'package:flutter/material.dart'; +import 'package:rework_experiments/wolt_page_layout_experiment/wolt_page_layout.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Flutter Demo', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + home: const _TestScreen(), + ); + } +} + +class _TestScreen extends StatelessWidget { + const _TestScreen(); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.grey, + body: Center( + child: FractionallySizedBox( + widthFactor: .5, + // heightFactor: .7, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 300), + child: WoltPageLayout( + header: const _CollapsedContent('header', Colors.blue), + footer: const _CollapsedContent('footer', Colors.green), + slivers: [ + const SliverAppBar.medium( + backgroundColor: Colors.amber, + ), + SliverList.builder( + itemBuilder: (context, index) { + debugPrint('1st seq $index'); + return _Slice(index); + }, + itemCount: 1, + ), + ], + ), + ), + ), + ), + ); + } +} + +class _CollapsedContent extends StatefulWidget { + final String title; + final Color color; + + const _CollapsedContent(this.title, this.color); + + @override + State<_CollapsedContent> createState() => _CollapsedContentState(); +} + +class _CollapsedContentState extends State<_CollapsedContent> { + bool _isExpanded = false; + + @override + Widget build(BuildContext context) { + return AnimatedContainer( + duration: const Duration(milliseconds: 300), + color: widget.color, + height: _isExpanded ? 300 : 100, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Center(child: Text(widget.title)), + Checkbox( + value: _isExpanded, + onChanged: (value) => setState(() => _isExpanded = value!), + ), + ], + ), + ); + } +} + +class _Slice extends StatelessWidget { + final int index; + + const _Slice(this.index); + + @override + Widget build(BuildContext context) { + return Container( + color: Colors.red, + margin: const EdgeInsets.all(8), + height: 300, + child: Text('Item $index'), + ); + } +} diff --git a/rework_experiments/lib/wolt_page_layout_experiment/wolt_page_layout.dart b/rework_experiments/lib/wolt_page_layout_experiment/wolt_page_layout.dart new file mode 100644 index 00000000..ee414af2 --- /dev/null +++ b/rework_experiments/lib/wolt_page_layout_experiment/wolt_page_layout.dart @@ -0,0 +1,456 @@ +import 'dart:async'; +import 'dart:math' as math; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; + +class WoltPageLayout extends StatefulWidget { + final Widget? header; + final Widget? footer; + final List slivers; + + const WoltPageLayout({ + super.key, + this.header, + this.footer, + required this.slivers, + }); + + @override + State createState() => _WoltPageLayoutState(); +} + +class _WoltPageLayoutState extends State + with TickerProviderStateMixin { + final _footerSizeDispatcher = ValueNotifier(0); + + @override + Widget build(BuildContext context) { + return Material( + // TODO: theming. + color: Colors.white, + child: _WoltPageScrollView( + slivers: [ + if (widget.header != null) + _Header( + child: Hero( + tag: 'Header', + flightShuttleBuilder: ( + BuildContext flightContext, + Animation animation, + HeroFlightDirection flightDirection, + BuildContext fromHeroContext, + BuildContext toHeroContext, + ) { + final anim = + _HeaderAnimation(parent: animation, vsync: this); + + return FadeTransition( + opacity: anim.appear, + child: toHeroContext.widget, + ); + }, + child: widget.header!), + ), + if (widget.footer != null) + _Footer( + sizeDispatcher: _footerSizeDispatcher, + child: Hero( + tag: 'Footer', + flightShuttleBuilder: ( + BuildContext flightContext, + Animation animation, + HeroFlightDirection flightDirection, + BuildContext fromHeroContext, + BuildContext toHeroContext, + ) { + return AnimatedBuilder( + animation: animation, + builder: (context, child) { + final fromBox = + fromHeroContext.findRenderObject() as RenderBox?; + final toBox = + toHeroContext.findRenderObject() as RenderBox?; + if (fromBox == null || toBox == null) { + return child!; + } + final correctionFrom = + (fromBox.parent as _FooterRenderSliver)._correction; + final correctionTo = + (toBox.parent as _FooterRenderSliver)._correction; + final av = animation.isForwardOrCompleted + ? animation.value + : 1 - animation.value; + final offset = Offset( + 0, + correctionFrom + + (correctionTo - correctionFrom) * av); + + return Transform.translate( + offset: offset, + child: child, + ); + }, + child: fromHeroContext.widget, + ); + }, + child: widget.footer!, + ), + ), + ...widget.slivers, + if (widget.footer != null) + _DummySizeSliver(trackedSizeDispatcher: _footerSizeDispatcher), + ], + ), + ); + } +} + +class _WoltPageScrollView extends CustomScrollView { + const _WoltPageScrollView({ + super.slivers = const [], + }); + + @override + Widget buildViewport(BuildContext context, ViewportOffset offset, + AxisDirection axisDirection, List slivers) { + assert(() { + switch (axisDirection) { + case AxisDirection.up: + case AxisDirection.down: + return debugCheckHasDirectionality( + context, + why: 'to determine the cross-axis direction of the scroll view', + hint: + 'Vertical scroll views create Viewport widgets that try to determine their cross axis direction ' + 'from the ambient Directionality.', + ); + case AxisDirection.left: + case AxisDirection.right: + return true; + } + }()); + return _WoltPageViewPort( + axisDirection: axisDirection, + offset: offset, + slivers: slivers, + clipBehavior: clipBehavior, + ); + } +} + +class _WoltPageViewPort extends ShrinkWrappingViewport { + const _WoltPageViewPort({ + super.axisDirection, + required super.offset, + super.slivers, + super.clipBehavior, + }); + + @override + RenderShrinkWrappingViewport createRenderObject(BuildContext context) { + return _RenderWoltPageViewPort( + axisDirection: axisDirection, + crossAxisDirection: crossAxisDirection ?? + Viewport.getDefaultCrossAxisDirection( + context, + axisDirection, + ), + offset: offset, + clipBehavior: clipBehavior, + ); + } +} + +class _RenderWoltPageViewPort extends RenderShrinkWrappingViewport { + _RenderWoltPageViewPort({ + super.axisDirection, + required super.crossAxisDirection, + required super.offset, + super.clipBehavior, + }); + + @override + void performLayout() { + super.performLayout(); + + _propagateEffectiveExtent(); + } + + void _propagateEffectiveExtent() { + final extent = axis == Axis.vertical ? size.height : size.width; + var child = firstChild; + + while (child != null) { + if (child is _IEffectiveExtentViewPortDependent) { + (child as _IEffectiveExtentViewPortDependent) + .performEffectiveExtent(extent); + } + + child = childAfter(child); + } + } +} + +class _Header extends SingleChildRenderObjectWidget { + const _Header({ + required Widget super.child, + }); + + @override + RenderObject createRenderObject(BuildContext context) { + return _HeaderRenderSliver(); + } +} + +class _HeaderRenderSliver extends RenderSliverPinnedPersistentHeader { + late double _childSize; + + _HeaderRenderSliver(); + + @override + double get maxExtent => _childSize; + + @override + double get minExtent => _childSize; + + @override + void performLayout() { + _calculateChild(); + + super.performLayout(); + } + + void _calculateChild() { + final constraints = this.constraints; + child!.layout(constraints.asBoxConstraints(), parentUsesSize: true); + switch (constraints.axis) { + case Axis.horizontal: + _childSize = child!.size.width; + break; + case Axis.vertical: + _childSize = child!.size.height; + break; + } + } +} + +class _Footer extends SingleChildRenderObjectWidget { + final ValueNotifier _sizeDispatcher; + + const _Footer({ + required Widget super.child, + required ValueNotifier sizeDispatcher, + }) : _sizeDispatcher = sizeDispatcher; + + @override + RenderObject createRenderObject(BuildContext context) { + return _FooterRenderSliver(_sizeDispatcher); + } +} + +abstract interface class _IEffectiveExtentViewPortDependent { + void performEffectiveExtent(double extent); +} + +class _FooterRenderSliver extends RenderSliverSingleBoxAdapter + implements _IEffectiveExtentViewPortDependent { + final LayerHandle _transformLayer = + LayerHandle(); + Matrix4? _paintTransform; + final ValueNotifier _sizeDispatcher; + late double _correction; + + _FooterRenderSliver(this._sizeDispatcher); + + @override + void performLayout() { + final SliverConstraints constraints = this.constraints; + child!.layout(constraints.asBoxConstraints(), parentUsesSize: true); + final double childExtent; + switch (constraints.axis) { + case Axis.horizontal: + childExtent = child!.size.width; + break; + case Axis.vertical: + childExtent = child!.size.height; + break; + } + _sizeDispatcher.value = childExtent; + + geometry = SliverGeometry( + scrollExtent: 0, + layoutExtent: 0, + paintExtent: 0, + paintOrigin: 0, + visible: true, + maxPaintExtent: 0, + hitTestExtent: childExtent, + hasVisualOverflow: true, + ); + } + + @override + void performEffectiveExtent(double extent) { + _paintTransform = Matrix4.identity(); + final edgeOffset = + constraints.viewportMainAxisExtent - constraints.remainingPaintExtent; + _correction = extent - _sizeDispatcher.value - edgeOffset; + + switch (constraints.axis) { + case Axis.horizontal: + _paintTransform!.translate(_correction, .0); + break; + case Axis.vertical: + _paintTransform!.translate(.0, _correction); + break; + } + } + + @override + void paint(PaintingContext context, Offset offset) { + if (child != null && geometry!.visible) { + _transformLayer.layer = context.pushTransform( + needsCompositing, + offset, + _paintTransform ?? Matrix4.identity(), + _paintChild, + oldLayer: _transformLayer.layer, + ); + } else { + _transformLayer.layer = null; + } + } + + @override + void dispose() { + _transformLayer.layer = null; + super.dispose(); + } + + void _paintChild(PaintingContext context, Offset offset) { + final childParentData = child!.parentData! as SliverPhysicalParentData; + context.paintChild(child!, offset + childParentData.paintOffset); + } + + @override + bool hitTest( + SliverHitTestResult result, { + required double mainAxisPosition, + required double crossAxisPosition, + }) { + final factMainStartPos = _correction; + final factMainEndPos = factMainStartPos + _sizeDispatcher.value; + + if (mainAxisPosition >= factMainStartPos && + mainAxisPosition <= factMainEndPos && + crossAxisPosition >= 0.0 && + crossAxisPosition <= constraints.crossAxisExtent) { + // make correction for child position + final adjustedMainAxisPosition = + mainAxisPosition - factMainStartPos - constraints.scrollOffset; + var haveHit = hitTestChildren(result, + mainAxisPosition: adjustedMainAxisPosition, + crossAxisPosition: crossAxisPosition); + + if (!haveHit) { + // always false and not necessary if we don't want to make class extendable + haveHit = hitTestSelf( + mainAxisPosition: mainAxisPosition, + crossAxisPosition: crossAxisPosition); + } + + if (haveHit) { + result.add( + SliverHitTestEntry( + this, + mainAxisPosition: mainAxisPosition, + crossAxisPosition: crossAxisPosition, + ), + ); + return true; + } + } + return false; + } +} + +class _DummySizeSliver extends LeafRenderObjectWidget { + final ValueListenable trackedSizeDispatcher; + + const _DummySizeSliver({required this.trackedSizeDispatcher}); + + @override + RenderObject createRenderObject(BuildContext context) { + return _DummySizeRenderSliver(trackedSizeDispatcher); + } +} + +class _DummySizeRenderSliver extends RenderSliver { + final ValueListenable trackedSizeDispatcher; + + _DummySizeRenderSliver(this.trackedSizeDispatcher) { + // Is not suppose to be changed + trackedSizeDispatcher.addListener(_onTrackedSizeChanged); + } + + @override + void performLayout() { + final trackedSize = trackedSizeDispatcher.value; + + final effectiveExtent = math.min( + trackedSize, + constraints.remainingPaintExtent, + ); + + geometry = SliverGeometry( + scrollExtent: trackedSize, + layoutExtent: effectiveExtent, + paintExtent: effectiveExtent, + maxPaintExtent: trackedSize, + cacheExtent: 0, + hitTestExtent: effectiveExtent, + hasVisualOverflow: true, + ); + } + + @override + void dispose() { + trackedSizeDispatcher.removeListener(_onTrackedSizeChanged); + + super.dispose(); + } + + void _onTrackedSizeChanged() { + scheduleMicrotask(() { + markNeedsLayout(); + }); + } +} + +class _HeaderAnimation extends AnimationController { + final _disappearDuration = const Duration(milliseconds: 100); + final _appearDuration = const Duration(milliseconds: 200); + + late final Animation _appearAnimation; + + Animation get appear => _appearAnimation; + + _HeaderAnimation({required Animation parent, required super.vsync}) { + _appearAnimation = TweenSequence( + >[ + TweenSequenceItem( + tween: Tween(begin: 1, end: 0) + .chain(CurveTween(curve: Curves.linear)), + weight: _disappearDuration.inMilliseconds.toDouble(), + ), + TweenSequenceItem( + tween: Tween(begin: 0, end: 1) + .chain(CurveTween(curve: Curves.linear)), + weight: _appearDuration.inMilliseconds.toDouble(), + ), + ], + ).animate(parent); + } +} diff --git a/rework_experiments/linux/.gitignore b/rework_experiments/linux/.gitignore new file mode 100644 index 00000000..d3896c98 --- /dev/null +++ b/rework_experiments/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/rework_experiments/linux/CMakeLists.txt b/rework_experiments/linux/CMakeLists.txt new file mode 100644 index 00000000..065beadc --- /dev/null +++ b/rework_experiments/linux/CMakeLists.txt @@ -0,0 +1,139 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "rework_experiments") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.rework_experiments") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/rework_experiments/linux/flutter/CMakeLists.txt b/rework_experiments/linux/flutter/CMakeLists.txt new file mode 100644 index 00000000..d5bd0164 --- /dev/null +++ b/rework_experiments/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/rework_experiments/linux/flutter/generated_plugin_registrant.cc b/rework_experiments/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..e71a16d2 --- /dev/null +++ b/rework_experiments/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/rework_experiments/linux/flutter/generated_plugin_registrant.h b/rework_experiments/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..e0f0a47b --- /dev/null +++ b/rework_experiments/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/rework_experiments/linux/flutter/generated_plugins.cmake b/rework_experiments/linux/flutter/generated_plugins.cmake new file mode 100644 index 00000000..2e1de87a --- /dev/null +++ b/rework_experiments/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/rework_experiments/linux/main.cc b/rework_experiments/linux/main.cc new file mode 100644 index 00000000..e7c5c543 --- /dev/null +++ b/rework_experiments/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/rework_experiments/linux/my_application.cc b/rework_experiments/linux/my_application.cc new file mode 100644 index 00000000..f49d9bcb --- /dev/null +++ b/rework_experiments/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "rework_experiments"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "rework_experiments"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/rework_experiments/linux/my_application.h b/rework_experiments/linux/my_application.h new file mode 100644 index 00000000..72271d5e --- /dev/null +++ b/rework_experiments/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/rework_experiments/macos/.gitignore b/rework_experiments/macos/.gitignore new file mode 100644 index 00000000..746adbb6 --- /dev/null +++ b/rework_experiments/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/rework_experiments/macos/Flutter/Flutter-Debug.xcconfig b/rework_experiments/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/rework_experiments/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/rework_experiments/macos/Flutter/Flutter-Release.xcconfig b/rework_experiments/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/rework_experiments/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/rework_experiments/macos/Flutter/GeneratedPluginRegistrant.swift b/rework_experiments/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000..cccf817a --- /dev/null +++ b/rework_experiments/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/rework_experiments/macos/Runner.xcodeproj/project.pbxproj b/rework_experiments/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..e9fb02c3 --- /dev/null +++ b/rework_experiments/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,695 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 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 */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 /* rework_experiments.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rework_experiments.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 = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* rework_experiments.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* rework_experiments.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1430; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rework_experiments.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rework_experiments"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rework_experiments.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rework_experiments"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rework_experiments.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rework_experiments"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/rework_experiments/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/rework_experiments/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/rework_experiments/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/rework_experiments/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/rework_experiments/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..8992f320 --- /dev/null +++ b/rework_experiments/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rework_experiments/macos/Runner.xcworkspace/contents.xcworkspacedata b/rework_experiments/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/rework_experiments/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/rework_experiments/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/rework_experiments/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/rework_experiments/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/rework_experiments/macos/Runner/AppDelegate.swift b/rework_experiments/macos/Runner/AppDelegate.swift new file mode 100644 index 00000000..d53ef643 --- /dev/null +++ b/rework_experiments/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..a2ec33f1 --- /dev/null +++ b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "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" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 00000000..82b6f9d9 Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 00000000..13b35eba Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 00000000..0a3f5fa4 Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 00000000..bdb57226 Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 00000000..f083318e Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 00000000..326c0e72 Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 00000000..2f1632cf Binary files /dev/null and b/rework_experiments/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/rework_experiments/macos/Runner/Base.lproj/MainMenu.xib b/rework_experiments/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 00000000..80e867a4 --- /dev/null +++ b/rework_experiments/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rework_experiments/macos/Runner/Configs/AppInfo.xcconfig b/rework_experiments/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 00000000..1ba318f5 --- /dev/null +++ b/rework_experiments/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = rework_experiments + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.reworkExperiments + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/rework_experiments/macos/Runner/Configs/Debug.xcconfig b/rework_experiments/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /dev/null +++ b/rework_experiments/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/rework_experiments/macos/Runner/Configs/Release.xcconfig b/rework_experiments/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 00000000..dff4f495 --- /dev/null +++ b/rework_experiments/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/rework_experiments/macos/Runner/Configs/Warnings.xcconfig b/rework_experiments/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 00000000..42bcbf47 --- /dev/null +++ b/rework_experiments/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/rework_experiments/macos/Runner/DebugProfile.entitlements b/rework_experiments/macos/Runner/DebugProfile.entitlements new file mode 100644 index 00000000..dddb8a30 --- /dev/null +++ b/rework_experiments/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/rework_experiments/macos/Runner/Info.plist b/rework_experiments/macos/Runner/Info.plist new file mode 100644 index 00000000..4789daa6 --- /dev/null +++ b/rework_experiments/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/rework_experiments/macos/Runner/MainFlutterWindow.swift b/rework_experiments/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 00000000..3cc05eb2 --- /dev/null +++ b/rework_experiments/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/rework_experiments/macos/Runner/Release.entitlements b/rework_experiments/macos/Runner/Release.entitlements new file mode 100644 index 00000000..852fa1a4 --- /dev/null +++ b/rework_experiments/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/rework_experiments/macos/RunnerTests/RunnerTests.swift b/rework_experiments/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..5418c9f5 --- /dev/null +++ b/rework_experiments/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import FlutterMacOS +import Cocoa +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/rework_experiments/pubspec.yaml b/rework_experiments/pubspec.yaml new file mode 100644 index 00000000..b68d480a --- /dev/null +++ b/rework_experiments/pubspec.yaml @@ -0,0 +1,28 @@ +name: rework_experiments +description: A new Flutter project. + +publish_to: "none" + +version: 1.0.0+1 + +environment: + sdk: ">=3.1.5 <4.0.0" + +dependencies: + flutter: + sdk: flutter + flutter_web_plugins: + sdk: flutter + cupertino_icons: ^1.0.2 + collection: ^1.18.0 + # Required for example. + go_router: ^14.2.1 + +dev_dependencies: + flutter_test: + sdk: flutter + + flutter_lints: ^2.0.0 + +flutter: + uses-material-design: true diff --git a/rework_experiments/test/widget_test.dart b/rework_experiments/test/widget_test.dart new file mode 100644 index 00000000..c2199143 --- /dev/null +++ b/rework_experiments/test/widget_test.dart @@ -0,0 +1,29 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rework_experiments/navigation_experiment/example.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/rework_experiments/web/favicon.png b/rework_experiments/web/favicon.png new file mode 100644 index 00000000..8aaa46ac Binary files /dev/null and b/rework_experiments/web/favicon.png differ diff --git a/rework_experiments/web/icons/Icon-192.png b/rework_experiments/web/icons/Icon-192.png new file mode 100644 index 00000000..b749bfef Binary files /dev/null and b/rework_experiments/web/icons/Icon-192.png differ diff --git a/rework_experiments/web/icons/Icon-512.png b/rework_experiments/web/icons/Icon-512.png new file mode 100644 index 00000000..88cfd48d Binary files /dev/null and b/rework_experiments/web/icons/Icon-512.png differ diff --git a/rework_experiments/web/icons/Icon-maskable-192.png b/rework_experiments/web/icons/Icon-maskable-192.png new file mode 100644 index 00000000..eb9b4d76 Binary files /dev/null and b/rework_experiments/web/icons/Icon-maskable-192.png differ diff --git a/rework_experiments/web/icons/Icon-maskable-512.png b/rework_experiments/web/icons/Icon-maskable-512.png new file mode 100644 index 00000000..d69c5669 Binary files /dev/null and b/rework_experiments/web/icons/Icon-maskable-512.png differ diff --git a/rework_experiments/web/index.html b/rework_experiments/web/index.html new file mode 100644 index 00000000..d7a23176 --- /dev/null +++ b/rework_experiments/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + rework_experiments + + + + + + + + + + diff --git a/rework_experiments/web/manifest.json b/rework_experiments/web/manifest.json new file mode 100644 index 00000000..c7b0f605 --- /dev/null +++ b/rework_experiments/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "rework_experiments", + "short_name": "rework_experiments", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/rework_experiments/windows/.gitignore b/rework_experiments/windows/.gitignore new file mode 100644 index 00000000..d492d0d9 --- /dev/null +++ b/rework_experiments/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/rework_experiments/windows/CMakeLists.txt b/rework_experiments/windows/CMakeLists.txt new file mode 100644 index 00000000..548e2829 --- /dev/null +++ b/rework_experiments/windows/CMakeLists.txt @@ -0,0 +1,102 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(rework_experiments LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "rework_experiments") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/rework_experiments/windows/flutter/CMakeLists.txt b/rework_experiments/windows/flutter/CMakeLists.txt new file mode 100644 index 00000000..930d2071 --- /dev/null +++ b/rework_experiments/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/rework_experiments/windows/flutter/generated_plugin_registrant.cc b/rework_experiments/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..8b6d4680 --- /dev/null +++ b/rework_experiments/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/rework_experiments/windows/flutter/generated_plugin_registrant.h b/rework_experiments/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..dc139d85 --- /dev/null +++ b/rework_experiments/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/rework_experiments/windows/flutter/generated_plugins.cmake b/rework_experiments/windows/flutter/generated_plugins.cmake new file mode 100644 index 00000000..b93c4c30 --- /dev/null +++ b/rework_experiments/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/rework_experiments/windows/runner/CMakeLists.txt b/rework_experiments/windows/runner/CMakeLists.txt new file mode 100644 index 00000000..394917c0 --- /dev/null +++ b/rework_experiments/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/rework_experiments/windows/runner/Runner.rc b/rework_experiments/windows/runner/Runner.rc new file mode 100644 index 00000000..c18317e3 --- /dev/null +++ b/rework_experiments/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "rework_experiments" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "rework_experiments" "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "rework_experiments.exe" "\0" + VALUE "ProductName", "rework_experiments" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/rework_experiments/windows/runner/flutter_window.cpp b/rework_experiments/windows/runner/flutter_window.cpp new file mode 100644 index 00000000..955ee303 --- /dev/null +++ b/rework_experiments/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/rework_experiments/windows/runner/flutter_window.h b/rework_experiments/windows/runner/flutter_window.h new file mode 100644 index 00000000..6da0652f --- /dev/null +++ b/rework_experiments/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/rework_experiments/windows/runner/main.cpp b/rework_experiments/windows/runner/main.cpp new file mode 100644 index 00000000..43bed475 --- /dev/null +++ b/rework_experiments/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"rework_experiments", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/rework_experiments/windows/runner/resource.h b/rework_experiments/windows/runner/resource.h new file mode 100644 index 00000000..66a65d1e --- /dev/null +++ b/rework_experiments/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/rework_experiments/windows/runner/resources/app_icon.ico b/rework_experiments/windows/runner/resources/app_icon.ico new file mode 100644 index 00000000..c04e20ca Binary files /dev/null and b/rework_experiments/windows/runner/resources/app_icon.ico differ diff --git a/rework_experiments/windows/runner/runner.exe.manifest b/rework_experiments/windows/runner/runner.exe.manifest new file mode 100644 index 00000000..a42ea768 --- /dev/null +++ b/rework_experiments/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/rework_experiments/windows/runner/utils.cpp b/rework_experiments/windows/runner/utils.cpp new file mode 100644 index 00000000..b2b08734 --- /dev/null +++ b/rework_experiments/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length <= 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/rework_experiments/windows/runner/utils.h b/rework_experiments/windows/runner/utils.h new file mode 100644 index 00000000..3879d547 --- /dev/null +++ b/rework_experiments/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/rework_experiments/windows/runner/win32_window.cpp b/rework_experiments/windows/runner/win32_window.cpp new file mode 100644 index 00000000..60608d0f --- /dev/null +++ b/rework_experiments/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/rework_experiments/windows/runner/win32_window.h b/rework_experiments/windows/runner/win32_window.h new file mode 100644 index 00000000..e901dde6 --- /dev/null +++ b/rework_experiments/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_