diff --git a/example/.gitignore b/example/.gitignore new file mode 100644 index 00000000..63938e2e --- /dev/null +++ b/example/.gitignore @@ -0,0 +1,78 @@ +# Miscellaneous +pubspec.lock +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +*.code-workspace +/coverage + +# 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/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +build/ + +# Android related +**/android/**/gradle-wrapper.jar +**/android/.gradle +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/local.properties +**/android/**/GeneratedPluginRegistrant.java + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/example/README.md b/example/README.md new file mode 100644 index 00000000..9a33f403 --- /dev/null +++ b/example/README.md @@ -0,0 +1,2 @@ +# Example + diff --git a/example/android/.gitignore b/example/android/.gitignore new file mode 100644 index 00000000..0a741cb4 --- /dev/null +++ b/example/android/.gitignore @@ -0,0 +1,11 @@ +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 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle new file mode 100644 index 00000000..07124d61 --- /dev/null +++ b/example/android/app/build.gradle @@ -0,0 +1,60 @@ +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 32 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + disable 'InvalidPackage' + } + + defaultConfig { + applicationId "com.acmesoftware.example" + minSdkVersion 21 + targetSdkVersion 30 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..5d04f4bc --- /dev/null +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..a7d36c8f --- /dev/null +++ b/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + diff --git a/packages/clean_framework/example/android/app/src/main/kotlin/com/acmesoftware/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/acmesoftware/example/MainActivity.kt similarity index 100% rename from packages/clean_framework/example/android/app/src/main/kotlin/com/acmesoftware/example/MainActivity.kt rename to example/android/app/src/main/kotlin/com/acmesoftware/example/MainActivity.kt diff --git a/example/android/app/src/main/res/drawable/launch_background.xml b/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..db77bb4b Binary files /dev/null and b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..17987b79 Binary files /dev/null and b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..09d43914 Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..d5f1c8d3 Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..4d6372ee Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..1f83a33f --- /dev/null +++ b/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..5d04f4bc --- /dev/null +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/android/build.gradle b/example/android/build.gradle new file mode 100644 index 00000000..73d46bcf --- /dev/null +++ b/example/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.6.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.2.2' + 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/example/android/gradle.properties b/example/android/gradle.properties new file mode 100644 index 00000000..a6738207 --- /dev/null +++ b/example/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..039eda99 --- /dev/null +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle new file mode 100644 index 00000000..44e62bcf --- /dev/null +++ b/example/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/packages/clean_framework/example/assets/flags.json b/example/assets/flags.json similarity index 100% rename from packages/clean_framework/example/assets/flags.json rename to example/assets/flags.json diff --git a/packages/clean_framework/example/integration_test/app_init_integration_test.dart b/example/integration_test/app_init_integration_test.dart similarity index 87% rename from packages/clean_framework/example/integration_test/app_init_integration_test.dart rename to example/integration_test/app_init_integration_test.dart index b0f74962..7463d9e0 100644 --- a/packages/clean_framework/example/integration_test/app_init_integration_test.dart +++ b/example/integration_test/app_init_integration_test.dart @@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:clean_framework_example/main.dart' as app; +import 'package:example/main.dart' as app; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/clean_framework/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id similarity index 100% rename from packages/clean_framework/example/ios/Flutter/.last_build_id rename to example/ios/Flutter/.last_build_id diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 00000000..d2c61fc4 --- /dev/null +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 9.0 + + diff --git a/example/ios/Flutter/Debug.xcconfig b/example/ios/Flutter/Debug.xcconfig new file mode 100644 index 00000000..ec97fc6f --- /dev/null +++ b/example/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/example/ios/Flutter/Release.xcconfig b/example/ios/Flutter/Release.xcconfig new file mode 100644 index 00000000..c4855bfe --- /dev/null +++ b/example/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/example/ios/Podfile b/example/ios/Podfile new file mode 100644 index 00000000..313ea4a1 --- /dev/null +++ b/example/ios/Podfile @@ -0,0 +1,41 @@ +# 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__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..1193fe64 --- /dev/null +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,597 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3AC18C1ED27F481C1BED83BE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFC7454685DF6498BF1978D /* Pods_Runner.framework */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; + 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; + 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 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 */; }; +/* End PBXBuildFile 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 = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 8834B17F6053F1307161D81D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 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; }; + 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 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 = ""; }; + C86FFF5B8092A5BF5E37B3D2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + DDFC7454685DF6498BF1978D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E2ED0B9341254BC4E8A32D0C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3AC18C1ED27F481C1BED83BE /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 356C1EDA1C4718B997F03609 /* Pods */ = { + isa = PBXGroup; + children = ( + E2ED0B9341254BC4E8A32D0C /* Pods-Runner.debug.xcconfig */, + 8834B17F6053F1307161D81D /* Pods-Runner.release.xcconfig */, + C86FFF5B8092A5BF5E37B3D2 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + 8D059E797CB2EFECD38A668A /* Frameworks */ = { + isa = PBXGroup; + children = ( + DDFC7454685DF6498BF1978D /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 356C1EDA1C4718B997F03609 /* Pods */, + 8D059E797CB2EFECD38A668A /* Frameworks */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, + 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 97C146F21CF9000F007C117D /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + CF2D77B37A31DFC34F7DB60E /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 4EC7F78FD432909300C8796A /* [CP] Embed Pods Frameworks */, + ); + 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 = "The Chromium Authors"; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 9740EEB41CF90195004384FC /* Debug.xcconfig 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; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 4EC7F78FD432909300C8796A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseFirestore/FirebaseFirestore.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/Libuv-gRPC/uv.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/abseil/absl.framework", + "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", + "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseFirestore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/uv.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + 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"; + }; + CF2D77B37A31DFC34F7DB60E /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, + 97C146F31CF9000F007C117D /* main.m in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase 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; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_NAME = "$(TARGET_NAME)"; + VERSIONING_SYSTEM = "apple-generic"; + }; + 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; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_NAME = "$(TARGET_NAME)"; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_NAME = "$(TARGET_NAME)"; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 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/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..3db53b6e --- /dev/null +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..21a3cc14 --- /dev/null +++ b/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/clean_framework/example/ios/Runner/AppDelegate.h b/example/ios/Runner/AppDelegate.h similarity index 100% rename from packages/clean_framework/example/ios/Runner/AppDelegate.h rename to example/ios/Runner/AppDelegate.h diff --git a/packages/clean_framework/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m similarity index 100% rename from packages/clean_framework/example/ios/Runner/AppDelegate.m rename to example/ios/Runner/AppDelegate.m diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d36b1fab --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 00000000..dc9ada47 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 00000000..28c6bf03 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 00000000..2ccbfd96 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 00000000..f091b6b0 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 00000000..4cde1211 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 00000000..d0ef06e7 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 00000000..dcdc2306 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 00000000..2ccbfd96 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 00000000..c8f9ed8f Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 00000000..a6d6b860 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 00000000..a6d6b860 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 00000000..75b2d164 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 00000000..c4df70d3 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 00000000..6a84f41e Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 00000000..d0e1f585 Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 00000000..0bedcf2f --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 00000000..9da19eac Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 00000000..89c2725b --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..f2e259c7 --- /dev/null +++ b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/example/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f3c28516 --- /dev/null +++ b/example/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist new file mode 100644 index 00000000..a9cf4e86 --- /dev/null +++ b/example/ios/Runner/Info.plist @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + CleanFrameworkExample + 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 + + + diff --git a/packages/clean_framework/example/ios/Runner/main.m b/example/ios/Runner/main.m similarity index 100% rename from packages/clean_framework/example/ios/Runner/main.m rename to example/ios/Runner/main.m diff --git a/packages/clean_framework/example/lib/asset_feature_provider.dart b/example/lib/asset_feature_provider.dart similarity index 100% rename from packages/clean_framework/example/lib/asset_feature_provider.dart rename to example/lib/asset_feature_provider.dart diff --git a/packages/clean_framework/example/lib/demo_router.dart b/example/lib/demo_router.dart similarity index 81% rename from packages/clean_framework/example/lib/demo_router.dart rename to example/lib/demo_router.dart index 53493420..2990e994 100644 --- a/packages/clean_framework/example/lib/demo_router.dart +++ b/example/lib/demo_router.dart @@ -1,8 +1,8 @@ -import 'package:clean_framework_example/features/country/presentation/country_ui.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_ui.dart'; -import 'package:clean_framework_example/features/random_cat/presentation/random_cat_ui.dart'; -import 'package:clean_framework_example/home_page.dart'; -import 'package:clean_framework_example/routes.dart'; +import 'package:example/features/country/presentation/country_ui.dart'; +import 'package:example/features/last_login/presentation/last_login_ui.dart'; +import 'package:example/features/random_cat/presentation/random_cat_ui.dart'; +import 'package:example/home_page.dart'; +import 'package:example/routes.dart'; import 'package:clean_framework_router/clean_framework_router.dart'; import 'package:flutter/material.dart'; diff --git a/packages/clean_framework/example/lib/features/country/domain/country_entity.dart b/example/lib/features/country/domain/country_entity.dart similarity index 100% rename from packages/clean_framework/example/lib/features/country/domain/country_entity.dart rename to example/lib/features/country/domain/country_entity.dart diff --git a/packages/clean_framework/example/lib/features/country/domain/country_model.dart b/example/lib/features/country/domain/country_model.dart similarity index 100% rename from packages/clean_framework/example/lib/features/country/domain/country_model.dart rename to example/lib/features/country/domain/country_model.dart diff --git a/packages/clean_framework/example/lib/features/country/domain/country_use_case.dart b/example/lib/features/country/domain/country_use_case.dart similarity index 100% rename from packages/clean_framework/example/lib/features/country/domain/country_use_case.dart rename to example/lib/features/country/domain/country_use_case.dart diff --git a/packages/clean_framework/example/lib/features/country/domain/country_view_model.dart b/example/lib/features/country/domain/country_view_model.dart similarity index 100% rename from packages/clean_framework/example/lib/features/country/domain/country_view_model.dart rename to example/lib/features/country/domain/country_view_model.dart diff --git a/packages/clean_framework/example/lib/features/country/external_interface/country_gateway.dart b/example/lib/features/country/external_interface/country_gateway.dart similarity index 88% rename from packages/clean_framework/example/lib/features/country/external_interface/country_gateway.dart rename to example/lib/features/country/external_interface/country_gateway.dart index 07deb7dd..c9c7100d 100644 --- a/packages/clean_framework/example/lib/features/country/external_interface/country_gateway.dart +++ b/example/lib/features/country/external_interface/country_gateway.dart @@ -1,5 +1,5 @@ -import 'package:clean_framework_example/features/country/domain/country_use_case.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/features/country/domain/country_use_case.dart'; +import 'package:example/providers.dart'; import 'package:clean_framework_graphql/clean_framework_graphql.dart'; class CountryGateway extends GraphQLGateway { @override - Presenter create(builder) => CountryPresenter(builder: builder); + CountryPresenter create(PresenterBuilder builder) { + return CountryPresenter(builder: builder); + } @override Widget build(BuildContext context, CountryViewModel model) { diff --git a/packages/clean_framework/example/lib/features/last_login/domain/last_login_entity.dart b/example/lib/features/last_login/domain/last_login_entity.dart similarity index 100% rename from packages/clean_framework/example/lib/features/last_login/domain/last_login_entity.dart rename to example/lib/features/last_login/domain/last_login_entity.dart diff --git a/packages/clean_framework/example/lib/features/last_login/domain/last_login_use_case.dart b/example/lib/features/last_login/domain/last_login_use_case.dart similarity index 100% rename from packages/clean_framework/example/lib/features/last_login/domain/last_login_use_case.dart rename to example/lib/features/last_login/domain/last_login_use_case.dart diff --git a/packages/clean_framework/example/lib/features/last_login/external_interface/last_login_date_gateway.dart b/example/lib/features/last_login/external_interface/last_login_date_gateway.dart similarity index 86% rename from packages/clean_framework/example/lib/features/last_login/external_interface/last_login_date_gateway.dart rename to example/lib/features/last_login/external_interface/last_login_date_gateway.dart index bc4aefd0..b210e0d7 100644 --- a/packages/clean_framework/example/lib/features/last_login/external_interface/last_login_date_gateway.dart +++ b/example/lib/features/last_login/external_interface/last_login_date_gateway.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework.dart'; import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/providers.dart'; import 'package:clean_framework_firestore/clean_framework_firestore.dart'; class LastLoginDateGateway extends FirebaseGateway { diff --git a/packages/clean_framework/example/lib/generated_plugin_registrant.dart b/example/lib/generated_plugin_registrant.dart similarity index 100% rename from packages/clean_framework/example/lib/generated_plugin_registrant.dart rename to example/lib/generated_plugin_registrant.dart diff --git a/packages/clean_framework/example/lib/home_page.dart b/example/lib/home_page.dart similarity index 98% rename from packages/clean_framework/example/lib/home_page.dart rename to example/lib/home_page.dart index a33aca76..76a2e704 100644 --- a/packages/clean_framework/example/lib/home_page.dart +++ b/example/lib/home_page.dart @@ -1,5 +1,5 @@ import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework_example/routes.dart'; +import 'package:example/routes.dart'; import 'package:clean_framework_router/clean_framework_router.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/main.dart b/example/lib/main.dart new file mode 100644 index 00000000..c611625a --- /dev/null +++ b/example/lib/main.dart @@ -0,0 +1,50 @@ +import 'dart:developer'; + +import 'package:clean_framework/clean_framework.dart'; +import 'package:example/asset_feature_provider.dart'; +import 'package:example/demo_router.dart'; +import 'package:example/providers.dart'; +import 'package:clean_framework_router/clean_framework_router.dart'; +import 'package:flutter/material.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + loadProviders(); + + runApp(ExampleApp()); +} + +class ExampleApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return FeatureScope( + register: () => AssetFeatureProvider(), + loader: (featureProvider) async { + // To demonstrate the lazy update triggered by change in feature flags. + await Future.delayed(Duration(seconds: 2)); + await featureProvider.load('assets/flags.json'); + }, + onLoaded: () { + log('Feature Flags activated.'); + }, + child: AppProvidersContainer( + providersContext: providersContext, + child: AppRouterScope( + create: () => DemoRouter(), + builder: (context) { + return MaterialApp.router( + routerConfig: context.router.config, + theme: ThemeData( + pageTransitionsTheme: PageTransitionsTheme( + builders: { + TargetPlatform.android: ZoomPageTransitionsBuilder(), + }, + ), + ), + ); + }, + ), + ), + ); + } +} diff --git a/example/lib/providers.dart b/example/lib/providers.dart new file mode 100644 index 00000000..2c132270 --- /dev/null +++ b/example/lib/providers.dart @@ -0,0 +1,86 @@ +import 'package:clean_framework/clean_framework.dart'; +import 'package:clean_framework/clean_framework_providers.dart'; +import 'package:example/features/last_login/domain/last_login_entity.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/features/last_login/external_interface/last_login_date_gateway.dart'; +import 'package:clean_framework_firestore/clean_framework_firestore.dart'; +import 'package:clean_framework_graphql/clean_framework_graphql.dart'; +import 'package:clean_framework_rest/clean_framework_rest.dart'; +import 'package:flutter/foundation.dart'; + +import 'features/country/domain/country_entity.dart'; +import 'features/country/domain/country_use_case.dart'; +import 'features/country/external_interface/country_gateway.dart'; +import 'features/random_cat/domain/random_cat_entity.dart'; +import 'features/random_cat/domain/random_cat_use_case.dart'; +import 'features/random_cat/external_interface/random_cat_gateway.dart'; + +ProvidersContext _providersContext = ProvidersContext(); + +ProvidersContext get providersContext => _providersContext; + +@visibleForTesting +void resetProvidersContext([ProvidersContext? context]) { + _providersContext = context ?? ProvidersContext(); +} + +final lastLoginUseCaseProvider = + UseCaseProvider( + (_) => LastLoginUseCase(), +); + +final lastLoginGatewayProvider = GatewayProvider( + (_) => LastLoginDateGateway(), +); + +final countryUseCaseProvider = UseCaseProvider( + (_) => CountryUseCase(), +); + +final countryGatewayProvider = GatewayProvider( + (_) => CountryGateway(), +); + +final randomCatUseCaseProvider = + UseCaseProvider( + (_) => RandomCatUseCase(), +); + +final randomCatGatewayProvider = GatewayProvider( + (_) => RandomCatGateway(), +); + +final firebaseExternalInterface = ExternalInterfaceProvider( + (_) => FirebaseExternalInterface( + firebaseClient: FirebaseClientFake({'date': '2021-10-07'}), + gatewayConnections: [ + () => lastLoginGatewayProvider.getGateway(providersContext), + ], + ), +); + +final graphQLExternalInterface = ExternalInterfaceProvider( + (_) => GraphQLExternalInterface( + link: 'https://countries.trevorblades.com', + gatewayConnections: [ + () => countryGatewayProvider.getGateway(providersContext), + ], + ), +); + +final restExternalInterface = ExternalInterfaceProvider( + (_) => RestExternalInterface( + baseUrl: 'https://thatcopy.pw', + gatewayConnections: [ + () => randomCatGatewayProvider.getGateway(providersContext), + ], + ), +); + +void loadProviders() { + lastLoginUseCaseProvider.getUseCaseFromContext(providersContext); + lastLoginGatewayProvider.getGateway(providersContext); + firebaseExternalInterface.getExternalInterface(providersContext); + graphQLExternalInterface.getExternalInterface(providersContext); + restExternalInterface.getExternalInterface(providersContext); +} diff --git a/packages/clean_framework/example/lib/routes.dart b/example/lib/routes.dart similarity index 100% rename from packages/clean_framework/example/lib/routes.dart rename to example/lib/routes.dart diff --git a/packages/clean_framework/example/lib/widgets.dart b/example/lib/widgets.dart similarity index 100% rename from packages/clean_framework/example/lib/widgets.dart rename to example/lib/widgets.dart diff --git a/example/macos/Podfile b/example/macos/Podfile new file mode 100644 index 00000000..fe733905 --- /dev/null +++ b/example/macos/Podfile @@ -0,0 +1,40 @@ +platform :osx, '10.13' + +# 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__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..7fc36747 --- /dev/null +++ b/example/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,635 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + 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 */ + 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 */; }; + 7DA976D09DD8F17862F72FAB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 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 */ + 031D7B6B51C58E643C17E6C3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 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 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.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 = ""; }; + 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9604139AD857FA2346CCC7E9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + B2BDE31144464ED25CC665CA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7DA976D09DD8F17862F72FAB /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 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 */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + 87C2ABD9930C52127428C150 /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* example.app */, + ); + 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 = ""; + }; + 87C2ABD9930C52127428C150 /* Pods */ = { + isa = PBXGroup; + children = ( + B2BDE31144464ED25CC665CA /* Pods-Runner.debug.xcconfig */, + 9604139AD857FA2346CCC7E9 /* Pods-Runner.release.xcconfig */, + 031D7B6B51C58E643C17E6C3 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + C94987F84CA617B6D57816A1 /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + 181AA18C70E82BA2AFA5B60B /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* example.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 = { + 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 */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 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 */ + 181AA18C70E82BA2AFA5B60B /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + 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"; + }; + C94987F84CA617B6D57816A1 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 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 */ + 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 */ + 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 = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + 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", + ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + 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 = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + 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 = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + 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", + ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + 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", + ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + 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 */ + 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/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..fb7259e1 --- /dev/null +++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/example/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..21a3cc14 --- /dev/null +++ b/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/macos/Runner/AppDelegate.swift b/example/macos/Runner/AppDelegate.swift new file mode 100644 index 00000000..d53ef643 --- /dev/null +++ b/example/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..a2ec33f1 --- /dev/null +++ b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 00000000..82b6f9d9 Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 00000000..13b35eba Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 00000000..0a3f5fa4 Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 00000000..bdb57226 Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 00000000..f083318e Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 00000000..326c0e72 Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 00000000..2f1632cf Binary files /dev/null and b/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/example/macos/Runner/Base.lproj/MainMenu.xib b/example/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 00000000..80e867a4 --- /dev/null +++ b/example/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/macos/Runner/Configs/AppInfo.xcconfig b/example/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 00000000..e35ec744 --- /dev/null +++ b/example/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = example + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.example + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2022 com.acmesoftware. All rights reserved. diff --git a/example/macos/Runner/Configs/Debug.xcconfig b/example/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /dev/null +++ b/example/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/example/macos/Runner/Configs/Release.xcconfig b/example/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 00000000..dff4f495 --- /dev/null +++ b/example/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/example/macos/Runner/Configs/Warnings.xcconfig b/example/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 00000000..42bcbf47 --- /dev/null +++ b/example/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/example/macos/Runner/DebugProfile.entitlements b/example/macos/Runner/DebugProfile.entitlements new file mode 100644 index 00000000..dddb8a30 --- /dev/null +++ b/example/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/example/macos/Runner/Info.plist b/example/macos/Runner/Info.plist new file mode 100644 index 00000000..4789daa6 --- /dev/null +++ b/example/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/example/macos/Runner/MainFlutterWindow.swift b/example/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 00000000..2722837e --- /dev/null +++ b/example/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +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/example/macos/Runner/Release.entitlements b/example/macos/Runner/Release.entitlements new file mode 100644 index 00000000..852fa1a4 --- /dev/null +++ b/example/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/example/pubspec.yaml b/example/pubspec.yaml new file mode 100644 index 00000000..848b2317 --- /dev/null +++ b/example/pubspec.yaml @@ -0,0 +1,33 @@ +name: example +description: Sandbox with example of all components from clean framework +version: 1.5.0 +publish_to: none + +environment: + sdk: '>=2.17.0 <3.0.0' + flutter: '>=3.0.0' + +dependencies: + flutter: + sdk: flutter + clean_framework: ^1.5.0 + clean_framework_firestore: ^0.1.0 + clean_framework_graphql: ^0.1.0 + clean_framework_rest: ^0.1.0 + clean_framework_router: ^0.1.0 + intl: ^0.18.0 + +dev_dependencies: + clean_framework_test: ^0.1.0 + flutter_test: + sdk: flutter + mockito: ^5.0.0-nullsafety.7 + equatable: ^2.0.5 + integration_test: + sdk: flutter + +flutter: + uses-material-design: true + + assets: + - assets/flags.json diff --git a/packages/clean_framework/example/test/features/country/domain/country_use_case_test.dart b/example/test/features/country/domain/country_use_case_test.dart similarity index 90% rename from packages/clean_framework/example/test/features/country/domain/country_use_case_test.dart rename to example/test/features/country/domain/country_use_case_test.dart index c9cb792d..f7c300f9 100644 --- a/packages/clean_framework/example/test/features/country/domain/country_use_case_test.dart +++ b/example/test/features/country/domain/country_use_case_test.dart @@ -1,7 +1,7 @@ -import 'package:clean_framework_example/features/country/domain/country_entity.dart'; -import 'package:clean_framework_example/features/country/domain/country_model.dart'; -import 'package:clean_framework_example/features/country/domain/country_use_case.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/features/country/domain/country_entity.dart'; +import 'package:example/features/country/domain/country_model.dart'; +import 'package:example/features/country/domain/country_use_case.dart'; +import 'package:example/providers.dart'; import 'package:flutter_test/flutter_test.dart'; final continents = { diff --git a/packages/clean_framework/example/test/features/country/external_interface/country_gateway_test.dart b/example/test/features/country/external_interface/country_gateway_test.dart similarity index 84% rename from packages/clean_framework/example/test/features/country/external_interface/country_gateway_test.dart rename to example/test/features/country/external_interface/country_gateway_test.dart index 029b56c5..10c88968 100644 --- a/packages/clean_framework/example/test/features/country/external_interface/country_gateway_test.dart +++ b/example/test/features/country/external_interface/country_gateway_test.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework_example/features/country/domain/country_entity.dart'; -import 'package:clean_framework_example/features/country/domain/country_model.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/features/country/domain/country_entity.dart'; +import 'package:example/features/country/domain/country_model.dart'; +import 'package:example/providers.dart'; import 'package:clean_framework_graphql/clean_framework_graphql.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/features/country/presentation/country_ui_test.dart b/example/test/features/country/presentation/country_ui_test.dart similarity index 95% rename from packages/clean_framework/example/test/features/country/presentation/country_ui_test.dart rename to example/test/features/country/presentation/country_ui_test.dart index 626e777d..843fe543 100644 --- a/packages/clean_framework/example/test/features/country/presentation/country_ui_test.dart +++ b/example/test/features/country/presentation/country_ui_test.dart @@ -1,8 +1,8 @@ import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework_example/demo_router.dart'; -import 'package:clean_framework_example/features/country/presentation/country_ui.dart'; -import 'package:clean_framework_example/providers.dart'; -import 'package:clean_framework_example/routes.dart'; +import 'package:example/demo_router.dart'; +import 'package:example/features/country/presentation/country_ui.dart'; +import 'package:example/providers.dart'; +import 'package:example/routes.dart'; import 'package:clean_framework_graphql/clean_framework_graphql.dart'; import 'package:clean_framework_test/clean_framework_test.dart'; import 'package:flutter/material.dart'; diff --git a/packages/clean_framework/example/test/features/last_login/domain/last_login_usecase_test.dart b/example/test/features/last_login/domain/last_login_usecase_test.dart similarity index 90% rename from packages/clean_framework/example/test/features/last_login/domain/last_login_usecase_test.dart rename to example/test/features/last_login/domain/last_login_usecase_test.dart index 476e7488..500f99d0 100644 --- a/packages/clean_framework/example/test/features/last_login/domain/last_login_usecase_test.dart +++ b/example/test/features/last_login/domain/last_login_usecase_test.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework.dart'; import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_entity.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/features/last_login/domain/last_login_entity.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/clean_framework/example/test/features/last_login/external_interface/last_login_date_gateway_test.dart b/example/test/features/last_login/external_interface/last_login_date_gateway_test.dart similarity index 87% rename from packages/clean_framework/example/test/features/last_login/external_interface/last_login_date_gateway_test.dart rename to example/test/features/last_login/external_interface/last_login_date_gateway_test.dart index 5c1dc564..2684bb99 100644 --- a/packages/clean_framework/example/test/features/last_login/external_interface/last_login_date_gateway_test.dart +++ b/example/test/features/last_login/external_interface/last_login_date_gateway_test.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework.dart'; import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; -import 'package:clean_framework_example/features/last_login/external_interface/last_login_date_gateway.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/features/last_login/external_interface/last_login_date_gateway.dart'; import 'package:clean_framework_firestore/clean_framework_firestore.dart'; import 'package:clean_framework_test/clean_framework_test.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/features/last_login/presentation/last_login_presenter_test.dart b/example/test/features/last_login/presentation/last_login_presenter_test.dart similarity index 92% rename from packages/clean_framework/example/test/features/last_login/presentation/last_login_presenter_test.dart rename to example/test/features/last_login/presentation/last_login_presenter_test.dart index d589b321..3431b511 100644 --- a/packages/clean_framework/example/test/features/last_login/presentation/last_login_presenter_test.dart +++ b/example/test/features/last_login/presentation/last_login_presenter_test.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_presenter.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_view_model.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/features/last_login/presentation/last_login_presenter.dart'; +import 'package:example/features/last_login/presentation/last_login_view_model.dart'; import 'package:clean_framework_test/clean_framework_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/features/last_login/presentation/last_login_ui_test.dart b/example/test/features/last_login/presentation/last_login_ui_test.dart similarity index 89% rename from packages/clean_framework/example/test/features/last_login/presentation/last_login_ui_test.dart rename to example/test/features/last_login/presentation/last_login_ui_test.dart index d47ec12b..7b86f142 100644 --- a/packages/clean_framework/example/test/features/last_login/presentation/last_login_ui_test.dart +++ b/example/test/features/last_login/presentation/last_login_ui_test.dart @@ -1,8 +1,8 @@ import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_presenter.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_ui.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_view_model.dart'; +import 'package:example/features/last_login/domain/last_login_use_case.dart'; +import 'package:example/features/last_login/presentation/last_login_presenter.dart'; +import 'package:example/features/last_login/presentation/last_login_ui.dart'; +import 'package:example/features/last_login/presentation/last_login_view_model.dart'; import 'package:clean_framework_test/clean_framework_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/features/random_cat/domain/random_cat_use_case_test.dart b/example/test/features/random_cat/domain/random_cat_use_case_test.dart similarity index 92% rename from packages/clean_framework/example/test/features/random_cat/domain/random_cat_use_case_test.dart rename to example/test/features/random_cat/domain/random_cat_use_case_test.dart index fb0ca208..d2d43f67 100644 --- a/packages/clean_framework/example/test/features/random_cat/domain/random_cat_use_case_test.dart +++ b/example/test/features/random_cat/domain/random_cat_use_case_test.dart @@ -1,7 +1,7 @@ import 'package:clean_framework/clean_framework.dart'; import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/random_cat/domain/random_cat_entity.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/features/random_cat/domain/random_cat_entity.dart'; +import 'package:example/providers.dart'; import 'package:clean_framework_rest/clean_framework_rest.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/home_page_test.dart b/example/test/home_page_test.dart similarity index 90% rename from packages/clean_framework/example/test/home_page_test.dart rename to example/test/home_page_test.dart index 3ba47841..f16625b5 100644 --- a/packages/clean_framework/example/test/home_page_test.dart +++ b/example/test/home_page_test.dart @@ -1,11 +1,11 @@ import 'package:clean_framework/clean_framework.dart'; import 'package:clean_framework/clean_framework_defaults.dart'; -import 'package:clean_framework_example/demo_router.dart'; -import 'package:clean_framework_example/features/country/presentation/country_ui.dart'; -import 'package:clean_framework_example/features/last_login/presentation/last_login_ui.dart'; -import 'package:clean_framework_example/features/random_cat/presentation/random_cat_ui.dart'; -import 'package:clean_framework_example/home_page.dart'; -import 'package:clean_framework_example/providers.dart'; +import 'package:example/demo_router.dart'; +import 'package:example/features/country/presentation/country_ui.dart'; +import 'package:example/features/last_login/presentation/last_login_ui.dart'; +import 'package:example/features/random_cat/presentation/random_cat_ui.dart'; +import 'package:example/home_page.dart'; +import 'package:example/providers.dart'; import 'package:clean_framework_router/clean_framework_router.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/main_test.dart b/example/test/main_test.dart similarity index 86% rename from packages/clean_framework/example/test/main_test.dart rename to example/test/main_test.dart index 7d67f2a0..b24761aa 100644 --- a/packages/clean_framework/example/test/main_test.dart +++ b/example/test/main_test.dart @@ -1,5 +1,5 @@ -import 'package:clean_framework_example/providers.dart'; -import 'package:clean_framework_example/main.dart' as app; +import 'package:example/providers.dart'; +import 'package:example/main.dart' as app; import 'package:clean_framework_firestore/clean_framework_firestore.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/clean_framework/example/test/routes_test.dart b/example/test/routes_test.dart similarity index 82% rename from packages/clean_framework/example/test/routes_test.dart rename to example/test/routes_test.dart index 42665ec6..98864a03 100644 --- a/packages/clean_framework/example/test/routes_test.dart +++ b/example/test/routes_test.dart @@ -1,5 +1,5 @@ -import 'package:clean_framework_example/demo_router.dart'; -import 'package:clean_framework_example/home_page.dart'; +import 'package:example/demo_router.dart'; +import 'package:example/home_page.dart'; import 'package:clean_framework_router/clean_framework_router.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/example/web/favicon.png b/example/web/favicon.png new file mode 100644 index 00000000..8aaa46ac Binary files /dev/null and b/example/web/favicon.png differ diff --git a/example/web/icons/Icon-192.png b/example/web/icons/Icon-192.png new file mode 100644 index 00000000..b749bfef Binary files /dev/null and b/example/web/icons/Icon-192.png differ diff --git a/example/web/icons/Icon-512.png b/example/web/icons/Icon-512.png new file mode 100644 index 00000000..88cfd48d Binary files /dev/null and b/example/web/icons/Icon-512.png differ diff --git a/example/web/index.html b/example/web/index.html new file mode 100644 index 00000000..1460b5e9 --- /dev/null +++ b/example/web/index.html @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + + diff --git a/example/web/manifest.json b/example/web/manifest.json new file mode 100644 index 00000000..8c012917 --- /dev/null +++ b/example/web/manifest.json @@ -0,0 +1,23 @@ +{ + "name": "example", + "short_name": "example", + "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" + } + ] +} diff --git a/melos.yaml b/melos.yaml index 6b5b4b5c..731432e0 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,6 +1,7 @@ name: clean_framework packages: + - example - packages/** command: diff --git a/packages/clean_framework/example/.gitignore b/packages/clean_framework/example/.gitignore index 63938e2e..24476c5d 100644 --- a/packages/clean_framework/example/.gitignore +++ b/packages/clean_framework/example/.gitignore @@ -1,5 +1,4 @@ # Miscellaneous -pubspec.lock *.class *.log *.pyc @@ -9,8 +8,7 @@ pubspec.lock .buildlog/ .history .svn/ -*.code-workspace -/coverage +migrate_working_dir/ # IntelliJ related *.iml @@ -25,54 +23,22 @@ pubspec.lock # Flutter/Dart/Pub related **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ .flutter-plugins .flutter-plugins-dependencies .packages .pub-cache/ .pub/ -build/ +/build/ -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java +# Symbolication related +app.*.symbols -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Flutter.podspec -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* +# Obfuscation related +app.*.map.json -# Exceptions to above rules. -!**/ios/**/default.mode1v3 -!**/ios/**/default.mode2v3 -!**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/packages/clean_framework/example/.metadata b/packages/clean_framework/example/.metadata new file mode 100644 index 00000000..262ceed0 --- /dev/null +++ b/packages/clean_framework/example/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled. + +version: + revision: 135454af32477f815a7525073027a3ff9eff1bfd + channel: stable + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: android + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: ios + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: linux + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: macos + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: web + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + - platform: windows + create_revision: 135454af32477f815a7525073027a3ff9eff1bfd + base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + + # 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/packages/clean_framework/example/README.md b/packages/clean_framework/example/README.md index 9a33f403..8268e694 100644 --- a/packages/clean_framework/example/README.md +++ b/packages/clean_framework/example/README.md @@ -1,2 +1,3 @@ -# Example +# Clean Framework Example +An example application to demonstrate usage of clean_framework package. \ No newline at end of file diff --git a/packages/clean_framework/example/android/.gitignore b/packages/clean_framework/example/android/.gitignore index 0a741cb4..6f568019 100644 --- a/packages/clean_framework/example/android/.gitignore +++ b/packages/clean_framework/example/android/.gitignore @@ -9,3 +9,5 @@ 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/packages/clean_framework/example/android/app/build.gradle b/packages/clean_framework/example/android/app/build.gradle index 07124d61..bfefb711 100644 --- a/packages/clean_framework/example/android/app/build.gradle +++ b/packages/clean_framework/example/android/app/build.gradle @@ -26,26 +26,37 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 32 + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - applicationId "com.acmesoftware.example" - minSdkVersion 21 - targetSdkVersion 30 + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.acmesoftware.clean_framework_example" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-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 } } diff --git a/packages/clean_framework/example/android/app/src/debug/AndroidManifest.xml b/packages/clean_framework/example/android/app/src/debug/AndroidManifest.xml index 5d04f4bc..ff05e929 100644 --- a/packages/clean_framework/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/clean_framework/example/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,7 @@ - diff --git a/packages/clean_framework/example/android/app/src/main/AndroidManifest.xml b/packages/clean_framework/example/android/app/src/main/AndroidManifest.xml index a7d36c8f..289bce58 100644 --- a/packages/clean_framework/example/android/app/src/main/AndroidManifest.xml +++ b/packages/clean_framework/example/android/app/src/main/AndroidManifest.xml @@ -1,16 +1,21 @@ - + + + diff --git a/packages/clean_framework/example/android/app/src/main/kotlin/com/acmesoftware/clean_framework_example/MainActivity.kt b/packages/clean_framework/example/android/app/src/main/kotlin/com/acmesoftware/clean_framework_example/MainActivity.kt new file mode 100644 index 00000000..d908f0b5 --- /dev/null +++ b/packages/clean_framework/example/android/app/src/main/kotlin/com/acmesoftware/clean_framework_example/MainActivity.kt @@ -0,0 +1,6 @@ +package com.acmesoftware.clean_framework_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/packages/clean_framework/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/clean_framework/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/packages/clean_framework/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/clean_framework/example/android/app/src/main/res/values-night/styles.xml b/packages/clean_framework/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..06952be7 --- /dev/null +++ b/packages/clean_framework/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/clean_framework/example/android/app/src/main/res/values/styles.xml b/packages/clean_framework/example/android/app/src/main/res/values/styles.xml index 1f83a33f..cb1ef880 100644 --- a/packages/clean_framework/example/android/app/src/main/res/values/styles.xml +++ b/packages/clean_framework/example/android/app/src/main/res/values/styles.xml @@ -1,18 +1,18 @@ - - - diff --git a/packages/clean_framework/example/android/app/src/profile/AndroidManifest.xml b/packages/clean_framework/example/android/app/src/profile/AndroidManifest.xml index 5d04f4bc..ff05e929 100644 --- a/packages/clean_framework/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/clean_framework/example/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,7 @@ - diff --git a/packages/clean_framework/example/android/build.gradle b/packages/clean_framework/example/android/build.gradle index 73d46bcf..83ae2200 100644 --- a/packages/clean_framework/example/android/build.gradle +++ b/packages/clean_framework/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/clean_framework/example/android/gradle.properties b/packages/clean_framework/example/android/gradle.properties index a6738207..94adc3a3 100644 --- a/packages/clean_framework/example/android/gradle.properties +++ b/packages/clean_framework/example/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.enableR8=true diff --git a/packages/clean_framework/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/clean_framework/example/android/gradle/wrapper/gradle-wrapper.properties index 039eda99..cb24abda 100644 --- a/packages/clean_framework/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/clean_framework/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/packages/clean_framework/example/assets/sad-flareon.png b/packages/clean_framework/example/assets/sad-flareon.png new file mode 100644 index 00000000..7c926c62 Binary files /dev/null and b/packages/clean_framework/example/assets/sad-flareon.png differ diff --git a/packages/clean_framework/example/ios/.gitignore b/packages/clean_framework/example/ios/.gitignore new file mode 100644 index 00000000..7a7f9873 --- /dev/null +++ b/packages/clean_framework/example/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/packages/clean_framework/example/ios/Flutter/AppFrameworkInfo.plist b/packages/clean_framework/example/ios/Flutter/AppFrameworkInfo.plist index d2c61fc4..9625e105 100644 --- a/packages/clean_framework/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/clean_framework/example/ios/Flutter/AppFrameworkInfo.plist @@ -1,26 +1,26 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 9.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/packages/clean_framework/example/ios/Podfile b/packages/clean_framework/example/ios/Podfile index 313ea4a1..88359b22 100644 --- a/packages/clean_framework/example/ios/Podfile +++ b/packages/clean_framework/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '11.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/clean_framework/example/ios/Runner.xcodeproj/project.pbxproj b/packages/clean_framework/example/ios/Runner.xcodeproj/project.pbxproj index 1193fe64..a72a2790 100644 --- a/packages/clean_framework/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/clean_framework/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,11 +8,9 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3AC18C1ED27F481C1BED83BE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFC7454685DF6498BF1978D /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78E4F938059396E024EB71D2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0968838A7D5D1BB77EB80101 /* Pods_Runner.framework */; }; 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 */; }; @@ -32,24 +30,23 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0968838A7D5D1BB77EB80101 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; + 19D5F6AC73F9E8450638D8B0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 5195105C73D01DF3EB5583DC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 617B2E60B73B81FE47FDD48D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 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 = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8834B17F6053F1307161D81D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 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; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 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 = ""; }; - C86FFF5B8092A5BF5E37B3D2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - DDFC7454685DF6498BF1978D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E2ED0B9341254BC4E8A32D0C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,30 +54,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3AC18C1ED27F481C1BED83BE /* Pods_Runner.framework in Frameworks */, + 78E4F938059396E024EB71D2 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 356C1EDA1C4718B997F03609 /* Pods */ = { + 0AA87682C795D3DF9DEDDD49 /* Frameworks */ = { isa = PBXGroup; children = ( - E2ED0B9341254BC4E8A32D0C /* Pods-Runner.debug.xcconfig */, - 8834B17F6053F1307161D81D /* Pods-Runner.release.xcconfig */, - C86FFF5B8092A5BF5E37B3D2 /* Pods-Runner.profile.xcconfig */, + 0968838A7D5D1BB77EB80101 /* Pods_Runner.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; - 8D059E797CB2EFECD38A668A /* Frameworks */ = { + 74290CDFC45CF0DBEFB30AB6 /* Pods */ = { isa = PBXGroup; children = ( - DDFC7454685DF6498BF1978D /* Pods_Runner.framework */, + 5195105C73D01DF3EB5583DC /* Pods-Runner.debug.xcconfig */, + 617B2E60B73B81FE47FDD48D /* Pods-Runner.release.xcconfig */, + 19D5F6AC73F9E8450638D8B0 /* Pods-Runner.profile.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -100,8 +97,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 356C1EDA1C4718B997F03609 /* Pods */, - 8D059E797CB2EFECD38A668A /* Frameworks */, + 74290CDFC45CF0DBEFB30AB6 /* Pods */, + 0AA87682C795D3DF9DEDDD49 /* Frameworks */, ); sourceTree = ""; }; @@ -116,27 +113,18 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -144,14 +132,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - CF2D77B37A31DFC34F7DB60E /* [CP] Check Pods Manifest.lock */, + CECBBFDD7DFC0AEA322230B0 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4EC7F78FD432909300C8796A /* [CP] Embed Pods Frameworks */, + 64F4F9758C06ADDC72BCEC53 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -169,15 +157,16 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1300; - ORGANIZATIONNAME = "The Chromium Authors"; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -201,7 +190,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -224,42 +212,17 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4EC7F78FD432909300C8796A /* [CP] Embed Pods Frameworks */ = { + 64F4F9758C06ADDC72BCEC53 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseFirestore/FirebaseFirestore.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Libuv-gRPC/uv.framework", - "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", - "${BUILT_PRODUCTS_DIR}/abseil/absl.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseFirestore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/uv.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -280,7 +243,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - CF2D77B37A31DFC34F7DB60E /* [CP] Check Pods Manifest.lock */ = { + CECBBFDD7DFC0AEA322230B0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -309,8 +272,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -381,6 +343,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -391,23 +354,19 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = HW5PK5B369; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.cleanFrameworkExample; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -511,6 +470,9 @@ 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; }; @@ -521,23 +483,20 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = HW5PK5B369; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.cleanFrameworkExample; 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; @@ -547,23 +506,19 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = HW5PK5B369; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.huntington.core; + PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.cleanFrameworkExample; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/packages/clean_framework/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/clean_framework/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/packages/clean_framework/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/clean_framework/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/clean_framework/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6e..c87d15a3 100644 --- a/packages/clean_framework/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/clean_framework/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - + + - - + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/clean_framework/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/clean_framework/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/packages/clean_framework/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/clean_framework/example/ios/Runner/AppDelegate.swift b/packages/clean_framework/example/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..70693e4a --- /dev/null +++ b/packages/clean_framework/example/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/packages/clean_framework/example/ios/Runner/Info.plist b/packages/clean_framework/example/ios/Runner/Info.plist index a9cf4e86..56c27a60 100644 --- a/packages/clean_framework/example/ios/Runner/Info.plist +++ b/packages/clean_framework/example/ios/Runner/Info.plist @@ -1,47 +1,51 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - CleanFrameworkExample - 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 + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Clean Framework Example + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + clean_framework_example + 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/packages/clean_framework/example/ios/Runner/Runner-Bridging-Header.h b/packages/clean_framework/example/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..308a2a56 --- /dev/null +++ b/packages/clean_framework/example/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/packages/clean_framework/example/lib/core/pokemon/pokemon_external_interface.dart b/packages/clean_framework/example/lib/core/pokemon/pokemon_external_interface.dart new file mode 100644 index 00000000..1a599a82 --- /dev/null +++ b/packages/clean_framework/example/lib/core/pokemon/pokemon_external_interface.dart @@ -0,0 +1,34 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_request.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_success_response.dart'; +import 'package:dio/dio.dart'; + +class PokemonExternalInterface + extends ExternalInterface { + PokemonExternalInterface({ + Dio? dio, + }) : _dio = dio ?? Dio(BaseOptions(baseUrl: 'https://pokeapi.co/api/v2/')); + + final Dio _dio; + + @override + void handleRequest() { + on( + (request, send) async { + final response = await _dio.get>( + request.resource, + queryParameters: request.queryParams, + ); + + final data = response.data!; + + send(PokemonSuccessResponse(data: data)); + }, + ); + } + + @override + FailureResponse onError(Object error) { + return UnknownFailureResponse(error); + } +} diff --git a/packages/clean_framework/example/lib/core/pokemon/pokemon_request.dart b/packages/clean_framework/example/lib/core/pokemon/pokemon_request.dart new file mode 100644 index 00000000..2ce9bfff --- /dev/null +++ b/packages/clean_framework/example/lib/core/pokemon/pokemon_request.dart @@ -0,0 +1,9 @@ +import 'package:clean_framework/clean_framework_core.dart'; + +abstract class PokemonRequest extends Request { + Map get queryParams => {}; +} + +abstract class GetPokemonRequest extends PokemonRequest { + String get resource; +} diff --git a/packages/clean_framework/example/lib/core/pokemon/pokemon_success_response.dart b/packages/clean_framework/example/lib/core/pokemon/pokemon_success_response.dart new file mode 100644 index 00000000..f545e4d4 --- /dev/null +++ b/packages/clean_framework/example/lib/core/pokemon/pokemon_success_response.dart @@ -0,0 +1,7 @@ +import 'package:clean_framework/clean_framework_core.dart'; + +class PokemonSuccessResponse extends SuccessResponse { + PokemonSuccessResponse({required this.data}); + + final Map data; +} diff --git a/packages/clean_framework/example/lib/features/home/domain/home_entity.dart b/packages/clean_framework/example/lib/features/home/domain/home_entity.dart new file mode 100644 index 00000000..429ba909 --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/domain/home_entity.dart @@ -0,0 +1,38 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/models/pokemon_model.dart'; + +enum HomeStatus { initial, loading, loaded, failed } + +class HomeEntity extends Entity { + HomeEntity({ + this.pokemons = const [], + this.pokemonNameQuery = '', + this.status = HomeStatus.initial, + this.isRefresh = false, + }); + + final List pokemons; + final String pokemonNameQuery; + final HomeStatus status; + final bool isRefresh; + + @override + List get props { + return [pokemons, pokemonNameQuery, status, isRefresh]; + } + + @override + HomeEntity copyWith({ + List? pokemons, + String? pokemonNameQuery, + HomeStatus? status, + bool? isRefresh, + }) { + return HomeEntity( + pokemons: pokemons ?? this.pokemons, + pokemonNameQuery: pokemonNameQuery ?? this.pokemonNameQuery, + status: status ?? this.status, + isRefresh: isRefresh ?? this.isRefresh, + ); + } +} diff --git a/packages/clean_framework/example/lib/features/home/domain/home_ui_output.dart b/packages/clean_framework/example/lib/features/home/domain/home_ui_output.dart new file mode 100644 index 00000000..d0cb2b17 --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/domain/home_ui_output.dart @@ -0,0 +1,18 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/domain/home_entity.dart'; +import 'package:clean_framework_example/features/home/models/pokemon_model.dart'; + +class HomeUIOutput extends Output { + HomeUIOutput({ + required this.pokemons, + required this.status, + required this.isRefresh, + }); + + final List pokemons; + final HomeStatus status; + final bool isRefresh; + + @override + List get props => [pokemons, status, isRefresh]; +} diff --git a/packages/clean_framework/example/lib/features/home/domain/home_use_case.dart b/packages/clean_framework/example/lib/features/home/domain/home_use_case.dart new file mode 100644 index 00000000..5604a135 --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/domain/home_use_case.dart @@ -0,0 +1,89 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/domain/home_entity.dart'; +import 'package:clean_framework_example/features/home/domain/home_ui_output.dart'; +import 'package:clean_framework_example/features/home/external_interface/pokemon_collection_gateway.dart'; +import 'package:clean_framework_example/features/home/models/pokemon_model.dart'; + +const _spritesBaseUrl = + 'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites'; + +class HomeUseCase extends UseCase { + HomeUseCase() + : super( + entity: HomeEntity(), + transformers: [ + HomeUIOutputTransformer(), + PokemonSearchInputTransformer(), + ], + ); + + Future fetchPokemons({bool isRefresh = false}) async { + if (!isRefresh) { + entity = entity.copyWith(status: HomeStatus.loading); + } + + await request( + PokemonCollectionGatewayOutput(), + onSuccess: (success) { + final pokemons = success.pokemonIdentities.map(_resolvePokemon); + + return entity.copyWith( + pokemons: pokemons.toList(growable: false), + status: HomeStatus.loaded, + isRefresh: isRefresh, + ); + }, + onFailure: (failure) { + return entity.copyWith( + status: HomeStatus.failed, + isRefresh: isRefresh, + ); + }, + ); + + if (isRefresh) { + entity = entity.copyWith(isRefresh: false, status: HomeStatus.loaded); + } + } + + PokemonModel _resolvePokemon(PokemonIdentity pokemon) { + return PokemonModel( + name: pokemon.name.toUpperCase(), + imageUrl: '$_spritesBaseUrl/pokemon/other/dream-world/${pokemon.id}.svg', + ); + } +} + +class PokemonSearchInput extends Input { + PokemonSearchInput({required this.name}); + + final String name; +} + +class HomeUIOutputTransformer + extends OutputTransformer { + @override + HomeUIOutput transform(HomeEntity entity) { + final filteredPokemons = entity.pokemons.where( + (pokemon) { + final pokeName = pokemon.name.toLowerCase(); + return pokeName.contains(entity.pokemonNameQuery.toLowerCase()); + }, + ); + + return HomeUIOutput( + pokemons: filteredPokemons.toList(growable: false), + status: entity.status, + isRefresh: entity.isRefresh, + ); + } +} + +class PokemonSearchInputTransformer + extends InputTransformer { + @override + HomeEntity transform(HomeEntity entity, PokemonSearchInput input) { + return entity.copyWith(pokemonNameQuery: input.name); + } +} diff --git a/packages/clean_framework/example/lib/features/home/external_interface/pokemon_collection_gateway.dart b/packages/clean_framework/example/lib/features/home/external_interface/pokemon_collection_gateway.dart new file mode 100644 index 00000000..94b78f1f --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/external_interface/pokemon_collection_gateway.dart @@ -0,0 +1,71 @@ +import 'package:clean_framework/clean_framework.dart'; +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_request.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_success_response.dart'; + +class PokemonCollectionGateway extends Gateway< + PokemonCollectionGatewayOutput, + PokemonCollectionRequest, + PokemonSuccessResponse, + PokemonCollectionSuccessInput> { + @override + PokemonCollectionRequest buildRequest(PokemonCollectionGatewayOutput output) { + return PokemonCollectionRequest(); + } + + @override + FailureInput onFailure(FailureResponse failureResponse) { + return FailureInput(message: failureResponse.message); + } + + @override + PokemonCollectionSuccessInput onSuccess(PokemonSuccessResponse response) { + final deserializer = Deserializer(response.data); + + return PokemonCollectionSuccessInput( + pokemonIdentities: deserializer.getList( + 'results', + converter: PokemonIdentity.fromJson, + ), + ); + } +} + +class PokemonCollectionGatewayOutput extends Output { + @override + List get props => []; +} + +class PokemonCollectionSuccessInput extends SuccessInput { + PokemonCollectionSuccessInput({required this.pokemonIdentities}); + + final List pokemonIdentities; +} + +final _pokemonResUrlRegex = RegExp(r'https://pokeapi.co/api/v2/pokemon/(\d+)/'); + +class PokemonIdentity { + PokemonIdentity({required this.name, required this.id}); + + final String name; + final String id; + + factory PokemonIdentity.fromJson(Map json) { + final deserializer = Deserializer(json); + + final match = _pokemonResUrlRegex.firstMatch(deserializer.getString('url')); + + return PokemonIdentity( + name: deserializer.getString('name'), + id: match?.group(1) ?? '0', + ); + } +} + +class PokemonCollectionRequest extends GetPokemonRequest { + @override + String get resource => 'pokemon'; + + @override + Map get queryParams => {'limit': 1000}; +} diff --git a/packages/clean_framework/example/lib/features/home/models/pokemon_model.dart b/packages/clean_framework/example/lib/features/home/models/pokemon_model.dart new file mode 100644 index 00000000..18511a0d --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/models/pokemon_model.dart @@ -0,0 +1,9 @@ +class PokemonModel { + PokemonModel({ + required this.name, + required this.imageUrl, + }); + + final String name; + final String imageUrl; +} diff --git a/packages/clean_framework/example/lib/features/home/presentation/home_presenter.dart b/packages/clean_framework/example/lib/features/home/presentation/home_presenter.dart new file mode 100644 index 00000000..ebcd477f --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/presentation/home_presenter.dart @@ -0,0 +1,46 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/domain/home_entity.dart'; +import 'package:clean_framework_example/features/home/domain/home_ui_output.dart'; +import 'package:clean_framework_example/features/home/domain/home_use_case.dart'; +import 'package:clean_framework_example/features/home/presentation/home_view_model.dart'; +import 'package:clean_framework_example/providers.dart'; +import 'package:flutter/material.dart'; + +class HomePresenter + extends Presenter { + HomePresenter({ + required super.builder, + }) : super(provider: homeUseCaseProvider); + + @override + void onLayoutReady(BuildContext context, HomeUseCase useCase) { + useCase.fetchPokemons(); + } + + @override + HomeViewModel createViewModel(HomeUseCase useCase, HomeUIOutput output) { + return HomeViewModel( + pokemons: output.pokemons, + onSearch: (query) => useCase.setInput(PokemonSearchInput(name: query)), + onRefresh: () => useCase.fetchPokemons(isRefresh: true), + onRetry: useCase.fetchPokemons, + isLoading: output.status == HomeStatus.loading, + hasFailedLoading: output.status == HomeStatus.failed, + ); + } + + @override + void onOutputUpdate(BuildContext context, HomeUIOutput output) { + if (output.isRefresh) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + output.status == HomeStatus.failed + ? 'Sorry, failed refreshing pokemons!' + : 'Refreshed pokemons successfully!', + ), + ), + ); + } + } +} diff --git a/packages/clean_framework/example/lib/features/home/presentation/home_ui.dart b/packages/clean_framework/example/lib/features/home/presentation/home_ui.dart new file mode 100644 index 00000000..b43242f0 --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/presentation/home_ui.dart @@ -0,0 +1,102 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/presentation/home_presenter.dart'; +import 'package:clean_framework_example/features/home/presentation/home_view_model.dart'; +import 'package:clean_framework_example/routing/routes.dart'; +import 'package:clean_framework_example/widgets/pokemon_card.dart'; +import 'package:clean_framework_example/widgets/pokemon_search_field.dart'; +import 'package:clean_framework_router/clean_framework_router.dart'; +import 'package:flutter/material.dart'; + +class HomeUI extends UI { + @override + HomePresenter create(PresenterBuilder builder) { + return HomePresenter(builder: builder); + } + + @override + Widget build(BuildContext context, HomeViewModel viewModel) { + final textTheme = Theme.of(context).textTheme; + + Widget child; + if (viewModel.isLoading) { + child = Center(child: CircularProgressIndicator()); + } else if (viewModel.hasFailedLoading) { + child = _LoadingFailed(onRetry: viewModel.onRetry); + } else { + child = RefreshIndicator( + onRefresh: viewModel.onRefresh, + child: Scrollbar( + thumbVisibility: true, + child: ListView.builder( + prototypeItem: SizedBox(height: 176), // 160 + 16 + padding: EdgeInsets.symmetric(horizontal: 16), + itemBuilder: (context, index) { + final pokemon = viewModel.pokemons[index]; + + return PokemonCard( + key: ValueKey(pokemon.name), + imageUrl: pokemon.imageUrl, + name: pokemon.name, + heroTag: pokemon.name, + onTap: () => context.router.go( + Routes.profile, + params: {'pokemon_name': pokemon.name}, + ), + ); + }, + itemCount: viewModel.pokemons.length, + ), + ), + ); + } + + return Scaffold( + appBar: AppBar( + title: Text('Pokémon'), + centerTitle: false, + titleTextStyle: textTheme.displaySmall!.copyWith( + fontWeight: FontWeight.w300, + ), + bottom: viewModel.isLoading || viewModel.hasFailedLoading + ? null + : PokemonSearchField(onChanged: viewModel.onSearch), + ), + body: child, + ); + } +} + +class _LoadingFailed extends StatelessWidget { + const _LoadingFailed({required this.onRetry}); + + final VoidCallback onRetry; + + @override + Widget build(BuildContext context) { + return Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only(left: 32), + child: Image.asset('assets/sad-flareon.png', height: 300), + ), + const SizedBox(height: 8), + Text( + 'Oops', + style: Theme.of(context).textTheme.displaySmall, + ), + const SizedBox(height: 8), + Text('I lost my fellow Pokémons'), + const SizedBox(height: 24), + OutlinedButton( + onPressed: onRetry, + child: Text('Help Flareon, find her friends'), + ), + const SizedBox(height: 64), + ], + ), + ); + } +} diff --git a/packages/clean_framework/example/lib/features/home/presentation/home_view_model.dart b/packages/clean_framework/example/lib/features/home/presentation/home_view_model.dart new file mode 100644 index 00000000..46e70648 --- /dev/null +++ b/packages/clean_framework/example/lib/features/home/presentation/home_view_model.dart @@ -0,0 +1,25 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/home/models/pokemon_model.dart'; +import 'package:flutter/foundation.dart'; + +class HomeViewModel extends ViewModel { + HomeViewModel({ + required this.pokemons, + required this.isLoading, + required this.hasFailedLoading, + required this.onRetry, + required this.onRefresh, + required this.onSearch, + }); + + final List pokemons; + final bool isLoading; + final bool hasFailedLoading; + + final VoidCallback onRetry; + final AsyncCallback onRefresh; + final ValueChanged onSearch; + + @override + List get props => [pokemons, isLoading, hasFailedLoading]; +} diff --git a/packages/clean_framework/example/lib/features/profile/domain/profile_entity.dart b/packages/clean_framework/example/lib/features/profile/domain/profile_entity.dart new file mode 100644 index 00000000..cced4d4f --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/domain/profile_entity.dart @@ -0,0 +1,45 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/models/pokemon_profile_model.dart'; + +class ProfileEntity extends Entity { + ProfileEntity({ + this.types = const [], + this.description = '', + this.height = 0, + this.weight = 0, + this.stats = const [], + }); + + final List types; + final String description; + final int height; + final int weight; + final List stats; + + @override + List get props => [types, description, height, weight, stats]; + + @override + ProfileEntity copyWith({ + List? types, + String? description, + int? height, + int? weight, + List? stats, + }) { + return ProfileEntity( + types: types ?? this.types, + description: description ?? this.description, + height: height ?? this.height, + weight: weight ?? this.weight, + stats: stats ?? this.stats, + ); + } +} + +class PokemonStat { + PokemonStat({required this.name, required this.point}); + + final String name; + final int point; +} diff --git a/packages/clean_framework/example/lib/features/profile/domain/profile_ui_output.dart b/packages/clean_framework/example/lib/features/profile/domain/profile_ui_output.dart new file mode 100644 index 00000000..8afccf15 --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/domain/profile_ui_output.dart @@ -0,0 +1,21 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_entity.dart'; + +class ProfileUIOutput extends Output { + ProfileUIOutput({ + required this.types, + required this.description, + required this.height, + required this.weight, + required this.stats, + }); + + final List types; + final String description; + final double height; + final double weight; + final List stats; + + @override + List get props => [types, description, height, weight, stats]; +} diff --git a/packages/clean_framework/example/lib/features/profile/domain/profile_use_case.dart b/packages/clean_framework/example/lib/features/profile/domain/profile_use_case.dart new file mode 100644 index 00000000..2e52906a --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/domain/profile_use_case.dart @@ -0,0 +1,79 @@ +import 'dart:math'; + +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_entity.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_ui_output.dart'; +import 'package:clean_framework_example/features/profile/external_interface/pokemon_profile_gateway.dart'; +import 'package:clean_framework_example/features/profile/external_interface/pokemon_species_gateway.dart'; + +class ProfileUseCase extends UseCase { + ProfileUseCase() + : super( + entity: ProfileEntity(), + transformers: [ProfileUIOutputTransformer()], + ); + + void fetchPokemonProfile(String name) { + final pokeName = name.toLowerCase(); + + request( + PokemonSpeciesGatewayOutput(name: pokeName), + onSuccess: (success) { + final descriptions = success.species.descriptions.where( + (desc) => desc.language == 'en', + ); + + final randomIndex = Random().nextInt(descriptions.length); + + return entity.copyWith( + description: descriptions.elementAt(randomIndex).text, + ); + }, + onFailure: (failure) => entity, + ); + + request( + PokemonProfileGatewayOutput(name: pokeName), + onSuccess: (success) { + final profile = success.profile; + + return entity.copyWith( + types: profile.types, + height: profile.height, + weight: profile.weight, + stats: profile.stats, + ); + }, + onFailure: (failure) => entity, + ); + } +} + +class ProfileUIOutputTransformer + extends OutputTransformer { + @override + ProfileUIOutput transform(ProfileEntity entity) { + return ProfileUIOutput( + types: entity.types, + description: entity.description.replaceAll(RegExp(r'[\n\f]'), ' '), + height: entity.height / 10, + weight: entity.weight / 10, + stats: entity.stats.map( + (s) { + return PokemonStat( + name: _kebabToTitleCase(s.name), + point: s.baseStat, + ); + }, + ).toList(growable: false), + ); + } + + String _kebabToTitleCase(String input) { + return input + .replaceAll('special', 'sp.') + .split('-') + .map((s) => s[0].toUpperCase() + s.substring(1)) + .join(' '); + } +} diff --git a/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_profile_gateway.dart b/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_profile_gateway.dart new file mode 100644 index 00000000..4e36698f --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_profile_gateway.dart @@ -0,0 +1,48 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_request.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_success_response.dart'; +import 'package:clean_framework_example/features/profile/models/pokemon_profile_model.dart'; + +class PokemonProfileGateway extends Gateway { + @override + PokemonProfileRequest buildRequest(PokemonProfileGatewayOutput output) { + return PokemonProfileRequest(name: output.name); + } + + @override + FailureInput onFailure(FailureResponse failureResponse) { + return FailureInput(message: failureResponse.message); + } + + @override + PokemonProfileSuccessInput onSuccess(PokemonSuccessResponse response) { + return PokemonProfileSuccessInput( + profile: PokemonProfileModel.fromJson(response.data), + ); + } +} + +class PokemonProfileGatewayOutput extends Output { + PokemonProfileGatewayOutput({required this.name}); + + final String name; + + @override + List get props => [name]; +} + +class PokemonProfileSuccessInput extends SuccessInput { + PokemonProfileSuccessInput({required this.profile}); + + final PokemonProfileModel profile; +} + +class PokemonProfileRequest extends GetPokemonRequest { + PokemonProfileRequest({required this.name}); + + final String name; + + @override + String get resource => 'pokemon/$name'; +} diff --git a/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_species_gateway.dart b/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_species_gateway.dart new file mode 100644 index 00000000..845be0b9 --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/external_interface/pokemon_species_gateway.dart @@ -0,0 +1,48 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_request.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_success_response.dart'; +import 'package:clean_framework_example/features/profile/models/pokemon_species_model.dart'; + +class PokemonSpeciesGateway extends Gateway { + @override + PokemonSpeciesRequest buildRequest(PokemonSpeciesGatewayOutput output) { + return PokemonSpeciesRequest(name: output.name); + } + + @override + FailureInput onFailure(FailureResponse failureResponse) { + return FailureInput(message: failureResponse.message); + } + + @override + PokemonSpeciesSuccessInput onSuccess(PokemonSuccessResponse response) { + return PokemonSpeciesSuccessInput( + species: PokemonSpeciesModel.fromJson(response.data), + ); + } +} + +class PokemonSpeciesGatewayOutput extends Output { + PokemonSpeciesGatewayOutput({required this.name}); + + final String name; + + @override + List get props => [name]; +} + +class PokemonSpeciesSuccessInput extends SuccessInput { + PokemonSpeciesSuccessInput({required this.species}); + + final PokemonSpeciesModel species; +} + +class PokemonSpeciesRequest extends GetPokemonRequest { + PokemonSpeciesRequest({required this.name}); + + final String name; + + @override + String get resource => 'pokemon-species/$name'; +} diff --git a/packages/clean_framework/example/lib/features/profile/models/pokemon_profile_model.dart b/packages/clean_framework/example/lib/features/profile/models/pokemon_profile_model.dart new file mode 100644 index 00000000..81aa1f6b --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/models/pokemon_profile_model.dart @@ -0,0 +1,52 @@ +import 'package:clean_framework/clean_framework.dart'; + +class PokemonProfileModel { + PokemonProfileModel({ + required this.baseExperience, + required this.height, + required this.weight, + required this.stats, + required this.types, + }); + + factory PokemonProfileModel.fromJson(Map json) { + final deserializer = Deserializer(json); + + return PokemonProfileModel( + baseExperience: deserializer.getInt('base_experience'), + height: deserializer.getInt('height'), + weight: deserializer.getInt('weight'), + stats: deserializer.getList( + 'stats', + converter: PokemonStatModel.fromJson, + ), + types: deserializer.getList('types', converter: (t) => t['type']['name']), + ); + } + + final int baseExperience; + final int height; + final int weight; + final List stats; + final List types; +} + +class PokemonStatModel { + PokemonStatModel({ + required this.name, + required this.baseStat, + }); + + factory PokemonStatModel.fromJson(Map json) { + final deserializer = Deserializer(json); + final stat = deserializer('stat'); + + return PokemonStatModel( + name: stat.getString('name'), + baseStat: deserializer.getInt('base_stat'), + ); + } + + final String name; + final int baseStat; +} diff --git a/packages/clean_framework/example/lib/features/profile/models/pokemon_species_model.dart b/packages/clean_framework/example/lib/features/profile/models/pokemon_species_model.dart new file mode 100644 index 00000000..15290929 --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/models/pokemon_species_model.dart @@ -0,0 +1,38 @@ +import 'package:clean_framework/clean_framework.dart'; + +class PokemonSpeciesModel { + PokemonSpeciesModel({required this.descriptions}); + + factory PokemonSpeciesModel.fromJson(Map json) { + final deserializer = Deserializer(json); + + return PokemonSpeciesModel( + descriptions: deserializer.getList( + 'flavor_text_entries', + converter: PokemonDescriptionModel.fromJson, + ), + ); + } + + final List descriptions; +} + +class PokemonDescriptionModel { + PokemonDescriptionModel({ + required this.text, + required this.language, + }); + + factory PokemonDescriptionModel.fromJson(Map json) { + final deserializer = Deserializer(json); + final language = deserializer('language'); + + return PokemonDescriptionModel( + text: deserializer.getString('flavor_text'), + language: language.getString('name'), + ); + } + + final String text; + final String language; +} diff --git a/packages/clean_framework/example/lib/features/profile/presentation/profile_presenter.dart b/packages/clean_framework/example/lib/features/profile/presentation/profile_presenter.dart new file mode 100644 index 00000000..0c58ca5e --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/presentation/profile_presenter.dart @@ -0,0 +1,35 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_ui_output.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_use_case.dart'; +import 'package:clean_framework_example/features/profile/presentation/profile_view_model.dart'; +import 'package:clean_framework_example/providers.dart'; +import 'package:flutter/material.dart'; + +class ProfilePresenter + extends Presenter { + ProfilePresenter({ + required super.builder, + required this.name, + }) : super(provider: profileUseCaseProvider); + + final String name; + + @protected + void onLayoutReady(BuildContext context, ProfileUseCase useCase) { + useCase.fetchPokemonProfile(name); + } + + @override + ProfileViewModel createViewModel( + ProfileUseCase useCase, + ProfileUIOutput output, + ) { + return ProfileViewModel( + pokemonTypes: output.types.map(PokemonType.new).toList(growable: false), + description: output.description, + height: '📏 ${output.height} m', + weight: '⚖️ ${output.weight} kg', + stats: output.stats, + ); + } +} diff --git a/packages/clean_framework/example/lib/features/profile/presentation/profile_ui.dart b/packages/clean_framework/example/lib/features/profile/presentation/profile_ui.dart new file mode 100644 index 00000000..3fa30012 --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/presentation/profile_ui.dart @@ -0,0 +1,228 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_entity.dart'; +import 'package:clean_framework_example/features/profile/presentation/profile_presenter.dart'; +import 'package:clean_framework_example/features/profile/presentation/profile_view_model.dart'; +import 'package:clean_framework_example/widgets/spotlight.dart'; +import 'package:flutter/material.dart'; + +class ProfileUI extends UI { + ProfileUI({required this.pokemonName}); + + final String pokemonName; + + @override + ProfilePresenter create(PresenterBuilder builder) { + return ProfilePresenter(builder: builder, name: pokemonName); + } + + @override + Widget build(BuildContext context, ProfileViewModel viewModel) { + return Scaffold( + appBar: AppBar( + title: Text(pokemonName), + elevation: 0, + backgroundColor: Colors.transparent, + ), + extendBodyBehindAppBar: true, + body: Spotlight( + height: 200, + heroTag: pokemonName, + cacheKey: pokemonName, + builder: (context) { + final pokeTypes = viewModel.pokemonTypes; + + return Card( + margin: EdgeInsets.zero, + elevation: Theme.of(context).brightness == Brightness.light ? 0 : 4, + color: Theme.of(context).colorScheme.surface.withAlpha(120), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(48), + ), + child: Padding( + padding: const EdgeInsets.fromLTRB(24, 96, 24, 16), + child: SingleChildScrollView( + child: Column( + children: [ + Wrap( + runSpacing: 8, + spacing: 8, + children: pokeTypes.map(_PokeTypeChip.new).toList(), + ), + const SizedBox(height: 24), + Text( + viewModel.description, + style: Theme.of(context).textTheme.bodySmall, + ), + const SizedBox(height: 24), + _BodyMeasurement( + height: viewModel.height, + weight: viewModel.weight, + ), + const SizedBox(height: 32), + _ProfileStats(stats: viewModel.stats), + ], + ), + ), + ), + ); + }, + ), + ); + } +} + +class _ProfileStats extends StatelessWidget { + const _ProfileStats({required this.stats}); + + final List stats; + + @override + Widget build(BuildContext context) { + return Column( + children: [ + for (final stat in stats) + Padding( + padding: const EdgeInsets.all(6), + child: _StatRow(stat: stat), + ), + ], + ); + } +} + +class _StatRow extends StatelessWidget { + const _StatRow({required this.stat}); + + final PokemonStat stat; + + @override + Widget build(BuildContext context) { + final themeData = Theme.of(context); + final primaryColor = themeData.colorScheme.primary; + final pointFraction = stat.point / 255; + + return Row( + children: [ + Expanded( + flex: 2, + child: Row( + children: [ + Expanded( + child: Text( + stat.name, + style: themeData.textTheme.bodySmall, + ), + ), + const SizedBox(width: 16), + Text( + stat.point.toString(), + style: themeData.textTheme.titleSmall, + ), + ], + ), + ), + const SizedBox(width: 32), + Expanded( + flex: 3, + child: ClipRRect( + borderRadius: BorderRadius.circular(8), + child: LinearProgressIndicator( + color: primaryColor.withAlpha(stat.point), + value: pointFraction, + minHeight: 8, + backgroundColor: themeData.colorScheme.surfaceVariant, + ), + ), + ), + ], + ); + } +} + +class _BodyMeasurement extends StatelessWidget { + const _BodyMeasurement({ + required this.height, + required this.weight, + }); + + final String height; + final String weight; + + @override + Widget build(BuildContext context) { + final themeData = Theme.of(context); + final titleStyle = themeData.textTheme.displaySmall!.copyWith(fontSize: 20); + final subtitleStyle = themeData.textTheme.bodySmall!.copyWith( + color: themeData.colorScheme.outline, + ); + + return Card( + margin: EdgeInsets.zero, + child: Padding( + padding: const EdgeInsets.all(16), + child: Row( + children: [ + Expanded( + child: Column( + children: [ + Text(weight, style: titleStyle), + const SizedBox(height: 4), + Text('Weight', style: subtitleStyle), + ], + ), + ), + Container( + width: 1, + height: 32, + color: themeData.colorScheme.surfaceVariant, + ), + Expanded( + child: Column( + children: [ + Text(height, style: titleStyle), + const SizedBox(height: 4), + Text('Height', style: subtitleStyle), + ], + ), + ), + ], + ), + ), + ); + } +} + +class _PokeTypeChip extends StatelessWidget { + const _PokeTypeChip(this.type); + + final PokemonType type; + + @override + Widget build(BuildContext context) { + return Material( + color: Colors.transparent, + shape: StadiumBorder( + side: BorderSide(color: type.color), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 6, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text(type.emoji), + Text( + type.name, + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: type.color), + ), + ], + ), + ), + ); + } +} diff --git a/packages/clean_framework/example/lib/features/profile/presentation/profile_view_model.dart b/packages/clean_framework/example/lib/features/profile/presentation/profile_view_model.dart new file mode 100644 index 00000000..876db2a8 --- /dev/null +++ b/packages/clean_framework/example/lib/features/profile/presentation/profile_view_model.dart @@ -0,0 +1,74 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_entity.dart'; +import 'package:flutter/material.dart'; + +class ProfileViewModel extends ViewModel { + ProfileViewModel({ + required this.pokemonTypes, + required this.description, + required this.height, + required this.weight, + required this.stats, + }); + + final List pokemonTypes; + final String description; + final String height; + final String weight; + final List stats; + + @override + List get props => [pokemonTypes, description, height, weight, stats]; +} + +class PokemonType { + PokemonType(this.name) + : color = _pokemonTypeColors[name] ?? Colors.white, + emoji = _pokemonTypeEmojis[name] ?? ''; + + final String name; + final String emoji; + final Color color; +} + +const _pokemonTypeColors = { + 'normal': Color(0xFFA8A77A), + 'fire': Color(0xFFEE8130), + 'water': Color(0xFF6390F0), + 'electric': Color(0xFFF7D02C), + 'grass': Color(0xFF7AC74C), + 'ice': Color(0xFF96D9D6), + 'fighting': Color(0xFFC22E28), + 'poison': Color(0xFFA33EA1), + 'ground': Color(0xFFE2BF65), + 'flying': Color(0xFFA98FF3), + 'psychic': Color(0xFFF95587), + 'bug': Color(0xFFA6B91A), + 'rock': Color(0xFFB6A136), + 'ghost': Color(0xFF735797), + 'dragon': Color(0xFF6F35FC), + 'dark': Color(0xFF705746), + 'steel': Color(0xFFB7B7CE), + 'fairy': Color(0xFFD685AD), +}; + +const _pokemonTypeEmojis = { + 'normal': '🔶', + 'fire': '🔥', + 'water': '💧', + 'electric': '⚡️', + 'grass': '🍃', + 'ice': '❄️', + 'fighting': '👊', + 'poison': '🍄', + 'ground': '🏔', + 'flying': '💨', + 'psychic': '👁️', + 'bug': '🕸', + 'rock': '🗿', + 'ghost': '👻', + 'dragon': '🐲', + 'dark': '🌙', + 'steel': '⚙️', + 'fairy': '🌈', +}; diff --git a/packages/clean_framework/example/lib/main.dart b/packages/clean_framework/example/lib/main.dart index f61ea397..ee1d00df 100644 --- a/packages/clean_framework/example/lib/main.dart +++ b/packages/clean_framework/example/lib/main.dart @@ -1,49 +1,50 @@ -import 'dart:developer'; - -import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework_example/asset_feature_provider.dart'; -import 'package:clean_framework_example/demo_router.dart'; +import 'package:clean_framework/clean_framework_core.dart'; import 'package:clean_framework_example/providers.dart'; +import 'package:clean_framework_example/routing/routes.dart'; import 'package:clean_framework_router/clean_framework_router.dart'; import 'package:flutter/material.dart'; +import 'package:stack_trace/stack_trace.dart' as stack_trace; + +final container = ProviderContainer(); -Future main() async { - WidgetsFlutterBinding.ensureInitialized(); - loadProviders(); +void main() { + FlutterError.demangleStackTrace = (StackTrace stack) { + if (stack is stack_trace.Trace) return stack.vmTrace; + if (stack is stack_trace.Chain) return stack.toTrace().vmTrace; + return stack; + }; + initializeExternalInterfaces(container); - runApp(ExampleApp()); + runApp(const MyApp()); } -class ExampleApp extends StatelessWidget { +class MyApp extends StatelessWidget { + const MyApp({super.key}); + @override Widget build(BuildContext context) { - return FeatureScope( - register: () => AssetFeatureProvider(), - loader: (featureProvider) async { - // To demonstrate the lazy update triggered by change in feature flags. - await Future.delayed(Duration(seconds: 2)); - await featureProvider.load('assets/flags.json'); - }, - onLoaded: () { - log('Feature Flags activated.'); - }, - child: AppProvidersContainer( - providersContext: providersContext, - child: AppRouterScope( - create: () => DemoRouter(), - builder: (context) { - return MaterialApp.router( - routerConfig: context.router.config, - theme: ThemeData( - pageTransitionsTheme: PageTransitionsTheme( - builders: { - TargetPlatform.android: ZoomPageTransitionsBuilder(), - }, - ), + return ProviderScope( + parent: container, + child: AppRouterScope( + create: PokeRouter.new, + builder: (context) { + return MaterialApp.router( + title: 'Clean Framework Example', + theme: ThemeData.from( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.green), + useMaterial3: true, + ), + darkTheme: ThemeData.from( + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.green, + brightness: Brightness.dark, ), - ); - }, - ), + useMaterial3: true, + ), + themeMode: ThemeMode.dark, + routerConfig: context.router.config, + ); + }, ), ); } diff --git a/packages/clean_framework/example/lib/providers.dart b/packages/clean_framework/example/lib/providers.dart index 08987b32..52e6540f 100644 --- a/packages/clean_framework/example/lib/providers.dart +++ b/packages/clean_framework/example/lib/providers.dart @@ -1,86 +1,39 @@ -import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_entity.dart'; -import 'package:clean_framework_example/features/last_login/domain/last_login_use_case.dart'; -import 'package:clean_framework_example/features/last_login/external_interface/last_login_date_gateway.dart'; -import 'package:clean_framework_firestore/clean_framework_firestore.dart'; -import 'package:clean_framework_graphql/clean_framework_graphql.dart'; -import 'package:clean_framework_rest/clean_framework_rest.dart'; -import 'package:flutter/foundation.dart'; +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:clean_framework_example/core/pokemon/pokemon_external_interface.dart'; +import 'package:clean_framework_example/features/home/domain/home_use_case.dart'; +import 'package:clean_framework_example/features/home/external_interface/pokemon_collection_gateway.dart'; +import 'package:clean_framework_example/features/profile/domain/profile_use_case.dart'; +import 'package:clean_framework_example/features/profile/external_interface/pokemon_profile_gateway.dart'; +import 'package:clean_framework_example/features/profile/external_interface/pokemon_species_gateway.dart'; -import 'features/country/domain/country_entity.dart'; -import 'features/country/domain/country_use_case.dart'; -import 'features/country/external_interface/country_gateway.dart'; -import 'features/random_cat/domain/random_cat_entity.dart'; -import 'features/random_cat/domain/random_cat_use_case.dart'; -import 'features/random_cat/external_interface/random_cat_gateway.dart'; +final homeUseCaseProvider = UseCaseProvider(HomeUseCase.new); -ProvidersContext _providersContext = ProvidersContext(); +final profileUseCaseProvider = UseCaseProvider(ProfileUseCase.new); -ProvidersContext get providersContext => _providersContext; - -@visibleForTesting -void resetProvidersContext([ProvidersContext? context]) { - _providersContext = context ?? ProvidersContext(); -} - -final lastLoginUseCaseProvider = - UseCaseProvider( - (_) => LastLoginUseCase(), -); - -final lastLoginGatewayProvider = GatewayProvider( - (_) => LastLoginDateGateway(), -); - -final countryUseCaseProvider = UseCaseProvider( - (_) => CountryUseCase(), -); - -final countryGatewayProvider = GatewayProvider( - (_) => CountryGateway(), -); - -final randomCatUseCaseProvider = - UseCaseProvider( - (_) => RandomCatUseCase(), -); - -final randomCatGatewayProvider = GatewayProvider( - (_) => RandomCatGateway(), +final pokemonCollectionGateway = GatewayProvider( + PokemonCollectionGateway.new, + useCases: [homeUseCaseProvider], ); -final firebaseExternalInterface = ExternalInterfaceProvider( - (_) => FirebaseExternalInterface( - firebaseClient: FirebaseClientFake({'date': '2021-10-07'}), - gatewayConnections: [ - () => lastLoginGatewayProvider.getGateway(providersContext), - ], - ), +final pokemonProfileGateway = GatewayProvider( + PokemonProfileGateway.new, + useCases: [profileUseCaseProvider], ); -final graphQLExternalInterface = ExternalInterfaceProvider( - (_) => GraphQLExternalInterface( - link: 'https://countries.trevorblades.com', - gatewayConnections: [ - () => countryGatewayProvider.getGateway(providersContext), - ], - ), +final pokemonSpeciesGateway = GatewayProvider( + PokemonSpeciesGateway.new, + useCases: [profileUseCaseProvider], ); -final restExternalInterface = ExternalInterfaceProvider( - (_) => RestExternalInterface( - baseUrl: 'https://thatcopy.pw', - gatewayConnections: [ - () => randomCatGatewayProvider.getGateway(providersContext), - ], - ), +final pokemonExternalInterfaceProvider = ExternalInterfaceProvider( + PokemonExternalInterface.new, + gateways: [ + pokemonCollectionGateway, + pokemonProfileGateway, + pokemonSpeciesGateway, + ], ); -void loadProviders() { - lastLoginUseCaseProvider.getUseCaseFromContext(providersContext); - lastLoginGatewayProvider.getGateway(providersContext); - firebaseExternalInterface.getExternalInterface(providersContext); - graphQLExternalInterface.getExternalInterface(providersContext); - restExternalInterface.getExternalInterface(providersContext); +void initializeExternalInterfaces(ProviderContainer container) { + pokemonExternalInterfaceProvider.initializeFor(container); } diff --git a/packages/clean_framework/example/lib/routing/routes.dart b/packages/clean_framework/example/lib/routing/routes.dart new file mode 100644 index 00000000..32014fab --- /dev/null +++ b/packages/clean_framework/example/lib/routing/routes.dart @@ -0,0 +1,46 @@ +import 'package:animations/animations.dart'; +import 'package:clean_framework_example/features/home/presentation/home_ui.dart'; +import 'package:clean_framework_example/features/profile/presentation/profile_ui.dart'; +import 'package:clean_framework_router/clean_framework_router.dart'; + +enum Routes with RoutesMixin { + home('/'), + profile(':pokemon_name'); + + const Routes(this.path); + + @override + final String path; +} + +class PokeRouter extends AppRouter { + @override + RouterConfiguration configureRouter() { + return RouterConfiguration( + routes: [ + AppRoute( + route: Routes.home, + builder: (_, __) => HomeUI(), + routes: [ + AppRoute.custom( + route: Routes.profile, + builder: (_, state) { + return ProfileUI( + pokemonName: state.params['pokemon_name'] ?? '', + ); + }, + transitionsBuilder: (_, animation, secondaryAnimation, child) { + return SharedAxisTransition( + animation: animation, + secondaryAnimation: secondaryAnimation, + transitionType: SharedAxisTransitionType.horizontal, + child: child, + ); + }, + ), + ], + ), + ], + ); + } +} diff --git a/packages/clean_framework/example/lib/widgets/pokemon_card.dart b/packages/clean_framework/example/lib/widgets/pokemon_card.dart new file mode 100644 index 00000000..c38fdd5d --- /dev/null +++ b/packages/clean_framework/example/lib/widgets/pokemon_card.dart @@ -0,0 +1,60 @@ +import 'package:clean_framework_example/widgets/svg_palette_card.dart'; +import 'package:flutter/material.dart'; + +class PokemonCard extends StatelessWidget { + const PokemonCard({ + super.key, + required this.imageUrl, + required this.name, + required this.onTap, + required this.heroTag, + }); + + final String imageUrl; + final String name; + final VoidCallback onTap; + final String heroTag; + + @override + Widget build(BuildContext context) { + return SvgPaletteCard( + cacheKey: name, + url: imageUrl, + onTap: onTap, + height: 160, + margin: EdgeInsets.symmetric(vertical: 8), + builder: (context, picture) { + return Padding( + padding: const EdgeInsets.all(16), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Text( + name, + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(fontWeight: FontWeight.w300), + ), + ), + ConstrainedBox( + constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width / 2, + ), + child: Hero(tag: heroTag, child: picture), + ), + ], + ), + ); + }, + backgroundColorBuilder: (context, palette) { + final color = Theme.of(context).brightness == Brightness.light + ? palette.lightVibrantColor?.color + : palette.darkVibrantColor?.color; + + return color?.withAlpha(120); + }, + ); + } +} diff --git a/packages/clean_framework/example/lib/widgets/pokemon_search_field.dart b/packages/clean_framework/example/lib/widgets/pokemon_search_field.dart new file mode 100644 index 00000000..906b234f --- /dev/null +++ b/packages/clean_framework/example/lib/widgets/pokemon_search_field.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; + +class PokemonSearchField extends StatelessWidget with PreferredSizeWidget { + const PokemonSearchField({super.key, required this.onChanged}); + + final ValueChanged onChanged; + + @override + Widget build(BuildContext context) { + final textTheme = Theme.of(context).textTheme; + + return Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Search for a Pokémon by name', + style: textTheme.bodyMedium!.copyWith( + fontWeight: FontWeight.w100, + ), + ), + const SizedBox(height: 8), + TextField( + onChanged: onChanged, + decoration: InputDecoration( + hintText: 'Pokémon name', + hintStyle: textTheme.bodyLarge!.copyWith( + fontWeight: FontWeight.w100, + ), + prefixIcon: Icon(Icons.search), + border: InputBorder.none, + filled: true, + fillColor: Theme.of(context).colorScheme.surfaceVariant, + ), + ) + ], + ), + ); + } + + @override + Size get preferredSize => Size.fromHeight(80); +} diff --git a/packages/clean_framework/example/lib/widgets/spotlight.dart b/packages/clean_framework/example/lib/widgets/spotlight.dart new file mode 100644 index 00000000..a1c63557 --- /dev/null +++ b/packages/clean_framework/example/lib/widgets/spotlight.dart @@ -0,0 +1,143 @@ +import 'dart:math'; + +import 'package:flutter/material.dart'; +import 'package:flutter_cache_manager/flutter_cache_manager.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:palette_generator/palette_generator.dart'; + +class Spotlight extends StatefulWidget { + const Spotlight({ + super.key, + required this.cacheKey, + required this.heroTag, + required this.builder, + this.placeholderBuilder, + this.width, + this.height, + }); + + final String cacheKey; + final String heroTag; + final WidgetBuilder builder; + final WidgetBuilder? placeholderBuilder; + final double? width; + final double? height; + + @override + State createState() => _SpotlightState(); +} + +class _SpotlightState extends State { + PaletteGenerator? _palette; + + @override + Widget build(BuildContext context) { + final size = MediaQuery.of(context).size; + + return FutureBuilder( + future: _loadFileFromCache(), + builder: (context, snapshot) { + if (snapshot.hasData) { + return Stack( + clipBehavior: Clip.none, + fit: StackFit.expand, + children: [ + Positioned( + top: 0, + height: size.height, + width: size.width, + child: DecoratedBox( + decoration: BoxDecoration( + borderRadius: BorderRadius.vertical( + bottom: Radius.circular(48), + ), + gradient: SweepGradient( + center: FractionalOffset(0.9, 0.5), + colors: [ + _getColor((p) => p.dominantColor), + _getColor((p) => p.vibrantColor), + _getColor((p) => p.mutedColor), + _getColor((p) => p.lightMutedColor), + _getColor((p) => p.dominantColor), + ], + stops: [0.0, 0.2, 0.5, 0.7, 1.0], + transform: GradientRotation(pi * 1.5), + ), + ), + child: DecoratedBox( + decoration: BoxDecoration( + gradient: RadialGradient( + center: FractionalOffset(0.5, 0.3), + colors: [ + for (var a = 0; a < 200; a++) + Theme.of(context) + .colorScheme + .background + .withAlpha(a), + ], + stops: [ + for (var stop = 0.0; stop < 1.0; stop += 1 / 200) stop + ], + radius: pi / 4, + ), + ), + child: const SizedBox(), + ), + ), + ), + Positioned.fill( + top: size.width / 1.5, + child: widget.builder(context), + ), + Positioned( + top: 0, + height: size.width * 1.2, + width: size.width, + child: Padding( + padding: const EdgeInsets.all(32), + child: Center( + child: Hero( + tag: widget.heroTag, + child: SvgPicture.string( + snapshot.data!, + placeholderBuilder: widget.placeholderBuilder, + height: widget.height, + width: widget.width, + ), + ), + ), + ), + ), + ], + ); + } + + return SizedBox(height: widget.height, width: widget.width); + }, + ); + } + + Future _loadFileFromCache() async { + final file = await DefaultCacheManager().getSingleFile( + '', + key: widget.cacheKey, + ); + final rawSvg = await file.readAsString(); + + if (rawSvg.isNotEmpty) { + final drawable = await svg.fromSvgString(rawSvg, widget.cacheKey); + final picture = drawable.toPicture(); + final image = await picture.toImage(100, 100); + _palette = await PaletteGenerator.fromImage(image); + } + + return rawSvg; + } + + Color _getColor(PaletteColor? Function(PaletteGenerator) generator) { + const fallbackColor = Colors.white; + + if (_palette == null) return fallbackColor; + return generator(_palette!)?.color ?? fallbackColor; + } +} diff --git a/packages/clean_framework/example/lib/widgets/svg_palette_card.dart b/packages/clean_framework/example/lib/widgets/svg_palette_card.dart new file mode 100644 index 00000000..3635b8b5 --- /dev/null +++ b/packages/clean_framework/example/lib/widgets/svg_palette_card.dart @@ -0,0 +1,122 @@ +import 'dart:developer'; + +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:palette_generator/palette_generator.dart'; +import 'package:flutter_cache_manager/flutter_cache_manager.dart'; + +class SvgPaletteCard extends StatefulWidget { + const SvgPaletteCard({ + super.key, + required this.url, + required this.builder, + this.duration = const Duration(milliseconds: 500), + this.cacheKey, + this.onTap, + this.placeholderBuilder, + this.backgroundColorBuilder, + this.width, + this.height, + this.margin = EdgeInsets.zero, + }); + + final String url; + final Widget Function(BuildContext, SvgPicture) builder; + final Duration duration; + final String? cacheKey; + final VoidCallback? onTap; + final WidgetBuilder? placeholderBuilder; + final Color? Function(BuildContext, PaletteGenerator)? backgroundColorBuilder; + final double? width; + final double? height; + final EdgeInsetsGeometry margin; + + @override + State createState() => _SvgPaletteCardState(); +} + +class _SvgPaletteCardState extends State { + Color? _color; + String _rawSvg = ''; + + @override + void initState() { + super.initState(); + _fetchSvg(); + } + + @override + void didUpdateWidget(SvgPaletteCard oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.url != widget.url) { + _fetchSvg(); + } + _generateColor(); + } + + @override + Widget build(BuildContext context) { + final borderRadius = BorderRadius.circular(12); + + return Card( + margin: widget.margin, + shape: RoundedRectangleBorder(borderRadius: borderRadius), + color: _color, + child: InkWell( + onTap: widget.onTap, + borderRadius: borderRadius, + child: AnimatedSwitcher( + duration: widget.duration, + child: _rawSvg.isEmpty + ? _buildPlaceHolder(context) + : widget.builder( + context, + SvgPicture.string( + _rawSvg, + placeholderBuilder: widget.placeholderBuilder, + height: widget.height, + width: widget.width, + ), + ), + ), + ), + ); + } + + Future _fetchSvg() async { + try { + final file = await DefaultCacheManager().getSingleFile( + widget.url, + key: widget.cacheKey, + ); + _rawSvg = await file.readAsString(); + + if (mounted) setState(() {}); + + _generateColor(); + } catch (e) { + log(e.toString(), name: 'SvgPaletteCard'); + } + } + + Future _generateColor() async { + if (_rawSvg.isNotEmpty) { + final drawable = await svg.fromSvgString(_rawSvg, widget.url); + final picture = drawable.toPicture(); + final image = await picture.toImage(100, 100); + final palette = await PaletteGenerator.fromImage(image); + + if (mounted) { + _color = widget.backgroundColorBuilder?.call(context, palette) ?? + palette.dominantColor?.color; + + setState(() {}); + } + } + } + + Widget _buildPlaceHolder(BuildContext context) { + return widget.placeholderBuilder?.call(context) ?? + SizedBox(height: widget.height, width: widget.width); + } +} diff --git a/packages/clean_framework/example/linux/.gitignore b/packages/clean_framework/example/linux/.gitignore new file mode 100644 index 00000000..d3896c98 --- /dev/null +++ b/packages/clean_framework/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/packages/clean_framework/example/linux/CMakeLists.txt b/packages/clean_framework/example/linux/CMakeLists.txt new file mode 100644 index 00000000..fa46a1bb --- /dev/null +++ b/packages/clean_framework/example/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# 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 "clean_framework_example") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.acmesoftware.clean_framework_example") + +# 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/packages/clean_framework/example/linux/flutter/CMakeLists.txt b/packages/clean_framework/example/linux/flutter/CMakeLists.txt new file mode 100644 index 00000000..d5bd0164 --- /dev/null +++ b/packages/clean_framework/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.cc b/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..e71a16d2 --- /dev/null +++ b/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.h b/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..e0f0a47b --- /dev/null +++ b/packages/clean_framework/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/clean_framework/example/linux/flutter/generated_plugins.cmake b/packages/clean_framework/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 00000000..2e1de87a --- /dev/null +++ b/packages/clean_framework/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/clean_framework/example/linux/main.cc b/packages/clean_framework/example/linux/main.cc new file mode 100644 index 00000000..e7c5c543 --- /dev/null +++ b/packages/clean_framework/example/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/packages/clean_framework/example/linux/my_application.cc b/packages/clean_framework/example/linux/my_application.cc new file mode 100644 index 00000000..f844ae6e --- /dev/null +++ b/packages/clean_framework/example/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "clean_framework_example"); + 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, "clean_framework_example"); + } + + 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/packages/clean_framework/example/linux/my_application.h b/packages/clean_framework/example/linux/my_application.h new file mode 100644 index 00000000..72271d5e --- /dev/null +++ b/packages/clean_framework/example/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/packages/clean_framework/example/macos/.gitignore b/packages/clean_framework/example/macos/.gitignore new file mode 100644 index 00000000..746adbb6 --- /dev/null +++ b/packages/clean_framework/example/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/packages/clean_framework/example/macos/Podfile b/packages/clean_framework/example/macos/Podfile index fe733905..dade8dfa 100644 --- a/packages/clean_framework/example/macos/Podfile +++ b/packages/clean_framework/example/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.13' +platform :osx, '10.11' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/clean_framework/example/macos/Runner.xcodeproj/project.pbxproj b/packages/clean_framework/example/macos/Runner.xcodeproj/project.pbxproj index 7fc36747..c243bd0e 100644 --- a/packages/clean_framework/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/clean_framework/example/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 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 */; }; - 7DA976D09DD8F17862F72FAB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,10 +52,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 031D7B6B51C58E643C17E6C3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 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 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* clean_framework_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "clean_framework_example.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 = ""; }; @@ -69,10 +67,7 @@ 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 = ""; }; - 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9604139AD857FA2346CCC7E9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - B2BDE31144464ED25CC665CA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +75,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7DA976D09DD8F17862F72FAB /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,14 +99,13 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 87C2ABD9930C52127428C150 /* Pods */, ); sourceTree = ""; }; 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* example.app */, + 33CC10ED2044A3C60003C045 /* clean_framework_example.app */, ); name = Products; sourceTree = ""; @@ -152,21 +145,9 @@ path = Runner; sourceTree = ""; }; - 87C2ABD9930C52127428C150 /* Pods */ = { - isa = PBXGroup; - children = ( - B2BDE31144464ED25CC665CA /* Pods-Runner.debug.xcconfig */, - 9604139AD857FA2346CCC7E9 /* Pods-Runner.release.xcconfig */, - 031D7B6B51C58E643C17E6C3 /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 8E5F56207E8DEFAA3AC1A815 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -178,13 +159,11 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C94987F84CA617B6D57816A1 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 181AA18C70E82BA2AFA5B60B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -193,7 +172,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* example.app */; + productReference = 33CC10ED2044A3C60003C045 /* clean_framework_example.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -254,23 +233,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 181AA18C70E82BA2AFA5B60B /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -308,28 +270,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - C94987F84CA617B6D57816A1 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -404,7 +344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -426,7 +366,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -484,7 +423,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -531,7 +470,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -553,7 +492,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -574,7 +512,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/packages/clean_framework/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/clean_framework/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fb7259e1..e3ba234c 100644 --- a/packages/clean_framework/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/clean_framework/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -54,7 +54,7 @@ @@ -71,7 +71,7 @@ diff --git a/packages/clean_framework/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/clean_framework/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc14..1d526a16 100644 --- a/packages/clean_framework/example/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/clean_framework/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/packages/clean_framework/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/clean_framework/example/macos/Runner/Configs/AppInfo.xcconfig index e35ec744..e2da662c 100644 --- a/packages/clean_framework/example/macos/Runner/Configs/AppInfo.xcconfig +++ b/packages/clean_framework/example/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = example +PRODUCT_NAME = clean_framework_example // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.example +PRODUCT_BUNDLE_IDENTIFIER = com.acmesoftware.cleanFrameworkExample // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2022 com.acmesoftware. All rights reserved. diff --git a/packages/clean_framework/example/pubspec.yaml b/packages/clean_framework/example/pubspec.yaml index d40db063..d80f53d2 100644 --- a/packages/clean_framework/example/pubspec.yaml +++ b/packages/clean_framework/example/pubspec.yaml @@ -1,33 +1,28 @@ name: clean_framework_example -description: Sandbox with example of all components from clean framework -version: 1.5.0 +description: An example application to demonstrate usage of clean_framework package. publish_to: none +version: 1.0.0+1 environment: - sdk: '>=2.17.0 <3.0.0' - flutter: '>=3.0.0' + sdk: '>=2.18.6 <3.0.0' dependencies: flutter: sdk: flutter + animations: ^2.0.7 clean_framework: ^1.5.0 - clean_framework_firestore: ^0.1.0 - clean_framework_graphql: ^0.1.0 - clean_framework_rest: ^0.1.0 clean_framework_router: ^0.1.0 - intl: ^0.17.0 + dio: ^4.0.6 + flutter_cache_manager: ^3.3.0 + flutter_svg: ^1.1.6 + palette_generator: ^0.3.3+2 dev_dependencies: - clean_framework_test: ^0.1.0 flutter_test: sdk: flutter - mockito: ^5.0.0-nullsafety.7 - equatable: ^2.0.5 - integration_test: - sdk: flutter flutter: uses-material-design: true assets: - - assets/flags.json + - assets/ \ No newline at end of file diff --git a/packages/clean_framework/example/web/icons/Icon-maskable-192.png b/packages/clean_framework/example/web/icons/Icon-maskable-192.png new file mode 100644 index 00000000..eb9b4d76 Binary files /dev/null and b/packages/clean_framework/example/web/icons/Icon-maskable-192.png differ diff --git a/packages/clean_framework/example/web/icons/Icon-maskable-512.png b/packages/clean_framework/example/web/icons/Icon-maskable-512.png new file mode 100644 index 00000000..d69c5669 Binary files /dev/null and b/packages/clean_framework/example/web/icons/Icon-maskable-512.png differ diff --git a/packages/clean_framework/example/web/index.html b/packages/clean_framework/example/web/index.html index 1460b5e9..0ddc5155 100644 --- a/packages/clean_framework/example/web/index.html +++ b/packages/clean_framework/example/web/index.html @@ -8,10 +8,13 @@ The path provided below has to start and end with a slash "/" in order for it to work correctly. - Fore more details: + For more details: * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base + + This is a placeholder for base href that will be replaced by the value of + the `--base-href` argument provided to `flutter build`. --> - + @@ -20,26 +23,36 @@ - + - example + clean_framework_example + + + + - - diff --git a/packages/clean_framework/example/web/manifest.json b/packages/clean_framework/example/web/manifest.json index 8c012917..9128dc36 100644 --- a/packages/clean_framework/example/web/manifest.json +++ b/packages/clean_framework/example/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "example", - "short_name": "example", + "name": "clean_framework_example", + "short_name": "clean_framework_example", "start_url": ".", "display": "standalone", "background_color": "#0175C2", @@ -18,6 +18,18 @@ "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/packages/clean_framework/example/windows/.gitignore b/packages/clean_framework/example/windows/.gitignore new file mode 100644 index 00000000..d492d0d9 --- /dev/null +++ b/packages/clean_framework/example/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/packages/clean_framework/example/windows/CMakeLists.txt b/packages/clean_framework/example/windows/CMakeLists.txt new file mode 100644 index 00000000..0b246d98 --- /dev/null +++ b/packages/clean_framework/example/windows/CMakeLists.txt @@ -0,0 +1,101 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(clean_framework_example 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 "clean_framework_example") + +# 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/packages/clean_framework/example/windows/flutter/CMakeLists.txt b/packages/clean_framework/example/windows/flutter/CMakeLists.txt new file mode 100644 index 00000000..930d2071 --- /dev/null +++ b/packages/clean_framework/example/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.cc b/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..8b6d4680 --- /dev/null +++ b/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.h b/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..dc139d85 --- /dev/null +++ b/packages/clean_framework/example/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/clean_framework/example/windows/flutter/generated_plugins.cmake b/packages/clean_framework/example/windows/flutter/generated_plugins.cmake new file mode 100644 index 00000000..b93c4c30 --- /dev/null +++ b/packages/clean_framework/example/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/clean_framework/example/windows/runner/CMakeLists.txt b/packages/clean_framework/example/windows/runner/CMakeLists.txt new file mode 100644 index 00000000..17411a8a --- /dev/null +++ b/packages/clean_framework/example/windows/runner/CMakeLists.txt @@ -0,0 +1,39 @@ +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_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/packages/clean_framework/example/windows/runner/Runner.rc b/packages/clean_framework/example/windows/runner/Runner.rc new file mode 100644 index 00000000..3096bbbf --- /dev/null +++ b/packages/clean_framework/example/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.acmesoftware" "\0" + VALUE "FileDescription", "clean_framework_example" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "clean_framework_example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 com.acmesoftware. All rights reserved." "\0" + VALUE "OriginalFilename", "clean_framework_example.exe" "\0" + VALUE "ProductName", "clean_framework_example" "\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/packages/clean_framework/example/windows/runner/flutter_window.cpp b/packages/clean_framework/example/windows/runner/flutter_window.cpp new file mode 100644 index 00000000..b43b9095 --- /dev/null +++ b/packages/clean_framework/example/windows/runner/flutter_window.cpp @@ -0,0 +1,61 @@ +#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()); + 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/packages/clean_framework/example/windows/runner/flutter_window.h b/packages/clean_framework/example/windows/runner/flutter_window.h new file mode 100644 index 00000000..6da0652f --- /dev/null +++ b/packages/clean_framework/example/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/clean_framework/example/windows/runner/main.cpp b/packages/clean_framework/example/windows/runner/main.cpp new file mode 100644 index 00000000..d8ac73fa --- /dev/null +++ b/packages/clean_framework/example/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.CreateAndShow(L"clean_framework_example", 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/packages/clean_framework/example/windows/runner/resource.h b/packages/clean_framework/example/windows/runner/resource.h new file mode 100644 index 00000000..66a65d1e --- /dev/null +++ b/packages/clean_framework/example/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/packages/clean_framework/example/windows/runner/resources/app_icon.ico b/packages/clean_framework/example/windows/runner/resources/app_icon.ico new file mode 100644 index 00000000..c04e20ca Binary files /dev/null and b/packages/clean_framework/example/windows/runner/resources/app_icon.ico differ diff --git a/packages/clean_framework/example/windows/runner/runner.exe.manifest b/packages/clean_framework/example/windows/runner/runner.exe.manifest new file mode 100644 index 00000000..a42ea768 --- /dev/null +++ b/packages/clean_framework/example/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/packages/clean_framework/example/windows/runner/utils.cpp b/packages/clean_framework/example/windows/runner/utils.cpp new file mode 100644 index 00000000..f5bf9fa0 --- /dev/null +++ b/packages/clean_framework/example/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#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); + 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, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/packages/clean_framework/example/windows/runner/utils.h b/packages/clean_framework/example/windows/runner/utils.h new file mode 100644 index 00000000..3879d547 --- /dev/null +++ b/packages/clean_framework/example/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/packages/clean_framework/example/windows/runner/win32_window.cpp b/packages/clean_framework/example/windows/runner/win32_window.cpp new file mode 100644 index 00000000..c10f08dc --- /dev/null +++ b/packages/clean_framework/example/windows/runner/win32_window.cpp @@ -0,0 +1,245 @@ +#include "win32_window.h" + +#include + +#include "resource.h" + +namespace { + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +// 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 registar 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::CreateAndShow(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 | WS_VISIBLE, + 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; + } + + return OnCreate(); +} + +// 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; + } + + 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. +} diff --git a/packages/clean_framework/example/windows/runner/win32_window.h b/packages/clean_framework/example/windows/runner/win32_window.h new file mode 100644 index 00000000..17ba4311 --- /dev/null +++ b/packages/clean_framework/example/windows/runner/win32_window.h @@ -0,0 +1,98 @@ +#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 and shows a win32 window with |title| and position and size 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 to will treat the width height passed in to this function + // as logical pixels and scale to appropriate for the default monitor. Returns + // true if the window was created successfully. + bool CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size); + + // 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 + // responsponds 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; + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/packages/clean_framework/lib/clean_framework_core.dart b/packages/clean_framework/lib/clean_framework_core.dart new file mode 100644 index 00000000..ab38cac2 --- /dev/null +++ b/packages/clean_framework/lib/clean_framework_core.dart @@ -0,0 +1,4 @@ +export 'package:clean_framework/src/core/core.dart'; +export 'package:clean_framework/src/presentation/presentation.dart'; +export 'package:flutter_riverpod/flutter_riverpod.dart' + show ProviderContainer, ProviderScope; diff --git a/packages/clean_framework/lib/clean_framework_providers.dart b/packages/clean_framework/lib/clean_framework_providers.dart index 27f4e24a..3037bd13 100644 --- a/packages/clean_framework/lib/clean_framework_providers.dart +++ b/packages/clean_framework/lib/clean_framework_providers.dart @@ -1,17 +1,18 @@ /// Clean Framework Providers library clean_framework_providers; +export 'package:clean_framework/src/core/external_interface/request.dart'; +export 'package:clean_framework/src/core/external_interface/response.dart'; +export 'package:clean_framework/src/core/use_case/entity.dart'; +export 'package:clean_framework/src/core/use_case/use_case.dart'; +export 'package:clean_framework/src/presentation/presenter/presenter.dart' + show PresenterBuilder; +export 'package:clean_framework/src/presentation/presenter/view_model.dart'; export 'package:clean_framework/src/providers/bridge_gateway_provider.dart'; -export 'package:clean_framework/src/providers/entity.dart'; export 'package:clean_framework/src/providers/external_interface.dart'; export 'package:clean_framework/src/providers/external_interface_provider.dart'; export 'package:clean_framework/src/providers/gateway.dart'; export 'package:clean_framework/src/providers/gateway_provider.dart'; export 'package:clean_framework/src/providers/presenter.dart'; export 'package:clean_framework/src/providers/ui.dart'; -export 'package:clean_framework/src/providers/use_case.dart'; -export 'package:clean_framework/src/providers/use_case.dart'; export 'package:clean_framework/src/providers/use_case_provider.dart'; -export 'package:clean_framework/src/providers/use_case_provider.dart'; -export 'package:clean_framework/src/providers/view_model.dart'; -export 'package:clean_framework/src/providers/view_model.dart'; diff --git a/packages/clean_framework/lib/src/core/clean_framework_provider.dart b/packages/clean_framework/lib/src/core/clean_framework_provider.dart new file mode 100644 index 00000000..2829f8ab --- /dev/null +++ b/packages/clean_framework/lib/src/core/clean_framework_provider.dart @@ -0,0 +1,9 @@ +import 'package:riverpod/riverpod.dart'; + +abstract class CleanFrameworkProvider

