diff --git a/next_gen_ui_demo/.gitignore b/next_gen_ui_demo/.gitignore new file mode 100644 index 000000000..24476c5d1 --- /dev/null +++ b/next_gen_ui_demo/.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/next_gen_ui_demo/analysis_options.yaml b/next_gen_ui_demo/analysis_options.yaml new file mode 100644 index 000000000..13d6fe105 --- /dev/null +++ b/next_gen_ui_demo/analysis_options.yaml @@ -0,0 +1 @@ +include: package:analysis_defaults/flutter.yaml diff --git a/next_gen_ui_demo/android/.gitignore b/next_gen_ui_demo/android/.gitignore new file mode 100644 index 000000000..6f568019d --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/android/app/build.gradle b/next_gen_ui_demo/android/app/build.gradle new file mode 100644 index 000000000..2cd6d6dfa --- /dev/null +++ b/next_gen_ui_demo/android/app/build.gradle @@ -0,0 +1,72 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + namespace "com.example.next_gen_ui_demo" + 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.next_gen_ui_demo" + // 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 { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/next_gen_ui_demo/android/app/src/debug/AndroidManifest.xml b/next_gen_ui_demo/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 000000000..399f6981d --- /dev/null +++ b/next_gen_ui_demo/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/next_gen_ui_demo/android/app/src/main/AndroidManifest.xml b/next_gen_ui_demo/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..0ae34ee61 --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/android/app/src/main/kotlin/com/example/next_gen_ui_demo/MainActivity.kt b/next_gen_ui_demo/android/app/src/main/kotlin/com/example/next_gen_ui_demo/MainActivity.kt new file mode 100644 index 000000000..92fc3978e --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/kotlin/com/example/next_gen_ui_demo/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.next_gen_ui_demo + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/next_gen_ui_demo/android/app/src/main/res/drawable-v21/launch_background.xml b/next_gen_ui_demo/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 000000000..f74085f3f --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/next_gen_ui_demo/android/app/src/main/res/drawable/launch_background.xml b/next_gen_ui_demo/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 000000000..304732f88 --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/next_gen_ui_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/next_gen_ui_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..db77bb4b7 Binary files /dev/null and b/next_gen_ui_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/next_gen_ui_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/next_gen_ui_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..17987b79b Binary files /dev/null and b/next_gen_ui_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/next_gen_ui_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/next_gen_ui_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..09d439148 Binary files /dev/null and b/next_gen_ui_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/next_gen_ui_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/next_gen_ui_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..d5f1c8d34 Binary files /dev/null and b/next_gen_ui_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/next_gen_ui_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/next_gen_ui_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..4d6372eeb Binary files /dev/null and b/next_gen_ui_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/next_gen_ui_demo/android/app/src/main/res/values-night/styles.xml b/next_gen_ui_demo/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 000000000..06952be74 --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/next_gen_ui_demo/android/app/src/main/res/values/styles.xml b/next_gen_ui_demo/android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..cb1ef8805 --- /dev/null +++ b/next_gen_ui_demo/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/next_gen_ui_demo/android/app/src/profile/AndroidManifest.xml b/next_gen_ui_demo/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 000000000..399f6981d --- /dev/null +++ b/next_gen_ui_demo/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/next_gen_ui_demo/android/build.gradle b/next_gen_ui_demo/android/build.gradle new file mode 100644 index 000000000..f7eb7f63c --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/android/gradle.properties b/next_gen_ui_demo/android/gradle.properties new file mode 100644 index 000000000..94adc3a3f --- /dev/null +++ b/next_gen_ui_demo/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/next_gen_ui_demo/android/gradle/wrapper/gradle-wrapper.properties b/next_gen_ui_demo/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..3c472b99c --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/android/settings.gradle b/next_gen_ui_demo/android/settings.gradle new file mode 100644 index 000000000..44e62bcf0 --- /dev/null +++ b/next_gen_ui_demo/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/next_gen_ui_demo/assets/fonts/Exo-Bold.ttf b/next_gen_ui_demo/assets/fonts/Exo-Bold.ttf new file mode 100644 index 000000000..6a01984dd Binary files /dev/null and b/next_gen_ui_demo/assets/fonts/Exo-Bold.ttf differ diff --git a/next_gen_ui_demo/assets/fonts/Exo-Medium.ttf b/next_gen_ui_demo/assets/fonts/Exo-Medium.ttf new file mode 100644 index 000000000..0aecfc5fd Binary files /dev/null and b/next_gen_ui_demo/assets/fonts/Exo-Medium.ttf differ diff --git a/next_gen_ui_demo/assets/fonts/OFL.txt b/next_gen_ui_demo/assets/fonts/OFL.txt new file mode 100644 index 000000000..5497537c1 --- /dev/null +++ b/next_gen_ui_demo/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2017 The Exo Project Authors (https://github.com/NDISCOVER/Exo-1.0) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/next_gen_ui_demo/assets/images/bg-base.jpg b/next_gen_ui_demo/assets/images/bg-base.jpg new file mode 100644 index 000000000..248eaf33b Binary files /dev/null and b/next_gen_ui_demo/assets/images/bg-base.jpg differ diff --git a/next_gen_ui_demo/assets/images/bg-light-receive.png b/next_gen_ui_demo/assets/images/bg-light-receive.png new file mode 100644 index 000000000..1fa7f0a1d Binary files /dev/null and b/next_gen_ui_demo/assets/images/bg-light-receive.png differ diff --git a/next_gen_ui_demo/assets/images/button-start-hover.png b/next_gen_ui_demo/assets/images/button-start-hover.png new file mode 100644 index 000000000..e65682960 Binary files /dev/null and b/next_gen_ui_demo/assets/images/button-start-hover.png differ diff --git a/next_gen_ui_demo/assets/images/button-start.png b/next_gen_ui_demo/assets/images/button-start.png new file mode 100644 index 000000000..7470032bf Binary files /dev/null and b/next_gen_ui_demo/assets/images/button-start.png differ diff --git a/next_gen_ui_demo/assets/images/fg-base.png b/next_gen_ui_demo/assets/images/fg-base.png new file mode 100644 index 000000000..40773f2cc Binary files /dev/null and b/next_gen_ui_demo/assets/images/fg-base.png differ diff --git a/next_gen_ui_demo/assets/images/fg-light-emit.png b/next_gen_ui_demo/assets/images/fg-light-emit.png new file mode 100644 index 000000000..e41a26b9b Binary files /dev/null and b/next_gen_ui_demo/assets/images/fg-light-emit.png differ diff --git a/next_gen_ui_demo/assets/images/fg-light-receive.png b/next_gen_ui_demo/assets/images/fg-light-receive.png new file mode 100644 index 000000000..2e6117f76 Binary files /dev/null and b/next_gen_ui_demo/assets/images/fg-light-receive.png differ diff --git a/next_gen_ui_demo/assets/images/mg-base.png b/next_gen_ui_demo/assets/images/mg-base.png new file mode 100644 index 000000000..ee46f519c Binary files /dev/null and b/next_gen_ui_demo/assets/images/mg-base.png differ diff --git a/next_gen_ui_demo/assets/images/mg-light-emit.png b/next_gen_ui_demo/assets/images/mg-light-emit.png new file mode 100644 index 000000000..a3124bce8 Binary files /dev/null and b/next_gen_ui_demo/assets/images/mg-light-emit.png differ diff --git a/next_gen_ui_demo/assets/images/mg-light-receive.png b/next_gen_ui_demo/assets/images/mg-light-receive.png new file mode 100644 index 000000000..cfc9ac71d Binary files /dev/null and b/next_gen_ui_demo/assets/images/mg-light-receive.png differ diff --git a/next_gen_ui_demo/assets/images/particle-wave.png b/next_gen_ui_demo/assets/images/particle-wave.png new file mode 100644 index 000000000..2ba415554 Binary files /dev/null and b/next_gen_ui_demo/assets/images/particle-wave.png differ diff --git a/next_gen_ui_demo/assets/images/select-left.png b/next_gen_ui_demo/assets/images/select-left.png new file mode 100644 index 000000000..143863383 Binary files /dev/null and b/next_gen_ui_demo/assets/images/select-left.png differ diff --git a/next_gen_ui_demo/assets/images/select-right.png b/next_gen_ui_demo/assets/images/select-right.png new file mode 100644 index 000000000..3c6ac628e Binary files /dev/null and b/next_gen_ui_demo/assets/images/select-right.png differ diff --git a/next_gen_ui_demo/assets/shaders/common/common.glsl b/next_gen_ui_demo/assets/shaders/common/common.glsl new file mode 100644 index 000000000..d75c591d7 --- /dev/null +++ b/next_gen_ui_demo/assets/shaders/common/common.glsl @@ -0,0 +1,16 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#define M_PI 3.14159265 +#define M_INVPI 0.31830989 + +float hash_1d(float v) { + float u = 50.0 * sin(v * 3000.0); + return 2.0 * fract(2.0 * u * u) - 1.0; +} + +float hash_2d(vec2 pos) { + vec2 uv = 50.0 * fract(pos * M_INVPI); + return 2.0 * fract(uv.x * uv.y * (uv.x + uv.y)) - 1.0; +} diff --git a/next_gen_ui_demo/assets/shaders/orb_shader.frag b/next_gen_ui_demo/assets/shaders/orb_shader.frag new file mode 100644 index 000000000..32e605e33 --- /dev/null +++ b/next_gen_ui_demo/assets/shaders/orb_shader.frag @@ -0,0 +1,332 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#version 460 core + +#include "common/common.glsl" +#include + +#define RAY_STEPS 30 + +uniform vec2 uResolution; +uniform vec4 uPackedData; +float uTime = uPackedData[0]; +float uExposure = uPackedData[1]; +float uFov = uPackedData[2]; +float uRoughness = uPackedData[3]; +uniform float uMetalness; +uniform vec3 uLightDir; +uniform float uLightR; +uniform vec3 uLightLumP; +uniform vec3 uAlbedo; +uniform float uIor; +uniform float uLightQuadAtt; +uniform vec3 uAmbientLight; +uniform float uAmbientLightDepthFactor; +uniform float uEnergy; + +out vec4 oColor; + +float noise_2d(vec2 pos) { + vec2 g = floor(pos); + float a = hash_2d(g); + float b = hash_2d(g + vec2(1.0, 0.0)); + float c = hash_2d(g + vec2(0.0, 1.0)); + float d = hash_2d(g + vec2(1.0, 1.0)); + + vec2 fp = pos - g; + vec2 sfp = smoothstep(vec2(0.0), vec2(1.0), fp); + + return a + (b - a) * sfp.x + (c - a) * sfp.y + + (a - b - c + d) * sfp.x * sfp.y; +} + +vec3 closest_point_on_disc(vec3 center, vec3 normal, float radius, vec3 p) { + vec3 r = p - center; + vec3 pr = r - dot(r, normal) * normal; + return center + normalize(pr) * min(length(pr), radius); +} + +// Compute area light illuminance from: Moving Frostbite to Physically Based +// Rendering 3.0, Siggraph 2014 +float illuminanceSphereOrDisk(float cosTheta, float sinSigmaSqr) { + float cosThetaSqr = cosTheta * cosTheta; + float sinTheta = sqrt(1.0 - cosThetaSqr); + + float illuminance = 0.0; + if (cosThetaSqr > sinSigmaSqr) { + illuminance = M_PI * sinSigmaSqr * clamp(cosTheta, 0.0, 1.0); + } else { + float x = sqrt(1.0 / sinSigmaSqr - 1.0); + float y = -x * (cosTheta / sinTheta); + float sinThetaSqrtY = sinTheta * sqrt(1.0 - y * y); + illuminance = (cosTheta * acos(y) - x * sinThetaSqrtY) * sinSigmaSqr + + atan(sinThetaSqrtY / x); + } + + return max(illuminance, 0.0); +} + +float evalIlluminanceDisk(vec3 N, vec3 L, vec3 lightN, float lightRadius, + float lightDistSqr) { + float cosTheta = dot(N, L); + float lightRSqr = lightRadius * lightRadius; + + float sinSigmaSqr = lightRSqr / (lightRSqr + max(lightRSqr, lightDistSqr)); + + float illuminance = illuminanceSphereOrDisk(cosTheta, sinSigmaSqr) * + clamp(dot(lightN, -L), 0.0, 1.0); + + return illuminance; +} + +float distribution_ggx(vec3 N, vec3 H, float roughness) { + float a = roughness * roughness; + float a2 = a * a; + float NdotH = max(dot(N, H), 0.0); + float NdotH2 = NdotH * NdotH; + + float nom = a2; + float denom = (NdotH2 * (a2 - 1.0) + 1.0); + denom = M_PI * denom * denom; + + return nom / denom; +} + +float geometry_schlick_ggx(float NdotV, float roughness) { + float r = (roughness + 1.0); + float k = (r * r) / 8.0; + + float nom = NdotV; + float denom = NdotV * (1.0 - k) + k; + + return nom / denom; +} + +float geometry_smith(vec3 N, vec3 V, float cosTheta, float roughness) { + float NdotV = max(dot(N, V), 0.0); + + float ggx2 = geometry_schlick_ggx(NdotV, roughness); + float ggx1 = geometry_schlick_ggx(cosTheta, roughness); + + return ggx1 * ggx2; +} + +vec3 fresnel_schlick(float cosTheta, vec3 F0) { + return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); +} + +vec3 brdf_eval(vec3 N, vec3 L, vec3 H, vec3 V, vec3 albedo, float roughness, + float metalness, vec3 Li) { + roughness = max(0.2, roughness); + + float cosTheta = max(dot(N, L), 0.0); + + // Diffuse color + vec3 F0 = vec3(0.04); + F0 = mix(F0, albedo, metalness); + + float NDF = distribution_ggx(N, H, roughness); + float G = geometry_smith(N, V, cosTheta, roughness); + vec3 F = fresnel_schlick(max(dot(H, V), 0.0), F0); + + vec3 num = NDF * G * F; + float denom = 4.0 * max(dot(N, V), 0.0) * cosTheta; + vec3 spec = num / max(denom, 0.001); + + vec3 kS = F; + vec3 kD = 1.0 - kS; + kD *= (1.0 - metalness); + + vec3 Lo = (kD * albedo / M_PI + spec) * Li * cosTheta; + + return Lo; +} + +vec3 btdf_eval(vec3 N, vec3 L, vec3 albedo, vec3 Li) { + vec3 Lo = albedo * Li * max(dot(N, L), 0.0); + return Lo; +} + +vec2 oct_encode(vec3 d) { + vec3 octant = sign(d); + + // Compute l1-norm version of the direction vector + float sum = dot(d, octant); + vec3 octahedron = d / sum; + + if (octahedron.z < 0.0) { + vec3 a = abs(octahedron); + octahedron.xy = octant.xy * (vec2(1.0) - a.yx); + } + + return octahedron.xy * 0.5 + 0.5; +} + +const mat2 octM0 = mat2(1.0, 0.0, 0.0, 1.0); +const mat2 octM1 = mat2(0.809017, 0.587785, -0.587785, 0.809017); +const mat2 octM2 = mat2(0.309017, 0.951057, -0.951057, 0.309017); +const mat2 octM3 = mat2(-0.309017, 0.951057, -0.951057, -0.309017); + +float fbm(vec2 pos) { + float sum = 0.0; + + sum += noise_2d(octM0 * pos); + sum += 0.5 * noise_2d(2.0 * octM1 * pos); + sum += 0.25 * noise_2d(4.0 * octM2 * pos); + sum += 0.125 * noise_2d(8.0 * octM3 * pos); + + return sum; +} + +vec2 fbm_sphere_sdf(vec3 center, float radius, vec3 pos) { + vec3 toP = pos - center; + radius = radius * mix(0.5, 1.0, uEnergy); + float d = length(toP); + vec2 uv = oct_encode(toP); + + float amp = mix(0.1, 0.6, uEnergy); + float dd = fbm(uv * 15.0 + uTime * vec2(1.0, -0.4)) * amp; + + return vec2(d + dd - radius, + mix(0.4, 1.0, float(d - (radius + 1.0 * amp) > 0.0))); +} + +vec2 sample_scene(vec3 pos) { + return fbm_sphere_sdf(vec3(0.0, 0.0, -10.0), 2.0, pos); +} + +const float sampleScale = 1.0 / sqrt(3.0) * 0.0005; + +vec3 sample_normal(vec3 pos) { + +#define NORMAL_SDF_SAMPLE_COUNT 4 + vec3 normalSampleOffsets[NORMAL_SDF_SAMPLE_COUNT]; + normalSampleOffsets[0] = vec3(1.0, -1.0, -1.0); + normalSampleOffsets[1] = vec3(-1.0, -1.0, 1.0); + normalSampleOffsets[2] = vec3(-1.0, 1.0, -1.0); + normalSampleOffsets[3] = vec3(1.0, 1.0, 1.0); + + vec3 result = vec3(0.0); + for (int i = 0; i < NORMAL_SDF_SAMPLE_COUNT; ++i) { + result += normalSampleOffsets[i] * sampleScale * + sample_scene(pos + normalSampleOffsets[i]).x; + } + + return normalize(result); +} + +float raymarch(vec3 start, vec3 dir) { + float tMin = 8.0; + float tMax = 15.0; + + float t = tMin; + + float result = -1.0; + + for (int i = 0; i < RAY_STEPS; ++i) { + if (t >= tMax) + break; + vec2 d = sample_scene(start + dir * t); + if (d.x < 0.0002) { + result = t; + break; + } + t += d.x * d.y; + } + + return result; +} + +void look_at(out mat3 cam, in vec3 eye, in vec3 center, in vec3 up) { + // Construct an ortho-normal basis for the camera + vec3 forward = normalize(center - eye); + vec3 right = cross(forward, up); + up = cross(right, forward); + + cam = mat3(right, up, forward); +} + +void sample_camera_ray(out vec3 origin, out vec3 direction, in mat3 cam, + vec3 eye, vec2 uv) { + + uv *= 2.0; + uv -= 1.0; + uv.y *= -1.0; + + float aspectRatio = uResolution.y / uResolution.x; + float vWidth = tan(uFov / 2.0); + float vHeight = vWidth * aspectRatio; + + vec3 forward = cam * vec3(0.0, 0.0, 1.0); + vec3 rayDir = cam * vec3(uv.x * vWidth, uv.y * vHeight, 1.0); + + origin = eye; + direction = normalize(rayDir); +} + +vec3 sample_disk_light(out vec3 L, vec3 P, vec3 N, vec3 lightP, vec3 lightN, + float lightR, vec3 lightAtt, vec3 lightLumP) { + vec3 toL = closest_point_on_disc(lightP, lightN, lightR, P) - P; + L = normalize(toL); + toL *= lightAtt.x; + float illuminance = evalIlluminanceDisk(N, L, lightN, lightR, dot(toL, toL)); + vec3 Li = lightLumP * illuminance; + return Li; +} + +vec4 pixel_color(vec3 o, vec3 d, vec3 lightP, vec3 lightN, float lightR, + vec3 lightAtt, vec3 lightLumP) { + float t = raymarch(o, d); + + vec4 result = vec4(0.0); + + if (t >= 0.0) { + vec3 P = o + d * t; + vec3 N = sample_normal(P); + vec3 V = -d; + vec3 R = refract(-V, N, uIor); + + float z = dot(vec3(0.0, 0.0, -1.0), P); + float zd = smoothstep(mix(0.0, 11.0, uAmbientLightDepthFactor), 14.0, z); + vec3 Lo = vec3(0.0); + vec3 L, Li; + + vec3 S = fresnel_schlick(max(dot(N, V), 0.0), vec3(0.02)); + + Li = + sample_disk_light(L, P, R, lightP, lightN, lightR, lightAtt, lightLumP); + Lo += (1.0 - S) * brdf_eval(-N, L, normalize(L + R), R, uAlbedo, uRoughness, + uMetalness, Li); + + Lo += zd * uAlbedo * uAmbientLight; + + result = vec4(Lo, 1.0); + } + + return result; +} + +void main() { + vec2 uv = vec2(FlutterFragCoord().xy) / uResolution; + + vec3 lightN = normalize(-uLightDir); + vec3 lightP = vec3(0.0, 0.0, -10.0) + uLightDir; + vec3 lightAtt = vec3(uLightQuadAtt, 0.0, 1.0); + + vec3 eye = vec3(0.0, 0.0, 1.0); + vec3 center = vec3(0.0, 0.0, 0.0); + vec3 up = vec3(0.0, 1.0, 0.0); + + mat3 cam; + look_at(cam, eye, center, up); + vec3 o, d; + + sample_camera_ray(o, d, cam, eye, uv); + vec4 hdrColor = + abs(pixel_color(o, d, lightP, lightN, uLightR, lightAtt, uLightLumP)); + + vec3 ldrColor = vec3(1.0) - exp(min(-(hdrColor.rgb) * uExposure, 0.0)); + oColor = vec4(ldrColor, hdrColor.a); +} diff --git a/next_gen_ui_demo/assets/shaders/ui_glitch.frag b/next_gen_ui_demo/assets/shaders/ui_glitch.frag new file mode 100644 index 000000000..55294e8a5 --- /dev/null +++ b/next_gen_ui_demo/assets/shaders/ui_glitch.frag @@ -0,0 +1,68 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#version 460 core + +#include "common/common.glsl" +#include + +uniform vec2 uResolution; +uniform float uTime; +uniform sampler2D uTex; + +out vec4 oColor; + +float cubicPulse(float c, float w, float x) { + x = abs(x - c); + if (x > w) + return 0.0; + x /= w; + return 1.0 - x*x*(3.0 - 2.0*x); +} + +float twoSin(float x) { + x = 6.49*x - 0.65; + float t = -0.7*sin(6.8*x) + 1.4*sin(2.9*x); + t = t/4.1 + 0.5; + return t; +} + + +void main() { + + vec2 uv = vec2(FlutterFragCoord().xy) / uResolution; + + float t_2 = cubicPulse(.5, .05, fract(uTime / 4.0)); + float t_1 = twoSin(fract(uTime / 5.0)); + float glitchScale = mix(0.0, 8.0, t_1 + t_2); + float aberrationSize = mix(0.0, 5.0, t_1 + t_2); + + float h = hash_1d(uv.y); + float hs = sign(h); + h = max(h, 0.0); + h = h * h; + h = round(h) * hs; + + uv += vec2(h * glitchScale, 0.0) / uResolution; + + vec2 redOffset = vec2(aberrationSize, 0.0) / uResolution; + vec2 greenOffset = vec2(0.0, 0.0) / uResolution; + vec2 blueOffset = vec2(-aberrationSize, 0.0) / uResolution; + + vec2 redUv = uv + redOffset; + vec2 greenUv = uv + greenOffset; + vec2 blueUv = uv + blueOffset; + + vec2 ra = texture(uTex, redUv).ra; + vec2 ga = texture(uTex, greenUv).ga; + vec2 ba = texture(uTex, blueUv).ba; + + // Convert from pre-multiplied alpha + ra.x /= ra.y; + ga.x /= ga.y; + ba.x /= ba.y; + + float alpha = max(ra.y, max(ga.y, ba.y)); + oColor = vec4(ra.x, ga.x, ba.x, 1.0) * alpha; +} diff --git a/next_gen_ui_demo/ios/.gitignore b/next_gen_ui_demo/ios/.gitignore new file mode 100644 index 000000000..7a7f9873a --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/ios/Flutter/AppFrameworkInfo.plist b/next_gen_ui_demo/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 000000000..9625e105d --- /dev/null +++ b/next_gen_ui_demo/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 + 11.0 + + diff --git a/next_gen_ui_demo/ios/Flutter/Debug.xcconfig b/next_gen_ui_demo/ios/Flutter/Debug.xcconfig new file mode 100644 index 000000000..ec97fc6f3 --- /dev/null +++ b/next_gen_ui_demo/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/next_gen_ui_demo/ios/Flutter/Release.xcconfig b/next_gen_ui_demo/ios/Flutter/Release.xcconfig new file mode 100644 index 000000000..c4855bfe2 --- /dev/null +++ b/next_gen_ui_demo/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/next_gen_ui_demo/ios/Podfile b/next_gen_ui_demo/ios/Podfile new file mode 100644 index 000000000..fdcc671eb --- /dev/null +++ b/next_gen_ui_demo/ios/Podfile @@ -0,0 +1,44 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '11.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/next_gen_ui_demo/ios/Runner.xcodeproj/project.pbxproj b/next_gen_ui_demo/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 000000000..2db4bda70 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,613 @@ +// !$*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 = { + LastUpgradeCheck = 1300; + 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 = 11.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.nextGenUiDemo; + 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.nextGenUiDemo.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.nextGenUiDemo.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.nextGenUiDemo.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 = 11.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 = 11.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.nextGenUiDemo; + 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.nextGenUiDemo; + 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/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/next_gen_ui_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/next_gen_ui_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 000000000..e42adcb34 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/ios/Runner.xcworkspace/contents.xcworkspacedata b/next_gen_ui_demo/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..1d526a16e --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/next_gen_ui_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/next_gen_ui_demo/ios/Runner/AppDelegate.swift b/next_gen_ui_demo/ios/Runner/AppDelegate.swift new file mode 100644 index 000000000..70693e4a8 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@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/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..d36b1fab2 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 000000000..dc9ada472 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 000000000..7353c41ec Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 000000000..797d452e4 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 000000000..6ed2d933e Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 000000000..4cd7b0099 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 000000000..fe730945a Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 000000000..321773cd8 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 000000000..797d452e4 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 000000000..502f463a9 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 000000000..0ec303439 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 000000000..0ec303439 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 000000000..e9f5fea27 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 000000000..84ac32ae7 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 000000000..8953cba09 Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 000000000..0467bf12a Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 000000000..0bedcf2fd --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/next_gen_ui_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 000000000..89c2725b7 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard b/next_gen_ui_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..f2e259c7c --- /dev/null +++ b/next_gen_ui_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/ios/Runner/Base.lproj/Main.storyboard b/next_gen_ui_demo/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 000000000..f3c28516f --- /dev/null +++ b/next_gen_ui_demo/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/ios/Runner/Info.plist b/next_gen_ui_demo/ios/Runner/Info.plist new file mode 100644 index 000000000..287ca112e --- /dev/null +++ b/next_gen_ui_demo/ios/Runner/Info.plist @@ -0,0 +1,53 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Next Gen UI Demo + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + next_gen_ui_demo + 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 + + UIViewControllerBasedStatusBarAppearance + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + FLTEnableImpeller + + + diff --git a/next_gen_ui_demo/ios/Runner/Runner-Bridging-Header.h b/next_gen_ui_demo/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 000000000..308a2a560 --- /dev/null +++ b/next_gen_ui_demo/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/next_gen_ui_demo/ios/RunnerTests/RunnerTests.swift b/next_gen_ui_demo/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..86a7c3b1b --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/lib/assets.dart b/next_gen_ui_demo/lib/assets.dart new file mode 100644 index 000000000..6f1e29b0b --- /dev/null +++ b/next_gen_ui_demo/lib/assets.dart @@ -0,0 +1,41 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:ui'; + +class AssetPaths { + /// Images + static const String _images = 'assets/images'; + + static const String titleBgBase = '$_images/bg-base.jpg'; + static const String titleBgReceive = '$_images/bg-light-receive.png'; + static const String titleFgEmit = '$_images/fg-light-emit.png'; + static const String titleFgReceive = '$_images/fg-light-receive.png'; + static const String titleFgBase = '$_images/fg-base.png'; + static const String titleMgEmit = '$_images/mg-light-emit.png'; + static const String titleMgReceive = '$_images/mg-light-receive.png'; + static const String titleMgBase = '$_images/mg-base.png'; + static const String titleStartBtn = '$_images/button-start.png'; + static const String titleStartBtnHover = '$_images/button-start-hover.png'; + static const String titleStartArrow = '$_images/button-start-arrow.png'; + static const String titleSelectedLeft = '$_images/select-left.png'; + static const String titleSelectedRight = '$_images/select-right.png'; + static const String pulseParticle = '$_images/particle3.png'; + + /// Shaders + static const String _shaders = 'assets/shaders'; + static const String orbShader = '$_shaders/orb_shader.frag'; + static const String uiShader = '$_shaders/ui_glitch.frag'; +} + +typedef Shaders = ({FragmentShader orb, FragmentShader ui}); + +Future loadShaders() async => ( + orb: (await _loadShader(AssetPaths.orbShader)), + ui: (await _loadShader(AssetPaths.uiShader)), + ); + +Future _loadShader(String path) async { + return (await FragmentProgram.fromAsset(path)).fragmentShader(); +} diff --git a/next_gen_ui_demo/lib/common/reactive_widget.dart b/next_gen_ui_demo/lib/common/reactive_widget.dart new file mode 100644 index 000000000..69ad8a158 --- /dev/null +++ b/next_gen_ui_demo/lib/common/reactive_widget.dart @@ -0,0 +1,37 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import 'ticking_builder.dart'; + +typedef ReactiveWidgetBuilder = Widget Function( + BuildContext context, double time, Size bounds); + +/// ReactiveWidget forces repainting a subtree on +/// each frame for ambient animation. +class ReactiveWidget extends StatefulWidget { + const ReactiveWidget({ + super.key, + required this.builder, + }); + final ReactiveWidgetBuilder builder; + @override + State createState() => _ReactiveWidgetState(); +} + +class _ReactiveWidgetState extends State { + @override + Widget build(BuildContext context) { + return TickingBuilder( + builder: (_, time) { + return LayoutBuilder( + builder: (context, constraints) { + return widget.builder(context, time, constraints.biggest); + }, + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/common/shader_effect.dart b/next_gen_ui_demo/lib/common/shader_effect.dart new file mode 100644 index 000000000..69bd75f7d --- /dev/null +++ b/next_gen_ui_demo/lib/common/shader_effect.dart @@ -0,0 +1,359 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:ui' as ui; + +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_animate/flutter_animate.dart'; + +/** + * This is an unfinished, pre-release effect for Flutter Animate: + * https://pub.dev/packages/flutter_animate + * + * It includes a copy of `AnimatedSampler` from Flutter Shaders: + * https://github.com/jonahwilliams/flutter_shaders + * + * Once `AnimatedSampler` (or equivalent) is stable, or included in the core + * SDK, this effect will be updated, tested, refined, and added to the + * effects.dart file. + */ + +// TODO: document. + +/// An effect that lets you apply an animated fragment shader to a target. +@immutable +class ShaderEffect extends Effect { + const ShaderEffect({ + super.delay, + super.duration, + super.curve, + this.shader, + this.update, + ShaderLayer? layer, + }) : layer = layer ?? ShaderLayer.replace, + super( + begin: 0, + end: 1, + ); + + final ui.FragmentShader? shader; + final ShaderUpdateCallback? update; + final ShaderLayer layer; + + @override + Widget build( + BuildContext context, + Widget child, + AnimationController controller, + EffectEntry entry, + ) { + double ratio = 1 / MediaQuery.of(context).devicePixelRatio; + Animation animation = buildAnimation(controller, entry); + return getOptimizedBuilder( + animation: animation, + builder: (_, __) { + return AnimatedSampler( + (image, size, canvas) { + EdgeInsets? insets; + if (update != null) { + insets = update!(shader!, animation.value, size, image); + } + Rect rect = Rect.fromLTWH(0, 0, size.width, size.height); + rect = insets?.inflateRect(rect) ?? rect; + + void drawImage() { + canvas.save(); + canvas.scale(ratio, ratio); + canvas.drawImage(image, Offset.zero, Paint()); + canvas.restore(); + } + + if (layer == ShaderLayer.foreground) drawImage(); + if (shader != null) canvas.drawRect(rect, Paint()..shader = shader); + if (layer == ShaderLayer.background) drawImage(); + }, + enabled: shader != null, + child: child, + ); + }, + ); + } +} + +extension ShaderEffectExtensions on AnimateManager { + /// Adds a [shader] extension to [AnimateManager] ([Animate] and [AnimateList]). + T shader({ + Duration? delay, + Duration? duration, + Curve? curve, + ui.FragmentShader? shader, + ShaderUpdateCallback? update, + ShaderLayer? layer, + }) => + addEffect(ShaderEffect( + delay: delay, + duration: duration, + curve: curve, + shader: shader, + update: update, + layer: layer, + )); +} + +enum ShaderLayer { foreground, background, replace } + +/// Function signature for [ShaderEffect] update handlers. +typedef ShaderUpdateCallback = EdgeInsets? Function( + ui.FragmentShader shader, double value, Size size, ui.Image image); + +/******************************************************************************/ +// TODO: add this as a dependency instead of copying it in once it is stable: +// https://github.com/jonahwilliams/flutter_shaders + +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/// A callback for the [AnimatedSamplerBuilder] widget. +typedef AnimatedSamplerBuilder = void Function( + ui.Image image, + Size size, + ui.Canvas canvas, +); + +/// A widget that allows access to a snapshot of the child widgets for painting +/// with a sampler applied to a [FragmentProgram]. +/// +/// When [enabled] is true, the child widgets will be painted into a texture +/// exposed as a [ui.Image]. This can then be passed to a [FragmentShader] +/// instance via [FragmentShader.setSampler]. +/// +/// If [enabled] is false, then the child widgets are painted as normal. +/// +/// Caveats: +/// * Platform views cannot be captured in a texture. If any are present they +/// will be excluded from the texture. Texture-based platform views are OK. +/// +/// Example: +/// +/// Providing an image to a fragment shader using +/// [FragmentShader.setImageSampler]. +/// +/// ```dart +/// Widget build(BuildContext context) { +/// return AnimatedSampler( +/// (ui.Image image, Size size, Canvas canvas) { +/// shader +/// ..setFloat(0, size.width) +/// ..setFloat(1, size.height) +/// ..setImageSampler(0, image); +/// canvas.drawRect(Offset.zero & size, Paint()..shader = shader); +/// }, +/// child: widget.child, +/// ); +/// } +/// ``` +/// +/// See also: +/// * [SnapshotWidget], which provides a similar API for the purpose of +/// caching during expensive animations. +class AnimatedSampler extends StatelessWidget { + /// Create a new [AnimatedSampler]. + const AnimatedSampler( + this.builder, { + required this.child, + super.key, + this.enabled = true, + }); + + /// A callback used by this widget to provide the children captured in + /// a texture. + final AnimatedSamplerBuilder builder; + + /// Whether the children should be captured in a texture or displayed as + /// normal. + final bool enabled; + + /// The child widget. + final Widget child; + + @override + Widget build(BuildContext context) { + return _ShaderSamplerBuilder( + builder, + enabled: enabled, + child: child, + ); + } +} + +class _ShaderSamplerBuilder extends SingleChildRenderObjectWidget { + const _ShaderSamplerBuilder( + this.builder, { + super.child, + required this.enabled, + }); + + final AnimatedSamplerBuilder builder; + final bool enabled; + + @override + RenderObject createRenderObject(BuildContext context) { + return _RenderShaderSamplerBuilderWidget( + devicePixelRatio: MediaQuery.of(context).devicePixelRatio, + builder: builder, + enabled: enabled, + ); + } + + @override + void updateRenderObject( + BuildContext context, covariant RenderObject renderObject) { + (renderObject as _RenderShaderSamplerBuilderWidget) + ..devicePixelRatio = MediaQuery.of(context).devicePixelRatio + ..builder = builder + ..enabled = enabled; + } +} + +// A render object that conditionally converts its child into a [ui.Image] +// and then paints it in place of the child. +class _RenderShaderSamplerBuilderWidget extends RenderProxyBox { + // Create a new [_RenderSnapshotWidget]. + _RenderShaderSamplerBuilderWidget({ + required double devicePixelRatio, + required AnimatedSamplerBuilder builder, + required bool enabled, + }) : _devicePixelRatio = devicePixelRatio, + _builder = builder, + _enabled = enabled; + + @override + OffsetLayer updateCompositedLayer( + {required covariant _ShaderSamplerBuilderLayer? oldLayer}) { + final _ShaderSamplerBuilderLayer layer = + oldLayer ?? _ShaderSamplerBuilderLayer(builder); + layer + ..callback = builder + ..size = size + ..devicePixelRatio = devicePixelRatio; + return layer; + } + + /// The device pixel ratio used to create the child image. + double get devicePixelRatio => _devicePixelRatio; + double _devicePixelRatio; + set devicePixelRatio(double value) { + if (value == devicePixelRatio) { + return; + } + _devicePixelRatio = value; + markNeedsCompositedLayerUpdate(); + } + + /// The painter used to paint the child snapshot or child widgets. + AnimatedSamplerBuilder get builder => _builder; + AnimatedSamplerBuilder _builder; + set builder(AnimatedSamplerBuilder value) { + if (value == builder) { + return; + } + _builder = value; + markNeedsCompositedLayerUpdate(); + } + + bool get enabled => _enabled; + bool _enabled; + set enabled(bool value) { + if (value == enabled) { + return; + } + _enabled = value; + markNeedsPaint(); + markNeedsCompositingBitsUpdate(); + } + + @override + bool get isRepaintBoundary => alwaysNeedsCompositing; + + @override + bool get alwaysNeedsCompositing => enabled; + + @override + void paint(PaintingContext context, Offset offset) { + if (size.isEmpty || !_enabled) { + return; + } + assert(offset == Offset.zero); + return super.paint(context, offset); + } +} + +/// A [Layer] that uses an [AnimatedSamplerBuilder] to create a [ui.Picture] +/// every time it is added to a scene. +class _ShaderSamplerBuilderLayer extends OffsetLayer { + _ShaderSamplerBuilderLayer(this._callback); + + Size get size => _size; + Size _size = Size.zero; + set size(Size value) { + if (value == size) { + return; + } + _size = value; + markNeedsAddToScene(); + } + + double get devicePixelRatio => _devicePixelRatio; + double _devicePixelRatio = 1.0; + set devicePixelRatio(double value) { + if (value == devicePixelRatio) { + return; + } + _devicePixelRatio = value; + markNeedsAddToScene(); + } + + AnimatedSamplerBuilder get callback => _callback; + AnimatedSamplerBuilder _callback; + set callback(AnimatedSamplerBuilder value) { + if (value == callback) { + return; + } + _callback = value; + markNeedsAddToScene(); + } + + ui.Image _buildChildScene(Rect bounds, double pixelRatio) { + final ui.SceneBuilder builder = ui.SceneBuilder(); + final Matrix4 transform = + Matrix4.diagonal3Values(pixelRatio, pixelRatio, 1); + builder.pushTransform(transform.storage); + addChildrenToScene(builder); + builder.pop(); + return builder.build().toImageSync( + (pixelRatio * bounds.width).ceil(), + (pixelRatio * bounds.height).ceil(), + ); + } + + @override + void addToScene(ui.SceneBuilder builder) { + if (size.isEmpty) return; + final ui.Image image = _buildChildScene( + offset & size, + devicePixelRatio, + ); + final ui.PictureRecorder pictureRecorder = ui.PictureRecorder(); + final Canvas canvas = Canvas(pictureRecorder); + try { + callback(image, size, canvas); + } finally { + image.dispose(); + } + final ui.Picture picture = pictureRecorder.endRecording(); + builder.addPicture(offset, picture); + } +} diff --git a/next_gen_ui_demo/lib/common/shader_painter.dart b/next_gen_ui_demo/lib/common/shader_painter.dart new file mode 100644 index 000000000..d6a4a5925 --- /dev/null +++ b/next_gen_ui_demo/lib/common/shader_painter.dart @@ -0,0 +1,28 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:ui'; + +import 'package:flutter/material.dart'; + +class ShaderPainter extends CustomPainter { + ShaderPainter(this.shader, {this.update}); + + final FragmentShader shader; + final void Function(FragmentShader, Size)? update; + + @override + void paint(Canvas canvas, Size size) { + update?.call(shader, size); + canvas.drawRect( + Rect.fromLTWH(0, 0, size.width, size.height), + Paint()..shader = shader, + ); + } + + @override + bool shouldRepaint(covariant ShaderPainter oldDelegate) { + return oldDelegate.shader != shader || oldDelegate.update != update; + } +} diff --git a/next_gen_ui_demo/lib/common/ticking_builder.dart b/next_gen_ui_demo/lib/common/ticking_builder.dart new file mode 100644 index 000000000..a311b9227 --- /dev/null +++ b/next_gen_ui_demo/lib/common/ticking_builder.dart @@ -0,0 +1,40 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; + +/// TickingBuilder is for ambient animation to be run +/// on each frame. +class TickingBuilder extends StatefulWidget { + const TickingBuilder({super.key, required this.builder}); + final Widget Function(BuildContext context, double time) builder; + @override + State createState() => _TickingBuilderState(); +} + +class _TickingBuilderState extends State + with SingleTickerProviderStateMixin { + late final Ticker _ticker; + double _time = 0.0; + + @override + void initState() { + super.initState(); + _ticker = createTicker(_handleTick)..start(); + } + + @override + void dispose() { + _ticker.dispose(); + super.dispose(); + } + + void _handleTick(Duration elapsed) { + setState(() => _time = elapsed.inMilliseconds.toDouble() / 1000.0); + } + + @override + Widget build(BuildContext context) => widget.builder.call(context, _time); +} diff --git a/next_gen_ui_demo/lib/common/ui_scaler.dart b/next_gen_ui_demo/lib/common/ui_scaler.dart new file mode 100644 index 000000000..07c328765 --- /dev/null +++ b/next_gen_ui_demo/lib/common/ui_scaler.dart @@ -0,0 +1,31 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; + +import 'package:flutter/material.dart'; + +class UiScaler extends StatelessWidget { + const UiScaler({ + super.key, + required this.child, + required this.alignment, + this.referenceHeight = 1080, + }); + + final int referenceHeight; + final Widget child; + final Alignment alignment; + + @override + Widget build(BuildContext context) { + final screenSize = MediaQuery.of(context).size; + final double scale = min(screenSize.height / referenceHeight, 1.0); + return Transform.scale( + scale: scale, + alignment: alignment, + child: child, + ); + } +} diff --git a/next_gen_ui_demo/lib/main.dart b/next_gen_ui_demo/lib/main.dart new file mode 100644 index 000000000..f34576ee1 --- /dev/null +++ b/next_gen_ui_demo/lib/main.dart @@ -0,0 +1,145 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:io'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:gap/gap.dart'; +import 'package:provider/provider.dart'; +import 'package:window_size/window_size.dart'; + +import 'assets.dart'; +import 'title_screen/title_screen.dart'; +import 'title_screen_1a/title_screen.dart' as title_screen_1a; +import 'title_screen_1b/title_screen.dart' as title_screen_1b; +import 'title_screen_2a/title_screen.dart' as title_screen_2a; +import 'title_screen_2c/title_screen.dart' as title_screen_2c; +import 'title_screen_3a/title_screen.dart' as title_screen_3a; +import 'title_screen_3b/title_screen.dart' as title_screen_3b; +import 'title_screen_3c/title_screen.dart' as title_screen_3c; +import 'title_screen_4a/title_screen.dart' as title_screen_4a; +import 'title_screen_4b/title_screen.dart' as title_screen_4b; +import 'title_screen_4c/title_screen.dart' as title_screen_4c; +import 'title_screen_4d/title_screen.dart' as title_screen_4d; +import 'title_screen_4e/title_screen.dart' as title_screen_4e; +import 'title_screen_5a/title_screen.dart' as title_screen_5a; +import 'title_screen_5b/title_screen.dart' as title_screen_5b; +import 'title_screen_6/title_screen.dart' as title_screen_6; + +void main() { + if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS)) { + WidgetsFlutterBinding.ensureInitialized(); + setWindowMinSize(const Size(800, 500)); + } + Animate.restartOnHotReload = true; + runApp( + FutureProvider( + create: (context) => loadShaders(), + initialData: null, + child: const NextGenApp(), + ), + ); +} + +class NextGenApp extends StatefulWidget { + const NextGenApp({super.key}); + + @override + State createState() => _NextGenAppState(); +} + +List< + TitleScreenBase Function( + {required void Function(Color) callback, Key? key})> steps = [ + title_screen_1a.TitleScreen.new, + title_screen_1b.TitleScreen.new, + title_screen_2a.TitleScreen.new, + title_screen_2c.TitleScreen.new, + title_screen_3a.TitleScreen.new, + title_screen_3b.TitleScreen.new, + title_screen_3c.TitleScreen.new, + title_screen_4a.TitleScreen.new, + title_screen_4b.TitleScreen.new, + title_screen_4c.TitleScreen.new, + title_screen_4d.TitleScreen.new, + title_screen_4e.TitleScreen.new, + title_screen_5a.TitleScreen.new, + title_screen_5b.TitleScreen.new, + title_screen_6.TitleScreen.new, +]; + +typedef ColorCallback = void Function(Color colorSchemeSeed); + +class _NextGenAppState extends State { + int step = 0; + Color? colorSchemeSeed; + + @override + Widget build(BuildContext context) { + return MaterialApp( + themeMode: ThemeMode.dark, + darkTheme: ThemeData( + brightness: Brightness.dark, + useMaterial3: true, + colorSchemeSeed: colorSchemeSeed, + ), + home: Scaffold( + appBar: AppBar( + title: Text( + 'Step ${step + 1} of ${steps.length}', + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(color: colorSchemeSeed), + ), + backgroundColor: Colors.black38, + ), + floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, + floatingActionButton: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Visibility( + visible: step > 0, + child: FloatingActionButton( + child: const Icon(Icons.arrow_back), + onPressed: () { + setState(() { + if (step > 0) step--; + debugPrint('Step = $step'); + }); + }, + ), + ), + Visibility( + visible: step > 0 && step + 1 < steps.length, + child: const Gap(24), + ), + Visibility( + visible: step + 1 < steps.length, + child: FloatingActionButton( + child: const Icon(Icons.arrow_forward), + onPressed: () { + setState(() { + if (step + 1 < steps.length) step++; + debugPrint('Step = $step'); + }); + }, + ), + ), + ], + ), + backgroundColor: Colors.black, + body: steps[step]( + callback: (color) { + setState(() { + colorSchemeSeed = color; + }); + }, + ), + ), + ); + } +} diff --git a/next_gen_ui_demo/lib/orb_shader/orb_shader_config.dart b/next_gen_ui_demo/lib/orb_shader/orb_shader_config.dart new file mode 100644 index 000000000..ef975cccf --- /dev/null +++ b/next_gen_ui_demo/lib/orb_shader/orb_shader_config.dart @@ -0,0 +1,131 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +class OrbShaderConfig { + const OrbShaderConfig({ + this.zoom = 0.3, + this.exposure = 0.4, + this.roughness = 0.3, + this.metalness = 0.3, + this.materialColor = const Color.fromARGB(255, 242, 163, 138), + this.lightRadius = 0.75, + this.lightColor = const Color(0xFFFFFFFF), + this.lightBrightness = 15.00, + this.ior = 0.5, + this.lightAttenuation = 0.5, + this.ambientLightColor = const Color(0xFFFFFFFF), + this.ambientLightBrightness = 0.2, + this.ambientLightDepthFactor = 0.3, + this.lightOffsetX = 0, + this.lightOffsetY = 0.1, + this.lightOffsetZ = -0.66, + }) : assert(zoom >= 0 && zoom <= 1), + assert(exposure >= 0), + assert(metalness >= 0 && metalness <= 1), + assert(lightRadius >= 0), + assert(lightBrightness >= 1), + assert(ior >= 0 && ior <= 2), + assert(lightAttenuation >= 0 && lightAttenuation <= 1), + assert(ambientLightBrightness >= 0); + + final double zoom; + + /// Camera exposure value, higher is brighter, 0 is black + final double exposure; + + /// How rough the surface is, somewhat translates to the intensity/radius + /// of specular highlights + final double roughness; + + /// 0 for a dielectric material (plastic, wood, grass, water, etc...), + /// 1 for a metal (iron, copper, aluminum, gold, etc...), a value in between + /// blends the two materials (not really physically accurate, has minor + /// artistic value) + final double metalness; + + /// any color, alpha ignored, for metal materials doesn't correspond to + /// surface color but to a reflectivity index based off of a 0 degree viewing + /// angle (can look these values up online for various actual metals) + final Color materialColor; + + /// The following light properties model a disk shaped light pointing + /// at the sphere + final double lightRadius; + + /// alpha ignored + final Color lightColor; + + /// Light Brightness measured in luminous power (perceived total + /// brightness of light, the larger the radius the more diffused the light + /// power is for a given area) + final double lightBrightness; + + /// 0..2, Index of refraction, higher value = more refraction, + final double ior; + + /// Light attenuation factor, 0 for no attenuation, 1 is very fast attenuation + final double lightAttenuation; + + /// alpha ignored + final Color ambientLightColor; + + final double ambientLightBrightness; + + /// Modulates the ambient light brightness based off of the depth of the + /// pixel. 1 means the ambient brightness factor at the front of the orb is 0, + /// brightness factor at the back is 1. 0 means there's no change to the + /// brightness factor based on depth + final double ambientLightDepthFactor; + + /// Offset of the light relative to the center of the orb, +x is to the right + final double lightOffsetX; + + /// Offset of the light relative to the center of the orb, +y is up + final double lightOffsetY; + + /// Offset of the light relative to the center of the orb, +z is facing the camera + final double lightOffsetZ; + + OrbShaderConfig copyWith({ + double? zoom, + double? exposure, + double? roughness, + double? metalness, + Color? materialColor, + double? lightRadius, + Color? lightColor, + double? lightBrightness, + double? ior, + double? lightAttenuation, + Color? ambientLightColor, + double? ambientLightBrightness, + double? ambientLightDepthFactor, + double? lightOffsetX, + double? lightOffsetY, + double? lightOffsetZ, + }) { + return OrbShaderConfig( + zoom: zoom ?? this.zoom, + exposure: exposure ?? this.exposure, + roughness: roughness ?? this.roughness, + metalness: metalness ?? this.metalness, + materialColor: materialColor ?? this.materialColor, + lightRadius: lightRadius ?? this.lightRadius, + lightColor: lightColor ?? this.lightColor, + lightBrightness: lightBrightness ?? this.lightBrightness, + ior: ior ?? this.ior, + lightAttenuation: lightAttenuation ?? this.lightAttenuation, + ambientLightColor: ambientLightColor ?? this.ambientLightColor, + ambientLightBrightness: + ambientLightBrightness ?? this.ambientLightBrightness, + ambientLightDepthFactor: + ambientLightDepthFactor ?? this.ambientLightDepthFactor, + lightOffsetX: lightOffsetX ?? this.lightOffsetX, + lightOffsetY: lightOffsetY ?? this.lightOffsetY, + lightOffsetZ: lightOffsetZ ?? this.lightOffsetZ, + ); + } +} diff --git a/next_gen_ui_demo/lib/orb_shader/orb_shader_painter.dart b/next_gen_ui_demo/lib/orb_shader/orb_shader_painter.dart new file mode 100644 index 000000000..50213545d --- /dev/null +++ b/next_gen_ui_demo/lib/orb_shader/orb_shader_painter.dart @@ -0,0 +1,85 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; +import 'dart:ui'; + +import 'package:flutter/material.dart'; +import 'package:vector_math/vector_math_64.dart' as v64; + +import 'orb_shader_config.dart'; + +class OrbShaderPainter extends CustomPainter { + OrbShaderPainter( + this.shader, { + required this.config, + required this.time, + required this.mousePos, + required this.energy, + }); + final FragmentShader shader; + final OrbShaderConfig config; + final double time; + final Offset mousePos; + final double energy; + + @override + void paint(Canvas canvas, Size size) { + double fov = v64.mix(pi / 4.3, pi / 2.0, config.zoom.clamp(0.0, 1.0)); + + v64.Vector3 colorToVector3(Color c) => + v64.Vector3( + c.red.toDouble(), + c.green.toDouble(), + c.blue.toDouble(), + ) / + 255.0; + + v64.Vector3 lightLumP = colorToVector3(config.lightColor).normalized() * + max(0.0, config.lightBrightness); + v64.Vector3 albedo = colorToVector3(config.materialColor); + + v64.Vector3 ambientLight = colorToVector3(config.ambientLightColor) * + max(0.0, config.ambientLightBrightness); + + shader.setFloat(0, size.width); + shader.setFloat(1, size.height); + shader.setFloat(2, time); + shader.setFloat(3, max(0.0, config.exposure)); + shader.setFloat(4, fov); + shader.setFloat(5, config.roughness.clamp(0.0, 1.0)); + shader.setFloat(6, config.metalness.clamp(0.0, 1.0)); + shader.setFloat(7, config.lightOffsetX); + shader.setFloat(8, config.lightOffsetY); + shader.setFloat(9, config.lightOffsetZ); + shader.setFloat(10, config.lightRadius); + shader.setFloat(11, lightLumP.x); + shader.setFloat(12, lightLumP.y); + shader.setFloat(13, lightLumP.z); + shader.setFloat(14, albedo.x); + shader.setFloat(15, albedo.y); + shader.setFloat(16, albedo.z); + shader.setFloat(17, config.ior.clamp(0.0, 2.0)); + shader.setFloat(18, config.lightAttenuation.clamp(0.0, 1.0)); + shader.setFloat(19, ambientLight.x); + shader.setFloat(20, ambientLight.y); + shader.setFloat(21, ambientLight.z); + shader.setFloat(22, config.ambientLightDepthFactor.clamp(0.0, 1.0)); + shader.setFloat(23, energy); + + canvas.drawRect( + Rect.fromLTWH(0, 0, size.width, size.height), + Paint()..shader = shader, + ); + } + + @override + bool shouldRepaint(covariant OrbShaderPainter oldDelegate) { + return oldDelegate.shader != shader || + oldDelegate.config != config || + oldDelegate.time != time || + oldDelegate.mousePos != mousePos || + oldDelegate.energy != energy; + } +} diff --git a/next_gen_ui_demo/lib/orb_shader/orb_shader_widget.dart b/next_gen_ui_demo/lib/orb_shader/orb_shader_widget.dart new file mode 100644 index 000000000..31b6ede2e --- /dev/null +++ b/next_gen_ui_demo/lib/orb_shader/orb_shader_widget.dart @@ -0,0 +1,123 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; +import 'dart:math'; +import 'dart:ui'; + +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:provider/provider.dart'; + +import '../assets.dart'; +import '../common/reactive_widget.dart'; +import 'orb_shader_config.dart'; +import 'orb_shader_painter.dart'; + +class OrbShaderWidget extends StatefulWidget { + const OrbShaderWidget({ + super.key, + required this.config, + this.onUpdate, + required this.mousePos, + required this.minEnergy, + }); + + final double minEnergy; + final OrbShaderConfig config; + final Offset mousePos; + final void Function(double energy)? onUpdate; + + @override + State createState() => OrbShaderWidgetState(); +} + +class OrbShaderWidgetState extends State + with SingleTickerProviderStateMixin { + final _heartbeatSequence = TweenSequence( + [ + TweenSequenceItem(tween: ConstantTween(0), weight: 40), + TweenSequenceItem( + tween: Tween(begin: 0.0, end: 1.0) + .chain(CurveTween(curve: Curves.easeInOutCubic)), + weight: 8), + TweenSequenceItem( + tween: Tween(begin: 1.0, end: 0.2) + .chain(CurveTween(curve: Curves.easeInOutCubic)), + weight: 12), + TweenSequenceItem( + tween: Tween(begin: 0.2, end: 0.8) + .chain(CurveTween(curve: Curves.easeInOutCubic)), + weight: 6), + TweenSequenceItem( + tween: Tween(begin: 0.8, end: 0.0) + .chain(CurveTween(curve: Curves.easeInOutCubic)), + weight: 10), + ], + ); + + late final AnimationController _heartbeatAnim; + + @override + void initState() { + super.initState(); + _heartbeatAnim = AnimationController(vsync: this, duration: 3000.ms) + ..repeat(); + } + + @override + void dispose() { + _heartbeatAnim.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) => Consumer( + builder: (context, shaders, _) { + if (shaders == null) return const SizedBox.expand(); + return ListenableBuilder( + listenable: _heartbeatAnim, + builder: (_, __) { + final heartbeatEnergy = + _heartbeatAnim.drive(_heartbeatSequence).value; + return TweenAnimationBuilder( + tween: Tween( + begin: widget.minEnergy, end: widget.minEnergy), + duration: 300.ms, + curve: Curves.easeOutCubic, + builder: (context, minEnergy, child) { + return ReactiveWidget( + builder: (context, time, size) { + double energyLevel = 0; + if (size.shortestSide != 0) { + final d = (Offset(size.width, size.height) / 2 - + widget.mousePos) + .distance; + final hitSize = size.shortestSide * .5; + energyLevel = 1 - min(1, (d / hitSize)); + scheduleMicrotask( + () => widget.onUpdate?.call(energyLevel)); + } + energyLevel += + (1.3 - energyLevel) * heartbeatEnergy * 0.1; + energyLevel = lerpDouble(minEnergy, 1, energyLevel)!; + return CustomPaint( + size: size, + painter: OrbShaderPainter( + shaders.orb, + config: widget.config, + time: time, + mousePos: widget.mousePos, + energy: energyLevel, + ), + ); + }, + ); + }, + ); + }, + ); + }, + ); +} diff --git a/next_gen_ui_demo/lib/styles.dart b/next_gen_ui_demo/lib/styles.dart new file mode 100644 index 000000000..1e449fff3 --- /dev/null +++ b/next_gen_ui_demo/lib/styles.dart @@ -0,0 +1,35 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +class TextStyles { + static const _font1 = TextStyle(fontFamily: 'Exo', color: Colors.white); + + static TextStyle get h1 => _font1.copyWith( + fontSize: 75, letterSpacing: 35, fontWeight: FontWeight.w700); + static TextStyle get h2 => h1.copyWith(fontSize: 40, letterSpacing: 0); + static TextStyle get h3 => + h1.copyWith(fontSize: 24, letterSpacing: 20, fontWeight: FontWeight.w400); + static TextStyle get body => _font1.copyWith(fontSize: 16); + static TextStyle get btn => _font1.copyWith( + fontSize: 16, + fontWeight: FontWeight.bold, + letterSpacing: 10, + ); +} + +abstract class AppColors { + static const orbColors = [ + Color(0xFF71FDBF), + Color(0xFFCE33FF), + Color(0xFFFF5033), + ]; + + static const emitColors = [ + Color(0xFF96FF33), + Color(0xFF00FFFF), + Color(0xFFFF993E), + ]; +} diff --git a/next_gen_ui_demo/lib/title_screen/title_screen.dart b/next_gen_ui_demo/lib/title_screen/title_screen.dart new file mode 100644 index 000000000..762f824cf --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen/title_screen.dart @@ -0,0 +1,8 @@ +import 'package:flutter/material.dart'; + +import '../main.dart'; + +abstract class TitleScreenBase extends StatefulWidget { + const TitleScreenBase({super.key, required this.callback}); + final ColorCallback callback; +} diff --git a/next_gen_ui_demo/lib/title_screen_1a/title_screen.dart b/next_gen_ui_demo/lib/title_screen_1a/title_screen.dart new file mode 100644 index 000000000..c633084c4 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_1a/title_screen.dart @@ -0,0 +1,36 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + @override + Widget build(BuildContext context) { + WidgetsBinding.instance.addPostFrameCallback( + (duration) => widget.callback(AppColors.orbColors[0])); + + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + Image.asset(AssetPaths.titleBgReceive), + ], + ), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_1b/title_screen.dart b/next_gen_ui_demo/lib/title_screen_1b/title_screen.dart new file mode 100644 index 000000000..c9cc1e3ea --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_1b/title_screen.dart @@ -0,0 +1,45 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + @override + Widget build(BuildContext context) { + WidgetsBinding.instance.addPostFrameCallback( + (duration) => widget.callback(AppColors.orbColors[0])); + + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + Image.asset(AssetPaths.titleBgReceive), + + /// Mg-Base + Image.asset(AssetPaths.titleMgBase), + + /// Mg-Receive + Image.asset(AssetPaths.titleMgReceive), + + /// Mg-Emit + Image.asset(AssetPaths.titleMgEmit), + ], + ), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_2a/title_screen.dart b/next_gen_ui_demo/lib/title_screen_2a/title_screen.dart new file mode 100644 index 000000000..8997812fe --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_2a/title_screen.dart @@ -0,0 +1,54 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + @override + Widget build(BuildContext context) { + WidgetsBinding.instance.addPostFrameCallback( + (duration) => widget.callback(AppColors.orbColors[0])); + + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + Image.asset(AssetPaths.titleBgReceive), + + /// Mg-Base + Image.asset(AssetPaths.titleMgBase), + + /// Mg-Receive + Image.asset(AssetPaths.titleMgReceive), + + /// Mg-Emit + Image.asset(AssetPaths.titleMgEmit), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + Image.asset(AssetPaths.titleFgReceive), + + /// Fg-Emit + Image.asset(AssetPaths.titleFgEmit), + ], + ), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_2c/title_screen.dart b/next_gen_ui_demo/lib/title_screen_2c/title_screen.dart new file mode 100644 index 000000000..0b0aea074 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_2c/title_screen.dart @@ -0,0 +1,106 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + @override + Widget build(BuildContext context) { + final orbColor = AppColors.orbColors[0]; + final emitColor = AppColors.emitColors[0]; + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(orbColor)); + + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + lightAmt: widget._finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + lightAmt: widget._finalEmitLightAmt, + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3a/title_screen.dart b/next_gen_ui_demo/lib/title_screen_3a/title_screen.dart new file mode 100644 index 000000000..a80de4d6c --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3a/title_screen.dart @@ -0,0 +1,112 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + @override + Widget build(BuildContext context) { + final orbColor = AppColors.orbColors[0]; + final emitColor = AppColors.emitColors[0]; + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(orbColor)); + + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + lightAmt: widget._finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + lightAmt: widget._finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + lightAmt: widget._finalEmitLightAmt, + ), + + /// UI + const Positioned.fill( + child: TitleScreenUi(), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3a/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_3a/title_screen_ui.dart new file mode 100644 index 000000000..63f726ef9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3a/title_screen_ui.dart @@ -0,0 +1,62 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + }); + @override + Widget build(BuildContext context) { + return const Padding( + padding: EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ), + Text('INTO THE UNKNOWN', style: TextStyles.h3), + ], + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3b/title_screen.dart b/next_gen_ui_demo/lib/title_screen_3b/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3b/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3b/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_3b/title_screen_ui.dart new file mode 100644 index 000000000..71e099ccf --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3b/title_screen_ui.dart @@ -0,0 +1,187 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ), + Text('INTO THE UNKNOWN', style: TextStyles.h3), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + // Bg with fill and outline + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3c/title_screen.dart b/next_gen_ui_demo/lib/title_screen_3c/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3c/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_3c/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_3c/title_screen_ui.dart new file mode 100644 index 000000000..d8a43373d --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_3c/title_screen_ui.dart @@ -0,0 +1,250 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ), + Text('INTO THE UNKNOWN', style: TextStyles.h3), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ), + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4a/title_screen.dart b/next_gen_ui_demo/lib/title_screen_4a/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4a/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4a/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_4a/title_screen_ui.dart new file mode 100644 index 000000000..99693bf45 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4a/title_screen_ui.dart @@ -0,0 +1,253 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ), + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4b/title_screen.dart b/next_gen_ui_demo/lib/title_screen_4b/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4b/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4b/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_4b/title_screen_ui.dart new file mode 100644 index 000000000..0ab47845a --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4b/title_screen_ui.dart @@ -0,0 +1,262 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ), + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4c/title_screen.dart b/next_gen_ui_demo/lib/title_screen_4c/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4c/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4c/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_4c/title_screen_ui.dart new file mode 100644 index 000000000..a08d21e2c --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4c/title_screen_ui.dart @@ -0,0 +1,267 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4d/title_screen.dart b/next_gen_ui_demo/lib/title_screen_4d/title_screen.dart new file mode 100644 index 000000000..c1e02a5b9 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4d/title_screen.dart @@ -0,0 +1,139 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: _orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: _orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: _emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4d/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_4d/title_screen_ui.dart new file mode 100644 index 000000000..5900a6b63 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4d/title_screen_ui.dart @@ -0,0 +1,273 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + AnimatedOpacity( + opacity: (!selected && (state.isHovered || state.isFocused)) + ? 1 + : 0, + duration: .3.seconds, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4e/title_screen.dart b/next_gen_ui_demo/lib/title_screen_4e/title_screen.dart new file mode 100644 index 000000000..44a5a9682 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4e/title_screen.dart @@ -0,0 +1,178 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: _AnimatedColors( + orbColor: _orbColor, + emitColor: _emitColor, + builder: (_, orbColor, emitColor) { + return Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ).animate().fadeIn(duration: 1.seconds, delay: .3.seconds); + }, + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} + +class _AnimatedColors extends StatelessWidget { + const _AnimatedColors({ + required this.emitColor, + required this.orbColor, + required this.builder, + }); + + final Color emitColor; + final Color orbColor; + + final Widget Function(BuildContext context, Color orbColor, Color emitColor) + builder; + + @override + Widget build(BuildContext context) { + final duration = .5.seconds; + return TweenAnimationBuilder( + tween: ColorTween(begin: emitColor, end: emitColor), + duration: duration, + builder: (_, emitColor, __) { + return TweenAnimationBuilder( + tween: ColorTween(begin: orbColor, end: orbColor), + duration: duration, + builder: (context, orbColor, __) { + return builder(context, orbColor!, emitColor!); + }, + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_4e/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_4e/title_screen_ui.dart new file mode 100644 index 000000000..5900a6b63 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_4e/title_screen_ui.dart @@ -0,0 +1,273 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; + +import '../assets.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + AnimatedOpacity( + opacity: (!selected && (state.isHovered || state.isFocused)) + ? 1 + : 0, + duration: .3.seconds, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_5a/title_screen.dart b/next_gen_ui_demo/lib/title_screen_5a/title_screen.dart new file mode 100644 index 000000000..44a5a9682 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_5a/title_screen.dart @@ -0,0 +1,178 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; + +import '../assets.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State { + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance + .addPostFrameCallback((duration) => widget.callback(_orbColor)); + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + widget.callback(_orbColor); + } + + void _handleDifficultyFocused(int? value) { + setState(() => _difficultyOverride = value); + widget.callback(_orbColor); + } + + final _finalReceiveLightAmt = 0.7; + final _finalEmitLightAmt = 0.5; + + @override + Widget build(BuildContext context) { + return Center( + child: _AnimatedColors( + orbColor: _orbColor, + emitColor: _emitColor, + builder: (_, orbColor, emitColor) { + return Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + ), + ), + ], + ).animate().fadeIn(duration: 1.seconds, delay: .3.seconds); + }, + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: Image.asset(imgSrc), + ); + } +} + +class _AnimatedColors extends StatelessWidget { + const _AnimatedColors({ + required this.emitColor, + required this.orbColor, + required this.builder, + }); + + final Color emitColor; + final Color orbColor; + + final Widget Function(BuildContext context, Color orbColor, Color emitColor) + builder; + + @override + Widget build(BuildContext context) { + final duration = .5.seconds; + return TweenAnimationBuilder( + tween: ColorTween(begin: emitColor, end: emitColor), + duration: duration, + builder: (_, emitColor, __) { + return TweenAnimationBuilder( + tween: ColorTween(begin: orbColor, end: orbColor), + duration: duration, + builder: (context, orbColor, __) { + return builder(context, orbColor!, emitColor!); + }, + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_5a/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_5a/title_screen_ui.dart new file mode 100644 index 000000000..022577f9d --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_5a/title_screen_ui.dart @@ -0,0 +1,299 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; +import 'package:provider/provider.dart'; + +import '../assets.dart'; +import '../common/shader_effect.dart'; +import '../common/ticking_builder.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: () {}), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + Widget content = Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + return Consumer( + builder: (context, shaders, _) { + if (shaders == null) return content; + return TickingBuilder( + builder: (context, time) { + return AnimatedSampler( + (image, size, canvas) { + const double overdrawPx = 30; + shaders.ui + ..setFloat(0, size.width) + ..setFloat(1, size.height) + ..setFloat(2, time) + ..setImageSampler(0, image); + Rect rect = Rect.fromLTWH(-overdrawPx, -overdrawPx, + size.width + overdrawPx, size.height + overdrawPx); + canvas.drawRect(rect, Paint()..shader = shaders.ui); + }, + child: content, + ); + }, + ); + }, + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + AnimatedOpacity( + opacity: (!selected && (state.isHovered || state.isFocused)) + ? 1 + : 0, + duration: .3.seconds, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_5b/title_screen.dart b/next_gen_ui_demo/lib/title_screen_5b/title_screen.dart new file mode 100644 index 000000000..71d730729 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_5b/title_screen.dart @@ -0,0 +1,312 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; +import 'dart:ui'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_animate/flutter_animate.dart'; + +import '../assets.dart'; +import '../orb_shader/orb_shader_config.dart'; +import '../orb_shader/orb_shader_widget.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State + with SingleTickerProviderStateMixin { + final _orbKey = GlobalKey(); + + /// Editable Settings + /// 0-1, receive lighting strength + final _minReceiveLightAmt = .35; + final _maxReceiveLightAmt = .7; + + /// 0-1, emit lighting strength + final _minEmitLightAmt = .5; + final _maxEmitLightAmt = 1; + + /// Internal + var _mousePos = Offset.zero; + + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + double _orbEnergy = 0; + double _minOrbEnergy = 0; + + double get _finalReceiveLightAmt { + final light = + lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0; + return light + _pulseEffect.value * .05 * _orbEnergy; + } + + double get _finalEmitLightAmt { + return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0; + } + + late final AnimationController _pulseEffect; + + Duration _getRndPulseDuration() => 100.ms + 200.ms * Random().nextDouble(); + + double _getMinEnergyForDifficulty(int difficulty) { + if (difficulty == 1) { + return .3; + } else if (difficulty == 2) { + return .6; + } + return 0; + } + + @override + void initState() { + super.initState(); + _pulseEffect = AnimationController( + vsync: this, + duration: _getRndPulseDuration(), + lowerBound: -1, + upperBound: 1, + ); + _pulseEffect.forward(); + _pulseEffect.addListener(_handlePulseEffectUpdate); + } + + @override + void dispose() { + _pulseEffect.dispose(); + super.dispose(); + } + + void _handlePulseEffectUpdate() { + if (_pulseEffect.status == AnimationStatus.completed) { + _pulseEffect.reverse(); + _pulseEffect.duration = _getRndPulseDuration(); + } else if (_pulseEffect.status == AnimationStatus.dismissed) { + _pulseEffect.duration = _getRndPulseDuration(); + _pulseEffect.forward(); + } + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + _bumpMinEnergy(); + } + + Future _bumpMinEnergy([double amount = 0.1]) async { + setState(() { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty) + amount; + }); + await Future.delayed(.2.seconds); + setState(() { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty); + }); + } + + void _handleStartPressed() => _bumpMinEnergy(0.3); + + void _handleDifficultyFocused(int? value) { + setState(() { + _difficultyOverride = value; + if (value == null) { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty); + } else { + _minOrbEnergy = _getMinEnergyForDifficulty(value); + } + }); + } + + /// Update mouse position so the orbWidget can use it, doing it here prevents + /// btns from blocking the mouse-move events in the widget itself. + void _handleMouseMove(PointerHoverEvent e) { + setState(() { + _mousePos = e.localPosition; + }); + } + + @override + Widget build(BuildContext context) { + return Center( + child: MouseRegion( + onHover: _handleMouseMove, + child: _AnimatedColors( + orbColor: _orbColor, + emitColor: _emitColor, + builder: (_, orbColor, emitColor) { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + widget.callback(orbColor); + }); + return Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Orb + Positioned.fill( + child: Stack( + children: [ + // Orb + OrbShaderWidget( + key: _orbKey, + mousePos: _mousePos, + minEnergy: _minOrbEnergy, + config: OrbShaderConfig( + ambientLightColor: orbColor, + materialColor: orbColor, + lightColor: orbColor, + ), + onUpdate: (energy) => setState(() { + _orbEnergy = energy; + }), + ), + ], + ), + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + pulseEffect: _pulseEffect, + lightAmt: _finalEmitLightAmt, + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + pulseEffect: _pulseEffect, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + onStartPressed: _handleStartPressed, + ), + ), + ], + ).animate().fadeIn(duration: 1.seconds, delay: .3.seconds); + }, + ), + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.pulseEffect, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final AnimationController pulseEffect; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ListenableBuilder( + listenable: pulseEffect, + child: Image.asset(imgSrc), + builder: (context, child) { + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: child, + ); + }, + ); + } +} + +class _AnimatedColors extends StatelessWidget { + const _AnimatedColors({ + required this.emitColor, + required this.orbColor, + required this.builder, + }); + + final Color emitColor; + final Color orbColor; + + final Widget Function(BuildContext context, Color orbColor, Color emitColor) + builder; + + @override + Widget build(BuildContext context) { + final duration = .5.seconds; + return TweenAnimationBuilder( + tween: ColorTween(begin: emitColor, end: emitColor), + duration: duration, + builder: (_, emitColor, __) { + return TweenAnimationBuilder( + tween: ColorTween(begin: orbColor, end: orbColor), + duration: duration, + builder: (context, orbColor, __) { + return builder(context, orbColor!, emitColor!); + }, + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_5b/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_5b/title_screen_ui.dart new file mode 100644 index 000000000..b2f3a4da4 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_5b/title_screen_ui.dart @@ -0,0 +1,301 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; +import 'package:provider/provider.dart'; + +import '../assets.dart'; +import '../common/shader_effect.dart'; +import '../common/ticking_builder.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + required this.onStartPressed, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + final VoidCallback onStartPressed; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: onStartPressed), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + Widget content = Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + return Consumer( + builder: (context, shaders, _) { + if (shaders == null) return content; + return TickingBuilder( + builder: (context, time) { + return AnimatedSampler( + (image, size, canvas) { + const double overdrawPx = 30; + shaders.ui + ..setFloat(0, size.width) + ..setFloat(1, size.height) + ..setFloat(2, time) + ..setImageSampler(0, image); + Rect rect = Rect.fromLTWH(-overdrawPx, -overdrawPx, + size.width + overdrawPx, size.height + overdrawPx); + canvas.drawRect(rect, Paint()..shader = shaders.ui); + }, + child: content, + ); + }, + ); + }, + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + AnimatedOpacity( + opacity: (!selected && (state.isHovered || state.isFocused)) + ? 1 + : 0, + duration: .3.seconds, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_6/particle_overlay.dart b/next_gen_ui_demo/lib/title_screen_6/particle_overlay.dart new file mode 100644 index 000000000..cc540f333 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_6/particle_overlay.dart @@ -0,0 +1,67 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; + +import 'package:flutter/material.dart'; +import 'package:particle_field/particle_field.dart'; +import 'package:rnd/rnd.dart'; + +class ParticleOverlay extends StatelessWidget { + const ParticleOverlay({super.key, required this.color, required this.energy}); + + final Color color; + final double energy; + + @override + Widget build(BuildContext context) { + return ParticleField( + spriteSheet: SpriteSheet( + image: const AssetImage('assets/images/particle-wave.png'), + ), + // blend the image's alpha with the specified color: + blendMode: BlendMode.dstIn, + + // this runs every tick: + onTick: (controller, _, size) { + List particles = controller.particles; + + // add a new particle with random angle, distance & velocity: + double a = rnd(pi * 2); + double dist = rnd(1, 4) * 35 + 150 * energy; + double vel = rnd(1, 2) * (1 + energy * 1.8); + particles.add(Particle( + // how many ticks this particle will live: + lifespan: rnd(1, 2) * 20 + energy * 15, + // starting distance from center: + x: cos(a) * dist, + y: sin(a) * dist, + // starting velocity: + vx: cos(a) * vel, + vy: sin(a) * vel, + // other starting values: + rotation: a, + scale: rnd(1, 2) * 0.6 + energy * 0.5, + )); + + // update all of the particles: + for (int i = particles.length - 1; i >= 0; i--) { + Particle p = particles[i]; + if (p.lifespan <= 0) { + // particle is expired, remove it: + particles.removeAt(i); + continue; + } + p.update( + scale: p.scale * 1.025, + vx: p.vx * 1.025, + vy: p.vy * 1.025, + color: color.withOpacity(p.lifespan * 0.001 + 0.01), + lifespan: p.lifespan - 1, + ); + } + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_6/title_screen.dart b/next_gen_ui_demo/lib/title_screen_6/title_screen.dart new file mode 100644 index 000000000..dc39e0288 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_6/title_screen.dart @@ -0,0 +1,323 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; +import 'dart:ui'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_animate/flutter_animate.dart'; + +import '../assets.dart'; +import '../orb_shader/orb_shader_config.dart'; +import '../orb_shader/orb_shader_widget.dart'; +import '../styles.dart'; +import '../title_screen/title_screen.dart'; +import 'particle_overlay.dart'; +import 'title_screen_ui.dart'; + +class TitleScreen extends TitleScreenBase { + const TitleScreen({super.key, required super.callback}); + + @override + State createState() => _TitleScreenState(); +} + +class _TitleScreenState extends State + with SingleTickerProviderStateMixin { + final _orbKey = GlobalKey(); + + /// Editable Settings + /// 0-1, receive lighting strength + final _minReceiveLightAmt = .35; + final _maxReceiveLightAmt = .7; + + /// 0-1, emit lighting strength + final _minEmitLightAmt = .5; + final _maxEmitLightAmt = 1; + + /// Internal + var _mousePos = Offset.zero; + + Color get _emitColor => + AppColors.emitColors[_difficultyOverride ?? _difficulty]; + Color get _orbColor => + AppColors.orbColors[_difficultyOverride ?? _difficulty]; + + /// Currently selected difficulty + int _difficulty = 0; + + /// Currently focused difficulty (if any) + int? _difficultyOverride; + double _orbEnergy = 0; + double _minOrbEnergy = 0; + + double get _finalReceiveLightAmt { + final light = + lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0; + return light + _pulseEffect.value * .05 * _orbEnergy; + } + + double get _finalEmitLightAmt { + return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0; + } + + late final AnimationController _pulseEffect; + + Duration _getRndPulseDuration() => 100.ms + 200.ms * Random().nextDouble(); + + double _getMinEnergyForDifficulty(int difficulty) { + if (difficulty == 1) { + return .3; + } else if (difficulty == 2) { + return .6; + } + return 0; + } + + @override + void initState() { + super.initState(); + _pulseEffect = AnimationController( + vsync: this, + duration: _getRndPulseDuration(), + lowerBound: -1, + upperBound: 1, + ); + _pulseEffect.forward(); + _pulseEffect.addListener(_handlePulseEffectUpdate); + } + + @override + void dispose() { + _pulseEffect.dispose(); + super.dispose(); + } + + void _handlePulseEffectUpdate() { + if (_pulseEffect.status == AnimationStatus.completed) { + _pulseEffect.reverse(); + _pulseEffect.duration = _getRndPulseDuration(); + } else if (_pulseEffect.status == AnimationStatus.dismissed) { + _pulseEffect.duration = _getRndPulseDuration(); + _pulseEffect.forward(); + } + } + + void _handleDifficultyPressed(int value) { + setState(() => _difficulty = value); + _bumpMinEnergy(); + } + + Future _bumpMinEnergy([double amount = 0.1]) async { + setState(() { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty) + amount; + }); + await Future.delayed(.2.seconds); + setState(() { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty); + }); + } + + void _handleStartPressed() => _bumpMinEnergy(0.3); + + void _handleDifficultyFocused(int? value) { + setState(() { + _difficultyOverride = value; + if (value == null) { + _minOrbEnergy = _getMinEnergyForDifficulty(_difficulty); + } else { + _minOrbEnergy = _getMinEnergyForDifficulty(value); + } + }); + } + + /// Update mouse position so the orbWidget can use it, doing it here prevents + /// btns from blocking the mouse-move events in the widget itself. + void _handleMouseMove(PointerHoverEvent e) { + setState(() { + _mousePos = e.localPosition; + }); + } + + @override + Widget build(BuildContext context) { + return Center( + child: MouseRegion( + onHover: _handleMouseMove, + child: _AnimatedColors( + orbColor: _orbColor, + emitColor: _emitColor, + builder: (_, orbColor, emitColor) { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + widget.callback(orbColor); + }); + return Stack( + children: [ + /// Bg-Base + Image.asset(AssetPaths.titleBgBase), + + /// Bg-Receive + _LitImage( + color: orbColor, + imgSrc: AssetPaths.titleBgReceive, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Orb + Positioned.fill( + child: Stack( + children: [ + // Orb + OrbShaderWidget( + key: _orbKey, + mousePos: _mousePos, + minEnergy: _minOrbEnergy, + config: OrbShaderConfig( + ambientLightColor: orbColor, + materialColor: orbColor, + lightColor: orbColor, + ), + onUpdate: (energy) => setState(() { + _orbEnergy = energy; + }), + ), + ], + ), + ), + + /// Mg-Base + _LitImage( + imgSrc: AssetPaths.titleMgBase, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Receive + _LitImage( + imgSrc: AssetPaths.titleMgReceive, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Mg-Emit + _LitImage( + imgSrc: AssetPaths.titleMgEmit, + color: emitColor, + pulseEffect: _pulseEffect, + lightAmt: _finalEmitLightAmt, + ), + + /// Particle Field + Positioned.fill( + child: IgnorePointer( + child: ParticleOverlay( + color: orbColor, + energy: _orbEnergy, + ), + ), + ), + + /// Fg-Rocks + Image.asset(AssetPaths.titleFgBase), + + /// Fg-Receive + _LitImage( + imgSrc: AssetPaths.titleFgReceive, + color: orbColor, + pulseEffect: _pulseEffect, + lightAmt: _finalReceiveLightAmt, + ), + + /// Fg-Emit + _LitImage( + imgSrc: AssetPaths.titleFgEmit, + color: emitColor, + pulseEffect: _pulseEffect, + lightAmt: _finalEmitLightAmt, + ), + + /// UI + Positioned.fill( + child: TitleScreenUi( + difficulty: _difficulty, + onDifficultyFocused: _handleDifficultyFocused, + onDifficultyPressed: _handleDifficultyPressed, + onStartPressed: _handleStartPressed, + ), + ), + ], + ).animate().fadeIn(duration: 1.seconds, delay: .3.seconds); + }, + ), + ), + ); + } +} + +class _LitImage extends StatelessWidget { + const _LitImage({ + required this.color, + required this.imgSrc, + required this.pulseEffect, + required this.lightAmt, + }); + final Color color; + final String imgSrc; + final AnimationController pulseEffect; + final double lightAmt; + + @override + Widget build(BuildContext context) { + final hsl = HSLColor.fromColor(color); + return ListenableBuilder( + listenable: pulseEffect, + child: Image.asset(imgSrc), + builder: (context, child) { + return ColorFiltered( + colorFilter: ColorFilter.mode( + hsl.withLightness(hsl.lightness * lightAmt).toColor(), + BlendMode.modulate, + ), + child: child, + ); + }, + ); + } +} + +class _AnimatedColors extends StatelessWidget { + const _AnimatedColors({ + required this.emitColor, + required this.orbColor, + required this.builder, + }); + + final Color emitColor; + final Color orbColor; + + final Widget Function(BuildContext context, Color orbColor, Color emitColor) + builder; + + @override + Widget build(BuildContext context) { + final duration = .5.seconds; + return TweenAnimationBuilder( + tween: ColorTween(begin: emitColor, end: emitColor), + duration: duration, + builder: (_, emitColor, __) { + return TweenAnimationBuilder( + tween: ColorTween(begin: orbColor, end: orbColor), + duration: duration, + builder: (context, orbColor, __) { + return builder(context, orbColor!, emitColor!); + }, + ); + }, + ); + } +} diff --git a/next_gen_ui_demo/lib/title_screen_6/title_screen_ui.dart b/next_gen_ui_demo/lib/title_screen_6/title_screen_ui.dart new file mode 100644 index 000000000..b2f3a4da4 --- /dev/null +++ b/next_gen_ui_demo/lib/title_screen_6/title_screen_ui.dart @@ -0,0 +1,301 @@ +// Copyright 2023 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:extra_alignments/extra_alignments.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:focusable_control_builder/focusable_control_builder.dart'; +import 'package:gap/gap.dart'; +import 'package:provider/provider.dart'; + +import '../assets.dart'; +import '../common/shader_effect.dart'; +import '../common/ticking_builder.dart'; +import '../common/ui_scaler.dart'; +import '../styles.dart'; + +class TitleScreenUi extends StatelessWidget { + const TitleScreenUi({ + super.key, + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + required this.onStartPressed, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + final VoidCallback onStartPressed; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 40, horizontal: 50), + child: Stack( + children: [ + /// Title Text + const TopLeft( + child: UiScaler( + alignment: Alignment.topLeft, + child: _TitleText(), + ), + ), + + /// Difficulty Btns + BottomLeft( + child: UiScaler( + alignment: Alignment.bottomLeft, + child: _DifficultyBtns( + difficulty: difficulty, + onDifficultyPressed: onDifficultyPressed, + onDifficultyFocused: onDifficultyFocused, + ), + ), + ), + + /// StartBtn + BottomRight( + child: UiScaler( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(bottom: 20, right: 40), + child: _StartBtn(onPressed: onStartPressed), + ), + ), + ), + ], + ), + ); + } +} + +class _TitleText extends StatelessWidget { + const _TitleText(); + + @override + Widget build(BuildContext context) { + Widget content = Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Gap(20), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Transform.translate( + offset: Offset(-(TextStyles.h1.letterSpacing! * .5), 0), + child: Text('OUTPOST', style: TextStyles.h1), + ), + Image.asset(AssetPaths.titleSelectedLeft, height: 65), + Text('57', style: TextStyles.h2), + Image.asset(AssetPaths.titleSelectedRight, height: 65), + ], + ).animate().fadeIn(delay: .8.seconds, duration: .7.seconds), + Text('INTO THE UNKNOWN', style: TextStyles.h3) + .animate() + .fadeIn(delay: 1.seconds, duration: .7.seconds), + ], + ); + return Consumer( + builder: (context, shaders, _) { + if (shaders == null) return content; + return TickingBuilder( + builder: (context, time) { + return AnimatedSampler( + (image, size, canvas) { + const double overdrawPx = 30; + shaders.ui + ..setFloat(0, size.width) + ..setFloat(1, size.height) + ..setFloat(2, time) + ..setImageSampler(0, image); + Rect rect = Rect.fromLTWH(-overdrawPx, -overdrawPx, + size.width + overdrawPx, size.height + overdrawPx); + canvas.drawRect(rect, Paint()..shader = shaders.ui); + }, + child: content, + ); + }, + ); + }, + ); + } +} + +class _DifficultyBtns extends StatelessWidget { + const _DifficultyBtns({ + required this.difficulty, + required this.onDifficultyPressed, + required this.onDifficultyFocused, + }); + + final int difficulty; + final void Function(int difficulty) onDifficultyPressed; + final void Function(int? difficulty) onDifficultyFocused; + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + _DifficultyBtn( + label: 'Casual', + selected: difficulty == 0, + onPressed: () => onDifficultyPressed(0), + onHover: (over) => onDifficultyFocused(over ? 0 : null), + ) + .animate() + .fadeIn(delay: 1.3.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Normal', + selected: difficulty == 1, + onPressed: () => onDifficultyPressed(1), + onHover: (over) => onDifficultyFocused(over ? 1 : null), + ) + .animate() + .fadeIn(delay: 1.5.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + _DifficultyBtn( + label: 'Hardcore', + selected: difficulty == 2, + onPressed: () => onDifficultyPressed(2), + onHover: (over) => onDifficultyFocused(over ? 2 : null), + ) + .animate() + .fadeIn(delay: 1.7.seconds, duration: .35.seconds) + .slide(begin: const Offset(0, .2)), + const Gap(20), + ], + ); + } +} + +class _DifficultyBtn extends StatelessWidget { + const _DifficultyBtn({ + required this.selected, + required this.onPressed, + required this.onHover, + required this.label, + }); + final String label; + final bool selected; + final VoidCallback onPressed; + final void Function(bool hasFocus) onHover; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + onPressed: onPressed, + onHoverChanged: (_, state) => onHover.call(state.isHovered), + builder: (_, state) { + return Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + width: 250, + height: 60, + child: Stack( + children: [ + /// Bg with fill and outline + AnimatedOpacity( + opacity: (!selected && (state.isHovered || state.isFocused)) + ? 1 + : 0, + duration: .3.seconds, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + border: Border.all(color: Colors.white, width: 5), + ), + ), + ), + + if (state.isHovered || state.isFocused) ...[ + Container( + decoration: BoxDecoration( + color: const Color(0xFF00D1FF).withOpacity(.1), + ), + ), + ], + + /// cross-hairs (selected state) + if (selected) ...[ + CenterLeft( + child: Image.asset(AssetPaths.titleSelectedLeft), + ), + CenterRight( + child: Image.asset(AssetPaths.titleSelectedRight), + ), + ], + + /// Label + Center( + child: Text(label.toUpperCase(), style: TextStyles.btn), + ), + ], + ), + ), + ); + }, + ); + } +} + +class _StartBtn extends StatefulWidget { + const _StartBtn({required this.onPressed}); + final VoidCallback onPressed; + + @override + State<_StartBtn> createState() => _StartBtnState(); +} + +class _StartBtnState extends State<_StartBtn> { + AnimationController? _btnAnim; + bool _wasHovered = false; + + @override + Widget build(BuildContext context) { + return FocusableControlBuilder( + cursor: SystemMouseCursors.click, + onPressed: widget.onPressed, + builder: (_, state) { + if ((state.isHovered || state.isFocused) && + !_wasHovered && + _btnAnim?.status != AnimationStatus.forward) { + _btnAnim?.forward(from: 0); + } + _wasHovered = (state.isHovered || state.isFocused); + return SizedBox( + width: 520, + height: 100, + child: Stack( + children: [ + Positioned.fill(child: Image.asset(AssetPaths.titleStartBtn)), + if (state.isHovered || state.isFocused) ...[ + Positioned.fill( + child: Image.asset(AssetPaths.titleStartBtnHover)), + ], + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text('START MISSION', + style: TextStyles.btn + .copyWith(fontSize: 24, letterSpacing: 18)), + ], + ), + ), + ], + ) + .animate(autoPlay: false, onInit: (c) => _btnAnim = c) + .shimmer(duration: .7.seconds, color: Colors.black), + ) + .animate() + .fadeIn(delay: 2.3.seconds) + .slide(begin: const Offset(0, .2)); + }, + ); + } +} diff --git a/next_gen_ui_demo/linux/.gitignore b/next_gen_ui_demo/linux/.gitignore new file mode 100644 index 000000000..d3896c984 --- /dev/null +++ b/next_gen_ui_demo/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/next_gen_ui_demo/linux/CMakeLists.txt b/next_gen_ui_demo/linux/CMakeLists.txt new file mode 100644 index 000000000..6536ea36f --- /dev/null +++ b/next_gen_ui_demo/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 "next_gen_ui_demo") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.next_gen_ui_demo") + +# 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/next_gen_ui_demo/linux/flutter/CMakeLists.txt b/next_gen_ui_demo/linux/flutter/CMakeLists.txt new file mode 100644 index 000000000..d5bd01648 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/linux/flutter/generated_plugin_registrant.cc b/next_gen_ui_demo/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..9f8c70320 --- /dev/null +++ b/next_gen_ui_demo/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) window_size_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WindowSizePlugin"); + window_size_plugin_register_with_registrar(window_size_registrar); +} diff --git a/next_gen_ui_demo/linux/flutter/generated_plugin_registrant.h b/next_gen_ui_demo/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..e0f0a47bc --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/linux/flutter/generated_plugins.cmake b/next_gen_ui_demo/linux/flutter/generated_plugins.cmake new file mode 100644 index 000000000..12c7443ed --- /dev/null +++ b/next_gen_ui_demo/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + window_size +) + +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/next_gen_ui_demo/linux/main.cc b/next_gen_ui_demo/linux/main.cc new file mode 100644 index 000000000..e7c5c5437 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/linux/my_application.cc b/next_gen_ui_demo/linux/my_application.cc new file mode 100644 index 000000000..54af944d7 --- /dev/null +++ b/next_gen_ui_demo/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, "next_gen_ui_demo"); + 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, "next_gen_ui_demo"); + } + + 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/next_gen_ui_demo/linux/my_application.h b/next_gen_ui_demo/linux/my_application.h new file mode 100644 index 000000000..72271d5e4 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/.gitignore b/next_gen_ui_demo/macos/.gitignore new file mode 100644 index 000000000..746adbb6b --- /dev/null +++ b/next_gen_ui_demo/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/next_gen_ui_demo/macos/Flutter/Flutter-Debug.xcconfig b/next_gen_ui_demo/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 000000000..4b81f9b2d --- /dev/null +++ b/next_gen_ui_demo/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/next_gen_ui_demo/macos/Flutter/Flutter-Release.xcconfig b/next_gen_ui_demo/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 000000000..5caa9d157 --- /dev/null +++ b/next_gen_ui_demo/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/next_gen_ui_demo/macos/Flutter/GeneratedPluginRegistrant.swift b/next_gen_ui_demo/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 000000000..f5cde84ba --- /dev/null +++ b/next_gen_ui_demo/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,12 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import window_size + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + WindowSizePlugin.register(with: registry.registrar(forPlugin: "WindowSizePlugin")) +} diff --git a/next_gen_ui_demo/macos/Podfile b/next_gen_ui_demo/macos/Podfile new file mode 100644 index 000000000..c795730db --- /dev/null +++ b/next_gen_ui_demo/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/next_gen_ui_demo/macos/Runner.xcodeproj/project.pbxproj b/next_gen_ui_demo/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 000000000..e75664cb4 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,791 @@ +// !$*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 */; }; + ABB066A132A1BA0CBE20C0BD /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF58516448207D044C6F9D9 /* Pods_RunnerTests.framework */; }; + FB7E38012F89174D1CC5B1A2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDAC3C9896E370890B04D0D4 /* Pods_Runner.framework */; }; +/* 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 */ + 13447278AB813B2C91CB09A3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 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 /* next_gen_ui_demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = next_gen_ui_demo.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 = ""; }; + 4FF58516448207D044C6F9D9 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 62FF126D066A3CF7AF63EF2C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 8ADC6DB37680AD82C2E0D691 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 8CF1BE027B40A35D90DD0AD5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + AF1A7D8E53B75D8268CEA628 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDAC3C9896E370890B04D0D4 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E26EDB8CF02E2E36276DFA4D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ABB066A132A1BA0CBE20C0BD /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FB7E38012F89174D1CC5B1A2 /* Pods_Runner.framework in Frameworks */, + ); + 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 */, + 3B07D42246158CA4F8A385C4 /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* next_gen_ui_demo.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 = ""; + }; + 3B07D42246158CA4F8A385C4 /* Pods */ = { + isa = PBXGroup; + children = ( + E26EDB8CF02E2E36276DFA4D /* Pods-Runner.debug.xcconfig */, + 62FF126D066A3CF7AF63EF2C /* Pods-Runner.release.xcconfig */, + 13447278AB813B2C91CB09A3 /* Pods-Runner.profile.xcconfig */, + AF1A7D8E53B75D8268CEA628 /* Pods-RunnerTests.debug.xcconfig */, + 8CF1BE027B40A35D90DD0AD5 /* Pods-RunnerTests.release.xcconfig */, + 8ADC6DB37680AD82C2E0D691 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + BDAC3C9896E370890B04D0D4 /* Pods_Runner.framework */, + 4FF58516448207D044C6F9D9 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 55BDBBCAEC1A5716A719AF8A /* [CP] Check Pods Manifest.lock */, + 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 = ( + 0F2BE1FD9BD1668EFDD3EBCD /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + 7E97DA7F841A159D00648459 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* next_gen_ui_demo.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + 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 */ + 0F2BE1FD9BD1668EFDD3EBCD /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 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"; + }; + 55BDBBCAEC1A5716A719AF8A /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 7E97DA7F841A159D00648459 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* 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; + baseConfigurationReference = AF1A7D8E53B75D8268CEA628 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.nextGenUiDemo.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/next_gen_ui_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/next_gen_ui_demo"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8CF1BE027B40A35D90DD0AD5 /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.nextGenUiDemo.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/next_gen_ui_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/next_gen_ui_demo"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8ADC6DB37680AD82C2E0D691 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.nextGenUiDemo.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/next_gen_ui_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/next_gen_ui_demo"; + }; + 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/next_gen_ui_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/next_gen_ui_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/next_gen_ui_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/next_gen_ui_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 000000000..312f48fdf --- /dev/null +++ b/next_gen_ui_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/macos/Runner.xcworkspace/contents.xcworkspacedata b/next_gen_ui_demo/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..21a3cc14c --- /dev/null +++ b/next_gen_ui_demo/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/next_gen_ui_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/next_gen_ui_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/next_gen_ui_demo/macos/Runner/AppDelegate.swift b/next_gen_ui_demo/macos/Runner/AppDelegate.swift new file mode 100644 index 000000000..d53ef6437 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..a2ec33f19 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 000000000..82b6f9d9a Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 000000000..13b35eba5 Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 000000000..0a3f5fa40 Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 000000000..bdb57226d Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 000000000..f083318e0 Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 000000000..326c0e72c Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 000000000..2f1632cfd Binary files /dev/null and b/next_gen_ui_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/next_gen_ui_demo/macos/Runner/Base.lproj/MainMenu.xib b/next_gen_ui_demo/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 000000000..80e867a4e --- /dev/null +++ b/next_gen_ui_demo/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/macos/Runner/Configs/AppInfo.xcconfig b/next_gen_ui_demo/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 000000000..65a573d21 --- /dev/null +++ b/next_gen_ui_demo/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 = next_gen_ui_demo + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.nextGenUiDemo + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/next_gen_ui_demo/macos/Runner/Configs/Debug.xcconfig b/next_gen_ui_demo/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 000000000..36b0fd946 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/next_gen_ui_demo/macos/Runner/Configs/Release.xcconfig b/next_gen_ui_demo/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 000000000..dff4f4956 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/next_gen_ui_demo/macos/Runner/Configs/Warnings.xcconfig b/next_gen_ui_demo/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 000000000..42bcbf478 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/DebugProfile.entitlements b/next_gen_ui_demo/macos/Runner/DebugProfile.entitlements new file mode 100644 index 000000000..dddb8a30c --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/Info.plist b/next_gen_ui_demo/macos/Runner/Info.plist new file mode 100644 index 000000000..4789daa6a --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/MainFlutterWindow.swift b/next_gen_ui_demo/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 000000000..3cc05eb23 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/macos/Runner/Release.entitlements b/next_gen_ui_demo/macos/Runner/Release.entitlements new file mode 100644 index 000000000..852fa1a47 --- /dev/null +++ b/next_gen_ui_demo/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/next_gen_ui_demo/macos/RunnerTests/RunnerTests.swift b/next_gen_ui_demo/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..5418c9f53 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/pubspec.yaml b/next_gen_ui_demo/pubspec.yaml new file mode 100644 index 000000000..0a0cf36ed --- /dev/null +++ b/next_gen_ui_demo/pubspec.yaml @@ -0,0 +1,46 @@ +name: next_gen_ui_demo +description: Building a Next Generation UI in Flutter +publish_to: 'none' +version: 0.1.0 + +environment: + sdk: '>=3.0.0-417.4.beta <4.0.0' + +dependencies: + cupertino_icons: ^1.0.5 + extra_alignments: ^1.0.0+1 + flextras: ^1.0.0 + flutter: + sdk: flutter + flutter_animate: ^4.1.1+1 + focusable_control_builder: ^1.0.1+1 + gap: ^3.0.0 + particle_field: ^1.0.0 + provider: ^6.0.5 + rnd: ^0.2.0 + vector_math: ^2.1.4 + window_size: + git: + url: https://github.com/google/flutter-desktop-embedding.git + path: plugins/window_size + +dev_dependencies: + analysis_defaults: + path: ../analysis_defaults + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + +flutter: + uses-material-design: true + fonts: + - family: Exo + fonts: + - asset: assets/fonts/Exo-Bold.ttf + - asset: assets/fonts/Exo-Medium.ttf + assets: + - assets/images/ + - assets/fonts/ + shaders: + - assets/shaders/orb_shader.frag + - assets/shaders/ui_glitch.frag diff --git a/next_gen_ui_demo/test/widget_test.dart b/next_gen_ui_demo/test/widget_test.dart new file mode 100644 index 000000000..67f93e2f7 --- /dev/null +++ b/next_gen_ui_demo/test/widget_test.dart @@ -0,0 +1,24 @@ +// 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_test/flutter_test.dart'; +import 'package:next_gen_ui_demo/assets.dart'; +import 'package:next_gen_ui_demo/main.dart'; +import 'package:provider/provider.dart'; + +void main() { + testWidgets('Smoke test', (tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget( + FutureProvider( + create: (context) => loadShaders(), + initialData: null, + child: const NextGenApp(), + ), + ); + }); +} diff --git a/next_gen_ui_demo/web/favicon.png b/next_gen_ui_demo/web/favicon.png new file mode 100644 index 000000000..8aaa46ac1 Binary files /dev/null and b/next_gen_ui_demo/web/favicon.png differ diff --git a/next_gen_ui_demo/web/icons/Icon-192.png b/next_gen_ui_demo/web/icons/Icon-192.png new file mode 100644 index 000000000..b749bfef0 Binary files /dev/null and b/next_gen_ui_demo/web/icons/Icon-192.png differ diff --git a/next_gen_ui_demo/web/icons/Icon-512.png b/next_gen_ui_demo/web/icons/Icon-512.png new file mode 100644 index 000000000..88cfd48df Binary files /dev/null and b/next_gen_ui_demo/web/icons/Icon-512.png differ diff --git a/next_gen_ui_demo/web/icons/Icon-maskable-192.png b/next_gen_ui_demo/web/icons/Icon-maskable-192.png new file mode 100644 index 000000000..eb9b4d76e Binary files /dev/null and b/next_gen_ui_demo/web/icons/Icon-maskable-192.png differ diff --git a/next_gen_ui_demo/web/icons/Icon-maskable-512.png b/next_gen_ui_demo/web/icons/Icon-maskable-512.png new file mode 100644 index 000000000..d69c56691 Binary files /dev/null and b/next_gen_ui_demo/web/icons/Icon-maskable-512.png differ diff --git a/next_gen_ui_demo/web/index.html b/next_gen_ui_demo/web/index.html new file mode 100644 index 000000000..ded726ba0 --- /dev/null +++ b/next_gen_ui_demo/web/index.html @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + next_gen_ui_demo + + + + + + + + + + diff --git a/next_gen_ui_demo/web/manifest.json b/next_gen_ui_demo/web/manifest.json new file mode 100644 index 000000000..d944af852 --- /dev/null +++ b/next_gen_ui_demo/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "next_gen_ui_demo", + "short_name": "next_gen_ui_demo", + "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/next_gen_ui_demo/windows/.gitignore b/next_gen_ui_demo/windows/.gitignore new file mode 100644 index 000000000..d492d0d98 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/CMakeLists.txt b/next_gen_ui_demo/windows/CMakeLists.txt new file mode 100644 index 000000000..735431dfc --- /dev/null +++ b/next_gen_ui_demo/windows/CMakeLists.txt @@ -0,0 +1,102 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(next_gen_ui_demo 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 "next_gen_ui_demo") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# 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/next_gen_ui_demo/windows/flutter/CMakeLists.txt b/next_gen_ui_demo/windows/flutter/CMakeLists.txt new file mode 100644 index 000000000..930d2071a --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/flutter/generated_plugin_registrant.cc b/next_gen_ui_demo/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..9372fc507 --- /dev/null +++ b/next_gen_ui_demo/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + WindowSizePluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowSizePlugin")); +} diff --git a/next_gen_ui_demo/windows/flutter/generated_plugin_registrant.h b/next_gen_ui_demo/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..dc139d85a --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/flutter/generated_plugins.cmake b/next_gen_ui_demo/windows/flutter/generated_plugins.cmake new file mode 100644 index 000000000..ff2147b2c --- /dev/null +++ b/next_gen_ui_demo/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + window_size +) + +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/next_gen_ui_demo/windows/runner/CMakeLists.txt b/next_gen_ui_demo/windows/runner/CMakeLists.txt new file mode 100644 index 000000000..394917c05 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/Runner.rc b/next_gen_ui_demo/windows/runner/Runner.rc new file mode 100644 index 000000000..fe2e086c2 --- /dev/null +++ b/next_gen_ui_demo/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", "next_gen_ui_demo" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "next_gen_ui_demo" "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "next_gen_ui_demo.exe" "\0" + VALUE "ProductName", "next_gen_ui_demo" "\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/next_gen_ui_demo/windows/runner/flutter_window.cpp b/next_gen_ui_demo/windows/runner/flutter_window.cpp new file mode 100644 index 000000000..b25e363ef --- /dev/null +++ b/next_gen_ui_demo/windows/runner/flutter_window.cpp @@ -0,0 +1,66 @@ +#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(); + }); + + 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/next_gen_ui_demo/windows/runner/flutter_window.h b/next_gen_ui_demo/windows/runner/flutter_window.h new file mode 100644 index 000000000..6da0652f0 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/main.cpp b/next_gen_ui_demo/windows/runner/main.cpp new file mode 100644 index 000000000..7e2172eba --- /dev/null +++ b/next_gen_ui_demo/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"next_gen_ui_demo", 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/next_gen_ui_demo/windows/runner/resource.h b/next_gen_ui_demo/windows/runner/resource.h new file mode 100644 index 000000000..66a65d1e4 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/resources/app_icon.ico b/next_gen_ui_demo/windows/runner/resources/app_icon.ico new file mode 100644 index 000000000..c04e20caf Binary files /dev/null and b/next_gen_ui_demo/windows/runner/resources/app_icon.ico differ diff --git a/next_gen_ui_demo/windows/runner/runner.exe.manifest b/next_gen_ui_demo/windows/runner/runner.exe.manifest new file mode 100644 index 000000000..a42ea7687 --- /dev/null +++ b/next_gen_ui_demo/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/next_gen_ui_demo/windows/runner/utils.cpp b/next_gen_ui_demo/windows/runner/utils.cpp new file mode 100644 index 000000000..b2b08734d --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/utils.h b/next_gen_ui_demo/windows/runner/utils.h new file mode 100644 index 000000000..3879d5475 --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/win32_window.cpp b/next_gen_ui_demo/windows/runner/win32_window.cpp new file mode 100644 index 000000000..60608d0fe --- /dev/null +++ b/next_gen_ui_demo/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/next_gen_ui_demo/windows/runner/win32_window.h b/next_gen_ui_demo/windows/runner/win32_window.h new file mode 100644 index 000000000..e901dde68 --- /dev/null +++ b/next_gen_ui_demo/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_ diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index ce5df798b..c8a078fe0 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -50,6 +50,7 @@ declare -ar PROJECT_NAMES=( "material_3_demo" # TODO(DomesticMouse): The '!' will have no effect because the receiver can't be null. # "navigation_and_routing" + "next_gen_ui_demo" "place_tracker" # TODO: https://github.com/flutter/samples/issues/1765 # "platform_channels" diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh index 2bf77306a..17298ca68 100755 --- a/tool/flutter_ci_script_master.sh +++ b/tool/flutter_ci_script_master.sh @@ -50,6 +50,7 @@ declare -ar PROJECT_NAMES=( "material_3_demo" # TODO(DomesticMouse): The '!' will have no effect because the receiver can't be null. # "navigation_and_routing" + "next_gen_ui_demo" "place_tracker" # TODO: https://github.com/flutter/samples/issues/1765 # "platform_channels" diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh index e0fff284e..59b04e10b 100755 --- a/tool/flutter_ci_script_stable.sh +++ b/tool/flutter_ci_script_stable.sh @@ -47,6 +47,7 @@ declare -ar PROJECT_NAMES=( "jsonexample" "material_3_demo" "navigation_and_routing" + "next_gen_ui_demo" "place_tracker" # TODO: https://github.com/flutter/samples/issues/1765 # "platform_channels"