diff --git a/experimental/material_3_demo/.gitignore b/experimental/material_3_demo/.gitignore deleted file mode 100644 index a8e938c08..000000000 --- a/experimental/material_3_demo/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# 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/ - -# Web related -lib/generated_plugin_registrant.dart - -# 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/experimental/material_3_demo/.metadata b/experimental/material_3_demo/.metadata deleted file mode 100644 index a7cbe7932..000000000 --- a/experimental/material_3_demo/.metadata +++ /dev/null @@ -1,45 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled. - -version: - revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - channel: beta - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: android - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: ios - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: linux - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: macos - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: web - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - platform: windows - create_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - base_revision: 0df8557c56a182d31fa024eeb08c428ae52edf7f - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/experimental/material_3_demo/README.md b/experimental/material_3_demo/README.md deleted file mode 100644 index 5004795c7..000000000 --- a/experimental/material_3_demo/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# Material 3 Demo - -This sample Flutter app showcases Material 3 features in the Flutter Material library. These features include updated components, typography, color system and elevation support. The app supports light and dark themes, different color palettes, as well as the ability to switch between Material 2 and Material 3. For more information about Material 3, the guidance is now live at https://m3.material.io/. - -This app also includes new M3 components that haven't landed in the Flutter stable channel, such as IconButtons, Chips, TextFields, Switches, Checkboxes, Radio buttons and ProgressIndicators. The app will be migrated to the non-experimental directory in the samples repo once all the components land in the stable branch. For more information about the components in the stable channel, please check the "material_3_demo" in the non-experimental directory. - -# Preview - -Screen Shot 2022-08-12 at 12 00 28 PMScreen Shot 2022-08-12 at 12 00 38 PM - - -# Features -## Icon Buttons on the Top App Bar - Users can switch between a light or dark theme with this button. - - Users can switch between Material 2 and Material 3 for the displayed components with this button. - - This button will bring up a pop-up menu that allows the user to change the base color used for the light and dark themes. This uses a new color seed feature to generate entire color schemes from a single color. - -## Component Screen -The default screen displays all the updated components in Material 3: AppBar, common Buttons, Floating Action Button(FAB), Chips, Card, Checkbox, Dialog, NavigationBar, NavigationRail, ProgressIndicators, Radio buttons, TextFields and Switch. - -### Adaptive Layout -Based on the fact that NavigationRail is not recommended on a small screen, the app changes its layout based on the screen width. If it's played on iOS or Android devices which have a narrow screen, a Navigation Bar will show at the bottom and will be used to navigate. But if it's played as a desktop or a web app, a Navigation Rail will show on the left side and at the same time, a Navigation Bar will show as an example but will not have any functionality. - -Users can see both layouts on one device by running a desktop app and adjusting the screen width. - -## Color Screen -With Material 3, we have added support for generating a full color scheme from a single seed color. The Color Screen shows users all of the colors in light and dark color palettes that are generated from the currently selected color. - -## Typography Screen -The Typography Screen displays the text styles used in for the default TextTheme. - -## Elevation Screen -The Elevation screen shows different ways of elevation with a new supported feature "surfaceTintColor" in the Material library. diff --git a/experimental/material_3_demo/analysis_options.yaml b/experimental/material_3_demo/analysis_options.yaml deleted file mode 100644 index 13d6fe105..000000000 --- a/experimental/material_3_demo/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: package:analysis_defaults/flutter.yaml diff --git a/experimental/material_3_demo/android/.gitignore b/experimental/material_3_demo/android/.gitignore deleted file mode 100644 index 6f568019d..000000000 --- a/experimental/material_3_demo/android/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -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/experimental/material_3_demo/android/app/build.gradle b/experimental/material_3_demo/android/app/build.gradle deleted file mode 100644 index 70c38f517..000000000 --- a/experimental/material_3_demo/android/app/build.gradle +++ /dev/null @@ -1,71 +0,0 @@ -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 { - 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.material_3_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/experimental/material_3_demo/android/app/src/debug/AndroidManifest.xml b/experimental/material_3_demo/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 2773b0bca..000000000 --- a/experimental/material_3_demo/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/experimental/material_3_demo/android/app/src/main/AndroidManifest.xml b/experimental/material_3_demo/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index a863694d1..000000000 --- a/experimental/material_3_demo/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/android/app/src/main/kotlin/com/example/material_3_demo/MainActivity.kt b/experimental/material_3_demo/android/app/src/main/kotlin/com/example/material_3_demo/MainActivity.kt deleted file mode 100644 index db3a75c76..000000000 --- a/experimental/material_3_demo/android/app/src/main/kotlin/com/example/material_3_demo/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.material_3_demo - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/experimental/material_3_demo/android/app/src/main/res/drawable-v21/launch_background.xml b/experimental/material_3_demo/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index f74085f3f..000000000 --- a/experimental/material_3_demo/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/experimental/material_3_demo/android/app/src/main/res/drawable/launch_background.xml b/experimental/material_3_demo/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f88..000000000 --- a/experimental/material_3_demo/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/experimental/material_3_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/experimental/material_3_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4b7..000000000 Binary files a/experimental/material_3_demo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/experimental/material_3_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/experimental/material_3_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b79b..000000000 Binary files a/experimental/material_3_demo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/experimental/material_3_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/experimental/material_3_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 09d439148..000000000 Binary files a/experimental/material_3_demo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/experimental/material_3_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/experimental/material_3_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d34..000000000 Binary files a/experimental/material_3_demo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/experimental/material_3_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/experimental/material_3_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372eeb..000000000 Binary files a/experimental/material_3_demo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/experimental/material_3_demo/android/app/src/main/res/values-night/styles.xml b/experimental/material_3_demo/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 06952be74..000000000 --- a/experimental/material_3_demo/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/experimental/material_3_demo/android/app/src/main/res/values/styles.xml b/experimental/material_3_demo/android/app/src/main/res/values/styles.xml deleted file mode 100644 index cb1ef8805..000000000 --- a/experimental/material_3_demo/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/experimental/material_3_demo/android/app/src/profile/AndroidManifest.xml b/experimental/material_3_demo/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index 2773b0bca..000000000 --- a/experimental/material_3_demo/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/experimental/material_3_demo/android/build.gradle b/experimental/material_3_demo/android/build.gradle deleted file mode 100644 index e50c3a02b..000000000 --- a/experimental/material_3_demo/android/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -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') -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/experimental/material_3_demo/android/gradle.properties b/experimental/material_3_demo/android/gradle.properties deleted file mode 100644 index 94adc3a3f..000000000 --- a/experimental/material_3_demo/android/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true -android.enableJetifier=true diff --git a/experimental/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties b/experimental/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 3c472b99c..000000000 --- a/experimental/material_3_demo/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -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/experimental/material_3_demo/android/settings.gradle b/experimental/material_3_demo/android/settings.gradle deleted file mode 100644 index 44e62bcf0..000000000 --- a/experimental/material_3_demo/android/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -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/experimental/material_3_demo/integration_test/integration_test.dart b/experimental/material_3_demo/integration_test/integration_test.dart deleted file mode 100644 index a8d59c4e6..000000000 --- a/experimental/material_3_demo/integration_test/integration_test.dart +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2021 The Flutter team. 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_test/flutter_test.dart'; -import 'package:integration_test/integration_test.dart'; -import 'package:material_3_demo/main.dart' as app; - -void main() { - IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - - testWidgets('verify app can run', (tester) async { - app.main(); - }); -} diff --git a/experimental/material_3_demo/ios/.gitignore b/experimental/material_3_demo/ios/.gitignore deleted file mode 100644 index 7a7f9873a..000000000 --- a/experimental/material_3_demo/ios/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -**/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/experimental/material_3_demo/ios/Flutter/AppFrameworkInfo.plist b/experimental/material_3_demo/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 9625e105d..000000000 --- a/experimental/material_3_demo/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 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/experimental/material_3_demo/ios/Flutter/Debug.xcconfig b/experimental/material_3_demo/ios/Flutter/Debug.xcconfig deleted file mode 100644 index ec97fc6f3..000000000 --- a/experimental/material_3_demo/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "Generated.xcconfig" diff --git a/experimental/material_3_demo/ios/Flutter/Release.xcconfig b/experimental/material_3_demo/ios/Flutter/Release.xcconfig deleted file mode 100644 index c4855bfe2..000000000 --- a/experimental/material_3_demo/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "Generated.xcconfig" diff --git a/experimental/material_3_demo/ios/Podfile b/experimental/material_3_demo/ios/Podfile deleted file mode 100644 index fdcc671eb..000000000 --- a/experimental/material_3_demo/ios/Podfile +++ /dev/null @@ -1,44 +0,0 @@ -# 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/experimental/material_3_demo/ios/Runner.xcodeproj/project.pbxproj b/experimental/material_3_demo/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index 85f86f725..000000000 --- a/experimental/material_3_demo/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,616 +0,0 @@ -// !$*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)"; - DEVELOPMENT_TEAM = TC87DMJLQP; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo; - 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.material3Demo.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.material3Demo.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.material3Demo.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)"; - DEVELOPMENT_TEAM = TC87DMJLQP; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo; - 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)"; - DEVELOPMENT_TEAM = TC87DMJLQP; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo; - 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/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a62..000000000 --- a/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5e..000000000 --- a/experimental/material_3_demo/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/experimental/material_3_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/material_3_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index e42adcb34..000000000 --- a/experimental/material_3_demo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/ios/Runner.xcworkspace/contents.xcworkspacedata b/experimental/material_3_demo/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a16e..000000000 --- a/experimental/material_3_demo/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5e..000000000 --- a/experimental/material_3_demo/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/experimental/material_3_demo/ios/Runner/AppDelegate.swift b/experimental/material_3_demo/ios/Runner/AppDelegate.swift deleted file mode 100644 index 70693e4a8..000000000 --- a/experimental/material_3_demo/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -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/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fab2..000000000 --- a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "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/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada472..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 7353c41ec..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 797d452e4..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index 6ed2d933e..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cd7b0099..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index fe730945a..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 321773cd8..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 797d452e4..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 502f463a9..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index 0ec303439..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index 0ec303439..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index e9f5fea27..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 84ac32ae7..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 8953cba09..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 0467bf12a..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2fd..000000000 --- a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19eaca..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19eaca..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19eaca..000000000 Binary files a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725b7..000000000 --- a/experimental/material_3_demo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 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/experimental/material_3_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard b/experimental/material_3_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c7c..000000000 --- a/experimental/material_3_demo/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/ios/Runner/Base.lproj/Main.storyboard b/experimental/material_3_demo/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c28516f..000000000 --- a/experimental/material_3_demo/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/ios/Runner/Info.plist b/experimental/material_3_demo/ios/Runner/Info.plist deleted file mode 100644 index 45576eaa6..000000000 --- a/experimental/material_3_demo/ios/Runner/Info.plist +++ /dev/null @@ -1,51 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Material 3 Demo - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - material_3_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 - - - diff --git a/experimental/material_3_demo/ios/Runner/Runner-Bridging-Header.h b/experimental/material_3_demo/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a560..000000000 --- a/experimental/material_3_demo/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/experimental/material_3_demo/ios/RunnerTests/RunnerTests.swift b/experimental/material_3_demo/ios/RunnerTests/RunnerTests.swift deleted file mode 100644 index 86a7c3b1b..000000000 --- a/experimental/material_3_demo/ios/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -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/experimental/material_3_demo/lib/color_palettes_screen.dart b/experimental/material_3_demo/lib/color_palettes_screen.dart deleted file mode 100644 index 580678be7..000000000 --- a/experimental/material_3_demo/lib/color_palettes_screen.dart +++ /dev/null @@ -1,386 +0,0 @@ -// Copyright 2021 The Flutter team. 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/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -const Widget divider = SizedBox(height: 10); - -// If screen content width is greater or equal to this value, the light and dark -// color schemes will be displayed in a column. Otherwise, they will -// be displayed in a row. -const double narrowScreenWidthThreshold = 400; - -class ColorPalettesScreen extends StatelessWidget { - const ColorPalettesScreen({super.key}); - - @override - Widget build(BuildContext context) { - Color selectedColor = Theme.of(context).primaryColor; - ThemeData lightTheme = ThemeData( - colorSchemeSeed: selectedColor, - brightness: Brightness.light, - ); - ThemeData darkTheme = ThemeData( - colorSchemeSeed: selectedColor, - brightness: Brightness.dark, - ); - - Widget schemeLabel(String brightness) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 15), - child: Text( - brightness, - style: const TextStyle(fontWeight: FontWeight.bold), - ), - ); - } - - Widget schemeView(ThemeData theme) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 15), - child: ColorSchemeView( - colorScheme: theme.colorScheme, - ), - ); - } - - Widget dynamicColorNotice() => RichText( - textAlign: TextAlign.center, - text: TextSpan( - style: Theme.of(context).textTheme.bodySmall, - children: [ - const TextSpan( - text: 'To create color schemes based on a ' - 'platform\'s implementation of dynamic color, ' - 'use the '), - TextSpan( - text: 'dynamic_color', - style: const TextStyle(decoration: TextDecoration.underline), - recognizer: TapGestureRecognizer() - ..onTap = () async { - final url = Uri.parse( - 'https://pub.dev/packages/dynamic_color', - ); - if (!await launchUrl(url)) { - throw Exception('Could not launch $url'); - } - }, - ), - const TextSpan(text: ' package.'), - ], - ), - ); - - return Expanded( - child: LayoutBuilder(builder: (context, constraints) { - if (constraints.maxWidth < narrowScreenWidthThreshold) { - return SingleChildScrollView( - child: Column( - children: [ - dynamicColorNotice(), - divider, - schemeLabel('Light ColorScheme'), - schemeView(lightTheme), - divider, - divider, - schemeLabel('Dark ColorScheme'), - schemeView(darkTheme), - ], - ), - ); - } else { - return SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.only(top: 5), - child: Column( - children: [ - dynamicColorNotice(), - Row( - children: [ - Expanded( - child: Column( - children: [ - schemeLabel('Light ColorScheme'), - schemeView(lightTheme), - ], - ), - ), - Expanded( - child: Column( - children: [ - schemeLabel('Dark ColorScheme'), - schemeView(darkTheme), - ], - ), - ), - ], - ), - ], - ), - ), - ); - } - }), - ); - } -} - -class ColorSchemeView extends StatelessWidget { - const ColorSchemeView({super.key, required this.colorScheme}); - - final ColorScheme colorScheme; - - @override - Widget build(BuildContext context) { - return Column( - children: [ - ColorGroup( - children: [ - ColorChip( - label: 'primary', - color: colorScheme.primary, - onColor: colorScheme.onPrimary, - ), - ColorChip( - label: 'onPrimary', - color: colorScheme.onPrimary, - onColor: colorScheme.primary, - ), - ColorChip( - label: 'primaryContainer', - color: colorScheme.primaryContainer, - onColor: colorScheme.onPrimaryContainer, - ), - ColorChip( - label: 'onPrimaryContainer', - color: colorScheme.onPrimaryContainer, - onColor: colorScheme.primaryContainer, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'secondary', - color: colorScheme.secondary, - onColor: colorScheme.onSecondary, - ), - ColorChip( - label: 'onSecondary', - color: colorScheme.onSecondary, - onColor: colorScheme.secondary, - ), - ColorChip( - label: 'secondaryContainer', - color: colorScheme.secondaryContainer, - onColor: colorScheme.onSecondaryContainer, - ), - ColorChip( - label: 'onSecondaryContainer', - color: colorScheme.onSecondaryContainer, - onColor: colorScheme.secondaryContainer, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'tertiary', - color: colorScheme.tertiary, - onColor: colorScheme.onTertiary, - ), - ColorChip( - label: 'onTertiary', - color: colorScheme.onTertiary, - onColor: colorScheme.tertiary, - ), - ColorChip( - label: 'tertiaryContainer', - color: colorScheme.tertiaryContainer, - onColor: colorScheme.onTertiaryContainer, - ), - ColorChip( - label: 'onTertiaryContainer', - color: colorScheme.onTertiaryContainer, - onColor: colorScheme.tertiaryContainer, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'error', - color: colorScheme.error, - onColor: colorScheme.onError, - ), - ColorChip( - label: 'onError', - color: colorScheme.onError, - onColor: colorScheme.error, - ), - ColorChip( - label: 'errorContainer', - color: colorScheme.errorContainer, - onColor: colorScheme.onErrorContainer, - ), - ColorChip( - label: 'onErrorContainer', - color: colorScheme.onErrorContainer, - onColor: colorScheme.errorContainer, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'surface', - color: colorScheme.surface, - onColor: colorScheme.onSurface, - ), - ColorChip( - label: 'onSurface', - color: colorScheme.onSurface, - onColor: colorScheme.surface, - ), - ColorChip( - label: 'surfaceVariant', - color: colorScheme.surfaceVariant, - onColor: colorScheme.onSurfaceVariant, - ), - ColorChip( - label: 'onSurfaceVariant', - color: colorScheme.onSurfaceVariant, - onColor: colorScheme.surfaceVariant, - ), - ColorChip( - label: 'surfaceTint', - color: colorScheme.surfaceTint, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'outline', - color: colorScheme.outline, - ), - ColorChip( - label: 'outlineVariant', - color: colorScheme.outlineVariant, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'inverseSurface', - color: colorScheme.inverseSurface, - onColor: colorScheme.onInverseSurface, - ), - ColorChip( - label: 'onInverseSurface', - color: colorScheme.onInverseSurface, - onColor: colorScheme.inverseSurface, - ), - ColorChip( - label: 'inversePrimary', - color: colorScheme.inversePrimary, - onColor: colorScheme.primary, - ), - ], - ), - divider, - ColorGroup( - children: [ - ColorChip( - label: 'background', - color: colorScheme.background, - onColor: colorScheme.onBackground, - ), - ColorChip( - label: 'onBackground', - color: colorScheme.onBackground, - onColor: colorScheme.background, - ), - ColorChip( - label: 'scrim', - color: colorScheme.scrim, - ), - ColorChip( - label: 'shadow', - color: colorScheme.shadow, - ), - ], - ), - divider, - ], - ); - } -} - -class ColorGroup extends StatelessWidget { - const ColorGroup({super.key, required this.children}); - - final List children; - - @override - Widget build(BuildContext context) { - return RepaintBoundary( - child: Card( - clipBehavior: Clip.antiAlias, - child: Column( - children: children, - ), - ), - ); - } -} - -class ColorChip extends StatelessWidget { - const ColorChip({ - super.key, - required this.color, - required this.label, - this.onColor, - }); - - final Color color; - final Color? onColor; - final String label; - - static Color contrastColor(Color color) { - final brightness = ThemeData.estimateBrightnessForColor(color); - switch (brightness) { - case Brightness.dark: - return Colors.white; - case Brightness.light: - return Colors.black; - } - } - - @override - Widget build(BuildContext context) { - final Color labelColor = onColor ?? contrastColor(color); - - return Container( - color: color, - child: Padding( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Expanded(child: Text(label, style: TextStyle(color: labelColor))), - ], - ), - ), - ); - } -} diff --git a/experimental/material_3_demo/lib/component_screen.dart b/experimental/material_3_demo/lib/component_screen.dart deleted file mode 100644 index c484e96fb..000000000 --- a/experimental/material_3_demo/lib/component_screen.dart +++ /dev/null @@ -1,2548 +0,0 @@ -// Copyright 2021 The Flutter team. 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/rendering.dart'; -import 'package:flutter/services.dart'; - -const rowDivider = SizedBox(width: 20); -const colDivider = SizedBox(height: 10); -const tinySpacing = 3.0; -const smallSpacing = 10.0; -const double cardWidth = 115; -const double widthConstraint = 450; - -class FirstComponentList extends StatelessWidget { - const FirstComponentList({ - super.key, - required this.showNavBottomBar, - required this.scaffoldKey, - required this.showSecondList, - }); - - final bool showNavBottomBar; - final GlobalKey scaffoldKey; - final bool showSecondList; - - @override - Widget build(BuildContext context) { - List children = [ - const Actions(), - colDivider, - const Communication(), - colDivider, - const Containment(), - if (!showSecondList) ...[ - colDivider, - Navigation(scaffoldKey: scaffoldKey), - colDivider, - const Selection(), - colDivider, - const TextInputs() - ], - ]; - List heights = List.filled(children.length, null); - - // Fully traverse this list before moving on. - return FocusTraversalGroup( - child: CustomScrollView( - slivers: [ - SliverPadding( - padding: showSecondList - ? const EdgeInsetsDirectional.only(end: smallSpacing) - : EdgeInsets.zero, - sliver: SliverList( - delegate: BuildSlivers( - heights: heights, - builder: (context, index) { - return _CacheHeight( - heights: heights, - index: index, - child: children[index], - ); - }, - ), - ), - ), - ], - ), - ); - } -} - -class SecondComponentList extends StatelessWidget { - const SecondComponentList({ - super.key, - required this.scaffoldKey, - }); - - final GlobalKey scaffoldKey; - - @override - Widget build(BuildContext context) { - List children = [ - Navigation(scaffoldKey: scaffoldKey), - colDivider, - const Selection(), - colDivider, - const TextInputs(), - ]; - List heights = List.filled(children.length, null); - - // Fully traverse this list before moving on. - return FocusTraversalGroup( - child: CustomScrollView( - slivers: [ - SliverPadding( - padding: const EdgeInsetsDirectional.only(end: smallSpacing), - sliver: SliverList( - delegate: BuildSlivers( - heights: heights, - builder: (context, index) { - return _CacheHeight( - heights: heights, - index: index, - child: children[index], - ); - }, - ), - ), - ), - ], - ), - ); - } -} - -// If the content of a CustomScrollView does not change, then it's -// safe to cache the heights of each item as they are laid out. The -// sum of the cached heights are returned by an override of -// `SliverChildDelegate.estimateMaxScrollOffset`. The default version -// of this method bases its estimate on the average height of the -// visible items. The override ensures that the scrollbar thumb's -// size, which depends on the max scroll offset, will shrink smoothly -// as the contents of the list are exposed for the first time, and -// then remain fixed. -class _CacheHeight extends SingleChildRenderObjectWidget { - const _CacheHeight({ - super.child, - required this.heights, - required this.index, - }); - - final List heights; - final int index; - - @override - RenderObject createRenderObject(BuildContext context) { - return _RenderCacheHeight( - heights: heights, - index: index, - ); - } - - @override - void updateRenderObject( - BuildContext context, _RenderCacheHeight renderObject) { - renderObject - ..heights = heights - ..index = index; - } -} - -class _RenderCacheHeight extends RenderProxyBox { - _RenderCacheHeight({ - required List heights, - required int index, - }) : _heights = heights, - _index = index, - super(); - - List _heights; - List get heights => _heights; - set heights(List value) { - if (value == _heights) { - return; - } - _heights = value; - markNeedsLayout(); - } - - int _index; - int get index => _index; - set index(int value) { - if (value == index) { - return; - } - _index = value; - markNeedsLayout(); - } - - @override - void performLayout() { - super.performLayout(); - heights[index] = size.height; - } -} - -// The heights information is used to override the `estimateMaxScrollOffset` and -// provide a more accurate estimation for the max scroll offset. -class BuildSlivers extends SliverChildBuilderDelegate { - BuildSlivers({ - required NullableIndexedWidgetBuilder builder, - required this.heights, - }) : super(builder, childCount: heights.length); - - final List heights; - - @override - double? estimateMaxScrollOffset(int firstIndex, int lastIndex, - double leadingScrollOffset, double trailingScrollOffset) { - return heights.reduce((sum, height) => (sum ?? 0) + (height ?? 0))!; - } -} - -class Actions extends StatelessWidget { - const Actions({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentGroupDecoration(label: 'Actions', children: [ - Buttons(), - FloatingActionButtons(), - IconToggleButtons(), - SegmentedButtons(), - ]); - } -} - -class Communication extends StatelessWidget { - const Communication({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentGroupDecoration(label: 'Communication', children: [ - NavigationBars( - selectedIndex: 1, - isExampleBar: true, - isBadgeExample: true, - ), - ProgressIndicators(), - SnackBarSection(), - ]); - } -} - -class Containment extends StatelessWidget { - const Containment({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentGroupDecoration(label: 'Containment', children: [ - BottomSheetSection(), - Cards(), - Dialogs(), - Dividers(), - // TODO: Add Lists, https://github.com/flutter/flutter/issues/114006 - // TODO: Add Side sheets, https://github.com/flutter/flutter/issues/119328 - ]); - } -} - -class Navigation extends StatelessWidget { - const Navigation({super.key, required this.scaffoldKey}); - - final GlobalKey scaffoldKey; - - @override - Widget build(BuildContext context) { - return ComponentGroupDecoration(label: 'Navigation', children: [ - const BottomAppBars(), - const NavigationBars( - selectedIndex: 0, - isExampleBar: true, - ), - NavigationDrawers(scaffoldKey: scaffoldKey), - const NavigationRails(), - const Tabs(), - const SearchAnchors(), - const TopAppBars(), - ]); - } -} - -class Selection extends StatelessWidget { - const Selection({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentGroupDecoration(label: 'Selection', children: [ - Checkboxes(), - Chips(), - DatePickers(), - Menus(), - Radios(), - Sliders(), - Switches(), - TimePickers(), - ]); - } -} - -class TextInputs extends StatelessWidget { - const TextInputs({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentGroupDecoration( - label: 'Text inputs', - children: [TextFields()], - ); - } -} - -class Buttons extends StatefulWidget { - const Buttons({super.key}); - - @override - State createState() => _ButtonsState(); -} - -class _ButtonsState extends State { - @override - Widget build(BuildContext context) { - return const ComponentDecoration( - label: 'Common buttons', - tooltipMessage: - 'Use ElevatedButton, FilledButton, FilledButton.tonal, OutlinedButton, or TextButton', - child: SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - ButtonsWithoutIcon(isDisabled: false), - ButtonsWithIcon(), - ButtonsWithoutIcon(isDisabled: true), - ], - ), - ), - ); - } -} - -class ButtonsWithoutIcon extends StatelessWidget { - final bool isDisabled; - - const ButtonsWithoutIcon({super.key, required this.isDisabled}); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 5.0), - child: IntrinsicWidth( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - ElevatedButton( - onPressed: isDisabled ? null : () {}, - child: const Text('Elevated'), - ), - colDivider, - FilledButton( - onPressed: isDisabled ? null : () {}, - child: const Text('Filled'), - ), - colDivider, - FilledButton.tonal( - onPressed: isDisabled ? null : () {}, - child: const Text('Filled tonal'), - ), - colDivider, - OutlinedButton( - onPressed: isDisabled ? null : () {}, - child: const Text('Outlined'), - ), - colDivider, - TextButton( - onPressed: isDisabled ? null : () {}, - child: const Text('Text'), - ), - ], - ), - ), - ); - } -} - -class ButtonsWithIcon extends StatelessWidget { - const ButtonsWithIcon({super.key}); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 10.0), - child: IntrinsicWidth( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - ElevatedButton.icon( - onPressed: () {}, - icon: const Icon(Icons.add), - label: const Text('Icon'), - ), - colDivider, - FilledButton.icon( - onPressed: () {}, - label: const Text('Icon'), - icon: const Icon(Icons.add), - ), - colDivider, - FilledButton.tonalIcon( - onPressed: () {}, - label: const Text('Icon'), - icon: const Icon(Icons.add), - ), - colDivider, - OutlinedButton.icon( - onPressed: () {}, - icon: const Icon(Icons.add), - label: const Text('Icon'), - ), - colDivider, - TextButton.icon( - onPressed: () {}, - icon: const Icon(Icons.add), - label: const Text('Icon'), - ) - ], - ), - ), - ); - } -} - -class FloatingActionButtons extends StatelessWidget { - const FloatingActionButtons({super.key}); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Floating action buttons', - tooltipMessage: - 'Use FloatingActionButton or FloatingActionButton.extended', - child: Wrap( - crossAxisAlignment: WrapCrossAlignment.center, - runSpacing: smallSpacing, - spacing: smallSpacing, - children: [ - FloatingActionButton.small( - onPressed: () {}, - tooltip: 'Small', - child: const Icon(Icons.add), - ), - FloatingActionButton.extended( - onPressed: () {}, - tooltip: 'Extended', - icon: const Icon(Icons.add), - label: const Text('Create'), - ), - FloatingActionButton( - onPressed: () {}, - tooltip: 'Standard', - child: const Icon(Icons.add), - ), - FloatingActionButton.large( - onPressed: () {}, - tooltip: 'Large', - child: const Icon(Icons.add), - ), - ], - ), - ); - } -} - -class Cards extends StatelessWidget { - const Cards({super.key}); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Cards', - tooltipMessage: 'Use Card', - child: Wrap( - alignment: WrapAlignment.spaceEvenly, - children: [ - SizedBox( - width: cardWidth, - child: Card( - child: Container( - padding: const EdgeInsets.fromLTRB(10, 5, 5, 10), - child: Column( - children: [ - Align( - alignment: Alignment.topRight, - child: IconButton( - icon: const Icon(Icons.more_vert), - onPressed: () {}, - ), - ), - const SizedBox(height: 20), - const Align( - alignment: Alignment.bottomLeft, - child: Text('Elevated'), - ) - ], - ), - ), - ), - ), - SizedBox( - width: cardWidth, - child: Card( - color: Theme.of(context).colorScheme.surfaceVariant, - elevation: 0, - child: Container( - padding: const EdgeInsets.fromLTRB(10, 5, 5, 10), - child: Column( - children: [ - Align( - alignment: Alignment.topRight, - child: IconButton( - icon: const Icon(Icons.more_vert), - onPressed: () {}, - ), - ), - const SizedBox(height: 20), - const Align( - alignment: Alignment.bottomLeft, - child: Text('Filled'), - ) - ], - ), - ), - ), - ), - SizedBox( - width: cardWidth, - child: Card( - elevation: 0, - shape: RoundedRectangleBorder( - side: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - borderRadius: const BorderRadius.all(Radius.circular(12)), - ), - child: Container( - padding: const EdgeInsets.fromLTRB(10, 5, 5, 10), - child: Column( - children: [ - Align( - alignment: Alignment.topRight, - child: IconButton( - icon: const Icon(Icons.more_vert), - onPressed: () {}, - ), - ), - const SizedBox(height: 20), - const Align( - alignment: Alignment.bottomLeft, - child: Text('Outlined'), - ) - ], - ), - ), - ), - ), - ], - ), - ); - } -} - -class _ClearButton extends StatelessWidget { - const _ClearButton({required this.controller}); - - final TextEditingController controller; - - @override - Widget build(BuildContext context) => IconButton( - icon: const Icon(Icons.clear), - onPressed: () => controller.clear(), - ); -} - -class TextFields extends StatefulWidget { - const TextFields({super.key}); - - @override - State createState() => _TextFieldsState(); -} - -class _TextFieldsState extends State { - final TextEditingController _controllerFilled = TextEditingController(); - final TextEditingController _controllerOutlined = TextEditingController(); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Text fields', - tooltipMessage: 'Use TextField with different InputDecoration', - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.all(smallSpacing), - child: TextField( - controller: _controllerFilled, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: _ClearButton(controller: _controllerFilled), - labelText: 'Filled', - hintText: 'hint text', - helperText: 'supporting text', - filled: true, - ), - ), - ), - Padding( - padding: const EdgeInsets.all(smallSpacing), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Flexible( - child: SizedBox( - width: 200, - child: TextField( - maxLength: 10, - maxLengthEnforcement: MaxLengthEnforcement.none, - controller: _controllerFilled, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: _ClearButton(controller: _controllerFilled), - labelText: 'Filled', - hintText: 'hint text', - helperText: 'supporting text', - filled: true, - errorText: 'error text', - ), - ), - ), - ), - const SizedBox(width: smallSpacing), - Flexible( - child: SizedBox( - width: 200, - child: TextField( - controller: _controllerFilled, - enabled: false, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: _ClearButton(controller: _controllerFilled), - labelText: 'Disabled', - hintText: 'hint text', - helperText: 'supporting text', - filled: true, - ), - ), - ), - ), - ], - ), - ), - Padding( - padding: const EdgeInsets.all(smallSpacing), - child: TextField( - controller: _controllerOutlined, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: _ClearButton(controller: _controllerOutlined), - labelText: 'Outlined', - hintText: 'hint text', - helperText: 'supporting text', - border: const OutlineInputBorder(), - ), - ), - ), - Padding( - padding: const EdgeInsets.all(smallSpacing), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Flexible( - child: SizedBox( - width: 200, - child: TextField( - controller: _controllerOutlined, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: - _ClearButton(controller: _controllerOutlined), - labelText: 'Outlined', - hintText: 'hint text', - helperText: 'supporting text', - errorText: 'error text', - border: const OutlineInputBorder(), - filled: true, - ), - ), - ), - ), - const SizedBox(width: smallSpacing), - Flexible( - child: SizedBox( - width: 200, - child: TextField( - controller: _controllerOutlined, - enabled: false, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search), - suffixIcon: - _ClearButton(controller: _controllerOutlined), - labelText: 'Disabled', - hintText: 'hint text', - helperText: 'supporting text', - border: const OutlineInputBorder(), - filled: true, - ), - ), - ), - ), - ])), - ], - ), - ); - } -} - -class Dialogs extends StatefulWidget { - const Dialogs({super.key}); - - @override - State createState() => _DialogsState(); -} - -class _DialogsState extends State { - void openDialog(BuildContext context) { - showDialog( - context: context, - builder: (context) => AlertDialog( - title: const Text('What is a dialog?'), - content: const Text( - 'A dialog is a type of modal window that appears in front of app content to provide critical information, or prompt for a decision to be made.'), - actions: [ - TextButton( - child: const Text('Dismiss'), - onPressed: () => Navigator.of(context).pop(), - ), - FilledButton( - child: const Text('Okay'), - onPressed: () => Navigator.of(context).pop(), - ), - ], - ), - ); - } - - void openFullscreenDialog(BuildContext context) { - showDialog( - context: context, - builder: (context) => Dialog.fullscreen( - child: Padding( - padding: const EdgeInsets.all(20.0), - child: Scaffold( - appBar: AppBar( - title: const Text('Full-screen dialog'), - centerTitle: false, - leading: IconButton( - icon: const Icon(Icons.close), - onPressed: () => Navigator.of(context).pop(), - ), - actions: [ - TextButton( - child: const Text('Close'), - onPressed: () => Navigator.of(context).pop(), - ), - ], - ), - ), - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Dialog', - tooltipMessage: - 'Use showDialog with Dialog.fullscreen, AlertDialog, or SimpleDialog', - child: Wrap( - alignment: WrapAlignment.spaceBetween, - children: [ - TextButton( - child: const Text( - 'Show dialog', - style: TextStyle(fontWeight: FontWeight.bold), - ), - onPressed: () => openDialog(context), - ), - TextButton( - child: const Text( - 'Show full-screen dialog', - style: TextStyle(fontWeight: FontWeight.bold), - ), - onPressed: () => openFullscreenDialog(context), - ), - ], - ), - ); - } -} - -class Dividers extends StatelessWidget { - const Dividers({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentDecoration( - label: 'Dividers', - tooltipMessage: 'Use Divider or VerticalDivider', - child: Column( - children: [ - Divider(key: Key('divider')), - ], - ), - ); - } -} - -class Switches extends StatelessWidget { - const Switches({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentDecoration( - label: 'Switches', - tooltipMessage: 'Use SwitchListTile or Switch', - child: Column( - children: [ - SwitchRow(isEnabled: true), - SwitchRow(isEnabled: false), - ], - ), - ); - } -} - -class SwitchRow extends StatefulWidget { - const SwitchRow({super.key, required this.isEnabled}); - - final bool isEnabled; - - @override - State createState() => _SwitchRowState(); -} - -class _SwitchRowState extends State { - bool value0 = false; - bool value1 = true; - - final MaterialStateProperty thumbIcon = - MaterialStateProperty.resolveWith((states) { - if (states.contains(MaterialState.selected)) { - return const Icon(Icons.check); - } - return const Icon(Icons.close); - }); - - @override - Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // TODO: use SwitchListTile when thumbIcon is available https://github.com/flutter/flutter/issues/118616 - Switch( - value: value0, - onChanged: widget.isEnabled - ? (value) { - setState(() { - value0 = value; - }); - } - : null, - ), - Switch( - thumbIcon: thumbIcon, - value: value1, - onChanged: widget.isEnabled - ? (value) { - setState(() { - value1 = value; - }); - } - : null, - ), - ], - ); - } -} - -class Checkboxes extends StatefulWidget { - const Checkboxes({super.key}); - - @override - State createState() => _CheckboxesState(); -} - -class _CheckboxesState extends State { - bool? isChecked0 = true; - bool? isChecked1; - bool? isChecked2 = false; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Checkboxes', - tooltipMessage: 'Use CheckboxListTile or Checkbox', - child: Column( - children: [ - CheckboxListTile( - tristate: true, - value: isChecked0, - title: const Text('Option 1'), - onChanged: (value) { - setState(() { - isChecked0 = value; - }); - }, - ), - CheckboxListTile( - tristate: true, - value: isChecked1, - title: const Text('Option 2'), - onChanged: (value) { - setState(() { - isChecked1 = value; - }); - }, - ), - CheckboxListTile( - tristate: true, - value: isChecked2, - title: const Text('Option 3'), - // TODO: showcase error state https://github.com/flutter/flutter/issues/118616 - onChanged: (value) { - setState(() { - isChecked2 = value; - }); - }, - ), - const CheckboxListTile( - tristate: true, - title: Text('Option 4'), - value: true, - onChanged: null, - ), - ], - ), - ); - } -} - -enum Value { first, second } - -class Radios extends StatefulWidget { - const Radios({super.key}); - - @override - State createState() => _RadiosState(); -} - -enum Options { option1, option2, option3 } - -class _RadiosState extends State { - Options? _selectedOption = Options.option1; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Radio buttons', - tooltipMessage: 'Use RadioListTile or Radio', - child: Column( - children: [ - RadioListTile( - title: const Text('Option 1'), - value: Options.option1, - groupValue: _selectedOption, - onChanged: (value) { - setState(() { - _selectedOption = value; - }); - }, - ), - RadioListTile( - title: const Text('Option 2'), - value: Options.option2, - groupValue: _selectedOption, - onChanged: (value) { - setState(() { - _selectedOption = value; - }); - }, - ), - RadioListTile( - title: const Text('Option 3'), - value: Options.option3, - groupValue: _selectedOption, - onChanged: null, - ), - ], - ), - ); - } -} - -class ProgressIndicators extends StatefulWidget { - const ProgressIndicators({super.key}); - - @override - State createState() => _ProgressIndicatorsState(); -} - -class _ProgressIndicatorsState extends State { - bool playProgressIndicator = false; - - @override - Widget build(BuildContext context) { - final double? progressValue = playProgressIndicator ? null : 0.7; - - return ComponentDecoration( - label: 'Progress indicators', - tooltipMessage: - 'Use CircularProgressIndicator or LinearProgressIndicator', - child: Column( - children: [ - Row( - children: [ - IconButton( - isSelected: playProgressIndicator, - selectedIcon: const Icon(Icons.pause), - icon: const Icon(Icons.play_arrow), - onPressed: () { - setState(() { - playProgressIndicator = !playProgressIndicator; - }); - }, - ), - Expanded( - child: Row( - children: [ - rowDivider, - CircularProgressIndicator( - value: progressValue, - ), - rowDivider, - Expanded( - child: LinearProgressIndicator( - value: progressValue, - ), - ), - rowDivider, - ], - ), - ), - ], - ), - ], - ), - ); - } -} - -const List appBarDestinations = [ - NavigationDestination( - tooltip: '', - icon: Icon(Icons.widgets_outlined), - label: 'Components', - selectedIcon: Icon(Icons.widgets), - ), - NavigationDestination( - tooltip: '', - icon: Icon(Icons.format_paint_outlined), - label: 'Color', - selectedIcon: Icon(Icons.format_paint), - ), - NavigationDestination( - tooltip: '', - icon: Icon(Icons.text_snippet_outlined), - label: 'Typography', - selectedIcon: Icon(Icons.text_snippet), - ), - NavigationDestination( - tooltip: '', - icon: Icon(Icons.invert_colors_on_outlined), - label: 'Elevation', - selectedIcon: Icon(Icons.opacity), - ) -]; - -const List exampleBarDestinations = [ - NavigationDestination( - tooltip: '', - icon: Icon(Icons.explore_outlined), - label: 'Explore', - selectedIcon: Icon(Icons.explore), - ), - NavigationDestination( - tooltip: '', - icon: Icon(Icons.pets_outlined), - label: 'Pets', - selectedIcon: Icon(Icons.pets), - ), - NavigationDestination( - tooltip: '', - icon: Icon(Icons.account_box_outlined), - label: 'Account', - selectedIcon: Icon(Icons.account_box), - ) -]; - -List barWithBadgeDestinations = [ - NavigationDestination( - tooltip: '', - icon: Badge.count(count: 1000, child: const Icon(Icons.mail_outlined)), - label: 'Mail', - selectedIcon: Badge.count(count: 1000, child: const Icon(Icons.mail)), - ), - const NavigationDestination( - tooltip: '', - icon: Badge(label: Text('10'), child: Icon(Icons.chat_bubble_outline)), - label: 'Chat', - selectedIcon: Badge(label: Text('10'), child: Icon(Icons.chat_bubble)), - ), - const NavigationDestination( - tooltip: '', - icon: Badge(child: Icon(Icons.group_outlined)), - label: 'Rooms', - selectedIcon: Badge(child: Icon(Icons.group_rounded)), - ), - NavigationDestination( - tooltip: '', - icon: Badge.count(count: 3, child: const Icon(Icons.videocam_outlined)), - label: 'Meet', - selectedIcon: Badge.count(count: 3, child: const Icon(Icons.videocam)), - ) -]; - -class NavigationBars extends StatefulWidget { - const NavigationBars({ - super.key, - this.onSelectItem, - required this.selectedIndex, - required this.isExampleBar, - this.isBadgeExample = false, - }); - - final void Function(int)? onSelectItem; - final int selectedIndex; - final bool isExampleBar; - final bool isBadgeExample; - - @override - State createState() => _NavigationBarsState(); -} - -class _NavigationBarsState extends State { - late int selectedIndex; - - @override - void initState() { - super.initState(); - selectedIndex = widget.selectedIndex; - } - - @override - void didUpdateWidget(covariant NavigationBars oldWidget) { - super.didUpdateWidget(oldWidget); - if (widget.selectedIndex != oldWidget.selectedIndex) { - selectedIndex = widget.selectedIndex; - } - } - - @override - Widget build(BuildContext context) { - // App NavigationBar should get first focus. - Widget navigationBar = Focus( - autofocus: !(widget.isExampleBar || widget.isBadgeExample), - child: NavigationBar( - selectedIndex: selectedIndex, - onDestinationSelected: (index) { - setState(() { - selectedIndex = index; - }); - if (!widget.isExampleBar) widget.onSelectItem!(index); - }, - destinations: widget.isExampleBar && widget.isBadgeExample - ? barWithBadgeDestinations - : widget.isExampleBar - ? exampleBarDestinations - : appBarDestinations, - ), - ); - - if (widget.isExampleBar && widget.isBadgeExample) { - navigationBar = ComponentDecoration( - label: 'Badges', - tooltipMessage: 'Use Badge or Badge.count', - child: navigationBar); - } else if (widget.isExampleBar) { - navigationBar = ComponentDecoration( - label: 'Navigation bar', - tooltipMessage: 'Use NavigationBar', - child: navigationBar); - } - - return navigationBar; - } -} - -class IconToggleButtons extends StatefulWidget { - const IconToggleButtons({super.key}); - - @override - State createState() => _IconToggleButtonsState(); -} - -class _IconToggleButtonsState extends State { - bool standardSelected = false; - bool filledSelected = false; - bool tonalSelected = false; - bool outlinedSelected = false; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Icon buttons', - tooltipMessage: - 'Use IconButton, IconButton.filled, IconButton.filledTonal, and IconButton.outlined', - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Column( - // Standard IconButton - children: [ - IconButton( - isSelected: standardSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: () { - setState(() { - standardSelected = !standardSelected; - }); - }, - ), - colDivider, - IconButton( - isSelected: standardSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: null, - ), - ], - ), - Column( - children: [ - // Filled IconButton - IconButton.filled( - isSelected: filledSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: () { - setState(() { - filledSelected = !filledSelected; - }); - }, - ), - colDivider, - IconButton.filled( - isSelected: filledSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: null, - ), - ], - ), - Column( - children: [ - // Filled Tonal IconButton - IconButton.filledTonal( - isSelected: tonalSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: () { - setState(() { - tonalSelected = !tonalSelected; - }); - }, - ), - colDivider, - IconButton.filledTonal( - isSelected: tonalSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: null, - ), - ], - ), - Column( - children: [ - // Outlined IconButton - IconButton.outlined( - isSelected: outlinedSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: () { - setState(() { - outlinedSelected = !outlinedSelected; - }); - }, - ), - colDivider, - IconButton.outlined( - isSelected: outlinedSelected, - icon: const Icon(Icons.settings_outlined), - selectedIcon: const Icon(Icons.settings), - onPressed: null, - ), - ], - ), - ], - ), - ); - } -} - -class Chips extends StatefulWidget { - const Chips({super.key}); - - @override - State createState() => _ChipsState(); -} - -class _ChipsState extends State { - bool isFiltered = true; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Chips', - tooltipMessage: - 'Use ActionChip, FilterChip, or InputChip. \nActionChip can also be used for suggestion chip', - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Wrap( - spacing: smallSpacing, - runSpacing: smallSpacing, - children: [ - ActionChip( - label: const Text('Assist'), - avatar: const Icon(Icons.event), - onPressed: () {}, - ), - FilterChip( - label: const Text('Filter'), - selected: isFiltered, - onSelected: (selected) { - setState(() => isFiltered = selected); - }, - ), - InputChip( - label: const Text('Input'), - onPressed: () {}, - onDeleted: () {}, - ), - ActionChip( - label: const Text('Suggestion'), - onPressed: () {}, - ), - ], - ), - colDivider, - Wrap( - spacing: smallSpacing, - runSpacing: smallSpacing, - children: [ - const ActionChip( - label: Text('Assist'), - avatar: Icon(Icons.event), - ), - FilterChip( - label: const Text('Filter'), - selected: isFiltered, - onSelected: null, - ), - InputChip( - label: const Text('Input'), - onDeleted: () {}, - isEnabled: false, - ), - const ActionChip( - label: Text('Suggestion'), - ), - ], - ), - ], - ), - ); - } -} - -class DatePickers extends StatefulWidget { - const DatePickers({super.key}); - - @override - State createState() => _DatePickersState(); -} - -class _DatePickersState extends State { - DateTime? selectedDate; - final DateTime _firstDate = DateTime(DateTime.now().year - 2); - final DateTime _lastDate = DateTime(DateTime.now().year + 1); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Date picker', - tooltipMessage: 'Use showDatePicker', - child: TextButton( - onPressed: () async { - DateTime? date = await showDatePicker( - context: context, - initialDate: selectedDate ?? DateTime.now(), - firstDate: _firstDate, - lastDate: _lastDate, - ); - setState(() { - selectedDate = date; - if (selectedDate != null) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text( - 'Selected Date: ${selectedDate!.day}/${selectedDate!.month}/${selectedDate!.year}'), - )); - } - }); - }, - child: const Text( - 'Show date picker', - style: TextStyle(fontWeight: FontWeight.bold), - ), - ), - ); - } -} - -class TimePickers extends StatefulWidget { - const TimePickers({super.key}); - - @override - State createState() => _TimePickersState(); -} - -class _TimePickersState extends State { - TimeOfDay? selectedTime; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Time picker', - tooltipMessage: 'Use showTimePicker', - child: TextButton( - onPressed: () async { - final TimeOfDay? time = await showTimePicker( - context: context, - initialTime: selectedTime ?? TimeOfDay.now(), - builder: (context, child) { - return MediaQuery( - data: MediaQuery.of(context).copyWith( - alwaysUse24HourFormat: true, - ), - child: child!, - ); - }, - ); - setState(() { - selectedTime = time; - if (selectedTime != null) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: - Text('Selected time: ${selectedTime!.format(context)}'), - )); - } - }); - }, - child: const Text( - 'Show time picker', - style: TextStyle(fontWeight: FontWeight.bold), - ), - ), - ); - } -} - -class SegmentedButtons extends StatelessWidget { - const SegmentedButtons({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentDecoration( - label: 'Segmented buttons', - tooltipMessage: 'Use SegmentedButton', - child: Column( - children: [ - SingleChoice(), - colDivider, - MultipleChoice(), - ], - ), - ); - } -} - -enum Calendar { day, week, month, year } - -class SingleChoice extends StatefulWidget { - const SingleChoice({super.key}); - - @override - State createState() => _SingleChoiceState(); -} - -class _SingleChoiceState extends State { - Calendar calendarView = Calendar.day; - - @override - Widget build(BuildContext context) { - return SegmentedButton( - segments: const >[ - ButtonSegment( - value: Calendar.day, - label: Text('Day'), - icon: Icon(Icons.calendar_view_day)), - ButtonSegment( - value: Calendar.week, - label: Text('Week'), - icon: Icon(Icons.calendar_view_week)), - ButtonSegment( - value: Calendar.month, - label: Text('Month'), - icon: Icon(Icons.calendar_view_month)), - ButtonSegment( - value: Calendar.year, - label: Text('Year'), - icon: Icon(Icons.calendar_today)), - ], - selected: {calendarView}, - onSelectionChanged: (newSelection) { - setState(() { - // By default there is only a single segment that can be - // selected at one time, so its value is always the first - // item in the selected set. - calendarView = newSelection.first; - }); - }, - ); - } -} - -enum Sizes { extraSmall, small, medium, large, extraLarge } - -class MultipleChoice extends StatefulWidget { - const MultipleChoice({super.key}); - - @override - State createState() => _MultipleChoiceState(); -} - -class _MultipleChoiceState extends State { - Set selection = {Sizes.large, Sizes.extraLarge}; - - @override - Widget build(BuildContext context) { - return SegmentedButton( - segments: const >[ - ButtonSegment(value: Sizes.extraSmall, label: Text('XS')), - ButtonSegment(value: Sizes.small, label: Text('S')), - ButtonSegment(value: Sizes.medium, label: Text('M')), - ButtonSegment( - value: Sizes.large, - label: Text('L'), - ), - ButtonSegment(value: Sizes.extraLarge, label: Text('XL')), - ], - selected: selection, - onSelectionChanged: (newSelection) { - setState(() { - selection = newSelection; - }); - }, - multiSelectionEnabled: true, - ); - } -} - -class SnackBarSection extends StatelessWidget { - const SnackBarSection({super.key}); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Snackbar', - tooltipMessage: - 'Use ScaffoldMessenger.of(context).showSnackBar with SnackBar', - child: TextButton( - onPressed: () { - final snackBar = SnackBar( - behavior: SnackBarBehavior.floating, - width: 400.0, - content: const Text('This is a snackbar'), - action: SnackBarAction( - label: 'Close', - onPressed: () {}, - ), - ); - - ScaffoldMessenger.of(context).hideCurrentSnackBar(); - ScaffoldMessenger.of(context).showSnackBar(snackBar); - }, - child: const Text( - 'Show snackbar', - style: TextStyle(fontWeight: FontWeight.bold), - ), - ), - ); - } -} - -class BottomSheetSection extends StatefulWidget { - const BottomSheetSection({super.key}); - - @override - State createState() => _BottomSheetSectionState(); -} - -class _BottomSheetSectionState extends State { - bool isNonModalBottomSheetOpen = false; - PersistentBottomSheetController? _nonModalBottomSheetController; - - @override - Widget build(BuildContext context) { - List buttonList = [ - IconButton(onPressed: () {}, icon: const Icon(Icons.share_outlined)), - IconButton(onPressed: () {}, icon: const Icon(Icons.add)), - IconButton(onPressed: () {}, icon: const Icon(Icons.delete_outline)), - IconButton(onPressed: () {}, icon: const Icon(Icons.archive_outlined)), - IconButton(onPressed: () {}, icon: const Icon(Icons.settings_outlined)), - IconButton(onPressed: () {}, icon: const Icon(Icons.favorite_border)), - ]; - List labelList = const [ - Text('Share'), - Text('Add to'), - Text('Trash'), - Text('Archive'), - Text('Settings'), - Text('Favorite') - ]; - - buttonList = List.generate( - buttonList.length, - (index) => Padding( - padding: const EdgeInsets.fromLTRB(20.0, 30.0, 20.0, 20.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - buttonList[index], - labelList[index], - ], - ), - )); - - return ComponentDecoration( - label: 'Bottom sheet', - tooltipMessage: 'Use showModalBottomSheet or showBottomSheet', - child: Wrap( - alignment: WrapAlignment.spaceEvenly, - children: [ - TextButton( - child: const Text( - 'Show modal bottom sheet', - style: TextStyle(fontWeight: FontWeight.bold), - ), - onPressed: () { - showModalBottomSheet( - showDragHandle: true, - context: context, - // TODO: Remove when this is in the framework https://github.com/flutter/flutter/issues/118619 - constraints: const BoxConstraints(maxWidth: 640), - builder: (context) { - return SizedBox( - height: 150, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 32.0), - child: ListView( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - children: buttonList, - ), - ), - ); - }, - ); - }, - ), - TextButton( - child: Text( - isNonModalBottomSheetOpen - ? 'Hide bottom sheet' - : 'Show bottom sheet', - style: const TextStyle(fontWeight: FontWeight.bold), - ), - onPressed: () { - if (isNonModalBottomSheetOpen) { - _nonModalBottomSheetController?.close(); - setState(() { - isNonModalBottomSheetOpen = false; - }); - return; - } else { - setState(() { - isNonModalBottomSheetOpen = true; - }); - } - - _nonModalBottomSheetController = showBottomSheet( - elevation: 8.0, - context: context, - // TODO: Remove when this is in the framework https://github.com/flutter/flutter/issues/118619 - constraints: const BoxConstraints(maxWidth: 640), - builder: (context) { - return SizedBox( - height: 150, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 32.0), - child: ListView( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - children: buttonList, - ), - ), - ); - }, - ); - }, - ), - ], - ), - ); - } -} - -class BottomAppBars extends StatelessWidget { - const BottomAppBars({super.key}); - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Bottom app bar', - tooltipMessage: 'Use BottomAppBar', - child: Column( - children: [ - SizedBox( - height: 80, - child: Scaffold( - floatingActionButton: FloatingActionButton( - onPressed: () {}, - elevation: 0.0, - child: const Icon(Icons.add), - ), - floatingActionButtonLocation: - FloatingActionButtonLocation.endContained, - bottomNavigationBar: BottomAppBar( - child: Row( - children: [ - const IconButtonAnchorExample(), - IconButton( - tooltip: 'Search', - icon: const Icon(Icons.search), - onPressed: () {}, - ), - IconButton( - tooltip: 'Favorite', - icon: const Icon(Icons.favorite), - onPressed: () {}, - ), - ], - ), - ), - ), - ), - ], - ), - ); - } -} - -class IconButtonAnchorExample extends StatelessWidget { - const IconButtonAnchorExample({super.key}); - - @override - Widget build(BuildContext context) { - return MenuAnchor( - builder: (context, controller, child) { - return IconButton( - onPressed: () { - if (controller.isOpen) { - controller.close(); - } else { - controller.open(); - } - }, - icon: const Icon(Icons.more_vert), - ); - }, - menuChildren: [ - MenuItemButton( - child: const Text('Menu 1'), - onPressed: () {}, - ), - MenuItemButton( - child: const Text('Menu 2'), - onPressed: () {}, - ), - SubmenuButton( - menuChildren: [ - MenuItemButton( - onPressed: () {}, - child: const Text('Menu 3.1'), - ), - MenuItemButton( - onPressed: () {}, - child: const Text('Menu 3.2'), - ), - MenuItemButton( - onPressed: () {}, - child: const Text('Menu 3.3'), - ), - ], - child: const Text('Menu 3'), - ), - ], - ); - } -} - -class ButtonAnchorExample extends StatelessWidget { - const ButtonAnchorExample({super.key}); - - @override - Widget build(BuildContext context) { - return MenuAnchor( - builder: (context, controller, child) { - return FilledButton.tonal( - onPressed: () { - if (controller.isOpen) { - controller.close(); - } else { - controller.open(); - } - }, - child: const Text('Show menu'), - ); - }, - menuChildren: [ - MenuItemButton( - leadingIcon: const Icon(Icons.people_alt_outlined), - child: const Text('Item 1'), - onPressed: () {}, - ), - MenuItemButton( - leadingIcon: const Icon(Icons.remove_red_eye_outlined), - child: const Text('Item 2'), - onPressed: () {}, - ), - MenuItemButton( - leadingIcon: const Icon(Icons.refresh), - onPressed: () {}, - child: const Text('Item 3'), - ), - ], - ); - } -} - -class NavigationDrawers extends StatelessWidget { - const NavigationDrawers({super.key, required this.scaffoldKey}); - final GlobalKey scaffoldKey; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Navigation drawer', - tooltipMessage: - 'Use NavigationDrawer. For modal navigation drawers, see Scaffold.endDrawer', - child: Column( - children: [ - const SizedBox(height: 520, child: NavigationDrawerSection()), - colDivider, - colDivider, - TextButton( - child: const Text('Show modal navigation drawer', - style: TextStyle(fontWeight: FontWeight.bold)), - onPressed: () { - scaffoldKey.currentState!.openEndDrawer(); - }, - ), - ], - ), - ); - } -} - -class NavigationDrawerSection extends StatefulWidget { - const NavigationDrawerSection({super.key}); - - @override - State createState() => - _NavigationDrawerSectionState(); -} - -class _NavigationDrawerSectionState extends State { - int navDrawerIndex = 0; - - @override - Widget build(BuildContext context) { - return NavigationDrawer( - onDestinationSelected: (selectedIndex) { - setState(() { - navDrawerIndex = selectedIndex; - }); - }, - selectedIndex: navDrawerIndex, - children: [ - Padding( - padding: const EdgeInsets.fromLTRB(28, 16, 16, 10), - child: Text( - 'Mail', - style: Theme.of(context).textTheme.titleSmall, - ), - ), - ...destinations.map((destination) { - return NavigationDrawerDestination( - label: Text(destination.label), - icon: destination.icon, - selectedIcon: destination.selectedIcon, - ); - }), - const Divider(indent: 28, endIndent: 28), - Padding( - padding: const EdgeInsets.fromLTRB(28, 16, 16, 10), - child: Text( - 'Labels', - style: Theme.of(context).textTheme.titleSmall, - ), - ), - ...labelDestinations.map((destination) { - return NavigationDrawerDestination( - label: Text(destination.label), - icon: destination.icon, - selectedIcon: destination.selectedIcon, - ); - }), - ], - ); - } -} - -class ExampleDestination { - const ExampleDestination(this.label, this.icon, this.selectedIcon); - - final String label; - final Widget icon; - final Widget selectedIcon; -} - -const List destinations = [ - ExampleDestination('Inbox', Icon(Icons.inbox_outlined), Icon(Icons.inbox)), - ExampleDestination('Outbox', Icon(Icons.send_outlined), Icon(Icons.send)), - ExampleDestination( - 'Favorites', Icon(Icons.favorite_outline), Icon(Icons.favorite)), - ExampleDestination('Trash', Icon(Icons.delete_outline), Icon(Icons.delete)), -]; - -const List labelDestinations = [ - ExampleDestination( - 'Family', Icon(Icons.bookmark_border), Icon(Icons.bookmark)), - ExampleDestination( - 'School', Icon(Icons.bookmark_border), Icon(Icons.bookmark)), - ExampleDestination('Work', Icon(Icons.bookmark_border), Icon(Icons.bookmark)), -]; - -class NavigationRails extends StatelessWidget { - const NavigationRails({super.key}); - - @override - Widget build(BuildContext context) { - return const ComponentDecoration( - label: 'Navigation rail', - tooltipMessage: 'Use NavigationRail', - child: IntrinsicWidth( - child: SizedBox(height: 420, child: NavigationRailSection())), - ); - } -} - -class NavigationRailSection extends StatefulWidget { - const NavigationRailSection({super.key}); - - @override - State createState() => _NavigationRailSectionState(); -} - -class _NavigationRailSectionState extends State { - int navRailIndex = 0; - - @override - Widget build(BuildContext context) { - return NavigationRail( - onDestinationSelected: (selectedIndex) { - setState(() { - navRailIndex = selectedIndex; - }); - }, - elevation: 4, - leading: FloatingActionButton( - child: const Icon(Icons.create), onPressed: () {}), - groupAlignment: 0.0, - selectedIndex: navRailIndex, - labelType: NavigationRailLabelType.selected, - destinations: [ - ...destinations.map((destination) { - return NavigationRailDestination( - label: Text(destination.label), - icon: destination.icon, - selectedIcon: destination.selectedIcon, - ); - }), - ], - ); - } -} - -class Tabs extends StatefulWidget { - const Tabs({super.key}); - - @override - State createState() => _TabsState(); -} - -class _TabsState extends State with TickerProviderStateMixin { - late TabController _tabController; - - @override - void initState() { - super.initState(); - _tabController = TabController(length: 3, vsync: this); - } - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Tabs', - tooltipMessage: 'Use TabBar', - child: SizedBox( - height: 80, - child: Scaffold( - appBar: AppBar( - bottom: TabBar( - controller: _tabController, - tabs: const [ - Tab( - icon: Icon(Icons.videocam_outlined), - text: 'Video', - iconMargin: EdgeInsets.only(bottom: 0.0), - ), - Tab( - icon: Icon(Icons.photo_outlined), - text: 'Photos', - iconMargin: EdgeInsets.only(bottom: 0.0), - ), - Tab( - icon: Icon(Icons.audiotrack_sharp), - text: 'Audio', - iconMargin: EdgeInsets.only(bottom: 0.0), - ), - ], - ), - // TODO: Showcase secondary tab bar https://github.com/flutter/flutter/issues/111962 - ), - ), - ), - ); - } -} - -class TopAppBars extends StatelessWidget { - const TopAppBars({super.key}); - - static final actions = [ - IconButton(icon: const Icon(Icons.attach_file), onPressed: () {}), - IconButton(icon: const Icon(Icons.event), onPressed: () {}), - IconButton(icon: const Icon(Icons.more_vert), onPressed: () {}), - ]; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Top app bars', - tooltipMessage: - 'Use AppBar, SliverAppBar, SliverAppBar.medium, or SliverAppBar.large', - child: Column( - children: [ - AppBar( - title: const Text('Center-aligned'), - leading: const BackButton(), - actions: [ - IconButton( - iconSize: 32, - icon: const Icon(Icons.account_circle_outlined), - onPressed: () {}, - ), - ], - centerTitle: true, - ), - colDivider, - AppBar( - title: const Text('Small'), - leading: const BackButton(), - actions: actions, - centerTitle: false, - ), - colDivider, - SizedBox( - height: 100, - child: CustomScrollView( - slivers: [ - SliverAppBar.medium( - title: const Text('Medium'), - leading: const BackButton(), - actions: actions, - ), - const SliverFillRemaining(), - ], - ), - ), - colDivider, - SizedBox( - height: 130, - child: CustomScrollView( - slivers: [ - SliverAppBar.large( - title: const Text('Large'), - leading: const BackButton(), - actions: actions, - ), - const SliverFillRemaining(), - ], - ), - ), - ], - ), - ); - } -} - -class Menus extends StatefulWidget { - const Menus({super.key}); - - @override - State createState() => _MenusState(); -} - -class _MenusState extends State { - final TextEditingController colorController = TextEditingController(); - final TextEditingController iconController = TextEditingController(); - IconLabel? selectedIcon = IconLabel.smile; - ColorLabel? selectedColor; - - @override - Widget build(BuildContext context) { - final List> colorEntries = - >[]; - for (final ColorLabel color in ColorLabel.values) { - colorEntries.add(DropdownMenuEntry( - value: color, label: color.label, enabled: color.label != 'Grey')); - } - - final List> iconEntries = - >[]; - for (final IconLabel icon in IconLabel.values) { - iconEntries - .add(DropdownMenuEntry(value: icon, label: icon.label)); - } - - return ComponentDecoration( - label: 'Menus', - tooltipMessage: 'Use MenuAnchor or DropdownMenu', - child: Column( - children: [ - const Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - ButtonAnchorExample(), - rowDivider, - IconButtonAnchorExample(), - ], - ), - colDivider, - Wrap( - alignment: WrapAlignment.spaceAround, - runAlignment: WrapAlignment.center, - crossAxisAlignment: WrapCrossAlignment.center, - spacing: smallSpacing, - runSpacing: smallSpacing, - children: [ - DropdownMenu( - controller: colorController, - label: const Text('Color'), - enableFilter: true, - dropdownMenuEntries: colorEntries, - inputDecorationTheme: const InputDecorationTheme(filled: true), - onSelected: (color) { - setState(() { - selectedColor = color; - }); - }, - ), - DropdownMenu( - initialSelection: IconLabel.smile, - controller: iconController, - leadingIcon: const Icon(Icons.search), - label: const Text('Icon'), - dropdownMenuEntries: iconEntries, - onSelected: (icon) { - setState(() { - selectedIcon = icon; - }); - }, - ), - Icon( - selectedIcon?.icon, - color: selectedColor?.color ?? Colors.grey.withOpacity(0.5), - ) - ], - ), - ], - ), - ); - } -} - -enum ColorLabel { - blue('Blue', Colors.blue), - pink('Pink', Colors.pink), - green('Green', Colors.green), - yellow('Yellow', Colors.yellow), - grey('Grey', Colors.grey); - - const ColorLabel(this.label, this.color); - final String label; - final Color color; -} - -enum IconLabel { - smile('Smile', Icons.sentiment_satisfied_outlined), - cloud( - 'Cloud', - Icons.cloud_outlined, - ), - brush('Brush', Icons.brush_outlined), - heart('Heart', Icons.favorite); - - const IconLabel(this.label, this.icon); - final String label; - final IconData icon; -} - -class Sliders extends StatefulWidget { - const Sliders({super.key}); - - @override - State createState() => _SlidersState(); -} - -class _SlidersState extends State { - double sliderValue0 = 30.0; - double sliderValue1 = 20.0; - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Sliders', - tooltipMessage: 'Use Slider or RangeSlider', - child: Column( - children: [ - Slider( - max: 100, - value: sliderValue0, - onChanged: (value) { - setState(() { - sliderValue0 = value; - }); - }, - ), - const SizedBox(height: 20), - Slider( - max: 100, - divisions: 5, - value: sliderValue1, - label: sliderValue1.round().toString(), - onChanged: (value) { - setState(() { - sliderValue1 = value; - }); - }, - ), - ], - )); - } -} - -class SearchAnchors extends StatefulWidget { - const SearchAnchors({super.key}); - - @override - State createState() => _SearchAnchorsState(); -} - -class _SearchAnchorsState extends State { - String? selectedColor; - List searchHistory = []; - - Iterable getHistoryList(SearchController controller) { - return searchHistory.map((color) => ListTile( - leading: const Icon(Icons.history), - title: Text(color.label), - trailing: IconButton( - icon: const Icon(Icons.call_missed), - onPressed: () { - controller.text = color.label; - controller.selection = - TextSelection.collapsed(offset: controller.text.length); - }), - onTap: () { - controller.closeView(color.label); - handleSelection(color); - }, - )); - } - - Iterable getSuggestions(SearchController controller) { - final String input = controller.value.text; - return ColorItem.values - .where((color) => color.label.contains(input)) - .map((filteredColor) => ListTile( - leading: CircleAvatar(backgroundColor: filteredColor.color), - title: Text(filteredColor.label), - trailing: IconButton( - icon: const Icon(Icons.call_missed), - onPressed: () { - controller.text = filteredColor.label; - controller.selection = - TextSelection.collapsed(offset: controller.text.length); - }), - onTap: () { - controller.closeView(filteredColor.label); - handleSelection(filteredColor); - }, - )); - } - - void handleSelection(ColorItem color) { - setState(() { - selectedColor = color.label; - if (searchHistory.length >= 5) { - searchHistory.removeLast(); - } - searchHistory.insert(0, color); - }); - } - - @override - Widget build(BuildContext context) { - return ComponentDecoration( - label: 'Search', - tooltipMessage: 'Use SearchAnchor or SearchAnchor.bar', - child: Column( - children: [ - SearchAnchor.bar( - barHintText: 'Search colors', - suggestionsBuilder: (context, controller) { - if (controller.text.isEmpty) { - if (searchHistory.isNotEmpty) { - return getHistoryList(controller); - } - return [ - const Center( - child: Text('No search history.', - style: TextStyle(color: Colors.grey)), - ) - ]; - } - return getSuggestions(controller); - }, - ), - const SizedBox(height: 20), - if (selectedColor == null) - const Text('Select a color') - else - Text('Last selected color is $selectedColor') - ], - ), - ); - } -} - -class ComponentDecoration extends StatefulWidget { - const ComponentDecoration({ - super.key, - required this.label, - required this.child, - this.tooltipMessage = '', - }); - - final String label; - final Widget child; - final String? tooltipMessage; - - @override - State createState() => _ComponentDecorationState(); -} - -class _ComponentDecorationState extends State { - final focusNode = FocusNode(); - - @override - Widget build(BuildContext context) { - return RepaintBoundary( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: smallSpacing), - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text(widget.label, - style: Theme.of(context).textTheme.titleSmall), - Tooltip( - message: widget.tooltipMessage, - child: const Padding( - padding: EdgeInsets.symmetric(horizontal: 5.0), - child: Icon(Icons.info_outline, size: 16)), - ), - ], - ), - ConstrainedBox( - constraints: - const BoxConstraints.tightFor(width: widthConstraint), - // Tapping within the a component card should request focus - // for that component's children. - child: Focus( - focusNode: focusNode, - canRequestFocus: true, - child: GestureDetector( - onTapDown: (_) { - focusNode.requestFocus(); - }, - behavior: HitTestBehavior.opaque, - child: Card( - elevation: 0, - shape: RoundedRectangleBorder( - side: BorderSide( - color: Theme.of(context).colorScheme.outlineVariant, - ), - borderRadius: const BorderRadius.all(Radius.circular(12)), - ), - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 5.0, vertical: 20.0), - child: Center( - child: widget.child, - ), - ), - ), - ), - ), - ), - ], - ), - ), - ); - } -} - -class ComponentGroupDecoration extends StatelessWidget { - const ComponentGroupDecoration( - {super.key, required this.label, required this.children}); - - final String label; - final List children; - - @override - Widget build(BuildContext context) { - // Fully traverse this component group before moving on - return FocusTraversalGroup( - child: Card( - margin: EdgeInsets.zero, - elevation: 0, - color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3), - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 20.0), - child: Center( - child: Column( - children: [ - Text(label, style: Theme.of(context).textTheme.titleLarge), - colDivider, - ...children - ], - ), - ), - ), - ), - ); - } -} - -enum ColorItem { - red('red', Colors.red), - orange('orange', Colors.orange), - yellow('yellow', Colors.yellow), - green('green', Colors.green), - blue('blue', Colors.blue), - indigo('indigo', Colors.indigo), - violet('violet', Color(0xFF8F00FF)), - purple('purple', Colors.purple), - pink('pink', Colors.pink), - silver('silver', Color(0xFF808080)), - gold('gold', Color(0xFFFFD700)), - beige('beige', Color(0xFFF5F5DC)), - brown('brown', Colors.brown), - grey('grey', Colors.grey), - black('black', Colors.black), - white('white', Colors.white); - - const ColorItem(this.label, this.color); - final String label; - final Color color; -} diff --git a/experimental/material_3_demo/lib/constants.dart b/experimental/material_3_demo/lib/constants.dart deleted file mode 100644 index 41b97ebd2..000000000 --- a/experimental/material_3_demo/lib/constants.dart +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2021 The Flutter team. 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'; - -// NavigationRail shows if the screen width is greater or equal to -// narrowScreenWidthThreshold; otherwise, NavigationBar is used for navigation. -const double narrowScreenWidthThreshold = 450; - -const double mediumWidthBreakpoint = 1000; -const double largeWidthBreakpoint = 1500; - -const double transitionLength = 500; - -// Whether the user has chosen a theme color via a direct [ColorSeed] selection, -// or an image [ColorImageProvider]. -enum ColorSelectionMethod { - colorSeed, - image, -} - -enum ColorSeed { - baseColor('M3 Baseline', Color(0xff6750a4)), - indigo('Indigo', Colors.indigo), - blue('Blue', Colors.blue), - teal('Teal', Colors.teal), - green('Green', Colors.green), - yellow('Yellow', Colors.yellow), - orange('Orange', Colors.orange), - deepOrange('Deep Orange', Colors.deepOrange), - pink('Pink', Colors.pink); - - const ColorSeed(this.label, this.color); - final String label; - final Color color; -} - -enum ColorImageProvider { - leaves('Leaves', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_1.png'), - peonies('Peonies', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_2.png'), - bubbles('Bubbles', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_3.png'), - seaweed('Seaweed', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_4.png'), - seagrapes('Sea Grapes', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_5.png'), - petals('Petals', - 'https://flutter.github.io/assets-for-api-docs/assets/material/content_based_color_scheme_6.png'); - - const ColorImageProvider(this.label, this.url); - final String label; - final String url; -} - -enum ScreenSelected { - component(0), - color(1), - typography(2), - elevation(3); - - const ScreenSelected(this.value); - final int value; -} diff --git a/experimental/material_3_demo/lib/elevation_screen.dart b/experimental/material_3_demo/lib/elevation_screen.dart deleted file mode 100644 index 6522e9b8e..000000000 --- a/experimental/material_3_demo/lib/elevation_screen.dart +++ /dev/null @@ -1,187 +0,0 @@ -// Copyright 2021 The Flutter team. 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 ElevationScreen extends StatelessWidget { - const ElevationScreen({super.key}); - - @override - Widget build(BuildContext context) { - Color shadowColor = Theme.of(context).colorScheme.shadow; - Color surfaceTint = Theme.of(context).colorScheme.primary; - return Expanded( - child: CustomScrollView( - slivers: [ - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.fromLTRB(16.0, 20, 16.0, 0), - child: Text( - 'Surface Tint Color Only', - style: Theme.of(context).textTheme.titleLarge, - ), - ), - ), - ElevationGrid( - surfaceTintColor: surfaceTint, - shadowColor: Colors.transparent, - ), - SliverList( - delegate: SliverChildListDelegate([ - const SizedBox(height: 10), - Padding( - padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0), - child: Text( - 'Surface Tint Color and Shadow Color', - style: Theme.of(context).textTheme.titleLarge, - ), - ), - ]), - ), - ElevationGrid( - shadowColor: shadowColor, - surfaceTintColor: surfaceTint, - ), - SliverList( - delegate: SliverChildListDelegate([ - const SizedBox(height: 10), - Padding( - padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0), - child: Text( - 'Shadow Color Only', - style: Theme.of(context).textTheme.titleLarge, - ), - ), - ]), - ), - ElevationGrid(shadowColor: shadowColor), - ], - ), - ); - } -} - -const double narrowScreenWidthThreshold = 450; - -class ElevationGrid extends StatelessWidget { - const ElevationGrid({super.key, this.shadowColor, this.surfaceTintColor}); - - final Color? shadowColor; - final Color? surfaceTintColor; - - List elevationCards( - Color? shadowColor, Color? surfaceTintColor) { - return elevations - .map( - (elevationInfo) => ElevationCard( - info: elevationInfo, - shadowColor: shadowColor, - surfaceTint: surfaceTintColor, - ), - ) - .toList(); - } - - @override - Widget build(BuildContext context) { - return SliverPadding( - padding: const EdgeInsets.all(8), - sliver: SliverLayoutBuilder(builder: (context, constraints) { - if (constraints.crossAxisExtent < narrowScreenWidthThreshold) { - return SliverGrid.count( - crossAxisCount: 3, - children: elevationCards(shadowColor, surfaceTintColor), - ); - } else { - return SliverGrid.count( - crossAxisCount: 6, - children: elevationCards(shadowColor, surfaceTintColor), - ); - } - }), - ); - } -} - -class ElevationCard extends StatefulWidget { - const ElevationCard( - {super.key, required this.info, this.shadowColor, this.surfaceTint}); - - final ElevationInfo info; - final Color? shadowColor; - final Color? surfaceTint; - - @override - State createState() => _ElevationCardState(); -} - -class _ElevationCardState extends State { - late double _elevation; - - @override - void initState() { - super.initState(); - _elevation = widget.info.elevation; - } - - @override - Widget build(BuildContext context) { - const BorderRadius borderRadius = BorderRadius.all(Radius.circular(4.0)); - final Color color = Theme.of(context).colorScheme.surface; - - return Padding( - padding: const EdgeInsets.all(8.0), - child: Material( - borderRadius: borderRadius, - elevation: _elevation, - color: color, - shadowColor: widget.shadowColor, - surfaceTintColor: widget.surfaceTint, - type: MaterialType.card, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Level ${widget.info.level}', - style: Theme.of(context).textTheme.labelMedium, - ), - Text( - '${widget.info.elevation.toInt()} dp', - style: Theme.of(context).textTheme.labelMedium, - ), - if (widget.surfaceTint != null) - Expanded( - child: Align( - alignment: Alignment.bottomRight, - child: Text( - '${widget.info.overlayPercent}%', - style: Theme.of(context).textTheme.bodySmall, - ), - ), - ), - ], - ), - ), - ), - ); - } -} - -class ElevationInfo { - const ElevationInfo(this.level, this.elevation, this.overlayPercent); - final int level; - final double elevation; - final int overlayPercent; -} - -const List elevations = [ - ElevationInfo(0, 0.0, 0), - ElevationInfo(1, 1.0, 5), - ElevationInfo(2, 3.0, 8), - ElevationInfo(3, 6.0, 11), - ElevationInfo(4, 8.0, 12), - ElevationInfo(5, 12.0, 14), -]; diff --git a/experimental/material_3_demo/lib/home.dart b/experimental/material_3_demo/lib/home.dart deleted file mode 100644 index f31532126..000000000 --- a/experimental/material_3_demo/lib/home.dart +++ /dev/null @@ -1,872 +0,0 @@ -// Copyright 2021 The Flutter team. 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 'color_palettes_screen.dart'; -import 'component_screen.dart'; -import 'constants.dart'; -import 'elevation_screen.dart'; -import 'typography_screen.dart'; - -class Home extends StatefulWidget { - const Home({ - super.key, - required this.useLightMode, - required this.useMaterial3, - required this.colorSelected, - required this.handleBrightnessChange, - required this.handleMaterialVersionChange, - required this.handleColorSelect, - required this.handleImageSelect, - required this.colorSelectionMethod, - required this.imageSelected, - }); - - final bool useLightMode; - final bool useMaterial3; - final ColorSeed colorSelected; - final ColorImageProvider imageSelected; - final ColorSelectionMethod colorSelectionMethod; - - final void Function(bool useLightMode) handleBrightnessChange; - final void Function() handleMaterialVersionChange; - final void Function(int value) handleColorSelect; - final void Function(int value) handleImageSelect; - - @override - State createState() => _HomeState(); -} - -class _HomeState extends State with SingleTickerProviderStateMixin { - final GlobalKey scaffoldKey = GlobalKey(); - late final AnimationController controller; - late final CurvedAnimation railAnimation; - bool controllerInitialized = false; - bool showMediumSizeLayout = false; - bool showLargeSizeLayout = false; - - int screenIndex = ScreenSelected.component.value; - - @override - initState() { - super.initState(); - controller = AnimationController( - duration: Duration(milliseconds: transitionLength.toInt() * 2), - value: 0, - vsync: this, - ); - railAnimation = CurvedAnimation( - parent: controller, - curve: const Interval(0.5, 1.0), - ); - } - - @override - void dispose() { - controller.dispose(); - super.dispose(); - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - - final double width = MediaQuery.of(context).size.width; - final AnimationStatus status = controller.status; - if (width > mediumWidthBreakpoint) { - if (width > largeWidthBreakpoint) { - showMediumSizeLayout = false; - showLargeSizeLayout = true; - } else { - showMediumSizeLayout = true; - showLargeSizeLayout = false; - } - if (status != AnimationStatus.forward && - status != AnimationStatus.completed) { - controller.forward(); - } - } else { - showMediumSizeLayout = false; - showLargeSizeLayout = false; - if (status != AnimationStatus.reverse && - status != AnimationStatus.dismissed) { - controller.reverse(); - } - } - if (!controllerInitialized) { - controllerInitialized = true; - controller.value = width > mediumWidthBreakpoint ? 1 : 0; - } - } - - void handleScreenChanged(int screenSelected) { - setState(() { - screenIndex = screenSelected; - }); - } - - Widget createScreenFor( - ScreenSelected screenSelected, bool showNavBarExample) { - switch (screenSelected) { - case ScreenSelected.component: - return Expanded( - child: OneTwoTransition( - animation: railAnimation, - one: FirstComponentList( - showNavBottomBar: showNavBarExample, - scaffoldKey: scaffoldKey, - showSecondList: showMediumSizeLayout || showLargeSizeLayout), - two: SecondComponentList( - scaffoldKey: scaffoldKey, - ), - ), - ); - case ScreenSelected.color: - return const ColorPalettesScreen(); - case ScreenSelected.typography: - return const TypographyScreen(); - case ScreenSelected.elevation: - return const ElevationScreen(); - } - } - - PreferredSizeWidget createAppBar() { - return AppBar( - title: widget.useMaterial3 - ? const Text('Material 3') - : const Text('Material 2'), - actions: !showMediumSizeLayout && !showLargeSizeLayout - ? [ - _BrightnessButton( - handleBrightnessChange: widget.handleBrightnessChange, - ), - _Material3Button( - handleMaterialVersionChange: widget.handleMaterialVersionChange, - ), - _ColorSeedButton( - handleColorSelect: widget.handleColorSelect, - colorSelected: widget.colorSelected, - colorSelectionMethod: widget.colorSelectionMethod, - ), - _ColorImageButton( - handleImageSelect: widget.handleImageSelect, - imageSelected: widget.imageSelected, - colorSelectionMethod: widget.colorSelectionMethod, - ) - ] - : [Container()], - ); - } - - Widget _trailingActions() => Column( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Flexible( - child: _BrightnessButton( - handleBrightnessChange: widget.handleBrightnessChange, - showTooltipBelow: false, - ), - ), - Flexible( - child: _Material3Button( - handleMaterialVersionChange: widget.handleMaterialVersionChange, - showTooltipBelow: false, - ), - ), - Flexible( - child: _ColorSeedButton( - handleColorSelect: widget.handleColorSelect, - colorSelected: widget.colorSelected, - colorSelectionMethod: widget.colorSelectionMethod, - ), - ), - Flexible( - child: _ColorImageButton( - handleImageSelect: widget.handleImageSelect, - imageSelected: widget.imageSelected, - colorSelectionMethod: widget.colorSelectionMethod, - ), - ), - ], - ); - - @override - Widget build(BuildContext context) { - return AnimatedBuilder( - animation: controller, - builder: (context, child) { - return NavigationTransition( - scaffoldKey: scaffoldKey, - animationController: controller, - railAnimation: railAnimation, - appBar: createAppBar(), - body: createScreenFor( - ScreenSelected.values[screenIndex], controller.value == 1), - navigationRail: NavigationRail( - extended: showLargeSizeLayout, - destinations: navRailDestinations, - selectedIndex: screenIndex, - onDestinationSelected: (index) { - setState(() { - screenIndex = index; - handleScreenChanged(screenIndex); - }); - }, - trailing: Expanded( - child: Padding( - padding: const EdgeInsets.only(bottom: 20), - child: showLargeSizeLayout - ? _ExpandedTrailingActions( - useLightMode: widget.useLightMode, - handleBrightnessChange: widget.handleBrightnessChange, - useMaterial3: widget.useMaterial3, - handleMaterialVersionChange: - widget.handleMaterialVersionChange, - handleImageSelect: widget.handleImageSelect, - handleColorSelect: widget.handleColorSelect, - colorSelectionMethod: widget.colorSelectionMethod, - imageSelected: widget.imageSelected, - colorSelected: widget.colorSelected, - ) - : _trailingActions(), - ), - ), - ), - navigationBar: NavigationBars( - onSelectItem: (index) { - setState(() { - screenIndex = index; - handleScreenChanged(screenIndex); - }); - }, - selectedIndex: screenIndex, - isExampleBar: false, - ), - ); - }, - ); - } -} - -class _BrightnessButton extends StatelessWidget { - const _BrightnessButton({ - required this.handleBrightnessChange, - this.showTooltipBelow = true, - }); - - final Function handleBrightnessChange; - final bool showTooltipBelow; - - @override - Widget build(BuildContext context) { - final isBright = Theme.of(context).brightness == Brightness.light; - return Tooltip( - preferBelow: showTooltipBelow, - message: 'Toggle brightness', - child: IconButton( - icon: isBright - ? const Icon(Icons.dark_mode_outlined) - : const Icon(Icons.light_mode_outlined), - onPressed: () => handleBrightnessChange(!isBright), - ), - ); - } -} - -class _Material3Button extends StatelessWidget { - const _Material3Button({ - required this.handleMaterialVersionChange, - this.showTooltipBelow = true, - }); - - final void Function() handleMaterialVersionChange; - final bool showTooltipBelow; - - @override - Widget build(BuildContext context) { - final useMaterial3 = Theme.of(context).useMaterial3; - return Tooltip( - preferBelow: showTooltipBelow, - message: 'Switch to Material ${useMaterial3 ? 2 : 3}', - child: IconButton( - icon: useMaterial3 - ? const Icon(Icons.filter_2) - : const Icon(Icons.filter_3), - onPressed: handleMaterialVersionChange, - ), - ); - } -} - -class _ColorSeedButton extends StatelessWidget { - const _ColorSeedButton({ - required this.handleColorSelect, - required this.colorSelected, - required this.colorSelectionMethod, - }); - - final void Function(int) handleColorSelect; - final ColorSeed colorSelected; - final ColorSelectionMethod colorSelectionMethod; - - @override - Widget build(BuildContext context) { - return PopupMenuButton( - icon: Icon( - Icons.palette_outlined, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - tooltip: 'Select a seed color', - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), - itemBuilder: (context) { - return List.generate(ColorSeed.values.length, (index) { - ColorSeed currentColor = ColorSeed.values[index]; - - return PopupMenuItem( - value: index, - enabled: currentColor != colorSelected || - colorSelectionMethod != ColorSelectionMethod.colorSeed, - child: Wrap( - children: [ - Padding( - padding: const EdgeInsets.only(left: 10), - child: Icon( - currentColor == colorSelected && - colorSelectionMethod != ColorSelectionMethod.image - ? Icons.color_lens - : Icons.color_lens_outlined, - color: currentColor.color, - ), - ), - Padding( - padding: const EdgeInsets.only(left: 20), - child: Text(currentColor.label), - ), - ], - ), - ); - }); - }, - onSelected: handleColorSelect, - ); - } -} - -class _ColorImageButton extends StatelessWidget { - const _ColorImageButton({ - required this.handleImageSelect, - required this.imageSelected, - required this.colorSelectionMethod, - }); - - final void Function(int) handleImageSelect; - final ColorImageProvider imageSelected; - final ColorSelectionMethod colorSelectionMethod; - - @override - Widget build(BuildContext context) { - return PopupMenuButton( - icon: Icon( - Icons.image_outlined, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - tooltip: 'Select a color extraction image', - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), - itemBuilder: (context) { - return List.generate(ColorImageProvider.values.length, (index) { - ColorImageProvider currentImageProvider = - ColorImageProvider.values[index]; - - return PopupMenuItem( - value: index, - enabled: currentImageProvider != imageSelected || - colorSelectionMethod != ColorSelectionMethod.image, - child: Wrap( - crossAxisAlignment: WrapCrossAlignment.center, - children: [ - Padding( - padding: const EdgeInsets.only(left: 10), - child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 48), - child: Padding( - padding: const EdgeInsets.all(4.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: Image( - image: NetworkImage( - ColorImageProvider.values[index].url), - ), - ), - ), - ), - ), - Padding( - padding: const EdgeInsets.only(left: 20), - child: Text(currentImageProvider.label), - ), - ], - ), - ); - }); - }, - onSelected: handleImageSelect, - ); - } -} - -class _ExpandedTrailingActions extends StatelessWidget { - const _ExpandedTrailingActions({ - required this.useLightMode, - required this.handleBrightnessChange, - required this.useMaterial3, - required this.handleMaterialVersionChange, - required this.handleColorSelect, - required this.handleImageSelect, - required this.imageSelected, - required this.colorSelected, - required this.colorSelectionMethod, - }); - - final void Function(bool) handleBrightnessChange; - final void Function() handleMaterialVersionChange; - final void Function(int) handleImageSelect; - final void Function(int) handleColorSelect; - - final bool useLightMode; - final bool useMaterial3; - - final ColorImageProvider imageSelected; - final ColorSeed colorSelected; - final ColorSelectionMethod colorSelectionMethod; - - @override - Widget build(BuildContext context) { - final screenHeight = MediaQuery.of(context).size.height; - final trailingActionsBody = Container( - constraints: const BoxConstraints.tightFor(width: 250), - padding: const EdgeInsets.symmetric(horizontal: 30), - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Row( - children: [ - const Text('Brightness'), - Expanded(child: Container()), - Switch( - value: useLightMode, - onChanged: (value) { - handleBrightnessChange(value); - }) - ], - ), - Row( - children: [ - useMaterial3 - ? const Text('Material 3') - : const Text('Material 2'), - Expanded(child: Container()), - Switch( - value: useMaterial3, - onChanged: (_) { - handleMaterialVersionChange(); - }) - ], - ), - const Divider(), - _ExpandedColorSeedAction( - handleColorSelect: handleColorSelect, - colorSelected: colorSelected, - colorSelectionMethod: colorSelectionMethod, - ), - const Divider(), - _ExpandedImageColorAction( - handleImageSelect: handleImageSelect, - imageSelected: imageSelected, - colorSelectionMethod: colorSelectionMethod, - ), - ], - ), - ); - return screenHeight > 740 - ? trailingActionsBody - : SingleChildScrollView(child: trailingActionsBody); - } -} - -class _ExpandedColorSeedAction extends StatelessWidget { - const _ExpandedColorSeedAction({ - required this.handleColorSelect, - required this.colorSelected, - required this.colorSelectionMethod, - }); - - final void Function(int) handleColorSelect; - final ColorSeed colorSelected; - final ColorSelectionMethod colorSelectionMethod; - - @override - Widget build(BuildContext context) { - return ConstrainedBox( - constraints: const BoxConstraints(maxHeight: 200.0), - child: GridView.count( - crossAxisCount: 3, - children: List.generate( - ColorSeed.values.length, - (i) => IconButton( - icon: const Icon(Icons.radio_button_unchecked), - color: ColorSeed.values[i].color, - isSelected: colorSelected.color == ColorSeed.values[i].color && - colorSelectionMethod == ColorSelectionMethod.colorSeed, - selectedIcon: const Icon(Icons.circle), - onPressed: () => handleColorSelect(i), - tooltip: ColorSeed.values[i].label, - ), - ), - ), - ); - } -} - -class _ExpandedImageColorAction extends StatelessWidget { - const _ExpandedImageColorAction({ - required this.handleImageSelect, - required this.imageSelected, - required this.colorSelectionMethod, - }); - - final void Function(int) handleImageSelect; - final ColorImageProvider imageSelected; - final ColorSelectionMethod colorSelectionMethod; - - @override - Widget build(BuildContext context) { - return ConstrainedBox( - constraints: const BoxConstraints(maxHeight: 150.0), - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 8.0), - child: GridView.count( - crossAxisCount: 3, - children: List.generate( - ColorImageProvider.values.length, - (i) => Tooltip( - message: ColorImageProvider.values[i].label, - child: InkWell( - borderRadius: BorderRadius.circular(4.0), - onTap: () => handleImageSelect(i), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Material( - borderRadius: BorderRadius.circular(4.0), - elevation: imageSelected == ColorImageProvider.values[i] && - colorSelectionMethod == ColorSelectionMethod.image - ? 3 - : 0, - child: Padding( - padding: const EdgeInsets.all(4.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(4.0), - child: Image( - image: NetworkImage(ColorImageProvider.values[i].url), - ), - ), - ), - ), - ), - ), - ), - ), - ), - ), - ); - } -} - -class NavigationTransition extends StatefulWidget { - const NavigationTransition( - {super.key, - required this.scaffoldKey, - required this.animationController, - required this.railAnimation, - required this.navigationRail, - required this.navigationBar, - required this.appBar, - required this.body}); - - final GlobalKey scaffoldKey; - final AnimationController animationController; - final CurvedAnimation railAnimation; - final Widget navigationRail; - final Widget navigationBar; - final PreferredSizeWidget appBar; - final Widget body; - - @override - State createState() => _NavigationTransitionState(); -} - -class _NavigationTransitionState extends State { - late final AnimationController controller; - late final CurvedAnimation railAnimation; - late final ReverseAnimation barAnimation; - bool controllerInitialized = false; - bool showDivider = false; - - @override - void initState() { - super.initState(); - - controller = widget.animationController; - railAnimation = widget.railAnimation; - - barAnimation = ReverseAnimation( - CurvedAnimation( - parent: controller, - curve: const Interval(0.0, 0.5), - ), - ); - } - - @override - Widget build(BuildContext context) { - final ColorScheme colorScheme = Theme.of(context).colorScheme; - - return Scaffold( - key: widget.scaffoldKey, - appBar: widget.appBar, - body: Row( - children: [ - RailTransition( - animation: railAnimation, - backgroundColor: colorScheme.surface, - child: widget.navigationRail, - ), - widget.body, - ], - ), - bottomNavigationBar: BarTransition( - animation: barAnimation, - backgroundColor: colorScheme.surface, - child: widget.navigationBar, - ), - endDrawer: const NavigationDrawerSection(), - ); - } -} - -final List navRailDestinations = appBarDestinations - .map( - (destination) => NavigationRailDestination( - icon: Tooltip( - message: destination.label, - child: destination.icon, - ), - selectedIcon: Tooltip( - message: destination.label, - child: destination.selectedIcon, - ), - label: Text(destination.label), - ), - ) - .toList(); - -class SizeAnimation extends CurvedAnimation { - SizeAnimation(Animation parent) - : super( - parent: parent, - curve: const Interval( - 0.2, - 0.8, - curve: Curves.easeInOutCubicEmphasized, - ), - reverseCurve: Interval( - 0, - 0.2, - curve: Curves.easeInOutCubicEmphasized.flipped, - ), - ); -} - -class OffsetAnimation extends CurvedAnimation { - OffsetAnimation(Animation parent) - : super( - parent: parent, - curve: const Interval( - 0.4, - 1.0, - curve: Curves.easeInOutCubicEmphasized, - ), - reverseCurve: Interval( - 0, - 0.2, - curve: Curves.easeInOutCubicEmphasized.flipped, - ), - ); -} - -class RailTransition extends StatefulWidget { - const RailTransition( - {super.key, - required this.animation, - required this.backgroundColor, - required this.child}); - - final Animation animation; - final Widget child; - final Color backgroundColor; - - @override - State createState() => _RailTransition(); -} - -class _RailTransition extends State { - late Animation offsetAnimation; - late Animation widthAnimation; - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - - // The animations are only rebuilt by this method when the text - // direction changes because this widget only depends on Directionality. - final bool ltr = Directionality.of(context) == TextDirection.ltr; - - widthAnimation = Tween( - begin: 0, - end: 1, - ).animate(SizeAnimation(widget.animation)); - - offsetAnimation = Tween( - begin: ltr ? const Offset(-1, 0) : const Offset(1, 0), - end: Offset.zero, - ).animate(OffsetAnimation(widget.animation)); - } - - @override - Widget build(BuildContext context) { - return ClipRect( - child: DecoratedBox( - decoration: BoxDecoration(color: widget.backgroundColor), - child: Align( - alignment: Alignment.topLeft, - widthFactor: widthAnimation.value, - child: FractionalTranslation( - translation: offsetAnimation.value, - child: widget.child, - ), - ), - ), - ); - } -} - -class BarTransition extends StatefulWidget { - const BarTransition( - {super.key, - required this.animation, - required this.backgroundColor, - required this.child}); - - final Animation animation; - final Color backgroundColor; - final Widget child; - - @override - State createState() => _BarTransition(); -} - -class _BarTransition extends State { - late final Animation offsetAnimation; - late final Animation heightAnimation; - - @override - void initState() { - super.initState(); - - offsetAnimation = Tween( - begin: const Offset(0, 1), - end: Offset.zero, - ).animate(OffsetAnimation(widget.animation)); - - heightAnimation = Tween( - begin: 0, - end: 1, - ).animate(SizeAnimation(widget.animation)); - } - - @override - Widget build(BuildContext context) { - return ClipRect( - child: DecoratedBox( - decoration: BoxDecoration(color: widget.backgroundColor), - child: Align( - alignment: Alignment.topLeft, - heightFactor: heightAnimation.value, - child: FractionalTranslation( - translation: offsetAnimation.value, - child: widget.child, - ), - ), - ), - ); - } -} - -class OneTwoTransition extends StatefulWidget { - const OneTwoTransition({ - super.key, - required this.animation, - required this.one, - required this.two, - }); - - final Animation animation; - final Widget one; - final Widget two; - - @override - State createState() => _OneTwoTransitionState(); -} - -class _OneTwoTransitionState extends State { - late final Animation offsetAnimation; - late final Animation widthAnimation; - - @override - void initState() { - super.initState(); - - offsetAnimation = Tween( - begin: const Offset(1, 0), - end: Offset.zero, - ).animate(OffsetAnimation(widget.animation)); - - widthAnimation = Tween( - begin: 0, - end: mediumWidthBreakpoint, - ).animate(SizeAnimation(widget.animation)); - } - - @override - Widget build(BuildContext context) { - return Row( - children: [ - Flexible( - flex: mediumWidthBreakpoint.toInt(), - child: widget.one, - ), - if (widthAnimation.value.toInt() > 0) ...[ - Flexible( - flex: widthAnimation.value.toInt(), - child: FractionalTranslation( - translation: offsetAnimation.value, - child: widget.two, - ), - ) - ], - ], - ); - } -} diff --git a/experimental/material_3_demo/lib/main.dart b/experimental/material_3_demo/lib/main.dart deleted file mode 100644 index 30426c56e..000000000 --- a/experimental/material_3_demo/lib/main.dart +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright 2021 The Flutter team. 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:convert'; - -import 'package:flutter/material.dart'; -import 'package:web_startup_analyzer/web_startup_analyzer.dart'; - -import 'constants.dart'; -import 'home.dart'; - -void main() async { - var analyzer = WebStartupAnalyzer(additionalFrameCount: 10); - debugPrint(json.encode(analyzer.startupTiming)); - analyzer.onFirstFrame.addListener(() { - debugPrint(json.encode({'firstFrame': analyzer.onFirstFrame.value})); - }); - analyzer.onFirstPaint.addListener(() { - debugPrint(json.encode({ - 'firstPaint': analyzer.onFirstPaint.value?.$1, - 'firstContentfulPaint': analyzer.onFirstPaint.value?.$2, - })); - }); - analyzer.onAdditionalFrames.addListener(() { - debugPrint(json.encode({ - 'additionalFrames': analyzer.onAdditionalFrames.value, - })); - }); - runApp( - const App(), - ); -} - -class App extends StatefulWidget { - const App({super.key}); - - @override - State createState() => _AppState(); -} - -class _AppState extends State { - bool useMaterial3 = true; - ThemeMode themeMode = ThemeMode.system; - ColorSeed colorSelected = ColorSeed.baseColor; - ColorImageProvider imageSelected = ColorImageProvider.leaves; - ColorScheme? imageColorScheme = const ColorScheme.light(); - ColorSelectionMethod colorSelectionMethod = ColorSelectionMethod.colorSeed; - - bool get useLightMode { - switch (themeMode) { - case ThemeMode.system: - return View.of(context).platformDispatcher.platformBrightness == - Brightness.light; - case ThemeMode.light: - return true; - case ThemeMode.dark: - return false; - } - } - - void handleBrightnessChange(bool useLightMode) { - setState(() { - themeMode = useLightMode ? ThemeMode.light : ThemeMode.dark; - }); - } - - void handleMaterialVersionChange() { - setState(() { - useMaterial3 = !useMaterial3; - }); - } - - void handleColorSelect(int value) { - setState(() { - colorSelectionMethod = ColorSelectionMethod.colorSeed; - colorSelected = ColorSeed.values[value]; - }); - } - - void handleImageSelect(int value) { - final String url = ColorImageProvider.values[value].url; - ColorScheme.fromImageProvider(provider: NetworkImage(url)) - .then((newScheme) { - setState(() { - colorSelectionMethod = ColorSelectionMethod.image; - imageSelected = ColorImageProvider.values[value]; - imageColorScheme = newScheme; - }); - }); - } - - @override - Widget build(BuildContext context) { - return MaterialApp( - debugShowCheckedModeBanner: false, - title: 'Material 3', - themeMode: themeMode, - theme: ThemeData( - colorSchemeSeed: colorSelectionMethod == ColorSelectionMethod.colorSeed - ? colorSelected.color - : null, - colorScheme: colorSelectionMethod == ColorSelectionMethod.image - ? imageColorScheme - : null, - useMaterial3: useMaterial3, - brightness: Brightness.light, - ), - darkTheme: ThemeData( - colorSchemeSeed: colorSelectionMethod == ColorSelectionMethod.colorSeed - ? colorSelected.color - : imageColorScheme!.primary, - useMaterial3: useMaterial3, - brightness: Brightness.dark, - ), - home: Home( - useLightMode: useLightMode, - useMaterial3: useMaterial3, - colorSelected: colorSelected, - imageSelected: imageSelected, - handleBrightnessChange: handleBrightnessChange, - handleMaterialVersionChange: handleMaterialVersionChange, - handleColorSelect: handleColorSelect, - handleImageSelect: handleImageSelect, - colorSelectionMethod: colorSelectionMethod, - ), - ); - } -} diff --git a/experimental/material_3_demo/lib/typography_screen.dart b/experimental/material_3_demo/lib/typography_screen.dart deleted file mode 100644 index 6950e9575..000000000 --- a/experimental/material_3_demo/lib/typography_screen.dart +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2021 The Flutter team. 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 TypographyScreen extends StatelessWidget { - const TypographyScreen({super.key}); - - @override - Widget build(BuildContext context) { - final textTheme = Theme.of(context) - .textTheme - .apply(displayColor: Theme.of(context).colorScheme.onSurface); - return Expanded( - child: ListView( - children: [ - const SizedBox(height: 7), - TextStyleExample( - name: 'Display Large', style: textTheme.displayLarge!), - TextStyleExample( - name: 'Display Medium', style: textTheme.displayMedium!), - TextStyleExample( - name: 'Display Small', style: textTheme.displaySmall!), - TextStyleExample( - name: 'Headline Large', style: textTheme.headlineLarge!), - TextStyleExample( - name: 'Headline Medium', style: textTheme.headlineMedium!), - TextStyleExample( - name: 'Headline Small', style: textTheme.headlineSmall!), - TextStyleExample(name: 'Title Large', style: textTheme.titleLarge!), - TextStyleExample(name: 'Title Medium', style: textTheme.titleMedium!), - TextStyleExample(name: 'Title Small', style: textTheme.titleSmall!), - TextStyleExample(name: 'Label Large', style: textTheme.labelLarge!), - TextStyleExample(name: 'Label Medium', style: textTheme.labelMedium!), - TextStyleExample(name: 'Label Small', style: textTheme.labelSmall!), - TextStyleExample(name: 'Body Large', style: textTheme.bodyLarge!), - TextStyleExample(name: 'Body Medium', style: textTheme.bodyMedium!), - TextStyleExample(name: 'Body Small', style: textTheme.bodySmall!), - ], - ), - ); - } -} - -class TextStyleExample extends StatelessWidget { - const TextStyleExample({ - super.key, - required this.name, - required this.style, - }); - - final String name; - final TextStyle style; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.all(8.0), - child: Text(name, style: style), - ); - } -} diff --git a/experimental/material_3_demo/linux/.gitignore b/experimental/material_3_demo/linux/.gitignore deleted file mode 100644 index d3896c984..000000000 --- a/experimental/material_3_demo/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flutter/ephemeral diff --git a/experimental/material_3_demo/linux/CMakeLists.txt b/experimental/material_3_demo/linux/CMakeLists.txt deleted file mode 100644 index 4d8398481..000000000 --- a/experimental/material_3_demo/linux/CMakeLists.txt +++ /dev/null @@ -1,139 +0,0 @@ -# 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 "material_3_demo") -# The unique GTK application identifier for this application. See: -# https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.material_3_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/experimental/material_3_demo/linux/flutter/CMakeLists.txt b/experimental/material_3_demo/linux/flutter/CMakeLists.txt deleted file mode 100644 index d5bd01648..000000000 --- a/experimental/material_3_demo/linux/flutter/CMakeLists.txt +++ /dev/null @@ -1,88 +0,0 @@ -# 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/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.cc b/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.cc deleted file mode 100644 index f6f23bfe9..000000000 --- a/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,15 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - -#include - -void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); - url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); -} diff --git a/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.h b/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.h deleted file mode 100644 index e0f0a47bc..000000000 --- a/experimental/material_3_demo/linux/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// 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/experimental/material_3_demo/linux/flutter/generated_plugins.cmake b/experimental/material_3_demo/linux/flutter/generated_plugins.cmake deleted file mode 100644 index f16b4c342..000000000 --- a/experimental/material_3_demo/linux/flutter/generated_plugins.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST - url_launcher_linux -) - -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/experimental/material_3_demo/linux/main.cc b/experimental/material_3_demo/linux/main.cc deleted file mode 100644 index e7c5c5437..000000000 --- a/experimental/material_3_demo/linux/main.cc +++ /dev/null @@ -1,6 +0,0 @@ -#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/experimental/material_3_demo/linux/my_application.cc b/experimental/material_3_demo/linux/my_application.cc deleted file mode 100644 index 0eb2ec9a5..000000000 --- a/experimental/material_3_demo/linux/my_application.cc +++ /dev/null @@ -1,104 +0,0 @@ -#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, "material_3_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, "material_3_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/experimental/material_3_demo/linux/my_application.h b/experimental/material_3_demo/linux/my_application.h deleted file mode 100644 index 72271d5e4..000000000 --- a/experimental/material_3_demo/linux/my_application.h +++ /dev/null @@ -1,18 +0,0 @@ -#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/experimental/material_3_demo/macos/.gitignore b/experimental/material_3_demo/macos/.gitignore deleted file mode 100644 index 746adbb6b..000000000 --- a/experimental/material_3_demo/macos/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Flutter-related -**/Flutter/ephemeral/ -**/Pods/ - -# Xcode-related -**/dgph -**/xcuserdata/ diff --git a/experimental/material_3_demo/macos/Flutter/Flutter-Debug.xcconfig b/experimental/material_3_demo/macos/Flutter/Flutter-Debug.xcconfig deleted file mode 100644 index 4b81f9b2d..000000000 --- a/experimental/material_3_demo/macos/Flutter/Flutter-Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/experimental/material_3_demo/macos/Flutter/Flutter-Release.xcconfig b/experimental/material_3_demo/macos/Flutter/Flutter-Release.xcconfig deleted file mode 100644 index 5caa9d157..000000000 --- a/experimental/material_3_demo/macos/Flutter/Flutter-Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/experimental/material_3_demo/macos/Flutter/GeneratedPluginRegistrant.swift b/experimental/material_3_demo/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index 8236f5728..000000000 --- a/experimental/material_3_demo/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import url_launcher_macos - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) -} diff --git a/experimental/material_3_demo/macos/Podfile b/experimental/material_3_demo/macos/Podfile deleted file mode 100644 index c795730db..000000000 --- a/experimental/material_3_demo/macos/Podfile +++ /dev/null @@ -1,43 +0,0 @@ -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/experimental/material_3_demo/macos/Runner.xcodeproj/project.pbxproj b/experimental/material_3_demo/macos/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index ddd81a110..000000000 --- a/experimental/material_3_demo/macos/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,695 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXAggregateTarget section */ - 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; - buildPhases = ( - 33CC111E2044C6BF0003C045 /* ShellScript */, - ); - dependencies = ( - ); - name = "Flutter Assemble"; - productName = FLX; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; - 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; - 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC10EC2044A3C60003C045; - remoteInfo = Runner; - }; - 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC111A2044C6BA0003C045; - remoteInfo = FLX; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 33CC110E2044A8840003C045 /* Bundle Framework */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Bundle Framework"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; - 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* material_3_demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "material_3_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 = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 331C80D2294CF70F00263BE5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10EA2044A3C60003C045 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C80D6294CF71000263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C80D7294CF71000263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 33BA886A226E78AF003329D5 /* Configs */ = { - isa = PBXGroup; - children = ( - 33E5194F232828860026EE4D /* AppInfo.xcconfig */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, - ); - path = Configs; - sourceTree = ""; - }; - 33CC10E42044A3C60003C045 = { - isa = PBXGroup; - children = ( - 33FAB671232836740065AC1E /* Runner */, - 33CEB47122A05771004F2AC0 /* Flutter */, - 331C80D6294CF71000263BE5 /* RunnerTests */, - 33CC10EE2044A3C60003C045 /* Products */, - D73912EC22F37F3D000D13A0 /* Frameworks */, - ); - sourceTree = ""; - }; - 33CC10EE2044A3C60003C045 /* Products */ = { - isa = PBXGroup; - children = ( - 33CC10ED2044A3C60003C045 /* material_3_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 = ""; - }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C80D4294CF70F00263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C80D1294CF70F00263BE5 /* Sources */, - 331C80D2294CF70F00263BE5 /* Frameworks */, - 331C80D3294CF70F00263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C80DA294CF71000263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 33CC10EC2044A3C60003C045 /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 33CC10E92044A3C60003C045 /* Sources */, - 33CC10EA2044A3C60003C045 /* Frameworks */, - 33CC10EB2044A3C60003C045 /* Resources */, - 33CC110E2044A8840003C045 /* Bundle Framework */, - 3399D490228B24CF009A79C7 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - 33CC11202044C79F0003C045 /* PBXTargetDependency */, - ); - name = Runner; - productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* material_3_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 */ - 3399D490228B24CF009A79C7 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; - }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, - ); - inputPaths = ( - Flutter/ephemeral/tripwire, - ); - outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C80D1294CF70F00263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10E92044A3C60003C045 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC10EC2044A3C60003C045 /* Runner */; - targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; - }; - 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; - targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 33CC10F52044A3C60003C045 /* Base */, - ); - name = MainMenu.xib; - path = Runner; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 331C80DB294CF71000263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/material_3_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/material_3_demo"; - }; - name = Debug; - }; - 331C80DC294CF71000263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/material_3_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/material_3_demo"; - }; - name = Release; - }; - 331C80DD294CF71000263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/material_3_demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/material_3_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/experimental/material_3_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/material_3_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/experimental/material_3_demo/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/experimental/material_3_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/material_3_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index 7bf63357a..000000000 --- a/experimental/material_3_demo/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/macos/Runner.xcworkspace/contents.xcworkspacedata b/experimental/material_3_demo/macos/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a16e..000000000 --- a/experimental/material_3_demo/macos/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/experimental/material_3_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/material_3_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/experimental/material_3_demo/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/experimental/material_3_demo/macos/Runner/AppDelegate.swift b/experimental/material_3_demo/macos/Runner/AppDelegate.swift deleted file mode 100644 index d53ef6437..000000000 --- a/experimental/material_3_demo/macos/Runner/AppDelegate.swift +++ /dev/null @@ -1,9 +0,0 @@ -import Cocoa -import FlutterMacOS - -@NSApplicationMain -class AppDelegate: FlutterAppDelegate { - override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { - return true - } -} diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index a2ec33f19..000000000 --- a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "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/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png deleted file mode 100644 index 82b6f9d9a..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png deleted file mode 100644 index 13b35eba5..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png deleted file mode 100644 index 0a3f5fa40..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png deleted file mode 100644 index bdb57226d..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png deleted file mode 100644 index f083318e0..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png deleted file mode 100644 index 326c0e72c..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png deleted file mode 100644 index 2f1632cfd..000000000 Binary files a/experimental/material_3_demo/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and /dev/null differ diff --git a/experimental/material_3_demo/macos/Runner/Base.lproj/MainMenu.xib b/experimental/material_3_demo/macos/Runner/Base.lproj/MainMenu.xib deleted file mode 100644 index 80e867a4e..000000000 --- a/experimental/material_3_demo/macos/Runner/Base.lproj/MainMenu.xib +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/macos/Runner/Configs/AppInfo.xcconfig b/experimental/material_3_demo/macos/Runner/Configs/AppInfo.xcconfig deleted file mode 100644 index 76173beaf..000000000 --- a/experimental/material_3_demo/macos/Runner/Configs/AppInfo.xcconfig +++ /dev/null @@ -1,14 +0,0 @@ -// 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 = material_3_demo - -// The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.material3Demo - -// The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/experimental/material_3_demo/macos/Runner/Configs/Debug.xcconfig b/experimental/material_3_demo/macos/Runner/Configs/Debug.xcconfig deleted file mode 100644 index 36b0fd946..000000000 --- a/experimental/material_3_demo/macos/Runner/Configs/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Debug.xcconfig" -#include "Warnings.xcconfig" diff --git a/experimental/material_3_demo/macos/Runner/Configs/Release.xcconfig b/experimental/material_3_demo/macos/Runner/Configs/Release.xcconfig deleted file mode 100644 index dff4f4956..000000000 --- a/experimental/material_3_demo/macos/Runner/Configs/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Release.xcconfig" -#include "Warnings.xcconfig" diff --git a/experimental/material_3_demo/macos/Runner/Configs/Warnings.xcconfig b/experimental/material_3_demo/macos/Runner/Configs/Warnings.xcconfig deleted file mode 100644 index 42bcbf478..000000000 --- a/experimental/material_3_demo/macos/Runner/Configs/Warnings.xcconfig +++ /dev/null @@ -1,13 +0,0 @@ -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/experimental/material_3_demo/macos/Runner/DebugProfile.entitlements b/experimental/material_3_demo/macos/Runner/DebugProfile.entitlements deleted file mode 100644 index 08c3ab17c..000000000 --- a/experimental/material_3_demo/macos/Runner/DebugProfile.entitlements +++ /dev/null @@ -1,14 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.cs.allow-jit - - com.apple.security.network.server - - com.apple.security.network.client - - - diff --git a/experimental/material_3_demo/macos/Runner/Info.plist b/experimental/material_3_demo/macos/Runner/Info.plist deleted file mode 100644 index 4789daa6a..000000000 --- a/experimental/material_3_demo/macos/Runner/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - 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/experimental/material_3_demo/macos/Runner/MainFlutterWindow.swift b/experimental/material_3_demo/macos/Runner/MainFlutterWindow.swift deleted file mode 100644 index 2722837ec..000000000 --- a/experimental/material_3_demo/macos/Runner/MainFlutterWindow.swift +++ /dev/null @@ -1,15 +0,0 @@ -import Cocoa -import FlutterMacOS - -class MainFlutterWindow: NSWindow { - override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() - let windowFrame = self.frame - self.contentViewController = flutterViewController - self.setFrame(windowFrame, display: true) - - RegisterGeneratedPlugins(registry: flutterViewController) - - super.awakeFromNib() - } -} diff --git a/experimental/material_3_demo/macos/Runner/Release.entitlements b/experimental/material_3_demo/macos/Runner/Release.entitlements deleted file mode 100644 index ee95ab7e5..000000000 --- a/experimental/material_3_demo/macos/Runner/Release.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.network.client - - - diff --git a/experimental/material_3_demo/macos/RunnerTests/RunnerTests.swift b/experimental/material_3_demo/macos/RunnerTests/RunnerTests.swift deleted file mode 100644 index 5418c9f53..000000000 --- a/experimental/material_3_demo/macos/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -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/experimental/material_3_demo/pubspec.yaml b/experimental/material_3_demo/pubspec.yaml deleted file mode 100644 index ee9449aa1..000000000 --- a/experimental/material_3_demo/pubspec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: material_3_demo -description: - A Flutter project showcasing supported Material 3 components, typography, color system and elevation. - Supports different light/dark mode, color seed, and comparison to Material 2. - -publish_to: "none" - -version: 1.0.0+1 - -environment: - sdk: ^3.2.0 - flutter: ^3.16.0 - -dependencies: - flutter: - sdk: flutter - - cupertino_icons: ^1.0.2 - url_launcher: ^6.1.8 - web_startup_analyzer: - path: ../../web/_packages/web_startup_analyzer - -dev_dependencies: - analysis_defaults: - path: ../../analysis_defaults - flutter_test: - sdk: flutter - integration_test: - sdk: flutter - -flutter: - uses-material-design: true diff --git a/experimental/material_3_demo/test/color_screen_test.dart b/experimental/material_3_demo/test/color_screen_test.dart deleted file mode 100644 index f9f6453fa..000000000 --- a/experimental/material_3_demo/test/color_screen_test.dart +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2021 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: avoid_types_on_closure_parameters -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:material_3_demo/color_palettes_screen.dart'; -import 'package:material_3_demo/main.dart'; - -import 'component_screen_test.dart'; - -void main() { - testWidgets( - 'Color palettes screen shows correctly when color icon is clicked ' - 'on NavigationBar', (tester) async { - widgetSetup(tester, 449); - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - - expect(find.text('Light ColorScheme'), findsNothing); - expect(find.text('Dark ColorScheme'), findsNothing); - expect(find.byType(NavigationBar), findsOneWidget); - Finder colorIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon( - NavigationDestination, Icons.format_paint_outlined)); - expect(colorIconOnBar, findsOneWidget); - await tester.tap(colorIconOnBar); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(colorIconOnBar, findsNothing); - - Finder selectedColorIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: - find.widgetWithIcon(NavigationDestination, Icons.format_paint)); - expect(selectedColorIconOnBar, findsOneWidget); - expect(find.text('Light ColorScheme'), findsOneWidget); - expect(find.text('Dark ColorScheme'), findsOneWidget); - }); - - testWidgets( - 'Color palettes screen shows correctly when color icon is clicked ' - 'on NavigationRail', (tester) async { - widgetSetup( - tester, 1200); // NavigationRail shows only when width is > 1000. - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - await tester.pumpAndSettle(); - expect(find.text('Light ColorScheme'), findsNothing); - expect(find.text('Dark ColorScheme'), findsNothing); - Finder colorIconOnRail = find.descendant( - of: find.byType(NavigationRail), - matching: find.byIcon(Icons.format_paint_outlined)); - expect(colorIconOnRail, findsOneWidget); - await tester.tap(colorIconOnRail); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(colorIconOnRail, findsNothing); - Finder selectedColorIconOnRail = find.descendant( - of: find.byType(NavigationRail), - matching: find.byIcon(Icons.format_paint)); - expect(selectedColorIconOnRail, findsOneWidget); - expect(find.text('Light ColorScheme'), findsOneWidget); - expect(find.text('Dark ColorScheme'), findsOneWidget); - }); - - testWidgets('Color screen shows correct content', (tester) async { - await tester.pumpWidget(const MaterialApp( - home: Scaffold(body: Row(children: [ColorPalettesScreen()])), - )); - expect(find.text('Light ColorScheme'), findsOneWidget); - expect(find.text('Dark ColorScheme'), findsOneWidget); - expect(find.byType(ColorGroup, skipOffstage: false), findsNWidgets(16)); - }); -} diff --git a/experimental/material_3_demo/test/component_screen_test.dart b/experimental/material_3_demo/test/component_screen_test.dart deleted file mode 100644 index b76721d5f..000000000 --- a/experimental/material_3_demo/test/component_screen_test.dart +++ /dev/null @@ -1,357 +0,0 @@ -// Copyright 2021 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: avoid_types_on_closure_parameters -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:material_3_demo/component_screen.dart'; -import 'package:material_3_demo/main.dart'; - -void main() { - testWidgets('Default main page shows all M3 components', (tester) async { - widgetSetup(tester, 800, windowHeight: 7000); - await tester.pumpWidget(const App()); - - // Elements on the app bar - expect(find.text('Material 3'), findsOneWidget); - expect( - find.widgetWithIcon(AppBar, Icons.dark_mode_outlined), findsOneWidget); - expect(find.widgetWithIcon(AppBar, Icons.filter_2), findsOneWidget); - expect(find.widgetWithIcon(AppBar, Icons.palette_outlined), findsOneWidget); - - // Elements on the component screen - // Common buttons - expect(find.widgetWithText(ElevatedButton, 'Elevated'), findsNWidgets(2)); - expect(find.widgetWithText(FilledButton, 'Filled'), findsNWidgets(2)); - expect(find.widgetWithText(FilledButton, 'Filled tonal'), findsNWidgets(2)); - expect(find.widgetWithText(OutlinedButton, 'Outlined'), findsNWidgets(2)); - expect(find.widgetWithText(TextButton, 'Text'), findsNWidgets(2)); - expect(find.widgetWithText(Buttons, 'Icon'), findsNWidgets(5)); - - // FABs - expect( - find.byType(FloatingActionButton), - findsNWidgets( - 6)); // 2 more show up in the bottom app bar. 1 more in the navigation rail - expect(find.widgetWithText(FloatingActionButton, 'Create'), findsOneWidget); - - // Icon buttons - expect(find.widgetWithIcon(IconButton, Icons.settings_outlined), - findsNWidgets(8)); - - // Segmented buttons - expect(find.byType(SegmentedButton), findsOneWidget); - expect(find.byType(SegmentedButton), findsOneWidget); - - // Badges - expect(find.byType(Badge), findsNWidgets(4)); - - // Progress indicators - Finder circularProgressIndicator = find.byType(CircularProgressIndicator); - expect(circularProgressIndicator, findsOneWidget); - Finder linearProgressIndicator = find.byType(LinearProgressIndicator); - expect(linearProgressIndicator, findsOneWidget); - - // Snackbar - expect(find.widgetWithText(TextButton, 'Show snackbar'), findsOneWidget); - - // Bottom sheet - expect(find.widgetWithText(TextButton, 'Show modal bottom sheet'), - findsOneWidget); - expect( - find.widgetWithText(TextButton, 'Show bottom sheet'), findsOneWidget); - - // Cards - expect(find.widgetWithText(Cards, 'Elevated'), findsOneWidget); - expect(find.widgetWithText(Cards, 'Filled'), findsOneWidget); - expect(find.widgetWithText(Cards, 'Outlined'), findsOneWidget); - - // Dialogs - expect(find.widgetWithText(TextButton, 'Show dialog'), findsOneWidget); - expect(find.widgetWithText(TextButton, 'Show full-screen dialog'), - findsOneWidget); - - // Dividers - expect(find.byKey(const Key('divider')), findsOneWidget); - - // Bottom app bar - expect(find.byType(BottomAppBar), findsOneWidget); - - // Navigation bar - // Third one is off screen in the scaffold - expect(find.byType(NavigationBar), findsNWidgets(3)); - - // Navigation drawer - expect(find.byType(Drawer), findsOneWidget); - expect(find.widgetWithText(TextButton, 'Show modal navigation drawer'), - findsOneWidget); - - // Navigation rail - // Second one is off screen in the scaffold - expect(find.byType(NavigationRail), findsNWidgets(2)); - - // Tabs - expect(find.byType(TabBar), findsOneWidget); - - // Search - expect(find.byType(SearchBar), findsOneWidget); - - // Top app bars - expect(find.byType(AppBar), findsNWidgets(6)); - - // Checkboxes - Finder checkboxExample = find.byType(CheckboxListTile); - expect(checkboxExample, findsNWidgets(4)); - - // Chips - expect(find.byType(ActionChip), - findsNWidgets(4)); // includes Assist and Suggestion chip. - expect(find.byType(FilterChip), findsNWidgets(2)); - expect(find.byType(InputChip), findsNWidgets(2)); - - // Date pickers - expect(find.widgetWithText(TextButton, 'Show date picker'), findsOneWidget); - - // Menus - expect(find.byType(MenuAnchor), findsNWidgets(5)); - expect(find.byType(DropdownMenu), findsOneWidget); - expect(find.byType(DropdownMenu), findsOneWidget); - - // Radios - Finder radioExample = find.byType(RadioListTile); - expect(radioExample, findsNWidgets(3)); - - // Sliders - expect(find.byType(Slider), findsNWidgets(2)); - - // Switches - expect(find.byType(Switch), findsNWidgets(4)); - - // Time pickers - expect(find.widgetWithText(TextButton, 'Show time picker'), findsOneWidget); - - // TextFields - expect(find.widgetWithText(TextField, 'Disabled'), findsNWidgets(2)); - expect(find.widgetWithText(TextField, 'Filled'), findsNWidgets(2)); - expect(find.widgetWithText(TextField, 'Outlined'), findsNWidgets(2)); - }); - - testWidgets( - 'NavigationRail doesn\'t show when width value is small than 1000 ' - '(in Portrait mode or narrow screen)', (tester) async { - widgetSetup(tester, 999, windowHeight: 7000); - await tester.pumpWidget(const App()); - await tester.pumpAndSettle(); - - // When screen width is less than 1000, NavigationBar will show. At the same - // time, the NavigationBar example still show up in the navigation group. - expect(find.byType(NavigationBars), - findsNWidgets(3)); // The real navBar, badges example and navBar example - expect(find.widgetWithText(NavigationBar, 'Components'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Color'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Typography'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Elevation'), findsOneWidget); - - expect(find.widgetWithText(NavigationBar, 'Explore'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Pets'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Account'), findsOneWidget); - }); - - testWidgets( - 'NavigationRail shows when width value is greater than or equal ' - 'to 1000 (in Landscape mode or wider screen)', (tester) async { - widgetSetup(tester, 1001, windowHeight: 3000); - await tester.pumpWidget(const App()); - await tester.pumpAndSettle(); - - // When screen width is greater than or equal to 1000, NavigationRail will show. - // At the same time, the NavigationBar will NOT show. - expect(find.byType(NavigationRail), findsNWidgets(2)); - expect(find.byType(Tooltip, skipOffstage: false), findsWidgets); - expect(find.widgetWithText(NavigationRail, 'Components'), findsOneWidget); - expect(find.widgetWithText(NavigationRail, 'Color'), findsOneWidget); - expect(find.widgetWithText(NavigationRail, 'Typography'), findsOneWidget); - expect(find.widgetWithText(NavigationRail, 'Elevation'), findsOneWidget); - - expect(find.widgetWithText(NavigationBar, 'Explore'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Pets'), findsOneWidget); - expect(find.widgetWithText(NavigationBar, 'Account'), findsOneWidget); - - // the Navigation bar should be out of screen. - final RenderBox box = - tester.renderObject(find.widgetWithText(NavigationBar, 'Components')); - expect(box.localToGlobal(Offset.zero), const Offset(0.0, 3080.0)); - }); - - testWidgets( - 'Material version switches between Material3 and Material2 when' - 'the version icon is clicked', (tester) async { - widgetSetup(tester, 450, windowHeight: 7000); - await tester.pumpWidget(const App()); - BuildContext defaultElevatedButton = - tester.firstElement(find.byType(ElevatedButton)); - BuildContext defaultIconButton = - tester.firstElement(find.byType(IconButton)); - BuildContext defaultFAB = - tester.firstElement(find.byType(FloatingActionButton)); - BuildContext defaultCard = - tester.firstElement(find.widgetWithText(Card, 'Elevated')); - BuildContext defaultChip = - tester.firstElement(find.widgetWithText(ActionChip, 'Assist')); - Finder dialog = find.text('Show dialog'); - await tester.tap(dialog); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext defaultAlertDialog = tester.element(find.byType(AlertDialog)); - expect(Theme.of(defaultAlertDialog).useMaterial3, true); - Finder dismiss = find.text('Okay'); - await tester.tap(dismiss); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - - expect(find.widgetWithIcon(AppBar, Icons.filter_2), findsOneWidget); - expect(find.widgetWithIcon(AppBar, Icons.filter_3), findsNothing); - expect(find.text('Material 3'), findsOneWidget); - expect(Theme.of(defaultElevatedButton).useMaterial3, true); - expect(Theme.of(defaultIconButton).useMaterial3, true); - expect(Theme.of(defaultFAB).useMaterial3, true); - expect(Theme.of(defaultCard).useMaterial3, true); - expect(Theme.of(defaultChip).useMaterial3, true); - - Finder appbarM3Icon = find.descendant( - of: find.byType(AppBar), - matching: find.widgetWithIcon(IconButton, Icons.filter_2)); - await tester.tap(appbarM3Icon); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext updatedElevatedButton = - tester.firstElement(find.byType(ElevatedButton)); - BuildContext updatedIconButton = - tester.firstElement(find.byType(IconButton)); - BuildContext updatedFAB = - tester.firstElement(find.byType(FloatingActionButton)); - BuildContext updatedCard = tester.firstElement(find.byType(Card)); - BuildContext updatedChip = - tester.firstElement(find.widgetWithText(ActionChip, 'Assist')); - Finder updatedDialog = find.text('Show dialog'); - await tester.tap(updatedDialog); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext updatedAlertDialog = - tester.firstElement(find.byType(AlertDialog)); - expect(Theme.of(updatedAlertDialog).useMaterial3, false); - Finder updatedDismiss = find.text('Dismiss'); - await tester.tap(updatedDismiss); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - - expect(find.widgetWithIcon(AppBar, Icons.filter_3), findsOneWidget); - expect(find.widgetWithIcon(AppBar, Icons.filter_2), findsNothing); - expect(find.text('Material 2'), findsOneWidget); - expect(Theme.of(updatedElevatedButton).useMaterial3, false); - expect(Theme.of(updatedIconButton).useMaterial3, false); - expect(Theme.of(updatedFAB).useMaterial3, false); - expect(Theme.of(updatedCard).useMaterial3, false); - expect(Theme.of(updatedChip).useMaterial3, false); - }); - - testWidgets( - 'Other screens become Material2 mode after changing mode from ' - 'main screen', (tester) async { - await tester.pumpWidget(const App()); - Finder appbarM2Icon = find.descendant( - of: find.byType(AppBar), - matching: find.widgetWithIcon(IconButton, Icons.filter_2)); - await tester.tap(appbarM2Icon); - Finder secondScreenIcon = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon( - NavigationDestination, Icons.format_paint_outlined)); - await tester.tap(secondScreenIcon); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext lightThemeText = - tester.element(find.text('Light ColorScheme')); - expect(Theme.of(lightThemeText).useMaterial3, false); - Finder thirdScreenIcon = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon( - NavigationDestination, Icons.text_snippet_outlined)); - await tester.tap(thirdScreenIcon); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext displayLargeText = tester.element(find.text('Display Large')); - expect(Theme.of(displayLargeText).useMaterial3, false); - Finder fourthScreenIcon = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon( - NavigationDestination, Icons.invert_colors_on_outlined)); - await tester.tap(fourthScreenIcon); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - BuildContext material = tester.firstElement(find.byType(Material)); - expect(Theme.of(material).useMaterial3, false); - }); - - testWidgets( - 'Brightness mode switches between dark and light when' - 'the brightness icon is clicked', (tester) async { - await tester.pumpWidget(const App()); - Finder lightIcon = find.descendant( - of: find.byType(AppBar), - matching: find.widgetWithIcon(IconButton, Icons.light_mode_outlined)); - Finder darkIcon = find.descendant( - of: find.byType(AppBar), - matching: find.widgetWithIcon(IconButton, Icons.dark_mode_outlined)); - BuildContext appBar = tester.element(find.byType(AppBar).first); - BuildContext body = tester.firstElement(find.byType(Scaffold).first); - BuildContext navigationRail = tester.element( - find.widgetWithIcon(NavigationRail, Icons.format_paint_outlined)); - expect(darkIcon, findsOneWidget); - expect(lightIcon, findsNothing); - expect(Theme.of(appBar).brightness, Brightness.light); - expect(Theme.of(body).brightness, Brightness.light); - expect(Theme.of(navigationRail).brightness, Brightness.light); - await tester.tap(darkIcon); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - - BuildContext appBar2 = tester.element(find.byType(AppBar).first); - BuildContext body2 = tester.element(find.byType(Scaffold).first); - BuildContext navigationRail2 = tester.element( - find.widgetWithIcon(NavigationRail, Icons.format_paint_outlined)); - - expect(darkIcon, findsNothing); - expect(lightIcon, findsOneWidget); - expect(Theme.of(appBar2).brightness, Brightness.dark); - expect(Theme.of(body2).brightness, Brightness.dark); - expect(Theme.of(navigationRail2).brightness, Brightness.dark); - }); - - testWidgets('Color theme changes when a color is selected from menu', - (tester) async { - Color m3BaseColor = const Color(0xff6750a4); - await tester.pumpWidget(Container()); - await tester.pumpWidget(const App()); - await tester.pump(); - Finder menuIcon = find.descendant( - of: find.byType(AppBar), - matching: find.widgetWithIcon(IconButton, Icons.palette_outlined)); - BuildContext appBar = tester - .element(find.widgetWithIcon(AppBar, Icons.palette_outlined).first); - BuildContext body = tester.element(find.byType(Scaffold).first); - - expect(Theme.of(appBar).primaryColor, m3BaseColor); - expect(Theme.of(body).primaryColor, m3BaseColor); - await tester.tap(menuIcon); - await tester.pumpAndSettle(); - await tester.tap(find.text('Blue').last); - await tester.pumpAndSettle(); - - BuildContext appBar2 = tester.element(find.byType(AppBar).first); - BuildContext body2 = tester.element(find.byType(Scaffold).first); - ThemeData expectedTheme = ThemeData(colorSchemeSeed: Colors.blue); - expect(Theme.of(appBar2).primaryColor, expectedTheme.primaryColor); - expect(Theme.of(body2).primaryColor, expectedTheme.primaryColor); - }); -} - -void widgetSetup(WidgetTester tester, double windowWidth, - {double? windowHeight}) { - final height = windowHeight ?? 846; - tester.view.devicePixelRatio = 2; - final dpi = tester.view.devicePixelRatio; - tester.view.physicalSize = Size(windowWidth * dpi, height * dpi); -} diff --git a/experimental/material_3_demo/test/elevation_screen_test.dart b/experimental/material_3_demo/test/elevation_screen_test.dart deleted file mode 100644 index 77014efca..000000000 --- a/experimental/material_3_demo/test/elevation_screen_test.dart +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2021 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: avoid_types_on_closure_parameters -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:material_3_demo/elevation_screen.dart'; -import 'package:material_3_demo/main.dart'; - -import 'component_screen_test.dart'; - -void main() { - testWidgets( - 'Surface Tones screen shows correctly when the corresponding icon is ' - 'selected on NavigationBar', (tester) async { - widgetSetup(tester, 449); - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - - expect(find.text('Surface Tint Color Only'), findsNothing); - expect(find.byType(NavigationBar), findsOneWidget); - Finder tintIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon( - NavigationDestination, Icons.invert_colors_on_outlined)); - expect(tintIconOnBar, findsOneWidget); - await tester.tap(tintIconOnBar); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(tintIconOnBar, findsNothing); - Finder selectedTintIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: find.widgetWithIcon(NavigationDestination, Icons.opacity)); - expect(selectedTintIconOnBar, findsOneWidget); - expect(find.text('Surface Tint Color Only'), findsOneWidget); - }); - - testWidgets( - 'Surface Tones screen shows correctly when the corresponding icon is ' - 'selected on NavigationRail', (tester) async { - widgetSetup( - tester, 1200); // NavigationRail shows only when width is > 1000. - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - expect(find.text('Surface Tint Color Only'), findsNothing); - Finder tintIconOnRail = find.descendant( - of: find.byType(NavigationRail), - matching: find.byIcon(Icons.invert_colors_on_outlined)); - expect(tintIconOnRail, findsOneWidget); - await tester.tap(tintIconOnRail); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(tintIconOnRail, findsNothing); - Finder selectedTintIconOnRail = find.descendant( - of: find.byType(NavigationRail), matching: find.byIcon(Icons.opacity)); - expect(selectedTintIconOnRail, findsOneWidget); - expect(find.text('Surface Tint Color Only'), findsOneWidget); - }); - - testWidgets('Surface Tones screen shows correct content', (tester) async { - await tester.pumpWidget(const MaterialApp( - home: Scaffold(body: Row(children: [ElevationScreen()])), - )); - expect(find.text('Surface Tint Color Only'), findsOneWidget); - expect(find.text('Surface Tint Color and Shadow Color'), findsOneWidget); - expect(find.text('Shadow Color Only'), findsOneWidget); - expect(find.byType(ElevationGrid), findsNWidgets(3)); - expect(find.byType(ElevationCard), findsNWidgets(18)); - }); -} diff --git a/experimental/material_3_demo/test/typography_screen_test.dart b/experimental/material_3_demo/test/typography_screen_test.dart deleted file mode 100644 index 42c10cd2f..000000000 --- a/experimental/material_3_demo/test/typography_screen_test.dart +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2021 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: avoid_types_on_closure_parameters -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:material_3_demo/main.dart'; -import 'package:material_3_demo/typography_screen.dart'; - -import 'component_screen_test.dart'; - -void main() { - testWidgets( - 'Typography screen shows correctly when the corresponding icon is ' - 'selected on NavigationBar', (tester) async { - widgetSetup(tester, 449); - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - - expect(find.text('Display Large'), findsNothing); - expect(find.byType(NavigationBar), findsOneWidget); - Finder textIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: find.byIcon(Icons.text_snippet_outlined)); - expect(textIconOnBar, findsOneWidget); - await tester.tap(textIconOnBar); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(textIconOnBar, findsNothing); - Finder selectedTextIconOnBar = find.descendant( - of: find.byType(NavigationBar), - matching: find.byIcon(Icons.text_snippet)); - expect(selectedTextIconOnBar, findsOneWidget); - expect(find.text('Display Large'), findsOneWidget); - }); - - testWidgets( - 'Typography screen shows correctly when the corresponding icon is ' - 'selected on NavigationRail', (tester) async { - widgetSetup( - tester, 1200); // NavigationRail shows only when width is > 1000. - addTearDown(tester.view.resetPhysicalSize); - await tester.pumpWidget(const App()); - expect(find.text('Display Large'), findsNothing); - Finder textIconOnRail = find.descendant( - of: find.byType(NavigationRail), - matching: find.byIcon(Icons.text_snippet_outlined)); - expect(textIconOnRail, findsOneWidget); - await tester.tap(textIconOnRail); - await tester.pumpAndSettle(const Duration(microseconds: 500)); - expect(textIconOnRail, findsNothing); - Finder selectedTextIconOnRail = find.descendant( - of: find.byType(NavigationRail), - matching: find.byIcon(Icons.text_snippet)); - expect(selectedTextIconOnRail, findsOneWidget); - expect(find.text('Display Large'), findsOneWidget); - }); - - testWidgets('Typography screen shows correct content', (tester) async { - await tester.pumpWidget(const MaterialApp( - home: Scaffold(body: Row(children: [TypographyScreen()])), - )); - expect(find.text('Display Large'), findsOneWidget); - expect(find.text('Display Medium'), findsOneWidget); - expect(find.text('Display Small'), findsOneWidget); - expect(find.text('Headline Large'), findsOneWidget); - expect(find.text('Headline Medium'), findsOneWidget); - expect(find.text('Headline Small'), findsOneWidget); - expect(find.text('Title Large'), findsOneWidget); - expect(find.text('Title Medium'), findsOneWidget); - expect(find.text('Title Small'), findsOneWidget); - await tester.scrollUntilVisible( - find.text('Body Small'), - 500.0, - ); - expect(find.text('Label Large'), findsOneWidget); - expect(find.text('Label Medium'), findsOneWidget); - expect(find.text('Label Small'), findsOneWidget); - expect(find.text('Body Large'), findsOneWidget); - expect(find.text('Body Medium'), findsOneWidget); - expect(find.text('Body Small'), findsOneWidget); - - expect(find.byType(TextStyleExample), findsNWidgets(15)); - }); -} diff --git a/experimental/material_3_demo/web/favicon.png b/experimental/material_3_demo/web/favicon.png deleted file mode 100644 index 8aaa46ac1..000000000 Binary files a/experimental/material_3_demo/web/favicon.png and /dev/null differ diff --git a/experimental/material_3_demo/web/icons/Icon-192.png b/experimental/material_3_demo/web/icons/Icon-192.png deleted file mode 100644 index b749bfef0..000000000 Binary files a/experimental/material_3_demo/web/icons/Icon-192.png and /dev/null differ diff --git a/experimental/material_3_demo/web/icons/Icon-512.png b/experimental/material_3_demo/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48df..000000000 Binary files a/experimental/material_3_demo/web/icons/Icon-512.png and /dev/null differ diff --git a/experimental/material_3_demo/web/icons/Icon-maskable-192.png b/experimental/material_3_demo/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e..000000000 Binary files a/experimental/material_3_demo/web/icons/Icon-maskable-192.png and /dev/null differ diff --git a/experimental/material_3_demo/web/icons/Icon-maskable-512.png b/experimental/material_3_demo/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691..000000000 Binary files a/experimental/material_3_demo/web/icons/Icon-maskable-512.png and /dev/null differ diff --git a/experimental/material_3_demo/web/index.html b/experimental/material_3_demo/web/index.html deleted file mode 100644 index 8f59269bf..000000000 --- a/experimental/material_3_demo/web/index.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - material_3_demo - - - - - - - - - - - diff --git a/experimental/material_3_demo/web/manifest.json b/experimental/material_3_demo/web/manifest.json deleted file mode 100644 index 0d59af8c7..000000000 --- a/experimental/material_3_demo/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "material_3_demo", - "short_name": "material_3_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/experimental/material_3_demo/windows/.gitignore b/experimental/material_3_demo/windows/.gitignore deleted file mode 100644 index d492d0d98..000000000 --- a/experimental/material_3_demo/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -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/experimental/material_3_demo/windows/CMakeLists.txt b/experimental/material_3_demo/windows/CMakeLists.txt deleted file mode 100644 index dec9d0b6f..000000000 --- a/experimental/material_3_demo/windows/CMakeLists.txt +++ /dev/null @@ -1,102 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.14) -project(material_3_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 "material_3_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/experimental/material_3_demo/windows/flutter/CMakeLists.txt b/experimental/material_3_demo/windows/flutter/CMakeLists.txt deleted file mode 100644 index 930d2071a..000000000 --- a/experimental/material_3_demo/windows/flutter/CMakeLists.txt +++ /dev/null @@ -1,104 +0,0 @@ -# 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/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.cc b/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.cc deleted file mode 100644 index 4f7884874..000000000 --- a/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - -#include - -void RegisterPlugins(flutter::PluginRegistry* registry) { - UrlLauncherWindowsRegisterWithRegistrar( - registry->GetRegistrarForPlugin("UrlLauncherWindows")); -} diff --git a/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.h b/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.h deleted file mode 100644 index dc139d85a..000000000 --- a/experimental/material_3_demo/windows/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// 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/experimental/material_3_demo/windows/flutter/generated_plugins.cmake b/experimental/material_3_demo/windows/flutter/generated_plugins.cmake deleted file mode 100644 index 88b22e5c7..000000000 --- a/experimental/material_3_demo/windows/flutter/generated_plugins.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST - url_launcher_windows -) - -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/experimental/material_3_demo/windows/runner/CMakeLists.txt b/experimental/material_3_demo/windows/runner/CMakeLists.txt deleted file mode 100644 index 394917c05..000000000 --- a/experimental/material_3_demo/windows/runner/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -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/experimental/material_3_demo/windows/runner/Runner.rc b/experimental/material_3_demo/windows/runner/Runner.rc deleted file mode 100644 index 0a24f5fd6..000000000 --- a/experimental/material_3_demo/windows/runner/Runner.rc +++ /dev/null @@ -1,121 +0,0 @@ -// 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", "material_3_demo" "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "material_3_demo" "\0" - VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "material_3_demo.exe" "\0" - VALUE "ProductName", "material_3_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/experimental/material_3_demo/windows/runner/flutter_window.cpp b/experimental/material_3_demo/windows/runner/flutter_window.cpp deleted file mode 100644 index b25e363ef..000000000 --- a/experimental/material_3_demo/windows/runner/flutter_window.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#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/experimental/material_3_demo/windows/runner/flutter_window.h b/experimental/material_3_demo/windows/runner/flutter_window.h deleted file mode 100644 index 6da0652f0..000000000 --- a/experimental/material_3_demo/windows/runner/flutter_window.h +++ /dev/null @@ -1,33 +0,0 @@ -#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/experimental/material_3_demo/windows/runner/main.cpp b/experimental/material_3_demo/windows/runner/main.cpp deleted file mode 100644 index 8585dc232..000000000 --- a/experimental/material_3_demo/windows/runner/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#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"material_3_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/experimental/material_3_demo/windows/runner/resource.h b/experimental/material_3_demo/windows/runner/resource.h deleted file mode 100644 index 66a65d1e4..000000000 --- a/experimental/material_3_demo/windows/runner/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{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/experimental/material_3_demo/windows/runner/resources/app_icon.ico b/experimental/material_3_demo/windows/runner/resources/app_icon.ico deleted file mode 100644 index c04e20caf..000000000 Binary files a/experimental/material_3_demo/windows/runner/resources/app_icon.ico and /dev/null differ diff --git a/experimental/material_3_demo/windows/runner/runner.exe.manifest b/experimental/material_3_demo/windows/runner/runner.exe.manifest deleted file mode 100644 index a42ea7687..000000000 --- a/experimental/material_3_demo/windows/runner/runner.exe.manifest +++ /dev/null @@ -1,20 +0,0 @@ - - - - - PerMonitorV2 - - - - - - - - - - - - - - - diff --git a/experimental/material_3_demo/windows/runner/utils.cpp b/experimental/material_3_demo/windows/runner/utils.cpp deleted file mode 100644 index b2b08734d..000000000 --- a/experimental/material_3_demo/windows/runner/utils.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#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/experimental/material_3_demo/windows/runner/utils.h b/experimental/material_3_demo/windows/runner/utils.h deleted file mode 100644 index 3879d5475..000000000 --- a/experimental/material_3_demo/windows/runner/utils.h +++ /dev/null @@ -1,19 +0,0 @@ -#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/experimental/material_3_demo/windows/runner/win32_window.cpp b/experimental/material_3_demo/windows/runner/win32_window.cpp deleted file mode 100644 index 60608d0fe..000000000 --- a/experimental/material_3_demo/windows/runner/win32_window.cpp +++ /dev/null @@ -1,288 +0,0 @@ -#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/experimental/material_3_demo/windows/runner/win32_window.h b/experimental/material_3_demo/windows/runner/win32_window.h deleted file mode 100644 index e901dde68..000000000 --- a/experimental/material_3_demo/windows/runner/win32_window.h +++ /dev/null @@ -1,102 +0,0 @@ -#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_