> { + CleanFrameworkProvider({required P provider}) : _provider = provider; + + final P _provider; + + P call() => _provider; +} diff --git a/packages/clean_framework/lib/src/core/core.dart b/packages/clean_framework/lib/src/core/core.dart new file mode 100644 index 00000000..c19144c0 --- /dev/null +++ b/packages/clean_framework/lib/src/core/core.dart @@ -0,0 +1,9 @@ +export 'external_interface/external_interface.dart'; +export 'external_interface/external_interface_provider.dart'; +export 'external_interface/request.dart'; +export 'external_interface/response.dart'; +export 'gateway/gateway.dart'; +export 'gateway/gateway_provider.dart'; +export 'use_case/entity.dart'; +export 'use_case/use_case.dart'; +export 'use_case/use_case_provider.dart'; diff --git a/packages/clean_framework/lib/src/core/external_interface/external_interface.dart b/packages/clean_framework/lib/src/core/external_interface/external_interface.dart new file mode 100644 index 00000000..bde4f0e7 --- /dev/null +++ b/packages/clean_framework/lib/src/core/external_interface/external_interface.dart @@ -0,0 +1,123 @@ +import 'dart:async'; + +import 'package:clean_framework/src/core/external_interface/request.dart'; +import 'package:clean_framework/src/core/external_interface/response.dart'; +import 'package:clean_framework/src/core/gateway/gateway.dart'; +import 'package:clean_framework/src/core/gateway/gateway_provider.dart'; +import 'package:clean_framework/src/utilities/either.dart'; +import 'package:meta/meta.dart'; +import 'package:riverpod/riverpod.dart'; + +abstract class ExternalInterface { + ExternalInterface() { + handleRequest(); + } + + @internal + void attach( + ProviderRef ref, { + required List providers, + }) { + for (final gatewayProvider in providers) { + _initTransporter(ref.read(gatewayProvider())); + } + } + + void _initTransporter(Gateway gateway) { + // ignore: invalid_use_of_visible_for_testing_member + gateway.feedResponse( + (request) async { + final req = request as R; + final requestCompleter = gateway is WatcherGateway + ? _StreamRequestCompleter(req, gateway.yieldResponse) + : _RequestCompleter(req); + + _requestController.add(requestCompleter); + return requestCompleter.future; + }, + ); + } + + final _RequestController _requestController = + StreamController.broadcast(); + + void handleRequest(); + + FailureResponse onError(Object error); + + void on( + RequestHandler handler, + ) { + _requestController.stream.where((e) => e.request is E).listen( + (e) async { + final request = e.request as E; + + try { + if (e is _StreamRequestCompleter) { + final event = e as _StreamRequestCompleter; + final handlerCall = handler( + request, + (response) { + if (!event.isCompleted) event.complete(response); + event.emitSuccess(response); + }, + ); + + if (handlerCall is Future) { + unawaited( + handlerCall.catchError( + (Object error) => e.completeFailure(_onError(error, request)), + ), + ); + } + } else { + await handler(request, e.complete); + } + } catch (error) { + e.completeFailure(_onError(error, request)); + } + }, + ); + } + + Never sendError(Object error) => throw error; + + FailureResponse _onError(Object error, R request) { + //CleanFrameworkObserver.instance.onExternalError(this, request, error); + final failure = onError(error); + //CleanFrameworkObserver.instance.onFailureResponse(this, request, failure); + return failure; + } +} + +typedef _RequestController + = StreamController<_RequestCompleter>; + +typedef ResponseSender = void Function(S response); + +typedef RequestHandler + = FutureOr Function(E request, ResponseSender send); + +class _RequestCompleter { + _RequestCompleter(this.request) : _completer = Completer(); + + final R request; + final Completer> _completer; + + Future> get future => _completer.future; + + bool get isCompleted => _completer.isCompleted; + + void complete(S success) => _completer.complete(Either.right(success)); + + void completeFailure(FailureResponse failure) { + _completer.complete(Either.left(failure)); + } +} + +class _StreamRequestCompleter + extends _RequestCompleter { + _StreamRequestCompleter(super.request, this.emitSuccess); + + final void Function(S) emitSuccess; +} diff --git a/packages/clean_framework/lib/src/core/external_interface/external_interface_provider.dart b/packages/clean_framework/lib/src/core/external_interface/external_interface_provider.dart new file mode 100644 index 00000000..070e9aba --- /dev/null +++ b/packages/clean_framework/lib/src/core/external_interface/external_interface_provider.dart @@ -0,0 +1,22 @@ +import 'package:clean_framework/src/core/clean_framework_provider.dart'; +import 'package:clean_framework/src/core/external_interface/external_interface.dart'; +import 'package:clean_framework/src/core/gateway/gateway_provider.dart'; +import 'package:meta/meta.dart'; +import 'package:riverpod/riverpod.dart'; + +class ExternalInterfaceProvider + extends CleanFrameworkProvider> { + ExternalInterfaceProvider( + E Function() create, { + List gateways = const [], + }) : super( + provider: Provider( + (ref) => create()..attach(ref, providers: gateways), + ), + ); + + @visibleForTesting + E read(ProviderContainer container) => container.read(call()); + + void initializeFor(ProviderContainer container) => read(container); +} diff --git a/packages/clean_framework/lib/src/core/external_interface/request.dart b/packages/clean_framework/lib/src/core/external_interface/request.dart new file mode 100644 index 00000000..21f7103b --- /dev/null +++ b/packages/clean_framework/lib/src/core/external_interface/request.dart @@ -0,0 +1,6 @@ +import 'package:meta/meta.dart'; + +@immutable +abstract class Request { + const Request(); +} diff --git a/packages/clean_framework/lib/src/core/external_interface/response.dart b/packages/clean_framework/lib/src/core/external_interface/response.dart new file mode 100644 index 00000000..861b33f3 --- /dev/null +++ b/packages/clean_framework/lib/src/core/external_interface/response.dart @@ -0,0 +1,43 @@ +import 'package:equatable/equatable.dart'; +import 'package:meta/meta.dart'; + +@immutable +abstract class Response extends Equatable { + const Response(); + @override + bool get stringify => true; +} + +class SuccessResponse extends Response { + const SuccessResponse(); + + @override + List get props => []; +} + +abstract class FailureResponse extends Response { + const FailureResponse({this.message = ''}); + + final String message; + + @override + List get props => [message]; +} + +class TypedFailureResponse extends FailureResponse { + const TypedFailureResponse({ + required this.type, + this.errorData = const {}, + super.message, + }); + + final T type; + final Map errorData; + + @override + List get props => [...super.props, type, errorData]; +} + +class UnknownFailureResponse extends FailureResponse { + UnknownFailureResponse([Object? error]) : super(message: error.toString()); +} diff --git a/packages/clean_framework/lib/src/core/gateway/gateway.dart b/packages/clean_framework/lib/src/core/gateway/gateway.dart new file mode 100644 index 00000000..cacf69d8 --- /dev/null +++ b/packages/clean_framework/lib/src/core/gateway/gateway.dart @@ -0,0 +1,90 @@ +import 'dart:async'; + +import 'package:clean_framework/src/core/external_interface/request.dart'; +import 'package:clean_framework/src/core/external_interface/response.dart'; +import 'package:clean_framework/src/core/use_case/use_case.dart'; +import 'package:clean_framework/src/core/use_case/use_case_provider.dart'; +import 'package:clean_framework/src/utilities/clean_framework_observer.dart'; +import 'package:clean_framework/src/utilities/either.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:meta/meta.dart'; + +abstract class Gateway { + void attach( + ProviderRef ref, { + required List providers, + }) { + _ref = ref; + _useCaseProviders = providers; + + for (final useCaseProvider in providers) { + useCaseProvider.notifier.then( + (notifier) { + ref + .read(notifier) + .subscribe((output) => buildInput(output as O)); + }, + ); + } + } + + late final ProviderRef _ref; + late final List _useCaseProviders; + + @visibleForTesting + @nonVirtual + // ignore: use_setters_to_change_properties + void feedResponse(Responder feeder) => _responder = feeder; + + @visibleForTesting + @nonVirtual + Future> buildInput(O output) { + return _processRequest(buildRequest(output)); + } + + late final Responder _responder; + + S onSuccess(covariant P response); + FailureInput onFailure(covariant FailureResponse failureResponse); + R buildRequest(O output); + + Future> _processRequest(R request) async { + final either = await _responder(request); + return either.fold( + (failureResponse) => Either.left(_onFailure(failureResponse)), + (response) => Either.right(onSuccess(response)), + ); + } + + FailureInput _onFailure(FailureResponse failureResponse) { + final failureInput = onFailure(failureResponse); + CleanFrameworkObserver.instance.onFailureInput(failureInput); + return failureInput; + } +} + +abstract class WatcherGateway< + O extends Output, + R extends Request, + P extends SuccessResponse, + S extends SuccessInput> extends Gateway { + @override + FailureInput onFailure(FailureResponse failureResponse) { + return FailureInput(message: failureResponse.message); + } + + @nonVirtual + void yieldResponse(P response) { + for (final useCaseProvider in _useCaseProviders) { + useCaseProvider.notifier.then( + (notifier) { + _ref.read(notifier).setInput(onSuccess(response)); + }, + ); + } + } +} + +typedef Responder + = FutureOr> Function(R request); diff --git a/packages/clean_framework/lib/src/core/gateway/gateway_provider.dart b/packages/clean_framework/lib/src/core/gateway/gateway_provider.dart new file mode 100644 index 00000000..d27e79eb --- /dev/null +++ b/packages/clean_framework/lib/src/core/gateway/gateway_provider.dart @@ -0,0 +1,20 @@ +import 'package:clean_framework/src/core/clean_framework_provider.dart'; +import 'package:clean_framework/src/core/gateway/gateway.dart'; +import 'package:clean_framework/src/core/use_case/use_case_provider.dart'; +import 'package:meta/meta.dart'; +import 'package:riverpod/riverpod.dart'; + +class GatewayProvider + extends CleanFrameworkProvider> { + GatewayProvider( + G Function() create, { + List useCases = const [], + }) : super( + provider: Provider( + (ref) => create()..attach(ref, providers: useCases), + ), + ); + + @visibleForTesting + G read(ProviderContainer container) => container.read(call()); +} diff --git a/packages/clean_framework/lib/src/providers/entity.dart b/packages/clean_framework/lib/src/core/use_case/entity.dart similarity index 85% rename from packages/clean_framework/lib/src/providers/entity.dart rename to packages/clean_framework/lib/src/core/use_case/entity.dart index b5166e32..4960a123 100644 --- a/packages/clean_framework/lib/src/providers/entity.dart +++ b/packages/clean_framework/lib/src/core/use_case/entity.dart @@ -5,4 +5,6 @@ import 'package:flutter/foundation.dart'; abstract class Entity extends Equatable { @override bool get stringify => true; + + external Entity copyWith(); } diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/input.dart b/packages/clean_framework/lib/src/core/use_case/helpers/input.dart similarity index 83% rename from packages/clean_framework/lib/src/providers/use_case/helpers/input.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/input.dart index e9846ef4..fdd43997 100644 --- a/packages/clean_framework/lib/src/providers/use_case/helpers/input.dart +++ b/packages/clean_framework/lib/src/core/use_case/helpers/input.dart @@ -1,4 +1,4 @@ -import 'package:clean_framework/src/providers/use_case/helpers/output.dart'; +import 'package:clean_framework/src/core/use_case/helpers/output.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/input_filter_map.dart b/packages/clean_framework/lib/src/core/use_case/helpers/input_filter_map.dart similarity index 100% rename from packages/clean_framework/lib/src/providers/use_case/helpers/input_filter_map.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/input_filter_map.dart diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/output.dart b/packages/clean_framework/lib/src/core/use_case/helpers/output.dart similarity index 100% rename from packages/clean_framework/lib/src/providers/use_case/helpers/output.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/output.dart diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/output_filter_map.dart b/packages/clean_framework/lib/src/core/use_case/helpers/output_filter_map.dart similarity index 100% rename from packages/clean_framework/lib/src/providers/use_case/helpers/output_filter_map.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/output_filter_map.dart diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/request_subscription_map.dart b/packages/clean_framework/lib/src/core/use_case/helpers/request_subscription_map.dart similarity index 86% rename from packages/clean_framework/lib/src/providers/use_case/helpers/request_subscription_map.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/request_subscription_map.dart index 9accec60..ac14d4ad 100644 --- a/packages/clean_framework/lib/src/providers/use_case/helpers/request_subscription_map.dart +++ b/packages/clean_framework/lib/src/core/use_case/helpers/request_subscription_map.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:clean_framework/src/providers/use_case/helpers/input.dart'; -import 'package:clean_framework/src/providers/use_case/helpers/output.dart'; +import 'package:clean_framework/src/core/use_case/helpers/input.dart'; +import 'package:clean_framework/src/core/use_case/helpers/output.dart'; import 'package:clean_framework/src/utilities/either.dart'; typedef RequestSubscriptionMap diff --git a/packages/clean_framework/lib/src/providers/use_case/helpers/use_case_transformer.dart b/packages/clean_framework/lib/src/core/use_case/helpers/use_case_transformer.dart similarity index 87% rename from packages/clean_framework/lib/src/providers/use_case/helpers/use_case_transformer.dart rename to packages/clean_framework/lib/src/core/use_case/helpers/use_case_transformer.dart index 55b482e3..6fd09d87 100644 --- a/packages/clean_framework/lib/src/providers/use_case/helpers/use_case_transformer.dart +++ b/packages/clean_framework/lib/src/core/use_case/helpers/use_case_transformer.dart @@ -1,6 +1,6 @@ -import 'package:clean_framework/src/providers/entity.dart'; -import 'package:clean_framework/src/providers/use_case/helpers/input.dart'; -import 'package:clean_framework/src/providers/use_case/helpers/output.dart'; +import 'package:clean_framework/src/core/use_case/entity.dart'; +import 'package:clean_framework/src/core/use_case/helpers/input.dart'; +import 'package:clean_framework/src/core/use_case/helpers/output.dart'; import 'package:meta/meta.dart'; part 'input_filter_map.dart'; diff --git a/packages/clean_framework/lib/src/providers/use_case.dart b/packages/clean_framework/lib/src/core/use_case/use_case.dart similarity index 84% rename from packages/clean_framework/lib/src/providers/use_case.dart rename to packages/clean_framework/lib/src/core/use_case/use_case.dart index 194c78aa..d8d2199a 100644 --- a/packages/clean_framework/lib/src/providers/use_case.dart +++ b/packages/clean_framework/lib/src/core/use_case/use_case.dart @@ -1,12 +1,12 @@ import 'dart:async'; -import 'package:clean_framework/src/providers/entity.dart'; -import 'package:clean_framework/src/providers/use_case/use_case_helpers.dart'; -import 'package:clean_framework/src/providers/use_case_debounce_mixin.dart'; +import 'package:clean_framework/src/core/use_case/entity.dart'; +import 'package:clean_framework/src/core/use_case/use_case_debounce_mixin.dart'; +import 'package:clean_framework/src/core/use_case/use_case_helpers.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:meta/meta.dart'; -export 'package:clean_framework/src/providers/use_case/use_case_helpers.dart'; +export 'package:clean_framework/src/core/use_case/use_case_helpers.dart'; typedef InputCallback = E Function(I); @@ -14,9 +14,9 @@ abstract class UseCase extends StateNotifier with UseCaseDebounceMixin { UseCase({ required E entity, + List>? transformers, @Deprecated('Use transformers instead') OutputFilterMap? outputFilters, @Deprecated('Use transformers instead') InputFilterMap? inputFilters, - List>? transformers, }) : _outputFilters = Map.of(outputFilters ?? const {}), _inputFilters = Map.of(inputFilters ?? const {}), super(entity) { @@ -34,6 +34,7 @@ abstract class UseCase extends StateNotifier @protected E get entity => super.state; + @visibleForTesting @protected set entity(E newEntity) => super.state = newEntity; @@ -49,6 +50,7 @@ abstract class UseCase extends StateNotifier _requestSubscriptions.add(subscription); } + @visibleForTesting @protected Future request( O output, { diff --git a/packages/clean_framework/lib/src/providers/use_case_debounce_mixin.dart b/packages/clean_framework/lib/src/core/use_case/use_case_debounce_mixin.dart similarity index 98% rename from packages/clean_framework/lib/src/providers/use_case_debounce_mixin.dart rename to packages/clean_framework/lib/src/core/use_case/use_case_debounce_mixin.dart index 5a22ef2a..2bb4e12c 100644 --- a/packages/clean_framework/lib/src/providers/use_case_debounce_mixin.dart +++ b/packages/clean_framework/lib/src/core/use_case/use_case_debounce_mixin.dart @@ -10,6 +10,7 @@ mixin UseCaseDebounceMixin { /// in a given frame of [duration]. /// /// If [immediate] is false, then then first action will also be debounced. + @visibleForTesting @protected void debounce({ required void Function() action, diff --git a/packages/clean_framework/lib/src/providers/use_case/use_case_helpers.dart b/packages/clean_framework/lib/src/core/use_case/use_case_helpers.dart similarity index 100% rename from packages/clean_framework/lib/src/providers/use_case/use_case_helpers.dart rename to packages/clean_framework/lib/src/core/use_case/use_case_helpers.dart diff --git a/packages/clean_framework/lib/src/core/use_case/use_case_provider.dart b/packages/clean_framework/lib/src/core/use_case/use_case_provider.dart new file mode 100644 index 00000000..3f314054 --- /dev/null +++ b/packages/clean_framework/lib/src/core/use_case/use_case_provider.dart @@ -0,0 +1,43 @@ +import 'dart:async'; + +import 'package:clean_framework/src/core/clean_framework_provider.dart'; +import 'package:clean_framework/src/core/use_case/entity.dart'; +import 'package:clean_framework/src/core/use_case/use_case.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:meta/meta.dart'; + +class UseCaseProvider> + extends CleanFrameworkProvider> { + UseCaseProvider(U Function() create) + : super(provider: StateNotifierProvider((_) => create())); + + Future> get notifier => _initCompleter.future; + + void init() { + if (!_initCompleter.isCompleted) { + _initCompleter.complete(call().notifier); + } + } + + final Completer> _initCompleter = Completer(); + + O subscribe(WidgetRef ref) { + return ref.watch(_listenForOutputChange(ref)); + } + + U getUseCase(WidgetRef ref) => ref.read(call().notifier); + + void listen(WidgetRef ref, void Function(O?, O) listener) { + ref.listen(_listenForOutputChange(ref), listener); + } + + AlwaysAliveProviderListenable _listenForOutputChange( + WidgetRef ref, + ) { + final useCase = getUseCase(ref); + return call().select((e) => useCase.getOutput()); + } + + @visibleForTesting + U read(ProviderContainer container) => container.read(call().notifier); +} diff --git a/packages/clean_framework/lib/src/presentation/presentation.dart b/packages/clean_framework/lib/src/presentation/presentation.dart new file mode 100644 index 00000000..eb64c2bc --- /dev/null +++ b/packages/clean_framework/lib/src/presentation/presentation.dart @@ -0,0 +1,3 @@ +export 'presenter/presenter.dart'; +export 'presenter/view_model.dart'; +export 'ui/ui.dart'; diff --git a/packages/clean_framework/lib/src/presentation/presenter/presenter.dart b/packages/clean_framework/lib/src/presentation/presenter/presenter.dart new file mode 100644 index 00000000..5179a0f5 --- /dev/null +++ b/packages/clean_framework/lib/src/presentation/presenter/presenter.dart @@ -0,0 +1,94 @@ +import 'package:clean_framework/src/core/core.dart'; +import 'package:clean_framework/src/presentation/presenter/view_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +abstract class Presenter extends ConsumerStatefulWidget { + const Presenter({ + super.key, + required UseCaseProvider provider, + required this.builder, + }) : _provider = provider; + final UseCaseProvider _provider; + final PresenterBuilder builder; + + @override + ConsumerState> createState() => _PresenterState(); + + @protected + V createViewModel(U useCase, O output); + + /// Called when this presenter is inserted into the tree. + @protected + void onLayoutReady(BuildContext context, U useCase) {} + + /// Called whenever the [output] updates. + @protected + void onOutputUpdate(BuildContext context, O output) {} + + /// Called whenever the presenter configuration changes. + @protected + void didUpdatePresenter( + BuildContext context, + covariant Presenter old, + U useCase, + ) {} + + /// Called when this presenter is removed from the tree. + @protected + void onDestroy(U useCase) {} + + @visibleForTesting + O subscribe(WidgetRef ref) => _provider.subscribe(ref); +} + +class _PresenterState + extends ConsumerState> { + U? _useCase; + + @override + WidgetRef get ref => context as WidgetRef; + + @override + void initState() { + super.initState(); + widget._provider + ..init() + ..notifier.then((_) => widget.onLayoutReady(context, _useCase!)); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + _useCase ??= widget._provider.getUseCase(ref) as U; + } + + @override + void didUpdateWidget(covariant Presenter oldWidget) { + super.didUpdateWidget(oldWidget); + widget.didUpdatePresenter(context, oldWidget, _useCase!); + } + + @override + Widget build(BuildContext context) { + widget._provider.listen(ref, _onOutputChanged); + final output = widget.subscribe(ref); + return widget.builder(widget.createViewModel(_useCase!, output)); + } + + void _onOutputChanged(O? previous, O next) { + if (previous != next) widget.onOutputUpdate(context, next); + } + + @override + void dispose() { + SchedulerBinding.instance.addPostFrameCallback((_) { + widget.onDestroy(_useCase!); + }); + super.dispose(); + } +} + +typedef PresenterBuilder = Widget Function(V viewModel); diff --git a/packages/clean_framework/lib/src/providers/view_model.dart b/packages/clean_framework/lib/src/presentation/presenter/view_model.dart similarity index 100% rename from packages/clean_framework/lib/src/providers/view_model.dart rename to packages/clean_framework/lib/src/presentation/presenter/view_model.dart diff --git a/packages/clean_framework/lib/src/presentation/ui/ui.dart b/packages/clean_framework/lib/src/presentation/ui/ui.dart new file mode 100644 index 00000000..8496c591 --- /dev/null +++ b/packages/clean_framework/lib/src/presentation/ui/ui.dart @@ -0,0 +1,37 @@ +import 'package:clean_framework/src/presentation/presentation.dart'; +import 'package:flutter/material.dart'; + +abstract class UI extends StatefulWidget { + UI({ + super.key, + PresenterCreator? create, + }) { + _create = create ?? this.create; + } + late final PresenterCreator? _create; + + Widget build(BuildContext context, V viewModel); + + Presenter create(PresenterBuilder builder); + + @override + // ignore: library_private_types_in_public_api + _UIState createState() => _UIState(); +} + +class _UIState extends State> { + @override + Widget build(BuildContext context) { + return widget._create! + .call((viewModel) => widget.build(context, viewModel)); + } +} + +typedef PresenterCreator = Presenter Function( + PresenterBuilder builder, +); + +typedef UIBuilder = Widget Function( + BuildContext context, + V viewModel, +); diff --git a/packages/clean_framework/lib/src/providers/external_interface.dart b/packages/clean_framework/lib/src/providers/external_interface.dart index f532c34b..ce12b226 100644 --- a/packages/clean_framework/lib/src/providers/external_interface.dart +++ b/packages/clean_framework/lib/src/providers/external_interface.dart @@ -1,5 +1,7 @@ import 'dart:async'; +import 'package:clean_framework/src/core/external_interface/request.dart'; +import 'package:clean_framework/src/core/external_interface/response.dart'; import 'package:clean_framework/src/providers/gateway.dart'; import 'package:clean_framework/src/utilities/clean_framework_observer.dart'; import 'package:clean_framework/src/utilities/either.dart'; diff --git a/packages/clean_framework/lib/src/providers/gateway.dart b/packages/clean_framework/lib/src/providers/gateway.dart index 130963cd..100e0376 100644 --- a/packages/clean_framework/lib/src/providers/gateway.dart +++ b/packages/clean_framework/lib/src/providers/gateway.dart @@ -2,7 +2,6 @@ import 'package:clean_framework/clean_framework_providers.dart'; import 'package:clean_framework/src/app_providers_container.dart'; import 'package:clean_framework/src/utilities/clean_framework_observer.dart'; import 'package:clean_framework/src/utilities/either.dart'; -import 'package:equatable/equatable.dart'; import 'package:meta/meta.dart'; abstract class Gateway = Future> Function(R request); - -@immutable -abstract class Request { - const Request(); -} - -@immutable -abstract class Response extends Equatable { - const Response(); - @override - bool get stringify => true; -} - -class SuccessResponse extends Response { - const SuccessResponse(); - - @override - List get props => []; -} - -abstract class FailureResponse extends Response { - const FailureResponse({this.message = ''}); - - final String message; - - @override - List get props => [message]; -} - -class TypedFailureResponse extends FailureResponse { - const TypedFailureResponse({ - required this.type, - this.errorData = const {}, - super.message, - }); - - final T type; - final Map errorData; - - @override - List get props => [...super.props, type, errorData]; -} - -class UnknownFailureResponse extends FailureResponse { - UnknownFailureResponse([Object? error]) : super(message: error.toString()); -} diff --git a/packages/clean_framework/lib/src/providers/presenter.dart b/packages/clean_framework/lib/src/providers/presenter.dart index e4a8d591..8e40bc00 100644 --- a/packages/clean_framework/lib/src/providers/presenter.dart +++ b/packages/clean_framework/lib/src/providers/presenter.dart @@ -1,4 +1,7 @@ -import 'package:clean_framework/clean_framework_providers.dart'; +import 'package:clean_framework/src/core/use_case/use_case.dart'; +import 'package:clean_framework/src/presentation/presenter/presenter.dart'; +import 'package:clean_framework/src/presentation/presenter/view_model.dart'; +import 'package:clean_framework/src/providers/use_case_provider.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -89,5 +92,3 @@ class _PresenterState super.dispose(); } } - -typedef PresenterBuilder = Widget Function(V viewModel); diff --git a/packages/clean_framework/lib/src/utilities/clean_framework_observer.dart b/packages/clean_framework/lib/src/utilities/clean_framework_observer.dart index 6308af13..ca367130 100644 --- a/packages/clean_framework/lib/src/utilities/clean_framework_observer.dart +++ b/packages/clean_framework/lib/src/utilities/clean_framework_observer.dart @@ -1,8 +1,9 @@ import 'dart:developer'; +import 'package:clean_framework/src/core/external_interface/request.dart'; +import 'package:clean_framework/src/core/external_interface/response.dart'; +import 'package:clean_framework/src/core/use_case/helpers/input.dart'; import 'package:clean_framework/src/providers/external_interface.dart'; -import 'package:clean_framework/src/providers/gateway.dart'; -import 'package:clean_framework/src/providers/use_case.dart'; /// The class to observe failures, route changes and other events. class CleanFrameworkObserver { diff --git a/packages/clean_framework/test/core/gateway/gateway_test.dart b/packages/clean_framework/test/core/gateway/gateway_test.dart new file mode 100644 index 00000000..d7cc637b --- /dev/null +++ b/packages/clean_framework/test/core/gateway/gateway_test.dart @@ -0,0 +1,137 @@ +import 'package:clean_framework/clean_framework.dart'; +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + group('Gateway tests |', () { + test('success', () async { + final gateway = TestGateway() + ..feedResponse( + (request) async => Either.right( + TestSuccessResponse('Hello ${request.name}!'), + ), + ); + + final input = await gateway.buildInput( + TestGatewayOutput('Acme Software'), + ); + + expect(input.isRight, isTrue); + expect(input.right.message, 'Hello Acme Software!'); + }); + + test('failure', () async { + final gateway = TestGateway() + ..feedResponse( + (request) async => const Either.left( + TypedFailureResponse( + message: 'Something went wrong', + type: 'failure', + ), + ), + ); + + final input = await gateway.buildInput( + TestGatewayOutput('Acme Software'), + ); + + expect(input.isLeft, isTrue); + expect(input.left.message, 'Something went wrong'); + }); + }); + + group('Watcher Gateway', () { + test('success', () async { + final gateway = TestWatcherGateway() + ..feedResponse( + (request) async => Either.right( + TestSuccessResponse('Hello ${request.name}!'), + ), + ); + + final input = await gateway.buildInput( + TestGatewayOutput('Acme Software'), + ); + + expect(input.isRight, isTrue); + expect(input.right.message, 'Hello Acme Software!'); + }); + + test('failure', () async { + final gateway = TestWatcherGateway() + ..feedResponse( + (request) async => const Either.left( + TypedFailureResponse( + message: 'Something went wrong', + type: 'failure', + ), + ), + ); + + final input = await gateway.buildInput( + TestGatewayOutput('Acme Software'), + ); + + expect(input.isLeft, isTrue); + expect(input.left.message, 'Something went wrong'); + }); + }); +} + +class TestGateway extends Gateway { + @override + TestRequest buildRequest(TestGatewayOutput output) { + return TestRequest(output.name); + } + + @override + FailureInput onFailure(FailureResponse failureResponse) { + return FailureInput(message: failureResponse.message); + } + + @override + TestSuccessInput onSuccess(TestSuccessResponse response) { + return TestSuccessInput(response.message); + } +} + +class TestWatcherGateway extends WatcherGateway { + @override + TestRequest buildRequest(TestGatewayOutput output) { + return TestRequest(output.name); + } + + @override + TestSuccessInput onSuccess(covariant TestSuccessResponse response) { + return TestSuccessInput(response.message); + } +} + +class TestGatewayOutput extends Output { + TestGatewayOutput(this.name); + + final String name; + + @override + List get props => [name]; +} + +class TestSuccessInput extends SuccessInput { + TestSuccessInput(this.message); + + final String message; +} + +class TestSuccessResponse extends SuccessResponse { + const TestSuccessResponse(this.message); + + final String message; +} + +class TestRequest extends Request { + const TestRequest(this.name); + + final String name; +} diff --git a/packages/clean_framework/test/core/gateway/gateyway_provider_test.dart b/packages/clean_framework/test/core/gateway/gateyway_provider_test.dart new file mode 100644 index 00000000..ab73b3a2 --- /dev/null +++ b/packages/clean_framework/test/core/gateway/gateyway_provider_test.dart @@ -0,0 +1 @@ +void main() {} diff --git a/packages/clean_framework/test/core/use_case/use_case_test.dart b/packages/clean_framework/test/core/use_case/use_case_test.dart new file mode 100644 index 00000000..97c469a4 --- /dev/null +++ b/packages/clean_framework/test/core/use_case/use_case_test.dart @@ -0,0 +1,324 @@ +import 'package:clean_framework/clean_framework.dart'; +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + late TestUseCase useCase; + + group('UseCase tests |', () { + setUp(() { + useCase = TestUseCase(); + }); + + tearDown(() { + useCase.dispose(); + }); + + test('entity updates with setter', () { + expect(useCase.entity, TestEntity()); + + useCase.entity = useCase.entity.copyWith(foo: 'bar'); + expect(useCase.entity, TestEntity(foo: 'bar')); + }); + + test('entity updates with setInput', () { + expect(useCase.entity, TestEntity()); + + useCase.setInput(TestInput(foo: 'input')); + expect(useCase.entity, TestEntity(foo: 'input')); + }); + + test( + 'entity update fails w/ setInput if no appropriate transformer is found', + () { + expect(useCase.entity, TestEntity()); + expect( + () => useCase.setInput(NoTransformerTestInput(foo: 'input')), + throwsStateError, + ); + }, + ); + + test( + 'getOutput() success', + () { + expect(useCase.entity, TestEntity()); + + useCase.setInput(TestInput(foo: 'input')); + + final output = useCase.getOutput(); + expect(output, TestOutput(foo: 'input')); + }, + ); + + test( + 'getOutput() fails when no appropriate transformer is found', + () { + expect(useCase.entity, TestEntity()); + + useCase.setInput(TestInput(foo: 'input')); + + expect(useCase.getOutput, throwsStateError); + }, + ); + + test( + 'successful request', + () async { + expect(useCase.entity, TestEntity()); + + useCase.subscribe( + (output) async { + final out = output as TestGatewayOutput; + return Either.right( + TestSuccessInput(message: 'Hello ${out.name}!'), + ); + }, + ); + + await useCase.request( + TestGatewayOutput(name: 'World'), + onSuccess: (success) => TestEntity(foo: success.message), + onFailure: (failure) => TestEntity(foo: 'failure'), + ); + + expect(useCase.entity, TestEntity(foo: 'Hello World!')); + }, + ); + + test( + 'request fails if there is no appropriate subscription present', + () async { + await useCase.request( + TestGatewayOutput(name: 'World'), + onSuccess: (success) => TestEntity(foo: success.message), + onFailure: (failure) => TestEntity(foo: 'Hello Anonymous!'), + ); + + expect(useCase.entity, TestEntity(foo: 'Hello Anonymous!')); + }, + ); + + test('throws error on duplicate subscription for same output', () { + useCase.subscribe( + (output) async { + final out = output as TestGatewayOutput; + return Either.right( + TestSuccessInput(message: 'Hello ${out.name}!'), + ); + }, + ); + + expect( + () => useCase.subscribe( + (output) async { + final out = output as TestGatewayOutput; + return Either.right( + TestSuccessInput(message: 'Hello ${out.name}!'), + ); + }, + ), + throwsStateError, + ); + }); + + group('debounce', () { + test( + 'performs action immediately first ' + 'and then only after the duration elapses', + () async { + useCase.entity = TestEntity(foo: '@'); + + String getChar() => useCase.entity.foo; + + void increment() { + useCase.debounce( + action: () { + useCase.entity = useCase.entity.copyWith( + foo: String.fromCharCode(getChar().codeUnitAt(0) + 1), + ); + }, + tag: 'increment', + duration: const Duration(milliseconds: 100), + ); + } + + increment(); + expect(getChar(), equals('A')); + + await Future.delayed(const Duration(milliseconds: 110)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 90)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 75)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 50)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 60)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 105)); + increment(); + expect(getChar(), equals('C')); + + await Future.delayed(const Duration(milliseconds: 95)); + increment(); + expect(getChar(), equals('C')); + + await Future.delayed(const Duration(milliseconds: 105)); + increment(); + expect(getChar(), equals('D')); + }, + ); + + test( + 'performs action only after the duration elapses; ' + 'when immediate is false', + () async { + useCase.entity = TestEntity(foo: 'A'); + + String getChar() => useCase.entity.foo; + + void increment() { + useCase.debounce( + action: () { + useCase.entity = useCase.entity.copyWith( + foo: String.fromCharCode(getChar().codeUnitAt(0) + 1), + ); + }, + tag: 'increment', + duration: const Duration(milliseconds: 100), + immediate: false, + ); + } + + increment(); + expect(getChar(), equals('A')); + + await Future.delayed(const Duration(milliseconds: 110)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 90)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 75)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 50)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 60)); + increment(); + expect(getChar(), equals('B')); + + await Future.delayed(const Duration(milliseconds: 105)); + increment(); + expect(getChar(), equals('C')); + + await Future.delayed(const Duration(milliseconds: 95)); + increment(); + expect(getChar(), equals('C')); + + await Future.delayed(const Duration(milliseconds: 105)); + increment(); + expect(getChar(), equals('D')); + }, + ); + }); + }); +} + +class TestUseCase extends UseCase { + TestUseCase() + : super( + entity: TestEntity(), + transformers: [ + TestInputTransformer(), + TestOutputTransformer(), + ], + ); +} + +class TestEntity extends Entity { + TestEntity({this.foo = ''}); + + final String foo; + + @override + List get props => [foo]; + + @override + TestEntity copyWith({String? foo}) => TestEntity(foo: foo ?? this.foo); +} + +class TestInput extends Input { + TestInput({required this.foo}); + + final String foo; +} + +class NoTransformerTestInput extends Input { + NoTransformerTestInput({required this.foo}); + + final String foo; +} + +class TestOutput extends Output { + TestOutput({required this.foo}); + + final String foo; + + @override + List get props => [foo]; +} + +class TestGatewayOutput extends Output { + TestGatewayOutput({required this.name}); + + final String name; + + @override + List get props => [name]; +} + +class TestSuccessInput extends SuccessInput { + TestSuccessInput({required this.message}); + + final String message; +} + +class NoTransformerTestOutput extends Output { + NoTransformerTestOutput({required this.foo}); + + final String foo; + + @override + List get props => [foo]; +} + +class TestInputTransformer extends InputTransformer { + @override + TestEntity transform(TestEntity entity, TestInput input) { + return entity.copyWith(foo: input.foo); + } +} + +class TestOutputTransformer extends OutputTransformer { + @override + TestOutput transform(TestEntity entity) { + return TestOutput(foo: entity.foo); + } +} diff --git a/packages/clean_framework/test/core/use_case/use_case_transformer_test.dart b/packages/clean_framework/test/core/use_case/use_case_transformer_test.dart new file mode 100644 index 00000000..f0ce32ee --- /dev/null +++ b/packages/clean_framework/test/core/use_case/use_case_transformer_test.dart @@ -0,0 +1,223 @@ +import 'package:clean_framework/clean_framework_core.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + late TestUseCase useCase; + + group('UseCase | transformer tests |', () { + setUp(() { + return useCase = TransformerTestUseCase(); + }); + + tearDown(() { + useCase.dispose(); + }); + + test('output transformer', () { + useCase + ..updateFoo('hello') + ..updateBar(3); + + expect(useCase.entity.foo, 'hello'); + expect(useCase.entity.bar, 3); + + expect(useCase.getOutput().foo, 'hello'); + expect(useCase.getOutput().bar, 3); + }); + + test('input transformer', () { + useCase.setInput(FooInput('hello')); + + expect(useCase.entity.foo, 'hello'); + + expect(useCase.getOutput().foo, 'hello'); + }); + }); + + group('UseCase | inline transformer tests |', () { + setUp(() { + return useCase = InlineTransformerTestUseCase(); + }); + + tearDown(() { + useCase.dispose(); + }); + + test('output transformer', () { + useCase + ..updateFoo('hello') + ..updateBar(3); + + expect(useCase.entity.foo, 'hello'); + expect(useCase.entity.bar, 3); + + expect(useCase.getOutput().foo, 'hello'); + expect(useCase.getOutput().bar, 3); + }); + + test('input transformer', () { + useCase.setInput(FooInput('hello')); + + expect(useCase.entity.foo, 'hello'); + + expect(useCase.getOutput().foo, 'hello'); + }); + }); + + group('UseCase | legacy filter tests |', () { + setUp(() { + return useCase = FilterTestUseCase(); + }); + + tearDown(() { + useCase.dispose(); + }); + + test('output filter', () { + useCase + ..updateFoo('hello') + ..updateBar(3); + + expect(useCase.entity.foo, 'hello'); + expect(useCase.entity.bar, 3); + + expect(useCase.getOutput().foo, 'hello'); + expect(useCase.getOutput().bar, 3); + }); + + test('input filter', () { + useCase.setInput(FooInput('hello')); + + expect(useCase.entity.foo, 'hello'); + + expect(useCase.getOutput(), FooOutput('hello')); + }); + }); +} + +abstract class TestUseCase extends UseCase { + TestUseCase({ + super.transformers, + super.inputFilters, + super.outputFilters, + }) : super(entity: TestEntity()); + + void updateFoo(String foo) { + entity = entity.copyWith(foo: foo); + } + + void updateBar(int bar) { + entity = entity.copyWith(bar: bar); + } +} + +class TransformerTestUseCase extends TestUseCase { + TransformerTestUseCase() + : super( + transformers: [ + FooOutputTransformer(), + BarOutputTransformer(), + FooInputTransformer(), + ], + ); +} + +class InlineTransformerTestUseCase extends TestUseCase { + InlineTransformerTestUseCase() + : super( + transformers: [ + OutputTransformer.from((entity) => FooOutput(entity.foo)), + OutputTransformer.from((entity) => BarOutput(entity.bar)), + InputTransformer.from( + (entity, input) => entity.copyWith(foo: input.foo), + ), + ], + ); +} + +class FilterTestUseCase extends TestUseCase { + FilterTestUseCase() + : super( + outputFilters: { + FooOutput: (entity) => FooOutput(entity.foo), + BarOutput: (entity) => BarOutput(entity.bar), + }, + inputFilters: { + FooInput: (input, entity) { + return entity.copyWith(foo: (input as FooInput).foo); + }, + }, + ); +} + +class TestSuccessInput extends SuccessInput { + TestSuccessInput(this.foo); + + final String foo; +} + +class TestEntity extends Entity { + TestEntity({ + this.foo = '', + this.bar = 0, + }); + + final String foo; + final int bar; + + @override + List get props => [foo, bar]; + + @override + TestEntity copyWith({ + String? foo, + int? bar, + }) { + return TestEntity( + foo: foo ?? this.foo, + bar: bar ?? this.bar, + ); + } +} + +class FooInput extends Input { + FooInput(this.foo); + final String foo; +} + +class FooOutput extends Output { + FooOutput(this.foo); + final String foo; + + @override + List get props => [foo]; +} + +class BarOutput extends Output { + BarOutput(this.bar); + final int bar; + + @override + List get props => [bar]; +} + +class FooOutputTransformer extends OutputTransformer { + @override + FooOutput transform(TestEntity entity) { + return FooOutput(entity.foo); + } +} + +class BarOutputTransformer extends OutputTransformer { + @override + BarOutput transform(TestEntity entity) { + return BarOutput(entity.bar); + } +} + +class FooInputTransformer extends InputTransformer { + @override + TestEntity transform(TestEntity entity, FooInput input) { + return entity.copyWith(foo: input.foo); + } +} diff --git a/packages/clean_framework/test/providers/use_case_transformer_test.dart b/packages/clean_framework/test/providers/use_case_transformer_test.dart index 3d52a0f1..7f96022d 100644 --- a/packages/clean_framework/test/providers/use_case_transformer_test.dart +++ b/packages/clean_framework/test/providers/use_case_transformer_test.dart @@ -43,6 +43,7 @@ class TestEntity extends Entity { @override List get props => [foo, bar]; + @override TestEntity copyWith({ String? foo, int? bar, diff --git a/packages/clean_framework/test/providers/use_case_unit_test.dart b/packages/clean_framework/test/providers/use_case_unit_test.dart deleted file mode 100644 index 38adbdcf..00000000 --- a/packages/clean_framework/test/providers/use_case_unit_test.dart +++ /dev/null @@ -1,268 +0,0 @@ -import 'package:clean_framework/clean_framework.dart'; -import 'package:clean_framework/clean_framework_providers.dart'; -import 'package:flutter_test/flutter_test.dart'; - -void main() { - test('UseCase instance, request failure due to not having a subscription', - () async { - final useCase = TestUseCase(TestEntity(foo: '')); - final viewModel = useCase.getOutput(); - - expect(viewModel.foo, ''); - - await useCase.fetchDataImmediately(); - - expect(useCase.entity, TestEntity(foo: 'failure')); - - useCase.dispose(); - }); - - test('UseCase subscription with successful request', () async { - final useCase = TestUseCase(TestEntity(foo: '')); - - final successInput = TestSuccessInput('success'); - expect(SuccessInput() == successInput, isFalse); - - useCase.subscribe((output) { - return Either.right(successInput); - }); - - expect( - () => useCase.subscribe((_) { - return Either.right(successInput); - }), - throwsStateError, - ); - - await useCase.fetchDataImmediately(); - - expect(useCase.entity, TestEntity(foo: 'success')); - - useCase.dispose(); - }); - - test('UseCase subscription with delayed response on input filter', () async { - final useCase = TestUseCase(TestEntity(foo: '')) - ..subscribe( - (output) => Either.right(SuccessInput()), - ); - - await useCase.fetchDataEventually(); - - //no data change at this point - expect(useCase.entity, TestEntity(foo: '')); - - useCase.setInput(TestSuccessInput('from input filter')); - - expect(useCase.entity, TestEntity(foo: 'from input filter')); - - useCase.dispose(); - }); - - test('UseCase instance, request failure due to not having a subscription', - () async { - final useCase = TestUseCase(TestEntity(foo: '')); - - expect(() => useCase.getOutput(), throwsStateError); - expect( - () => useCase.setInput(FailureInput()), - throwsStateError, - ); - - useCase.dispose(); - }); - - test('UseCase debounce test with immediate', () async { - final useCase = DebouncedUseCase(immediate: true); - - int getCount() => useCase.entity.count; - - useCase.increment(); - expect(getCount(), equals(1)); - - await Future.delayed(const Duration(milliseconds: 110)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 90)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 75)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 50)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 60)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 105)); - useCase.increment(); - expect(getCount(), equals(3)); - - await Future.delayed(const Duration(milliseconds: 95)); - useCase.increment(); - expect(getCount(), equals(3)); - - await Future.delayed(const Duration(milliseconds: 105)); - useCase.increment(); - expect(getCount(), equals(4)); - - useCase.dispose(); - }); - - test('UseCase debounce test without immediate', () async { - final useCase = DebouncedUseCase(immediate: false); - - int getCount() => useCase.entity.count; - - useCase.increment(); - expect(getCount(), equals(0)); - - await Future.delayed(const Duration(milliseconds: 40)); - useCase.increment(); - expect(getCount(), equals(0)); - - await Future.delayed(const Duration(milliseconds: 100)); - useCase.increment(); - expect(getCount(), equals(1)); - - await Future.delayed(const Duration(milliseconds: 110)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 90)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 75)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 50)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 60)); - useCase.increment(); - expect(getCount(), equals(2)); - - await Future.delayed(const Duration(milliseconds: 105)); - useCase.increment(); - expect(getCount(), equals(3)); - - await Future.delayed(const Duration(milliseconds: 95)); - useCase.increment(); - expect(getCount(), equals(3)); - - await Future.delayed(const Duration(milliseconds: 105)); - useCase.increment(); - expect(getCount(), equals(4)); - - useCase.dispose(); - }); -} - -class TestUseCase extends UseCase { - TestUseCase(TestEntity entity) - : super( - entity: entity, - transformers: [ - OutputTransformer.from((entity) => TestOutput(entity.foo)), - InputTransformer.from( - (entity, input) => entity.merge(foo: input.foo), - ), - ], - ); - - Future fetchDataImmediately() async { - await request( - TestDirectOutput('123'), - onFailure: (_) => entity.merge(foo: 'failure'), - onSuccess: (success) => entity.merge(foo: success.foo), - ); - } - - Future fetchDataEventually() async { - await request( - TestSubscriptionOutput('123'), - onFailure: (_) => entity.merge(foo: 'failure'), - onSuccess: (_) => entity, // no changes on the entity are needed, - // the changes should happen on the inputFilter. - ); - } -} - -class TestSuccessInput extends SuccessInput { - TestSuccessInput(this.foo); - final String foo; -} - -class TestDirectOutput extends Output { - TestDirectOutput(this.id); - final String id; - - @override - List get props => [id]; -} - -class TestSubscriptionOutput extends Output { - TestSubscriptionOutput(this.id); - final String id; - - @override - List get props => [id]; -} - -class TestEntity extends Entity { - TestEntity({required this.foo}); - final String foo; - - @override - List get props => [foo]; - - TestEntity merge({String? foo}) => TestEntity(foo: foo ?? this.foo); -} - -class TestOutput extends Output { - TestOutput(this.foo); - final String foo; - - @override - List get props => [foo]; -} - -class DebouncedUseCase extends UseCase { - DebouncedUseCase({required this.immediate}) - : super(entity: DebouncedEntity(count: 0)); - - final bool immediate; - - void increment() { - return debounce( - action: () { - entity = entity.merge(count: entity.count + 1); - }, - tag: 'increment', - duration: const Duration(milliseconds: 100), - immediate: immediate, - ); - } -} - -class DebouncedEntity extends Entity { - DebouncedEntity({required this.count}); - - final int count; - - @override - List get props => [count]; - - DebouncedEntity merge({int? count}) { - return DebouncedEntity(count: count ?? this.count); - } -} diff --git a/packages/clean_framework_router/pubspec.yaml b/packages/clean_framework_router/pubspec.yaml index 1f048da1..d25b4346 100644 --- a/packages/clean_framework_router/pubspec.yaml +++ b/packages/clean_framework_router/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: clean_framework: ^2.0.0-dev.0 flutter: sdk: flutter - go_router: ^6.0.0 + go_router: ^6.0.1 dev_dependencies: flutter_test: diff --git a/packages/clean_framework_router/test/app_router_test.dart b/packages/clean_framework_router/test/app_router_test.dart index 62d0cfb3..07792175 100644 --- a/packages/clean_framework_router/test/app_router_test.dart +++ b/packages/clean_framework_router/test/app_router_test.dart @@ -378,7 +378,7 @@ void main() { expect(find.text('Detail'), findsOneWidget); expect(find.text('More Detail'), findsNothing); - expect(testRouter.location, '/detail/'); + expect(testRouter.location, '/detail'); }); testWidgets(