diff --git a/StudioProjects/yimaru_app/.gitignore b/StudioProjects/yimaru_app/.gitignore new file mode 100644 index 0000000..3820a95 --- /dev/null +++ b/StudioProjects/yimaru_app/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ +/coverage/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/StudioProjects/yimaru_app/.metadata b/StudioProjects/yimaru_app/.metadata new file mode 100644 index 0000000..b5527e1 --- /dev/null +++ b/StudioProjects/yimaru_app/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "66dd93f9a27ffe2a9bfc8297506ce066ff51265f" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: android + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: ios + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: linux + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: macos + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: web + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + - platform: windows + create_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + base_revision: 66dd93f9a27ffe2a9bfc8297506ce066ff51265f + + # 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/StudioProjects/yimaru_app/.vscode/settings.json b/StudioProjects/yimaru_app/.vscode/settings.json new file mode 100644 index 0000000..25d97f4 --- /dev/null +++ b/StudioProjects/yimaru_app/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "*.dart": "${capture}.mobile.dart, ${capture}.tablet.dart, ${capture}.desktop.dart, ${capture}.form.dart, ${capture}.g.dart, ${capture}.freezed.dart, ${capture}.logger.dart, ${capture}.locator.dart, ${capture}.router.dart, ${capture}.dialogs.dart, ${capture}.bottomsheets.dart" + } +} + diff --git a/StudioProjects/yimaru_app/README.md b/StudioProjects/yimaru_app/README.md new file mode 100644 index 0000000..6679e57 --- /dev/null +++ b/StudioProjects/yimaru_app/README.md @@ -0,0 +1,13 @@ +# yimaru_app + +A new Flutter project. + +## Golden Tests + +Golden tests are already setup for this project. To run the tests and update the golden files, run: + +```bash +flutter test --update-goldens +``` + +The golden test screenshots will be stored under `test/golden/`. diff --git a/StudioProjects/yimaru_app/analysis_options.yaml b/StudioProjects/yimaru_app/analysis_options.yaml new file mode 100644 index 0000000..f9b3034 --- /dev/null +++ b/StudioProjects/yimaru_app/analysis_options.yaml @@ -0,0 +1 @@ +include: package:flutter_lints/flutter.yaml diff --git a/StudioProjects/yimaru_app/android/.gitignore b/StudioProjects/yimaru_app/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/StudioProjects/yimaru_app/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/StudioProjects/yimaru_app/android/app/build.gradle.kts b/StudioProjects/yimaru_app/android/app/build.gradle.kts new file mode 100644 index 0000000..19de2ad --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.yimaru_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.yimaru_app" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + 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.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/StudioProjects/yimaru_app/android/app/src/debug/AndroidManifest.xml b/StudioProjects/yimaru_app/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/main/AndroidManifest.xml b/StudioProjects/yimaru_app/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..6561fcc --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/main/kotlin/com/example/yimaru_app/MainActivity.kt b/StudioProjects/yimaru_app/android/app/src/main/kotlin/com/example/yimaru_app/MainActivity.kt new file mode 100644 index 0000000..3e34068 --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/kotlin/com/example/yimaru_app/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.yimaru_app + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/drawable-v21/launch_background.xml b/StudioProjects/yimaru_app/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/drawable/launch_background.xml b/StudioProjects/yimaru_app/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/StudioProjects/yimaru_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/values-night/styles.xml b/StudioProjects/yimaru_app/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/main/res/values/styles.xml b/StudioProjects/yimaru_app/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/StudioProjects/yimaru_app/android/app/src/profile/AndroidManifest.xml b/StudioProjects/yimaru_app/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/StudioProjects/yimaru_app/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/StudioProjects/yimaru_app/android/build.gradle.kts b/StudioProjects/yimaru_app/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/StudioProjects/yimaru_app/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/StudioProjects/yimaru_app/android/gradle.properties b/StudioProjects/yimaru_app/android/gradle.properties new file mode 100644 index 0000000..fbee1d8 --- /dev/null +++ b/StudioProjects/yimaru_app/android/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true diff --git a/StudioProjects/yimaru_app/android/gradle/wrapper/gradle-wrapper.properties b/StudioProjects/yimaru_app/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e4ef43f --- /dev/null +++ b/StudioProjects/yimaru_app/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/StudioProjects/yimaru_app/android/settings.gradle.kts b/StudioProjects/yimaru_app/android/settings.gradle.kts new file mode 100644 index 0000000..ca7fe06 --- /dev/null +++ b/StudioProjects/yimaru_app/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false +} + +include(":app") diff --git a/StudioProjects/yimaru_app/ios/.gitignore b/StudioProjects/yimaru_app/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/ios/Flutter/AppFrameworkInfo.plist b/StudioProjects/yimaru_app/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..1dc6cf7 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 13.0 + + diff --git a/StudioProjects/yimaru_app/ios/Flutter/Debug.xcconfig b/StudioProjects/yimaru_app/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/StudioProjects/yimaru_app/ios/Flutter/Release.xcconfig b/StudioProjects/yimaru_app/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.pbxproj b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..79e3510 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,616 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + 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 */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + 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 = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + 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 = 13.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; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + 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 = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..e3773d4 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcworkspace/contents.xcworkspacedata b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/StudioProjects/yimaru_app/ios/Runner/AppDelegate.swift b/StudioProjects/yimaru_app/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..7353c41 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..6ed2d93 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cd7b00 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..fe73094 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..321773c Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..502f463 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..e9f5fea Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..84ac32a Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..8953cba Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..0467bf1 Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/StudioProjects/yimaru_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/StudioProjects/yimaru_app/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/ios/Runner/Base.lproj/Main.storyboard b/StudioProjects/yimaru_app/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/ios/Runner/Info.plist b/StudioProjects/yimaru_app/ios/Runner/Info.plist new file mode 100644 index 0000000..ed66cce --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Yimaru App + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + yimaru_app + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/StudioProjects/yimaru_app/ios/Runner/Runner-Bridging-Header.h b/StudioProjects/yimaru_app/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/StudioProjects/yimaru_app/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/StudioProjects/yimaru_app/ios/RunnerTests/RunnerTests.swift b/StudioProjects/yimaru_app/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/StudioProjects/yimaru_app/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/StudioProjects/yimaru_app/lib/app/app.bottomsheets.dart b/StudioProjects/yimaru_app/lib/app/app.bottomsheets.dart new file mode 100644 index 0000000..777004c --- /dev/null +++ b/StudioProjects/yimaru_app/lib/app/app.bottomsheets.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +// ************************************************************************** +// StackedBottomsheetGenerator +// ************************************************************************** + +import 'package:stacked_services/stacked_services.dart'; + +import 'app.locator.dart'; +import '../ui/bottom_sheets/notice/notice_sheet.dart'; + +enum BottomSheetType { + notice, +} + +void setupBottomSheetUi() { + final bottomsheetService = locator(); + + final Map builders = { + BottomSheetType.notice: (context, request, completer) => + NoticeSheet(request: request, completer: completer), + }; + + bottomsheetService.setCustomSheetBuilders(builders); +} diff --git a/StudioProjects/yimaru_app/lib/app/app.dart b/StudioProjects/yimaru_app/lib/app/app.dart new file mode 100644 index 0000000..4e96242 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/app/app.dart @@ -0,0 +1,32 @@ +import 'package:yimaru_app/ui/bottom_sheets/notice/notice_sheet.dart'; +import 'package:yimaru_app/ui/dialogs/info_alert/info_alert_dialog.dart'; +import 'package:yimaru_app/ui/views/home/home_view.dart'; +import 'package:yimaru_app/ui/views/startup/startup_view.dart'; +import 'package:stacked/stacked_annotations.dart'; +import 'package:stacked_services/stacked_services.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_view.dart'; +// @stacked-import + +@StackedApp( + routes: [ + MaterialRoute(page: HomeView), + MaterialRoute(page: StartupView), + MaterialRoute(page: OnboardingView), +// @stacked-route + ], + dependencies: [ + LazySingleton(classType: BottomSheetService), + LazySingleton(classType: DialogService), + LazySingleton(classType: NavigationService), + // @stacked-service + ], + bottomsheets: [ + StackedBottomsheet(classType: NoticeSheet), + // @stacked-bottom-sheet + ], + dialogs: [ + StackedDialog(classType: InfoAlertDialog), + // @stacked-dialog + ], +) +class App {} diff --git a/StudioProjects/yimaru_app/lib/app/app.dialogs.dart b/StudioProjects/yimaru_app/lib/app/app.dialogs.dart new file mode 100644 index 0000000..2a4e944 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/app/app.dialogs.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +// ************************************************************************** +// StackedDialogGenerator +// ************************************************************************** + +import 'package:stacked_services/stacked_services.dart'; + +import 'app.locator.dart'; +import '../ui/dialogs/info_alert/info_alert_dialog.dart'; + +enum DialogType { + infoAlert, +} + +void setupDialogUi() { + final dialogService = locator(); + + final Map builders = { + DialogType.infoAlert: (context, request, completer) => + InfoAlertDialog(request: request, completer: completer), + }; + + dialogService.registerCustomDialogBuilders(builders); +} diff --git a/StudioProjects/yimaru_app/lib/app/app.locator.dart b/StudioProjects/yimaru_app/lib/app/app.locator.dart new file mode 100644 index 0000000..9d4a8da --- /dev/null +++ b/StudioProjects/yimaru_app/lib/app/app.locator.dart @@ -0,0 +1,28 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +// ************************************************************************** +// StackedLocatorGenerator +// ************************************************************************** + +// ignore_for_file: public_member_api_docs, implementation_imports, depend_on_referenced_packages + +import 'package:stacked_services/src/bottom_sheet/bottom_sheet_service.dart'; +import 'package:stacked_services/src/dialog/dialog_service.dart'; +import 'package:stacked_services/src/navigation/navigation_service.dart'; +import 'package:stacked_shared/stacked_shared.dart'; + +final locator = StackedLocator.instance; + +Future setupLocator({ + String? environment, + EnvironmentFilter? environmentFilter, +}) async { +// Register environments + locator.registerEnvironment( + environment: environment, environmentFilter: environmentFilter); + +// Register dependencies + locator.registerLazySingleton(() => BottomSheetService()); + locator.registerLazySingleton(() => DialogService()); + locator.registerLazySingleton(() => NavigationService()); +} diff --git a/StudioProjects/yimaru_app/lib/app/app.router.dart b/StudioProjects/yimaru_app/lib/app/app.router.dart new file mode 100644 index 0000000..b85ee7b --- /dev/null +++ b/StudioProjects/yimaru_app/lib/app/app.router.dart @@ -0,0 +1,158 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +// ************************************************************************** +// StackedNavigatorGenerator +// ************************************************************************** + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:flutter/material.dart' as _i5; +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart' as _i1; +import 'package:stacked_services/stacked_services.dart' as _i6; +import 'package:yimaru_app/ui/views/home/home_view.dart' as _i2; +import 'package:yimaru_app/ui/views/onboarding/onboarding_view.dart' as _i4; +import 'package:yimaru_app/ui/views/startup/startup_view.dart' as _i3; + +class Routes { + static const homeView = '/home-view'; + + static const startupView = '/startup-view'; + + static const onboardingView = '/onboarding-view'; + + static const all = { + homeView, + startupView, + onboardingView, + }; +} + +class StackedRouter extends _i1.RouterBase { + final _routes = <_i1.RouteDef>[ + _i1.RouteDef( + Routes.homeView, + page: _i2.HomeView, + ), + _i1.RouteDef( + Routes.startupView, + page: _i3.StartupView, + ), + _i1.RouteDef( + Routes.onboardingView, + page: _i4.OnboardingView, + ), + ]; + + final _pagesMap = { + _i2.HomeView: (data) { + return _i5.MaterialPageRoute( + builder: (context) => const _i2.HomeView(), + settings: data, + ); + }, + _i3.StartupView: (data) { + return _i5.MaterialPageRoute( + builder: (context) => const _i3.StartupView(), + settings: data, + ); + }, + _i4.OnboardingView: (data) { + return _i5.MaterialPageRoute( + builder: (context) => const _i4.OnboardingView(), + settings: data, + ); + }, + }; + + @override + List<_i1.RouteDef> get routes => _routes; + + @override + Map get pagesMap => _pagesMap; +} + +extension NavigatorStateExtension on _i6.NavigationService { + Future navigateToHomeView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return navigateTo(Routes.homeView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future navigateToStartupView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return navigateTo(Routes.startupView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future navigateToOnboardingView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return navigateTo(Routes.onboardingView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithHomeView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.homeView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithStartupView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.startupView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithOnboardingView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.onboardingView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } +} diff --git a/StudioProjects/yimaru_app/lib/main.dart b/StudioProjects/yimaru_app/lib/main.dart new file mode 100644 index 0000000..9d7a4de --- /dev/null +++ b/StudioProjects/yimaru_app/lib/main.dart @@ -0,0 +1,28 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/app/app.bottomsheets.dart'; +import 'package:yimaru_app/app/app.dialogs.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:yimaru_app/app/app.router.dart'; +import 'package:stacked_services/stacked_services.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + await setupLocator(); + setupDialogUi(); + setupBottomSheetUi(); + runApp(const MainApp()); +} + +class MainApp extends StatelessWidget { + const MainApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + initialRoute: Routes.startupView, + onGenerateRoute: StackedRouter().onGenerateRoute, + navigatorKey: StackedService.navigatorKey, + navigatorObservers: [StackedService.routeObserver], + ); + } +} diff --git a/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet.dart b/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet.dart new file mode 100644 index 0000000..8de3929 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet.dart @@ -0,0 +1,53 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:stacked/stacked.dart'; +import 'package:stacked_services/stacked_services.dart'; + +import 'notice_sheet_model.dart'; + +class NoticeSheet extends StackedView { + final Function(SheetResponse)? completer; + final SheetRequest request; + const NoticeSheet({Key? key, required this.completer, required this.request}) + : super(key: key); + + @override + Widget builder( + BuildContext context, + NoticeSheetModel viewModel, + Widget? child, + ) { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 15), + decoration: const BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + request.title!, + style: const TextStyle(fontSize: 25, fontWeight: FontWeight.w900), + ), + verticalSpaceTiny, + Text( + request.description!, + style: const TextStyle(fontSize: 14, color: kcMediumGrey), + maxLines: 3, + softWrap: true, + ), + verticalSpaceLarge, + ], + ), + ); + } + + @override + NoticeSheetModel viewModelBuilder(BuildContext context) => NoticeSheetModel(); +} diff --git a/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet_model.dart b/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet_model.dart new file mode 100644 index 0000000..f344b19 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/bottom_sheets/notice/notice_sheet_model.dart @@ -0,0 +1,3 @@ +import 'package:stacked/stacked.dart'; + +class NoticeSheetModel extends BaseViewModel {} diff --git a/StudioProjects/yimaru_app/lib/ui/common/app_colors.dart b/StudioProjects/yimaru_app/lib/ui/common/app_colors.dart new file mode 100644 index 0000000..b9b1b22 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/common/app_colors.dart @@ -0,0 +1,11 @@ +import 'package:flutter/material.dart'; + +const Color kcBackgroundColor = kcWhiteColor; +const Color kcWhiteColor = Color(0xFFFFFFFF); +const Color kcMediumGrey = Color(0xFF474A54); +const Color kcPrimaryColor = Color(0xFF9E2891); +const Color kcDarkGreyColor = Color(0xFF1A1B1E); +const Color kcVeryLightGrey = Color(0xFFE3E3E3); +const Color kcPrimaryColorDark = Color(0xFF300151); +const Color kcPrimaryColorLight = Color(0x149E2891); +const Color kcLightGrey = Color.fromARGB(255, 187, 187, 187); diff --git a/StudioProjects/yimaru_app/lib/ui/common/app_strings.dart b/StudioProjects/yimaru_app/lib/ui/common/app_strings.dart new file mode 100644 index 0000000..06e7c8f --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/common/app_strings.dart @@ -0,0 +1,3 @@ +const String ksHomeBottomSheetTitle = 'Build Great Apps!'; +const String ksHomeBottomSheetDescription = + 'Stacked is built to help you build better apps. Give us a chance and we\'ll prove it to you. Check out stacked.filledstacks.com to learn more'; diff --git a/StudioProjects/yimaru_app/lib/ui/common/ui_helpers.dart b/StudioProjects/yimaru_app/lib/ui/common/ui_helpers.dart new file mode 100644 index 0000000..1cf232c --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/common/ui_helpers.dart @@ -0,0 +1,126 @@ +import 'dart:math'; + +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; + +const double _tinySize = 5.0; +const double _smallSize = 10.0; +const double _mediumSize = 25.0; +const double _largeSize = 50.0; +const double _massiveSize = 120.0; + +const Widget horizontalSpaceTiny = SizedBox(width: _tinySize); +const Widget horizontalSpaceSmall = SizedBox(width: _smallSize); +const Widget horizontalSpaceMedium = SizedBox(width: _mediumSize); +const Widget horizontalSpaceLarge = SizedBox(width: _largeSize); + +const Widget verticalSpaceTiny = SizedBox(height: _tinySize); +const Widget verticalSpaceSmall = SizedBox(height: _smallSize); +const Widget verticalSpaceMedium = SizedBox(height: _mediumSize); +const Widget verticalSpaceLarge = SizedBox(height: _largeSize); +const Widget verticalSpaceMassive = SizedBox(height: _massiveSize); + +Widget spacedDivider = const Column( + children: [ + verticalSpaceMedium, + Divider(color: Colors.blueGrey, height: 5.0), + verticalSpaceMedium, + ], +); + +Widget verticalSpace(double height) => SizedBox(height: height); + +double screenWidth(BuildContext context) => MediaQuery.of(context).size.width; + +double screenHeight(BuildContext context) => MediaQuery.of(context).size.height; + +double screenHeightFraction( + BuildContext context, { + int dividedBy = 1, + double offsetBy = 0, + double max = 3000, +}) => + min((screenHeight(context) - offsetBy) / dividedBy, max); + +double screenWidthFraction( + BuildContext context, { + int dividedBy = 1, + double offsetBy = 0, + double max = 3000, +}) => + min((screenWidth(context) - offsetBy) / dividedBy, max); + +double halfScreenWidth(BuildContext context) => + screenWidthFraction(context, dividedBy: 2); + +double thirdScreenWidth(BuildContext context) => + screenWidthFraction(context, dividedBy: 3); + +double quarterScreenWidth(BuildContext context) => + screenWidthFraction(context, dividedBy: 4); + +double getResponsiveHorizontalSpaceMedium(BuildContext context) => + screenWidthFraction(context, dividedBy: 10); + +double getResponsiveSmallFontSize(BuildContext context) => + getResponsiveFontSize(context, fontSize: 14, max: 15); + +double getResponsiveMediumFontSize(BuildContext context) => + getResponsiveFontSize(context, fontSize: 16, max: 17); + +double getResponsiveLargeFontSize(BuildContext context) => + getResponsiveFontSize(context, fontSize: 21, max: 31); + +double getResponsiveExtraLargeFontSize(BuildContext context) => + getResponsiveFontSize(context, fontSize: 25); + +double getResponsiveMassiveFontSize(BuildContext context) => + getResponsiveFontSize(context, fontSize: 30); + +double getResponsiveFontSize( + BuildContext context, { + double? fontSize, + double? max, +}) { + max ??= 100; + + var responsiveSize = min( + screenWidthFraction(context, dividedBy: 10) * ((fontSize ?? 100) / 100), + max, + ); + + return responsiveSize; +} + +InputDecoration inputDecoration({ + String? hint, + required bool focus, +}) => + InputDecoration( + hintText: hint, + filled: true, + border: border, + errorBorder: errorBorder, + enabledBorder: enabledBorder, + focusedBorder: focusedBorder, + fillColor: focus ? kcPrimaryColor.withOpacity(0.2) : kcWhiteColor, + ); + +Border rightBorder = Border( + right: BorderSide( + width: 1, + color: kcLightGrey.withOpacity(0.25), + ), +); + +OutlineInputBorder border = + const OutlineInputBorder(borderSide: BorderSide(color: kcPrimaryColor)); +OutlineInputBorder errorBorder = + const OutlineInputBorder(borderSide: BorderSide(color: kcPrimaryColor)); +OutlineInputBorder enabledBorder = + const OutlineInputBorder(borderSide: BorderSide(color: kcPrimaryColor)); +OutlineInputBorder focusedBorder = + const OutlineInputBorder(borderSide: BorderSide(color: kcPrimaryColor)); + +UnderlineInputBorder searchBorder = + const UnderlineInputBorder(borderSide: BorderSide(color: kcPrimaryColor)); diff --git a/StudioProjects/yimaru_app/lib/ui/common/validators/onboarding_form_validator.dart b/StudioProjects/yimaru_app/lib/ui/common/validators/onboarding_form_validator.dart new file mode 100644 index 0000000..e0b711e --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/common/validators/onboarding_form_validator.dart @@ -0,0 +1,12 @@ +class OnboardingFormValidator { + static String? validateForm(String? value) { + if (value == null) { + return null; + } + + if (value.isEmpty) { + return 'The field is required'; + } + return null; + } +} diff --git a/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog.dart b/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog.dart new file mode 100644 index 0000000..fe05f6c --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog.dart @@ -0,0 +1,107 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:stacked/stacked.dart'; +import 'package:stacked_services/stacked_services.dart'; + +import 'info_alert_dialog_model.dart'; + +const double _graphicSize = 60; + +class InfoAlertDialog extends StackedView { + final DialogRequest request; + final Function(DialogResponse) completer; + + const InfoAlertDialog({ + Key? key, + required this.request, + required this.completer, + }) : super(key: key); + + @override + Widget builder( + BuildContext context, + InfoAlertDialogModel viewModel, + Widget? child, + ) { + return Dialog( + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + backgroundColor: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + request.title!, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w900, + ), + ), + verticalSpaceTiny, + Text( + request.description!, + style: const TextStyle( + fontSize: 14, + color: kcMediumGrey, + ), + maxLines: 3, + softWrap: true, + ), + ], + ), + ), + Container( + width: _graphicSize, + height: _graphicSize, + decoration: const BoxDecoration( + color: Color(0xffF6E7B0), + borderRadius: BorderRadius.all( + Radius.circular(_graphicSize / 2), + ), + ), + alignment: Alignment.center, + child: const Text('⭐️', style: TextStyle(fontSize: 30)), + ), + ], + ), + verticalSpaceMedium, + GestureDetector( + onTap: () => completer(DialogResponse(confirmed: true)), + child: Container( + height: 50, + width: double.infinity, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(10), + ), + child: const Text( + 'Got it', + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + ), + ), + ], + ), + ), + ); + } + + @override + InfoAlertDialogModel viewModelBuilder(BuildContext context) => + InfoAlertDialogModel(); +} diff --git a/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog_model.dart b/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog_model.dart new file mode 100644 index 0000000..0070aa1 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/dialogs/info_alert/info_alert_dialog_model.dart @@ -0,0 +1,3 @@ +import 'package:stacked/stacked.dart'; + +class InfoAlertDialogModel extends BaseViewModel {} diff --git a/StudioProjects/yimaru_app/lib/ui/shared/widgets/custom_elevated_button.dart b/StudioProjects/yimaru_app/lib/ui/shared/widgets/custom_elevated_button.dart new file mode 100644 index 0000000..c5b94e0 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/shared/widgets/custom_elevated_button.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; + +class CustomElevatedButton extends StatelessWidget { + final String text; + final double width; + final double height; + final double borderRadius; + final Color backgroundColor; + final Color foregroundColor; + final GestureTapCallback? onTap; + + const CustomElevatedButton({ + super.key, + this.onTap, + required this.text, + required this.height, + this.borderRadius = 0, + required this.backgroundColor, + required this.foregroundColor, + this.width = double.maxFinite, + }); + + @override + Widget build(BuildContext context) => _buildButtonWrapper(); + + Widget _buildButtonWrapper() => + SizedBox(height: 50, width: width, child: _buildButton()); + + Widget _buildButton() => OutlinedButton( + onPressed: onTap, + style: OutlinedButton.styleFrom( + side: BorderSide.none, + backgroundColor: backgroundColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(borderRadius)), + ), + child: _buildText(), + ); + + Widget _buildText() => Text( + text, + style: TextStyle(color: foregroundColor, fontWeight: FontWeight.bold), + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/home/home_view.dart b/StudioProjects/yimaru_app/lib/ui/views/home/home_view.dart new file mode 100644 index 0000000..26b32ed --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/home/home_view.dart @@ -0,0 +1,74 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; + +import 'home_viewmodel.dart'; + +class HomeView extends StackedView { + const HomeView({Key? key}) : super(key: key); + + @override + Widget builder(BuildContext context, HomeViewModel viewModel, Widget? child) { + return Scaffold( + body: SafeArea( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 25.0), + child: Center( + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + verticalSpaceLarge, + Column( + children: [ + const Text( + 'Hello, STACKED!', + style: TextStyle( + fontSize: 35, + fontWeight: FontWeight.w900, + ), + ), + verticalSpaceMedium, + MaterialButton( + color: Colors.black, + onPressed: viewModel.incrementCounter, + child: Text( + viewModel.counterLabel, + style: const TextStyle(color: Colors.white), + ), + ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + MaterialButton( + color: kcDarkGreyColor, + onPressed: viewModel.showDialog, + child: const Text( + 'Show Dialog', + style: TextStyle(color: Colors.white), + ), + ), + MaterialButton( + color: kcDarkGreyColor, + onPressed: viewModel.showBottomSheet, + child: const Text( + 'Show Bottom Sheet', + style: TextStyle(color: Colors.white), + ), + ), + ], + ), + ], + ), + ), + ), + ), + ); + } + + @override + HomeViewModel viewModelBuilder(BuildContext context) => HomeViewModel(); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/home/home_viewmodel.dart b/StudioProjects/yimaru_app/lib/ui/views/home/home_viewmodel.dart new file mode 100644 index 0000000..5928270 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/home/home_viewmodel.dart @@ -0,0 +1,36 @@ +import 'package:yimaru_app/app/app.bottomsheets.dart'; +import 'package:yimaru_app/app/app.dialogs.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:yimaru_app/ui/common/app_strings.dart'; +import 'package:stacked/stacked.dart'; +import 'package:stacked_services/stacked_services.dart'; + +class HomeViewModel extends BaseViewModel { + final _dialogService = locator(); + final _bottomSheetService = locator(); + + String get counterLabel => 'Counter is: $_counter'; + + int _counter = 0; + + void incrementCounter() { + _counter++; + rebuildUi(); + } + + void showDialog() { + _dialogService.showCustomDialog( + variant: DialogType.infoAlert, + title: 'Stacked Rocks!', + description: 'Give stacked $_counter stars on Github', + ); + } + + void showBottomSheet() { + _bottomSheetService.showCustomSheet( + variant: BottomSheetType.notice, + title: ksHomeBottomSheetTitle, + description: ksHomeBottomSheetDescription, + ); + } +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/age_group_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/age_group_form.dart new file mode 100644 index 0000000..a4ee919 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/age_group_form.dart @@ -0,0 +1,116 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/custom_small_radio_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +class AgeGroupForm extends ViewModelWidget { + const AgeGroupForm({super.key}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceMedium, + _buildAgeGroups(viewModel) + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'Which age range are you in?', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'We’ll personalize your learning experience based on your age.', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildAgeGroups(OnboardingViewModel viewModel) => ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: viewModel.ageGroups.length, + itemBuilder: (context, index) => _buildAgeGroup( + title: viewModel.ageGroups[index], + selected: viewModel.isSelectedAgeGroup(viewModel.ageGroups[index]), + onTap: () => + viewModel.setSelectedAgeGroup(viewModel.ageGroups[index]), + ), + ); + + Widget _buildAgeGroup( + {required String title, + required bool selected, + required GestureTapCallback onTap}) => + CustomSmallRadioButton( + title: title, + onTap: onTap, + selected: selected, + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/country_region_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/country_region_form.dart new file mode 100644 index 0000000..b8a58a8 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/country_region_form.dart @@ -0,0 +1,118 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/custom_dropdown.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +class CountryRegionForm extends ViewModelWidget { + const CountryRegionForm({super.key}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceMedium, + _buildCountryDropDown(viewModel), + verticalSpaceMedium, + _buildRegionDropDown(viewModel), + verticalSpaceMedium, + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'Where are you from?', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'Select your country and region from the dropdown', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildCountryDropDown(OnboardingViewModel viewModel) => + CustomDropDownPicker( + hint: 'Select country', + icon: _buildSearchIcon(), + items: (value, props) => viewModel.getCountries(), + onChanged: (value) {}, + selectedItem: 'Ethiopia'); + + Widget _buildRegionDropDown(OnboardingViewModel viewModel) => + CustomDropDownPicker( + hint: 'Select region', + icon: _buildSearchIcon(), + items: (value, props) => viewModel.getRegions('Addis Ababa'), + onChanged: (value) {}, + selectedItem: 'Addis Ababa'); + + Icon _buildSearchIcon() => const Icon( + Icons.search, + color: kcPrimaryColor, + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/educational_background_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/educational_background_form.dart new file mode 100644 index 0000000..9dc61c6 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/educational_background_form.dart @@ -0,0 +1,118 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/custom_small_radio_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +class EducationalBackgroundForm extends ViewModelWidget { + const EducationalBackgroundForm({super.key}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceMedium, + _buildEducationalLevels(viewModel) + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'What’s your current educational level?', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'This helps us tailor your lessons to your experience.', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildEducationalLevels(OnboardingViewModel viewModel) => + ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: viewModel.educationalBackgrounds.length, + itemBuilder: (context, index) => _buildEducationalLevel( + title: viewModel.educationalBackgrounds[index], + selected: viewModel.isSelectedEducationalBackground( + viewModel.educationalBackgrounds[index]), + onTap: () => viewModel.setSelectedEducationalBackground( + viewModel.educationalBackgrounds[index]), + ), + ); + + Widget _buildEducationalLevel( + {required String title, + required bool selected, + required GestureTapCallback onTap}) => + CustomSmallRadioButton( + title: title, + onTap: onTap, + selected: selected, + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/full_name_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/full_name_form.dart new file mode 100644 index 0000000..0432480 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/full_name_form.dart @@ -0,0 +1,125 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +import '../onboarding_view.form.dart'; + +class FullNameForm extends ViewModelWidget { + final TextEditingController fullNameController; + + const FullNameForm({super.key, required this.fullNameController}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceLarge, + _buildFullNameFormField(viewModel), + if (viewModel.hasFullNameValidationMessage && viewModel.focusFullName) + verticalSpaceTiny, + if (viewModel.hasFullNameValidationMessage && viewModel.focusFullName) + _buildFullNameValidatorWrapper(viewModel) + ]; + + Widget _buildAppBar() => const OnboardingAppBar( + showBackButton: false, + ); + + Widget _buildTitle() => const Text( + 'What should we call you? 😊', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'We’ll use your name to personalize your learning journey.', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildFullNameFormField(OnboardingViewModel viewModel) => + TextFormField( + controller: fullNameController, + onTap: viewModel.setFullNameFocus, + decoration: inputDecoration(focus:viewModel.focusFullName), + + ); + + Widget _buildFullNameValidatorWrapper(OnboardingViewModel viewModel) => + viewModel.hasFullNameValidationMessage + ? _buildFullNameValidator(viewModel) + : Container(); + + Widget _buildFullNameValidator(OnboardingViewModel viewModel) => Text( + viewModel.fullNameValidationMessage!, + style: const TextStyle( + color: Colors.red, + fontSize: 12, + fontWeight: FontWeight.w700, + ), + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_goal_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_goal_form.dart new file mode 100644 index 0000000..3f38523 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_goal_form.dart @@ -0,0 +1,127 @@ +import 'package:flutter/material.dart'; +import 'package:iconsax/iconsax.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/custom_large_radio_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +class LearningGoalForm extends ViewModelWidget { + const LearningGoalForm({super.key}); + + IconData getIcon(int icon) { + switch (icon) { + case 0: + return Iconsax.book; + case 1: + return Iconsax.microphone; + case 2: + return Iconsax.bag; + } + return Icons.book; + } + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceMedium, + _buildLearningGoals(viewModel) + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'Hi Johnny, Choose your learning goal.', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildLearningGoals(OnboardingViewModel viewModel) => ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: viewModel.learningGoals.length, + itemBuilder: (context, index) => _buildLearningGoal( + title: viewModel.learningGoals[index]['title'], + icon: getIcon(viewModel.learningGoals[index]['icon']), + subtitle: viewModel.learningGoals[index]['subtitle'], + selected: viewModel + .isSelectedLearningGoal(viewModel.learningGoals[index]['title']), + onTap: () => viewModel + .setSelectedLearningGoal(viewModel.learningGoals[index]['title']), + ), + ); + + Widget _buildLearningGoal( + {required String title, + required bool selected, + required IconData icon, + required String subtitle, + required GestureTapCallback onTap}) => + CustomLargeRadioButton( + icon: icon, + title: title, + onTap: onTap, + subtitle: subtitle, + selected: selected, + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_reason_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_reason_form.dart new file mode 100644 index 0000000..7abdd27 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/learning_reason_form.dart @@ -0,0 +1,155 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_view.form.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/custom_small_radio_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +class LearningReasonForm extends ViewModelWidget { + final TextEditingController learningReasonController; + + const LearningReasonForm({super.key, required this.learningReasonController}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => + SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceMedium, + _buildReasons(viewModel), + if (viewModel.showTextBox) _buildReasonFormField(viewModel), + if (viewModel.showTextBox && + viewModel.hasLearningReasonValidationMessage && + viewModel.focusLearningReason) + verticalSpaceTiny, + if (viewModel.showTextBox && + viewModel.hasLearningReasonValidationMessage && + viewModel.focusLearningReason) + _buildReasonValidatorWrapper(viewModel), + verticalSpaceMedium, + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'What’s your main goal for improving your English?', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'Your goal helps us tailor your learning journey.', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildReasons(OnboardingViewModel viewModel) => ListView.builder( + shrinkWrap: true, + padding: EdgeInsets.zero, + itemCount: viewModel.learningReasons.length, + physics: const NeverScrollableScrollPhysics(), + itemBuilder: (context, index) => _buildLearningReason( + title: viewModel.learningReasons[index], + selected: viewModel + .isSelectedLearningReason(viewModel.learningReasons[index]), + onTap: () => viewModel + .setSelectedLearningReason(viewModel.learningReasons[index]), + ), + ); + + Widget _buildLearningReason( + {required String title, + required bool selected, + required GestureTapCallback onTap}) => + CustomSmallRadioButton( + title: title, + onTap: onTap, + selected: selected, + ); + + Widget _buildReasonFormField(OnboardingViewModel viewModel) => TextFormField( + maxLines: 3, + controller: learningReasonController, + onTap: viewModel.setLearningReasonFocus, + decoration: inputDecoration(focus: true, hint: 'Write your goal…'), + ); + + Widget _buildReasonValidatorWrapper(OnboardingViewModel viewModel) => + viewModel.hasLearningReasonValidationMessage + ? _buildReasonValidator(viewModel) + : Container(); + + Widget _buildReasonValidator(OnboardingViewModel viewModel) => Text( + viewModel.learningReasonValidationMessage!, + style: const TextStyle( + fontSize: 12, + color: Colors.red, + fontWeight: FontWeight.w700, + ), + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/occupation_form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/occupation_form.dart new file mode 100644 index 0000000..51f6c14 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/forms/occupation_form.dart @@ -0,0 +1,124 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; +import 'package:yimaru_app/ui/shared/widgets/custom_elevated_button.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/onboarding_app_bar.dart'; + +import '../onboarding_view.form.dart'; + +class OccupationForm extends ViewModelWidget { + final TextEditingController occupationController; + + const OccupationForm({super.key, required this.occupationController}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildScaffoldWrapper(viewModel); + + Widget _buildScaffoldWrapper(OnboardingViewModel viewModel) => Scaffold( + backgroundColor: kcBackgroundColor, + body: _buildScaffold(viewModel), + ); + + Widget _buildScaffold(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildScaffoldChildren(viewModel), + ); + + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(), _buildExpandedBody(viewModel)]; + + Widget _buildExpandedBody(OnboardingViewModel viewModel) => + Expanded(child: _buildBodyWrapper(viewModel)); + + Widget _buildBodyWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 15), + child: _buildBody(viewModel), + ); + + Widget _buildBody(OnboardingViewModel viewModel) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildBodyChildren(viewModel), + ); + + List _buildBodyChildren(OnboardingViewModel viewModel) => + [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)]; + + Widget _buildUpperColumn(OnboardingViewModel viewModel) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildUpperColumnChildren(viewModel), + ); + + List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceMedium, + _buildTitle(), + verticalSpaceSmall, + _buildSubTitle(), + verticalSpaceLarge, + _buildOccupationFormField(viewModel), + if (viewModel.hasOccupationValidationMessage && + viewModel.focusOccupation) + verticalSpaceTiny, + if (viewModel.hasOccupationValidationMessage && + viewModel.focusOccupation) + _buildOccupationValidatorWrapper(viewModel) + ]; + + Widget _buildAppBar() => const OnboardingAppBar(); + + Widget _buildTitle() => const Text( + 'What’s your occupation?', + style: TextStyle( + fontSize: 25, + color: kcDarkGreyColor, + fontWeight: FontWeight.w600, + ), + ); + + Widget _buildSubTitle() => const Text( + 'We’ll personalize your learning experience based on your occupation.', + style: TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildOccupationFormField(OnboardingViewModel viewModel) => + TextFormField( + controller: occupationController, + onTap: viewModel.setOccupationFocus, + decoration: inputDecoration(focus: viewModel.focusOccupation), + ); + + Widget _buildOccupationValidatorWrapper(OnboardingViewModel viewModel) => + viewModel.hasOccupationValidationMessage + ? _buildOccupationValidator(viewModel) + : Container(); + + Widget _buildOccupationValidator(OnboardingViewModel viewModel) => Text( + viewModel.occupationValidationMessage!, + style: const TextStyle( + color: Colors.red, + fontSize: 12, + fontWeight: FontWeight.w700, + ), + ); + + Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( + padding: const EdgeInsets.only(bottom: 50), + child: _buildContinueButton(viewModel), + ); + + Widget _buildContinueButton(OnboardingViewModel viewModel) => + CustomElevatedButton( + height: 55, + text: 'Continue', + borderRadius: 12, + onTap: () => viewModel.next(), + foregroundColor: kcWhiteColor, + backgroundColor: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.dart new file mode 100644 index 0000000..e4200db --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.dart @@ -0,0 +1,82 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:stacked/stacked_annotations.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/age_group_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/country_region_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/educational_background_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/full_name_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/learning_goal_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/learning_reason_form.dart'; +import 'package:yimaru_app/ui/views/onboarding/forms/occupation_form.dart'; + +import '../../common/validators/onboarding_form_validator.dart'; +import 'onboarding_viewmodel.dart'; +import 'onboarding_view.form.dart'; + +@FormView(fields: [ + FormTextField( + name: 'fullName', validator: OnboardingFormValidator.validateForm), + FormTextField( + name: 'occupation', validator: OnboardingFormValidator.validateForm), + FormTextField( + name: 'learningReason', validator: OnboardingFormValidator.validateForm) +]) +class OnboardingView extends StackedView + with $OnboardingView { + const OnboardingView({Key? key}) : super(key: key); + + @override + Widget builder( + BuildContext context, + OnboardingViewModel viewModel, + Widget? child, + ) => + _buildOnboardingScreens(viewModel); + + Widget _buildOnboardingScreens(OnboardingViewModel viewModel) => IndexedStack( + index: viewModel.currentStep, + children: _buildScreens(), + ); + + List _buildScreens() => [ + _buildFullNameForm(), + _buildEducationalBackgroundForm(), + _buildAgeGroupForm(), + _buildOccupationForm(), + _buildCountryRegionForm(), + _buildLearningGoalForm(), + _buildLearningReasonForm() + ]; + + Widget _buildFullNameForm() => FullNameForm( + fullNameController: fullNameController, + ); + + Widget _buildEducationalBackgroundForm() => const EducationalBackgroundForm(); + + Widget _buildAgeGroupForm() => const AgeGroupForm(); + + Widget _buildOccupationForm() => OccupationForm( + occupationController: occupationController, + ); + + Widget _buildCountryRegionForm() => const CountryRegionForm(); + + Widget _buildLearningGoalForm() => const LearningGoalForm(); + + Widget _buildLearningReasonForm() => LearningReasonForm( + learningReasonController: learningReasonController, + ); + + @override + void onViewModelReady(OnboardingViewModel viewModel) { + syncFormWithViewModel(viewModel); + super.onViewModelReady(viewModel); + } + + @override + OnboardingViewModel viewModelBuilder( + BuildContext context, + ) => + OnboardingViewModel(); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.form.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.form.dart new file mode 100644 index 0000000..58d4ae0 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_view.form.dart @@ -0,0 +1,246 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +// ************************************************************************** +// StackedFormGenerator +// ************************************************************************** + +// ignore_for_file: public_member_api_docs, constant_identifier_names, non_constant_identifier_names,unnecessary_this + +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/validators/onboarding_form_validator.dart'; + +const bool _autoTextFieldValidation = true; + +const String FullNameValueKey = 'fullName'; +const String OccupationValueKey = 'occupation'; +const String LearningReasonValueKey = 'learningReason'; + +final Map _OnboardingViewTextEditingControllers = + {}; + +final Map _OnboardingViewFocusNodes = {}; + +final Map _OnboardingViewTextValidations = { + FullNameValueKey: OnboardingFormValidator.validateForm, + OccupationValueKey: OnboardingFormValidator.validateForm, + LearningReasonValueKey: OnboardingFormValidator.validateForm, +}; + +mixin $OnboardingView { + TextEditingController get fullNameController => + _getFormTextEditingController(FullNameValueKey); + TextEditingController get occupationController => + _getFormTextEditingController(OccupationValueKey); + TextEditingController get learningReasonController => + _getFormTextEditingController(LearningReasonValueKey); + + FocusNode get fullNameFocusNode => _getFormFocusNode(FullNameValueKey); + FocusNode get occupationFocusNode => _getFormFocusNode(OccupationValueKey); + FocusNode get learningReasonFocusNode => + _getFormFocusNode(LearningReasonValueKey); + + TextEditingController _getFormTextEditingController( + String key, { + String? initialValue, + }) { + if (_OnboardingViewTextEditingControllers.containsKey(key)) { + return _OnboardingViewTextEditingControllers[key]!; + } + + _OnboardingViewTextEditingControllers[key] = + TextEditingController(text: initialValue); + return _OnboardingViewTextEditingControllers[key]!; + } + + FocusNode _getFormFocusNode(String key) { + if (_OnboardingViewFocusNodes.containsKey(key)) { + return _OnboardingViewFocusNodes[key]!; + } + _OnboardingViewFocusNodes[key] = FocusNode(); + return _OnboardingViewFocusNodes[key]!; + } + + /// Registers a listener on every generated controller that calls [model.setData()] + /// with the latest textController values + void syncFormWithViewModel(FormStateHelper model) { + fullNameController.addListener(() => _updateFormData(model)); + occupationController.addListener(() => _updateFormData(model)); + learningReasonController.addListener(() => _updateFormData(model)); + + _updateFormData(model, forceValidate: _autoTextFieldValidation); + } + + /// Registers a listener on every generated controller that calls [model.setData()] + /// with the latest textController values + @Deprecated( + 'Use syncFormWithViewModel instead.' + 'This feature was deprecated after 3.1.0.', + ) + void listenToFormUpdated(FormViewModel model) { + fullNameController.addListener(() => _updateFormData(model)); + occupationController.addListener(() => _updateFormData(model)); + learningReasonController.addListener(() => _updateFormData(model)); + + _updateFormData(model, forceValidate: _autoTextFieldValidation); + } + + /// Updates the formData on the FormViewModel + void _updateFormData(FormStateHelper model, {bool forceValidate = false}) { + model.setData( + model.formValueMap + ..addAll({ + FullNameValueKey: fullNameController.text, + OccupationValueKey: occupationController.text, + LearningReasonValueKey: learningReasonController.text, + }), + ); + + if (_autoTextFieldValidation || forceValidate) { + updateValidationData(model); + } + } + + bool validateFormFields(FormViewModel model) { + _updateFormData(model, forceValidate: true); + return model.isFormValid; + } + + /// Calls dispose on all the generated controllers and focus nodes + void disposeForm() { + // The dispose function for a TextEditingController sets all listeners to null + + for (var controller in _OnboardingViewTextEditingControllers.values) { + controller.dispose(); + } + for (var focusNode in _OnboardingViewFocusNodes.values) { + focusNode.dispose(); + } + + _OnboardingViewTextEditingControllers.clear(); + _OnboardingViewFocusNodes.clear(); + } +} + +extension ValueProperties on FormStateHelper { + bool get hasAnyValidationMessage => this + .fieldsValidationMessages + .values + .any((validation) => validation != null); + + bool get isFormValid { + if (!_autoTextFieldValidation) this.validateForm(); + + return !hasAnyValidationMessage; + } + + String? get fullNameValue => this.formValueMap[FullNameValueKey] as String?; + String? get occupationValue => + this.formValueMap[OccupationValueKey] as String?; + String? get learningReasonValue => + this.formValueMap[LearningReasonValueKey] as String?; + + set fullNameValue(String? value) { + this.setData( + this.formValueMap..addAll({FullNameValueKey: value}), + ); + + if (_OnboardingViewTextEditingControllers.containsKey(FullNameValueKey)) { + _OnboardingViewTextEditingControllers[FullNameValueKey]?.text = + value ?? ''; + } + } + + set occupationValue(String? value) { + this.setData( + this.formValueMap..addAll({OccupationValueKey: value}), + ); + + if (_OnboardingViewTextEditingControllers.containsKey(OccupationValueKey)) { + _OnboardingViewTextEditingControllers[OccupationValueKey]?.text = + value ?? ''; + } + } + + set learningReasonValue(String? value) { + this.setData( + this.formValueMap..addAll({LearningReasonValueKey: value}), + ); + + if (_OnboardingViewTextEditingControllers.containsKey( + LearningReasonValueKey)) { + _OnboardingViewTextEditingControllers[LearningReasonValueKey]?.text = + value ?? ''; + } + } + + bool get hasFullName => + this.formValueMap.containsKey(FullNameValueKey) && + (fullNameValue?.isNotEmpty ?? false); + bool get hasOccupation => + this.formValueMap.containsKey(OccupationValueKey) && + (occupationValue?.isNotEmpty ?? false); + bool get hasLearningReason => + this.formValueMap.containsKey(LearningReasonValueKey) && + (learningReasonValue?.isNotEmpty ?? false); + + bool get hasFullNameValidationMessage => + this.fieldsValidationMessages[FullNameValueKey]?.isNotEmpty ?? false; + bool get hasOccupationValidationMessage => + this.fieldsValidationMessages[OccupationValueKey]?.isNotEmpty ?? false; + bool get hasLearningReasonValidationMessage => + this.fieldsValidationMessages[LearningReasonValueKey]?.isNotEmpty ?? + false; + + String? get fullNameValidationMessage => + this.fieldsValidationMessages[FullNameValueKey]; + String? get occupationValidationMessage => + this.fieldsValidationMessages[OccupationValueKey]; + String? get learningReasonValidationMessage => + this.fieldsValidationMessages[LearningReasonValueKey]; +} + +extension Methods on FormStateHelper { + setFullNameValidationMessage(String? validationMessage) => + this.fieldsValidationMessages[FullNameValueKey] = validationMessage; + setOccupationValidationMessage(String? validationMessage) => + this.fieldsValidationMessages[OccupationValueKey] = validationMessage; + setLearningReasonValidationMessage(String? validationMessage) => + this.fieldsValidationMessages[LearningReasonValueKey] = validationMessage; + + /// Clears text input fields on the Form + void clearForm() { + fullNameValue = ''; + occupationValue = ''; + learningReasonValue = ''; + } + + /// Validates text input fields on the Form + void validateForm() { + this.setValidationMessages({ + FullNameValueKey: getValidationMessage(FullNameValueKey), + OccupationValueKey: getValidationMessage(OccupationValueKey), + LearningReasonValueKey: getValidationMessage(LearningReasonValueKey), + }); + } +} + +/// Returns the validation message for the given key +String? getValidationMessage(String key) { + final validatorForKey = _OnboardingViewTextValidations[key]; + if (validatorForKey == null) return null; + + String? validationMessageForKey = validatorForKey( + _OnboardingViewTextEditingControllers[key]!.text, + ); + + return validationMessageForKey; +} + +/// Updates the fieldsValidationMessages on the FormViewModel +void updateValidationData(FormStateHelper model) => + model.setValidationMessages({ + FullNameValueKey: getValidationMessage(FullNameValueKey), + OccupationValueKey: getValidationMessage(OccupationValueKey), + LearningReasonValueKey: getValidationMessage(LearningReasonValueKey), + }); diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_viewmodel.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_viewmodel.dart new file mode 100644 index 0000000..f9944c0 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/onboarding_viewmodel.dart @@ -0,0 +1,175 @@ +import 'package:stacked/stacked.dart'; +import 'package:stacked_services/stacked_services.dart'; +import '../../../app/app.locator.dart'; +import 'onboarding_view.form.dart'; + +class OnboardingViewModel extends FormViewModel { + final _navigationService = locator(); + + int _currentStep = 0; + + int get currentStep => _currentStep; + + // Full name + bool _focusFullName = false; + + bool get focusFullName => _focusFullName; + + // Educational background + final List _educationalBackgrounds = [ + 'No formal education', + 'Primary school', + 'Secondary /High school', + 'College / Diploma', + 'Bachelor’s and above' + ]; + + List get educationalBackgrounds => _educationalBackgrounds; + + String? _selectedEducationalBackground; + + String? get selectedEducationalBackground => _selectedEducationalBackground; + + // Age group + final List _ageGroups = [ + '8-14', + '15-18', + '19-26', + '26+', + ]; + + List get ageGroups => _ageGroups; + + String? _selectedAgeGroup; + + String? get selectedAgeGroup => _selectedAgeGroup; + + // Occupation + bool _focusOccupation = false; + + bool get focusOccupation => _focusOccupation; + + // Learning goal + String? _selectedLearningGoal; + + String? get selectedLearningGoal => _selectedLearningGoal; + + final List> _learningGoals = [ + { + 'icon': 0, + 'title': 'Learn to Speak English', + 'subtitle': 'I know some English, but i want to learn to speak it', + }, + { + 'icon': 1, + 'title': 'Practice Speaking English', + 'subtitle': 'I already speak English, but I want more practice.', + }, + { + 'icon': 2, + 'title': 'Skill-based Courses', + 'subtitle': 'I want courses for IELTS, TOEFL, Duolingo, or work.', + }, + ]; + + List> get learningGoals => _learningGoals; + + // Learning reason + bool _showTextBox = false; + + bool get showTextBox => _showTextBox; + + bool _focusLearningReason = false; + + bool get focusLearningReason => _focusLearningReason; + + String? _selectedLearningReason; + + String? get selectedLearningReason => _selectedLearningReason; + + final List _learningReasons = [ + 'Speak confidently at work or school', + 'Travel or handle daily situations', + 'Connect with family or friends', + 'General skills expansion', + 'Other' + ]; + + List get learningReasons => _learningReasons; + + // Full name + void setFullNameFocus() { + _focusFullName = true; + rebuildUi(); + } + + // Education background + void setSelectedEducationalBackground(String title) { + _selectedEducationalBackground = title; + rebuildUi(); + } + + bool isSelectedEducationalBackground(String title) => + _selectedEducationalBackground == title; + + // Age group + void setSelectedAgeGroup(String title) { + _selectedAgeGroup = title; + rebuildUi(); + } + + bool isSelectedAgeGroup(String title) => _selectedAgeGroup == title; + + // Occupation + void setOccupationFocus() { + _focusOccupation = true; + rebuildUi(); + } + + // Country + Future> getCountries() async => ['Ethiopia', 'Djibouti']; + + // Region + Future> getRegions(String country) async => + ['Addis Ababa', 'Oromia']; + + // Learning goal + void setSelectedLearningGoal(String title) { + _selectedLearningGoal = title; + rebuildUi(); + } + + bool isSelectedLearningGoal(String title) => _selectedLearningGoal == title; + + // Learning reason + void setLearningReasonFocus() { + _focusLearningReason = true; + rebuildUi(); + } + + void setSelectedLearningReason(String title) { + _selectedLearningReason = title; + if (title.toLowerCase() == 'other') { + _showTextBox = true; + } else { + if (_showTextBox) { + _showTextBox = false; + _focusLearningReason = false; + } + } + rebuildUi(); + } + + bool isSelectedLearningReason(String title) => + _selectedLearningReason == title; + + void next() { + _currentStep++; + rebuildUi(); + } + + void pop() { + _currentStep--; + rebuildUi(); + } +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_dropdown.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_dropdown.dart new file mode 100644 index 0000000..ec6edc2 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_dropdown.dart @@ -0,0 +1,127 @@ +import 'dart:async'; + +import 'package:dropdown_search/dropdown_search.dart'; +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; + +class CustomDropDownPicker extends StatelessWidget { + final Icon icon; + final String hint; + final String selectedItem; + final void Function(String?)? onChanged; + final FutureOr> Function(String value, LoadProps? props)? items; + + const CustomDropDownPicker( + {super.key, + required this.hint, + required this.icon, + required this.items, + required this.onChanged, + required this.selectedItem}); + + @override + Widget build(BuildContext context) => _buildDropDownSearchWrapper(); + + Widget _buildDropDownSearchWrapper() => Theme( + data: ThemeData().copyWith(cardColor: kcBackgroundColor), + child: _buildDropDownSearch(), + ); + + Widget _buildDropDownSearch() => DropdownSearch( + popupProps: _popupProps(), + selectedItem: selectedItem, + onChanged: (value) => onChanged!(value), + decoratorProps: _dropDownDecoratorProps(), + dropdownBuilder: (context, value) => _buildDropdownBuilder(value), + items: (value, properties) async => await items!(value, properties), + ); + + PopupProps _popupProps() => PopupProps.menu( + showSearchBox: true, + showSelectedItems: true, + searchFieldProps: _searchFieldProps(), + menuProps: const MenuProps(color: kcBackgroundColor), + itemBuilder: (context, value, isSelected, isPicked) => + _buildPopupProsBuilderWrapper(value), + ); + + TextFieldProps _searchFieldProps() => TextFieldProps( + maxLines: 1, + autofocus: true, + style: const TextStyle( + fontSize: 14, + color: kcLightGrey, + ), + padding: EdgeInsets.zero, + cursorColor: kcLightGrey, + decoration: _popUpDecoration(), + ); + + InputDecoration _popUpDecoration() => InputDecoration( + filled: true, + errorBorder: searchBorder, + prefix: _buildPrefixIcon(), + focusedBorder: searchBorder, + enabledBorder: searchBorder, + disabledBorder: searchBorder, + focusedErrorBorder: searchBorder, + hintStyle: const TextStyle( + fontSize: 14, + color: kcLightGrey, + ), + fillColor: kcPrimaryColor.withOpacity(0.2), + contentPadding: const EdgeInsets.symmetric(vertical: 10, horizontal: 0), + ); + + Widget _buildPopupProsBuilderWrapper(String value) => Padding( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), + child: _buildPopupProsBuilder(value), + ); + + Widget _buildPopupProsBuilder(String value) => Text( + value, + maxLines: 1, + style: const TextStyle(color: kcDarkGreyColor, fontSize: 14), + ); + + DropDownDecoratorProps _dropDownDecoratorProps() => DropDownDecoratorProps( + decoration: _dropDownDecoration(), + textAlignVertical: TextAlignVertical.center, + ); + + InputDecoration _dropDownDecoration() => InputDecoration( + filled: true, + hintText: hint, + hintMaxLines: 1, + errorBorder: border, + focusedBorder: border, + enabledBorder: border, + disabledBorder: border, + focusedErrorBorder: border, + hintStyle: const TextStyle( + fontSize: 14, + color: kcLightGrey, + ), + fillColor: kcPrimaryColor.withOpacity(0.2), + contentPadding: + const EdgeInsets.symmetric(vertical: 10, horizontal: 15), + ); + + Widget _buildPrefixIcon() => Container( + width: 30, + alignment: Alignment.center, + decoration: BoxDecoration(border: rightBorder), + margin: const EdgeInsets.only(right: 25, bottom: 7.5, left: 5), + child: icon, + ); + + Widget _buildDropdownBuilder(String? value) => Text( + value ?? hint, + maxLines: 1, + style: const TextStyle( + fontSize: 14, + color: kcDarkGreyColor, + ), + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_large_radio_button.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_large_radio_button.dart new file mode 100644 index 0000000..b7ca6cb --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_large_radio_button.dart @@ -0,0 +1,88 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; + +class CustomLargeRadioButton extends StatelessWidget { + final String title; + final bool selected; + final IconData icon; + final String subtitle; + final GestureTapCallback? onTap; + + const CustomLargeRadioButton( + {super.key, + this.onTap, + required this.title, + required this.icon, + required this.selected, + required this.subtitle}); + + @override + Widget build(BuildContext context) => _buildButtonWrapper(); + + Widget _buildButtonWrapper() => Container( + height: 125, + width: double.maxFinite, + margin: const EdgeInsets.only(bottom: 15), + child: _buildContainerWrapper(), + ); + + Widget _buildContainerWrapper() => GestureDetector( + onTap: onTap, + child: _buildContainer(), + ); + + Widget _buildContainer() => Container( + padding: const EdgeInsets.symmetric(horizontal: 15), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: selected ? kcPrimaryColor.withOpacity(0.2) : kcWhiteColor, + border: Border.all( + color: selected ? kcPrimaryColor : kcPrimaryColor.withOpacity(0.75), + ), + ), + child: _buildButtonColumnWrapper(), + ); + + Widget _buildButtonColumnWrapper() => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _buildButtonRowChildren(), + ); + + List _buildButtonRowChildren() => + [_buildIconSectionWrapper(), _buildTitle(), _buildSubTitle()]; + + Widget _buildIconSectionWrapper() => Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildIconSectionChildren(), + ); + + List _buildIconSectionChildren() => + [_buildLeadingIcon(), _buildSelectedCheckBox()]; + + Widget _buildLeadingIcon() => Icon( + icon, + color: kcPrimaryColor, + size: 25, + ); + + Widget _buildTitle() => Text( + title, + style: const TextStyle( + fontSize: 18, + color: kcDarkGreyColor, + fontWeight: FontWeight.w500, + ), + ); + + Widget _buildSubTitle() => Text( + subtitle, + style: const TextStyle( + color: kcMediumGrey, + ), + ); + + Widget _buildSelectedCheckBox() => Checkbox( + value: selected, + activeColor: kcPrimaryColor, + onChanged: (value) => onTap); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_small_radio_button.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_small_radio_button.dart new file mode 100644 index 0000000..aad8769 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/custom_small_radio_button.dart @@ -0,0 +1,56 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; + +class CustomSmallRadioButton extends StatelessWidget { + final String title; + final bool selected; + final GestureTapCallback? onTap; + + const CustomSmallRadioButton( + {super.key, required this.title, required this.selected, this.onTap}); + + @override + Widget build(BuildContext context) => _buildButtonWrapper(); + + Widget _buildButtonWrapper() => Container( + height: 50, + width: double.maxFinite, + margin: const EdgeInsets.only(bottom: 15), + child: _buildContainerWrapper(), + ); + + Widget _buildContainerWrapper() => GestureDetector( + onTap: onTap, + child: _buildContainer(), + ); + + Widget _buildContainer() => Container( + padding: const EdgeInsets.symmetric(horizontal: 15), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: selected ? kcPrimaryColor.withOpacity(0.2) : kcWhiteColor, + border: Border.all( + color: selected ? kcPrimaryColor : kcPrimaryColor.withOpacity(0.75), + ), + ), + child: _buildButtonRowWrapper(), + ); + + Widget _buildButtonRowWrapper() => Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: _buildButtonRowChildren(), + ); + + List _buildButtonRowChildren() => + [_buildText(), if (selected) _buildIcon()]; + + Widget _buildText() => Text( + title, + style: const TextStyle(color: kcDarkGreyColor), + ); + + Widget _buildIcon() => const Icon( + Icons.check_circle, + color: kcPrimaryColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/language_button.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/language_button.dart new file mode 100644 index 0000000..b8883d4 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/language_button.dart @@ -0,0 +1,25 @@ +import 'package:flutter/material.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; + +class LanguageButton extends StatelessWidget { + final String language; + const LanguageButton({super.key, required this.language}); + + @override + Widget build(BuildContext context) => _buildContainer(); + Widget _buildContainer() => Container( + width: 40, + height: 40, + alignment: Alignment.center, + decoration: BoxDecoration( + color: kcPrimaryColor, + borderRadius: BorderRadius.circular(10), + border: Border.all(color: kcWhiteColor)), + child: _buildLanguage(), + ); + + Widget _buildLanguage() => Text( + language, + style: const TextStyle(color: kcWhiteColor), + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/onboarding_app_bar.dart b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/onboarding_app_bar.dart new file mode 100644 index 0000000..85c0d7e --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/onboarding/widgets/onboarding_app_bar.dart @@ -0,0 +1,72 @@ +import 'package:flutter/material.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; +import 'package:yimaru_app/ui/views/onboarding/widgets/language_button.dart'; + +class OnboardingAppBar extends ViewModelWidget { + final bool showBackButton; + final bool showLanguageSelection; + + const OnboardingAppBar( + {super.key, + this.showBackButton = true, + this.showLanguageSelection = true}); + + @override + Widget build(BuildContext context, OnboardingViewModel viewModel) => + _buildAppBarWrapper(viewModel); + + Widget _buildAppBarWrapper(OnboardingViewModel viewModel) => Container( + height: 125, + width: double.maxFinite, + alignment: Alignment.bottomCenter, + decoration: const BoxDecoration( + color: kcPrimaryColor, + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(24), + bottomRight: Radius.circular(24), + ), + ), + padding: const EdgeInsets.only(bottom: 25, right: 15), + child: _buildAppBarItems(viewModel), + ); + + Widget _buildAppBarItems(OnboardingViewModel viewModel) => Stack( + children: _buildAppBarItemChildren(viewModel), + ); + + List _buildAppBarItemChildren(OnboardingViewModel viewModel) => [ + if (showBackButton) _buildBackButtonWrapper(viewModel), + _buildRightButton() + ]; + + Widget _buildBackButtonWrapper(OnboardingViewModel viewModel) => Align( + alignment: Alignment.bottomLeft, + child: _buildBackButton(viewModel), + ); + + Widget _buildBackButton(OnboardingViewModel viewModel) => BackButton( + onPressed: viewModel.pop, + style: const ButtonStyle( + foregroundColor: WidgetStatePropertyAll(kcWhiteColor)), + ); + + Widget _buildRightButton() => Align( + alignment: Alignment.bottomRight, + child: showLanguageSelection + ? _buildLanguageSelector() + : _buildCloseButton()); + + Widget _buildLanguageSelector() => const LanguageButton(language: 'EN'); + + Widget _buildCloseButton() => IconButton( + onPressed: () {}, + icon: _buildCloseIcon(), + ); + + Widget _buildCloseIcon() => const Icon( + Icons.close, + color: kcWhiteColor, + ); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/startup/startup_view.dart b/StudioProjects/yimaru_app/lib/ui/views/startup/startup_view.dart new file mode 100644 index 0000000..ea99e04 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/startup/startup_view.dart @@ -0,0 +1,53 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/ui/common/ui_helpers.dart'; + +import 'startup_viewmodel.dart'; + +class StartupView extends StackedView { + const StartupView({Key? key}) : super(key: key); + + @override + Widget builder( + BuildContext context, + StartupViewModel viewModel, + Widget? child, + ) { + return const Scaffold( + body: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'STACKED', + style: TextStyle(fontSize: 40, fontWeight: FontWeight.w900), + ), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text('Loading ...', style: TextStyle(fontSize: 16)), + horizontalSpaceSmall, + SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + color: Colors.black, + strokeWidth: 6, + ), + ), + ], + ), + ], + ), + ), + ); + } + + @override + StartupViewModel viewModelBuilder(BuildContext context) => StartupViewModel(); + + @override + void onViewModelReady(StartupViewModel viewModel) => SchedulerBinding.instance + .addPostFrameCallback((timeStamp) => viewModel.runStartupLogic()); +} diff --git a/StudioProjects/yimaru_app/lib/ui/views/startup/startup_viewmodel.dart b/StudioProjects/yimaru_app/lib/ui/views/startup/startup_viewmodel.dart new file mode 100644 index 0000000..eb738e0 --- /dev/null +++ b/StudioProjects/yimaru_app/lib/ui/views/startup/startup_viewmodel.dart @@ -0,0 +1,18 @@ +import 'package:stacked/stacked.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:yimaru_app/app/app.router.dart'; +import 'package:stacked_services/stacked_services.dart'; + +class StartupViewModel extends BaseViewModel { + final _navigationService = locator(); + + // Place anything here that needs to happen before we get into the application + Future runStartupLogic() async { + await Future.delayed(const Duration(seconds: 3)); + + // This is where you can make decisions on where your app should navigate when + // you have custom startup logic + + _navigationService.replaceWithOnboardingView(); + } +} diff --git a/StudioProjects/yimaru_app/linux/.gitignore b/StudioProjects/yimaru_app/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/StudioProjects/yimaru_app/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/StudioProjects/yimaru_app/linux/CMakeLists.txt b/StudioProjects/yimaru_app/linux/CMakeLists.txt new file mode 100644 index 0000000..c576a2f --- /dev/null +++ b/StudioProjects/yimaru_app/linux/CMakeLists.txt @@ -0,0 +1,128 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +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 "yimaru_app") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.yimaru_app") + +# 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) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# 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) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# 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/StudioProjects/yimaru_app/linux/flutter/CMakeLists.txt b/StudioProjects/yimaru_app/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/linux/flutter/generated_plugin_registrant.cc b/StudioProjects/yimaru_app/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/linux/flutter/generated_plugin_registrant.h b/StudioProjects/yimaru_app/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/linux/flutter/generated_plugins.cmake b/StudioProjects/yimaru_app/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/linux/runner/CMakeLists.txt b/StudioProjects/yimaru_app/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/StudioProjects/yimaru_app/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +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} + "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 preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/StudioProjects/yimaru_app/linux/runner/main.cc b/StudioProjects/yimaru_app/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/StudioProjects/yimaru_app/linux/runner/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/StudioProjects/yimaru_app/linux/runner/my_application.cc b/StudioProjects/yimaru_app/linux/runner/my_application.cc new file mode 100644 index 0000000..9b6f031 --- /dev/null +++ b/StudioProjects/yimaru_app/linux/runner/my_application.cc @@ -0,0 +1,148 @@ +#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) + +// Called when first Flutter frame received. +static void first_frame_cb(MyApplication* self, FlView* view) { + gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); +} + +// 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, "yimaru_app"); + 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, "yimaru_app"); + } + + gtk_window_set_default_size(window, 1280, 720); + + 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); + GdkRGBA background_color; + // Background defaults to black, override it here if necessary, e.g. #00000000 + // for transparent. + gdk_rgba_parse(&background_color, "#000000"); + fl_view_set_background_color(view, &background_color); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + // Show the window when Flutter renders. + // Requires the view to be realized so we can start rendering. + g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), + self); + gtk_widget_realize(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 GApplication::startup. +static void my_application_startup(GApplication* application) { + // MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + // MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// 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_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, "flags", + G_APPLICATION_NON_UNIQUE, nullptr)); +} diff --git a/StudioProjects/yimaru_app/linux/runner/my_application.h b/StudioProjects/yimaru_app/linux/runner/my_application.h new file mode 100644 index 0000000..db16367 --- /dev/null +++ b/StudioProjects/yimaru_app/linux/runner/my_application.h @@ -0,0 +1,21 @@ +#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/StudioProjects/yimaru_app/macos/.gitignore b/StudioProjects/yimaru_app/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/StudioProjects/yimaru_app/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/StudioProjects/yimaru_app/macos/Flutter/Flutter-Debug.xcconfig b/StudioProjects/yimaru_app/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/StudioProjects/yimaru_app/macos/Flutter/Flutter-Release.xcconfig b/StudioProjects/yimaru_app/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/StudioProjects/yimaru_app/macos/Flutter/GeneratedPluginRegistrant.swift b/StudioProjects/yimaru_app/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..cccf817 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.pbxproj b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..827ddde --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* yimaru_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "yimaru_app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* yimaru_app.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* yimaru_app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/yimaru_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/yimaru_app"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/yimaru_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/yimaru_app"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/yimaru_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/yimaru_app"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + 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; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + 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; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/StudioProjects/yimaru_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..61eadad --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/macos/Runner.xcworkspace/contents.xcworkspacedata b/StudioProjects/yimaru_app/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/StudioProjects/yimaru_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/StudioProjects/yimaru_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/StudioProjects/yimaru_app/macos/Runner/AppDelegate.swift b/StudioProjects/yimaru_app/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/StudioProjects/yimaru_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/StudioProjects/yimaru_app/macos/Runner/Base.lproj/MainMenu.xib b/StudioProjects/yimaru_app/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StudioProjects/yimaru_app/macos/Runner/Configs/AppInfo.xcconfig b/StudioProjects/yimaru_app/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..ba0faf2 --- /dev/null +++ b/StudioProjects/yimaru_app/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 = yimaru_app + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.yimaruApp + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved. diff --git a/StudioProjects/yimaru_app/macos/Runner/Configs/Debug.xcconfig b/StudioProjects/yimaru_app/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/StudioProjects/yimaru_app/macos/Runner/Configs/Release.xcconfig b/StudioProjects/yimaru_app/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/StudioProjects/yimaru_app/macos/Runner/Configs/Warnings.xcconfig b/StudioProjects/yimaru_app/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/macos/Runner/DebugProfile.entitlements b/StudioProjects/yimaru_app/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/macos/Runner/Info.plist b/StudioProjects/yimaru_app/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/macos/Runner/MainFlutterWindow.swift b/StudioProjects/yimaru_app/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/StudioProjects/yimaru_app/macos/Runner/Release.entitlements b/StudioProjects/yimaru_app/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/StudioProjects/yimaru_app/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/StudioProjects/yimaru_app/macos/RunnerTests/RunnerTests.swift b/StudioProjects/yimaru_app/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/StudioProjects/yimaru_app/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/StudioProjects/yimaru_app/pubspec.lock b/StudioProjects/yimaru_app/pubspec.lock new file mode 100644 index 0000000..0ea6f34 --- /dev/null +++ b/StudioProjects/yimaru_app/pubspec.lock @@ -0,0 +1,685 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + url: "https://pub.dev" + source: hosted + version: "67.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + url: "https://pub.dev" + source: hosted + version: "6.4.1" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 + url: "https://pub.dev" + source: hosted + version: "4.1.1" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" + source: hosted + version: "2.4.13" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + url: "https://pub.dev" + source: hosted + version: "7.3.2" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139" + url: "https://pub.dev" + source: hosted + version: "8.12.1" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" + url: "https://pub.dev" + source: hosted + version: "2.0.4" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243" + url: "https://pub.dev" + source: hosted + version: "4.11.0" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: transitive + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + url: "https://pub.dev" + source: hosted + version: "2.3.6" + dropdown_search: + dependency: "direct main" + description: + name: dropdown_search + sha256: c29b3e5147a82a06a4a08b3b574c51cb48cc17ad89893d53ee72a6f86643622e + url: "https://pub.dev" + source: hosted + version: "6.0.2" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + url: "https://pub.dev" + source: hosted + version: "2.0.3" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + freezed_annotation: + dependency: transitive + description: + name: freezed_annotation + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 + url: "https://pub.dev" + source: hosted + version: "2.4.4" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + get: + dependency: transitive + description: + name: get + sha256: "5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a" + url: "https://pub.dev" + source: hosted + version: "4.7.3" + get_it: + dependency: transitive + description: + name: get_it + sha256: ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9 + url: "https://pub.dev" + source: hosted + version: "8.3.0" + glob: + dependency: transitive + description: + name: glob + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + url: "https://pub.dev" + source: hosted + version: "2.1.3" + golden_toolkit: + dependency: "direct dev" + description: + name: golden_toolkit + sha256: "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0" + url: "https://pub.dev" + source: hosted + version: "0.15.0" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + url: "https://pub.dev" + source: hosted + version: "3.2.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + iconsax: + dependency: "direct main" + description: + name: iconsax + sha256: fb0144c61f41f3f8a385fadc27783ea9f5359670be885ed7f35cef32565d5228 + url: "https://pub.dev" + source: hosted + version: "0.0.8" + io: + dependency: transitive + description: + name: io + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://pub.dev" + source: hosted + version: "1.0.5" + js: + dependency: transitive + description: + name: js + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" + url: "https://pub.dev" + source: hosted + version: "0.7.2" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + logger: + dependency: transitive + description: + name: logger + sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + url: "https://pub.dev" + source: hosted + version: "1.17.0" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + mockito: + dependency: "direct dev" + description: + name: mockito + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" + url: "https://pub.dev" + source: hosted + version: "5.4.4" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc + url: "https://pub.dev" + source: hosted + version: "2.2.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + pool: + dependency: transitive + description: + name: pool + sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" + url: "https://pub.dev" + source: hosted + version: "1.5.2" + provider: + dependency: transitive + description: + name: provider + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" + source: hosted + version: "6.1.5+1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + recase: + dependency: transitive + description: + name: recase + sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213 + url: "https://pub.dev" + source: hosted + version: "4.1.0" + shelf: + dependency: transitive + description: + name: shelf + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + url: "https://pub.dev" + source: hosted + version: "1.4.2" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stacked: + dependency: "direct main" + description: + name: stacked + sha256: "5f4a6ba6cfa43c5854690de0f946eef1694250cf46ecf7859519d90bf764b1e4" + url: "https://pub.dev" + source: hosted + version: "3.5.0" + stacked_generator: + dependency: "direct dev" + description: + name: stacked_generator + sha256: eaa6447e3fd4d4010b746629b5518364d7fa7f6453ffb6416ad449fd352d1181 + url: "https://pub.dev" + source: hosted + version: "1.6.1" + stacked_services: + dependency: "direct main" + description: + name: stacked_services + sha256: a70c5c86f89a9258139ff174bf045a527099ea8552f8497ebb0b755469841bb4 + url: "https://pub.dev" + source: hosted + version: "1.6.0" + stacked_shared: + dependency: "direct main" + description: + name: stacked_shared + sha256: "3d69b34d87422b78a7e5123681d3f4bcdd79757170454933f68795c54812d003" + url: "https://pub.dev" + source: hosted + version: "1.4.2" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 + url: "https://pub.dev" + source: hosted + version: "2.1.1" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + url: "https://pub.dev" + source: hosted + version: "0.7.7" + timing: + dependency: transitive + description: + name: timing + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + universal_io: + dependency: transitive + description: + name: universal_io + sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + url: "https://pub.dev" + source: hosted + version: "2.2.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" + url: "https://pub.dev" + source: hosted + version: "15.0.2" + watcher: + dependency: transitive + description: + name: watcher + sha256: f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249 + url: "https://pub.dev" + source: hosted + version: "1.2.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 + url: "https://pub.dev" + source: hosted + version: "3.0.3" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" + source: hosted + version: "3.1.3" +sdks: + dart: ">=3.8.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/StudioProjects/yimaru_app/pubspec.yaml b/StudioProjects/yimaru_app/pubspec.yaml new file mode 100644 index 0000000..e3538ef --- /dev/null +++ b/StudioProjects/yimaru_app/pubspec.yaml @@ -0,0 +1,30 @@ +name: yimaru_app +description: A new Flutter project. +publish_to: 'none' +version: 0.1.0 + +environment: + sdk: '>=3.0.3 <4.0.0' + +dependencies: + flutter: + sdk: flutter + stacked: ^3.4.0 + iconsax: ^0.0.8 + dropdown_search: ^6.0.2 + stacked_services: ^1.1.0 + + stacked_shared: any +dev_dependencies: + flutter_test: + sdk: flutter + mockito: ^5.4.1 + build_runner: ^2.4.5 + flutter_lints: ^2.0.0 + golden_toolkit: ^0.15.0 + stacked_generator: ^1.3.3 + + +flutter: + uses-material-design: true + diff --git a/StudioProjects/yimaru_app/stacked.json b/StudioProjects/yimaru_app/stacked.json new file mode 100644 index 0000000..16fa6db --- /dev/null +++ b/StudioProjects/yimaru_app/stacked.json @@ -0,0 +1,17 @@ +{ + "bottom_sheets_path": "ui/bottom_sheets", + "dialogs_path": "ui/dialogs", + "line_length": 80, + "locator_name": "locator", + "prefer_web": false, + "register_mocks_function": "registerServices", + "services_path": "services", + "stacked_app_file_path": "app/app.dart", + "test_helpers_file_path": "helpers/test_helpers.dart", + "test_services_path": "services", + "test_views_path": "viewmodels", + "test_widgets_path": "widget_models", + "v1": false, + "views_path": "ui/views", + "widgets_path": "ui/widgets/common" +} diff --git a/StudioProjects/yimaru_app/test/golden/home_view_golden_test.dart b/StudioProjects/yimaru_app/test/golden/home_view_golden_test.dart new file mode 100644 index 0000000..38879a4 --- /dev/null +++ b/StudioProjects/yimaru_app/test/golden/home_view_golden_test.dart @@ -0,0 +1,27 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:golden_toolkit/golden_toolkit.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:yimaru_app/ui/views/home/home_view.dart'; + +void main() { + setUpAll(() => setupLocator()); + tearDownAll(() => locator.reset()); + + testGoldens('HomeView - default state', (tester) async { + await loadAppFonts(); + + // Set device pixel ratio and size + await tester.binding.setSurfaceSize(const Size(393, 852)); + tester.binding.window.devicePixelRatioTestValue = 1.0; + + await tester.pumpWidget( + const MediaQuery( + data: MediaQueryData(size: Size(393, 852), devicePixelRatio: 1.0), + child: MaterialApp(debugShowCheckedModeBanner: false, home: HomeView()), + ), + ); + + await screenMatchesGolden(tester, 'home_view_default'); + }); +} diff --git a/StudioProjects/yimaru_app/test/helpers/test_helpers.dart b/StudioProjects/yimaru_app/test/helpers/test_helpers.dart new file mode 100644 index 0000000..df3b057 --- /dev/null +++ b/StudioProjects/yimaru_app/test/helpers/test_helpers.dart @@ -0,0 +1,85 @@ +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:stacked_services/stacked_services.dart'; +// @stacked-import + +import 'test_helpers.mocks.dart'; + +@GenerateMocks( + [], + customMocks: [ + MockSpec(onMissingStub: OnMissingStub.returnDefault), + MockSpec(onMissingStub: OnMissingStub.returnDefault), + MockSpec(onMissingStub: OnMissingStub.returnDefault), + // @stacked-mock-spec + ], +) +void registerServices() { + getAndRegisterNavigationService(); + getAndRegisterBottomSheetService(); + getAndRegisterDialogService(); + // @stacked-mock-register +} + +MockNavigationService getAndRegisterNavigationService() { + _removeRegistrationIfExists(); + final service = MockNavigationService(); + locator.registerSingleton(service); + return service; +} + +MockBottomSheetService getAndRegisterBottomSheetService({ + SheetResponse? showCustomSheetResponse, +}) { + _removeRegistrationIfExists(); + final service = MockBottomSheetService(); + + when( + service.showCustomSheet( + enableDrag: anyNamed('enableDrag'), + enterBottomSheetDuration: anyNamed('enterBottomSheetDuration'), + exitBottomSheetDuration: anyNamed('exitBottomSheetDuration'), + ignoreSafeArea: anyNamed('ignoreSafeArea'), + isScrollControlled: anyNamed('isScrollControlled'), + barrierDismissible: anyNamed('barrierDismissible'), + additionalButtonTitle: anyNamed('additionalButtonTitle'), + variant: anyNamed('variant'), + title: anyNamed('title'), + hasImage: anyNamed('hasImage'), + imageUrl: anyNamed('imageUrl'), + showIconInMainButton: anyNamed('showIconInMainButton'), + mainButtonTitle: anyNamed('mainButtonTitle'), + showIconInSecondaryButton: anyNamed('showIconInSecondaryButton'), + secondaryButtonTitle: anyNamed('secondaryButtonTitle'), + showIconInAdditionalButton: anyNamed('showIconInAdditionalButton'), + takesInput: anyNamed('takesInput'), + barrierColor: anyNamed('barrierColor'), + barrierLabel: anyNamed('barrierLabel'), + customData: anyNamed('customData'), + data: anyNamed('data'), + description: anyNamed('description'), + ), + ).thenAnswer( + (realInvocation) => + Future.value(showCustomSheetResponse ?? SheetResponse()), + ); + + locator.registerSingleton(service); + return service; +} + +MockDialogService getAndRegisterDialogService() { + _removeRegistrationIfExists(); + final service = MockDialogService(); + locator.registerSingleton(service); + return service; +} + +// @stacked-mock-create + +void _removeRegistrationIfExists() { + if (locator.isRegistered()) { + locator.unregister(); + } +} diff --git a/StudioProjects/yimaru_app/test/helpers/test_helpers.mocks.dart b/StudioProjects/yimaru_app/test/helpers/test_helpers.mocks.dart new file mode 100644 index 0000000..651298f --- /dev/null +++ b/StudioProjects/yimaru_app/test/helpers/test_helpers.mocks.dart @@ -0,0 +1,684 @@ +// Mocks generated by Mockito 5.4.4 from annotations +// in yimaru_app/test/helpers/test_helpers.dart. +// Do not manually edit this file. + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'dart:async' as _i5; +import 'dart:ui' as _i6; + +import 'package:flutter/material.dart' as _i4; +import 'package:mockito/mockito.dart' as _i1; +import 'package:mockito/src/dummies.dart' as _i3; +import 'package:stacked_services/stacked_services.dart' as _i2; + +// ignore_for_file: type=lint +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters +// ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis +// ignore_for_file: camel_case_types +// ignore_for_file: subtype_of_sealed_class + +/// A class which mocks [NavigationService]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockNavigationService extends _i1.Mock implements _i2.NavigationService { + @override + String get previousRoute => (super.noSuchMethod( + Invocation.getter(#previousRoute), + returnValue: _i3.dummyValue( + this, + Invocation.getter(#previousRoute), + ), + returnValueForMissingStub: _i3.dummyValue( + this, + Invocation.getter(#previousRoute), + ), + ) as String); + + @override + String get currentRoute => (super.noSuchMethod( + Invocation.getter(#currentRoute), + returnValue: _i3.dummyValue( + this, + Invocation.getter(#currentRoute), + ), + returnValueForMissingStub: _i3.dummyValue( + this, + Invocation.getter(#currentRoute), + ), + ) as String); + + @override + _i4.GlobalKey<_i4.NavigatorState>? nestedNavigationKey(int? index) => + (super.noSuchMethod( + Invocation.method( + #nestedNavigationKey, + [index], + ), + returnValueForMissingStub: null, + ) as _i4.GlobalKey<_i4.NavigatorState>?); + + @override + void config({ + bool? enableLog, + bool? defaultPopGesture, + bool? defaultOpaqueRoute, + Duration? defaultDurationTransition, + bool? defaultGlobalState, + _i2.Transition? defaultTransitionStyle, + String? defaultTransition, + }) => + super.noSuchMethod( + Invocation.method( + #config, + [], + { + #enableLog: enableLog, + #defaultPopGesture: defaultPopGesture, + #defaultOpaqueRoute: defaultOpaqueRoute, + #defaultDurationTransition: defaultDurationTransition, + #defaultGlobalState: defaultGlobalState, + #defaultTransitionStyle: defaultTransitionStyle, + #defaultTransition: defaultTransition, + }, + ), + returnValueForMissingStub: null, + ); + + @override + _i5.Future? navigateWithTransition( + _i4.Widget? page, { + bool? opaque, + String? transition = r'', + Duration? duration, + bool? popGesture, + int? id, + _i4.Curve? curve, + bool? fullscreenDialog = false, + bool? preventDuplicates = true, + _i2.Transition? transitionClass, + _i2.Transition? transitionStyle, + String? routeName, + }) => + (super.noSuchMethod( + Invocation.method( + #navigateWithTransition, + [page], + { + #opaque: opaque, + #transition: transition, + #duration: duration, + #popGesture: popGesture, + #id: id, + #curve: curve, + #fullscreenDialog: fullscreenDialog, + #preventDuplicates: preventDuplicates, + #transitionClass: transitionClass, + #transitionStyle: transitionStyle, + #routeName: routeName, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? replaceWithTransition( + _i4.Widget? page, { + bool? opaque, + String? transition = r'', + Duration? duration, + bool? popGesture, + int? id, + _i4.Curve? curve, + bool? fullscreenDialog = false, + bool? preventDuplicates = true, + _i2.Transition? transitionClass, + _i2.Transition? transitionStyle, + String? routeName, + }) => + (super.noSuchMethod( + Invocation.method( + #replaceWithTransition, + [page], + { + #opaque: opaque, + #transition: transition, + #duration: duration, + #popGesture: popGesture, + #id: id, + #curve: curve, + #fullscreenDialog: fullscreenDialog, + #preventDuplicates: preventDuplicates, + #transitionClass: transitionClass, + #transitionStyle: transitionStyle, + #routeName: routeName, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + bool back({ + dynamic result, + int? id, + }) => + (super.noSuchMethod( + Invocation.method( + #back, + [], + { + #result: result, + #id: id, + }, + ), + returnValue: false, + returnValueForMissingStub: false, + ) as bool); + + @override + void popUntil( + _i4.RoutePredicate? predicate, { + int? id, + }) => + super.noSuchMethod( + Invocation.method( + #popUntil, + [predicate], + {#id: id}, + ), + returnValueForMissingStub: null, + ); + + @override + void popRepeated(int? popTimes) => super.noSuchMethod( + Invocation.method( + #popRepeated, + [popTimes], + ), + returnValueForMissingStub: null, + ); + + @override + _i5.Future? navigateTo( + String? routeName, { + dynamic arguments, + int? id, + bool? preventDuplicates = true, + Map? parameters, + _i4.RouteTransitionsBuilder? transition, + }) => + (super.noSuchMethod( + Invocation.method( + #navigateTo, + [routeName], + { + #arguments: arguments, + #id: id, + #preventDuplicates: preventDuplicates, + #parameters: parameters, + #transition: transition, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? navigateToView( + _i4.Widget? view, { + dynamic arguments, + int? id, + bool? opaque, + _i4.Curve? curve, + Duration? duration, + bool? fullscreenDialog = false, + bool? popGesture, + bool? preventDuplicates = true, + _i2.Transition? transition, + _i2.Transition? transitionStyle, + }) => + (super.noSuchMethod( + Invocation.method( + #navigateToView, + [view], + { + #arguments: arguments, + #id: id, + #opaque: opaque, + #curve: curve, + #duration: duration, + #fullscreenDialog: fullscreenDialog, + #popGesture: popGesture, + #preventDuplicates: preventDuplicates, + #transition: transition, + #transitionStyle: transitionStyle, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? replaceWith( + String? routeName, { + dynamic arguments, + int? id, + bool? preventDuplicates = true, + Map? parameters, + _i4.RouteTransitionsBuilder? transition, + }) => + (super.noSuchMethod( + Invocation.method( + #replaceWith, + [routeName], + { + #arguments: arguments, + #id: id, + #preventDuplicates: preventDuplicates, + #parameters: parameters, + #transition: transition, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? clearStackAndShow( + String? routeName, { + dynamic arguments, + int? id, + Map? parameters, + }) => + (super.noSuchMethod( + Invocation.method( + #clearStackAndShow, + [routeName], + { + #arguments: arguments, + #id: id, + #parameters: parameters, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? clearStackAndShowView( + _i4.Widget? view, { + dynamic arguments, + int? id, + }) => + (super.noSuchMethod( + Invocation.method( + #clearStackAndShowView, + [view], + { + #arguments: arguments, + #id: id, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? clearTillFirstAndShow( + String? routeName, { + dynamic arguments, + int? id, + bool? preventDuplicates = true, + Map? parameters, + }) => + (super.noSuchMethod( + Invocation.method( + #clearTillFirstAndShow, + [routeName], + { + #arguments: arguments, + #id: id, + #preventDuplicates: preventDuplicates, + #parameters: parameters, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? clearTillFirstAndShowView( + _i4.Widget? view, { + dynamic arguments, + int? id, + }) => + (super.noSuchMethod( + Invocation.method( + #clearTillFirstAndShowView, + [view], + { + #arguments: arguments, + #id: id, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); + + @override + _i5.Future? pushNamedAndRemoveUntil( + String? routeName, { + _i4.RoutePredicate? predicate, + dynamic arguments, + int? id, + }) => + (super.noSuchMethod( + Invocation.method( + #pushNamedAndRemoveUntil, + [routeName], + { + #predicate: predicate, + #arguments: arguments, + #id: id, + }, + ), + returnValueForMissingStub: null, + ) as _i5.Future?); +} + +/// A class which mocks [BottomSheetService]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockBottomSheetService extends _i1.Mock + implements _i2.BottomSheetService { + @override + void setCustomSheetBuilders(Map? builders) => + super.noSuchMethod( + Invocation.method( + #setCustomSheetBuilders, + [builders], + ), + returnValueForMissingStub: null, + ); + + @override + _i5.Future<_i2.SheetResponse?> showBottomSheet({ + required String? title, + String? description, + String? confirmButtonTitle = r'Ok', + String? cancelButtonTitle, + bool? enableDrag = true, + bool? barrierDismissible = true, + bool? isScrollControlled = false, + Duration? exitBottomSheetDuration, + Duration? enterBottomSheetDuration, + bool? ignoreSafeArea, + bool? useRootNavigator = false, + double? elevation = 1.0, + }) => + (super.noSuchMethod( + Invocation.method( + #showBottomSheet, + [], + { + #title: title, + #description: description, + #confirmButtonTitle: confirmButtonTitle, + #cancelButtonTitle: cancelButtonTitle, + #enableDrag: enableDrag, + #barrierDismissible: barrierDismissible, + #isScrollControlled: isScrollControlled, + #exitBottomSheetDuration: exitBottomSheetDuration, + #enterBottomSheetDuration: enterBottomSheetDuration, + #ignoreSafeArea: ignoreSafeArea, + #useRootNavigator: useRootNavigator, + #elevation: elevation, + }, + ), + returnValue: _i5.Future<_i2.SheetResponse?>.value(), + returnValueForMissingStub: + _i5.Future<_i2.SheetResponse?>.value(), + ) as _i5.Future<_i2.SheetResponse?>); + + @override + _i5.Future<_i2.SheetResponse?> showCustomSheet({ + dynamic variant, + String? title, + String? description, + bool? hasImage = false, + String? imageUrl, + bool? showIconInMainButton = false, + String? mainButtonTitle, + bool? showIconInSecondaryButton = false, + String? secondaryButtonTitle, + bool? showIconInAdditionalButton = false, + String? additionalButtonTitle, + bool? takesInput = false, + _i6.Color? barrierColor = const _i6.Color(2315255808), + double? elevation = 1.0, + bool? barrierDismissible = true, + bool? isScrollControlled = false, + String? barrierLabel = r'', + dynamic customData, + R? data, + bool? enableDrag = true, + Duration? exitBottomSheetDuration, + Duration? enterBottomSheetDuration, + bool? ignoreSafeArea, + bool? useRootNavigator = false, + }) => + (super.noSuchMethod( + Invocation.method( + #showCustomSheet, + [], + { + #variant: variant, + #title: title, + #description: description, + #hasImage: hasImage, + #imageUrl: imageUrl, + #showIconInMainButton: showIconInMainButton, + #mainButtonTitle: mainButtonTitle, + #showIconInSecondaryButton: showIconInSecondaryButton, + #secondaryButtonTitle: secondaryButtonTitle, + #showIconInAdditionalButton: showIconInAdditionalButton, + #additionalButtonTitle: additionalButtonTitle, + #takesInput: takesInput, + #barrierColor: barrierColor, + #elevation: elevation, + #barrierDismissible: barrierDismissible, + #isScrollControlled: isScrollControlled, + #barrierLabel: barrierLabel, + #customData: customData, + #data: data, + #enableDrag: enableDrag, + #exitBottomSheetDuration: exitBottomSheetDuration, + #enterBottomSheetDuration: enterBottomSheetDuration, + #ignoreSafeArea: ignoreSafeArea, + #useRootNavigator: useRootNavigator, + }, + ), + returnValue: _i5.Future<_i2.SheetResponse?>.value(), + returnValueForMissingStub: _i5.Future<_i2.SheetResponse?>.value(), + ) as _i5.Future<_i2.SheetResponse?>); + + @override + void completeSheet(_i2.SheetResponse? response) => + super.noSuchMethod( + Invocation.method( + #completeSheet, + [response], + ), + returnValueForMissingStub: null, + ); +} + +/// A class which mocks [DialogService]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockDialogService extends _i1.Mock implements _i2.DialogService { + @override + void registerCustomDialogBuilders( + Map? builders) => + super.noSuchMethod( + Invocation.method( + #registerCustomDialogBuilders, + [builders], + ), + returnValueForMissingStub: null, + ); + + @override + void registerCustomDialogBuilder({ + required dynamic variant, + required _i4.Widget Function( + _i4.BuildContext, + _i2.DialogRequest, + dynamic Function(_i2.DialogResponse), + )? builder, + }) => + super.noSuchMethod( + Invocation.method( + #registerCustomDialogBuilder, + [], + { + #variant: variant, + #builder: builder, + }, + ), + returnValueForMissingStub: null, + ); + + @override + _i5.Future<_i2.DialogResponse?> showDialog({ + String? title, + String? description, + String? cancelTitle, + _i6.Color? cancelTitleColor, + String? buttonTitle = r'Ok', + _i6.Color? buttonTitleColor, + bool? barrierDismissible = false, + _i4.RouteSettings? routeSettings, + _i4.GlobalKey<_i4.NavigatorState>? navigatorKey, + _i2.DialogPlatform? dialogPlatform, + }) => + (super.noSuchMethod( + Invocation.method( + #showDialog, + [], + { + #title: title, + #description: description, + #cancelTitle: cancelTitle, + #cancelTitleColor: cancelTitleColor, + #buttonTitle: buttonTitle, + #buttonTitleColor: buttonTitleColor, + #barrierDismissible: barrierDismissible, + #routeSettings: routeSettings, + #navigatorKey: navigatorKey, + #dialogPlatform: dialogPlatform, + }, + ), + returnValue: _i5.Future<_i2.DialogResponse?>.value(), + returnValueForMissingStub: + _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + + @override + _i5.Future<_i2.DialogResponse?> showCustomDialog({ + dynamic variant, + String? title, + String? description, + bool? hasImage = false, + String? imageUrl, + bool? showIconInMainButton = false, + String? mainButtonTitle, + bool? showIconInSecondaryButton = false, + String? secondaryButtonTitle, + bool? showIconInAdditionalButton = false, + String? additionalButtonTitle, + bool? takesInput = false, + _i6.Color? barrierColor = const _i6.Color(2315255808), + bool? barrierDismissible = false, + String? barrierLabel = r'', + bool? useSafeArea = true, + _i4.RouteSettings? routeSettings, + _i4.GlobalKey<_i4.NavigatorState>? navigatorKey, + _i4.RouteTransitionsBuilder? transitionBuilder, + dynamic customData, + R? data, + }) => + (super.noSuchMethod( + Invocation.method( + #showCustomDialog, + [], + { + #variant: variant, + #title: title, + #description: description, + #hasImage: hasImage, + #imageUrl: imageUrl, + #showIconInMainButton: showIconInMainButton, + #mainButtonTitle: mainButtonTitle, + #showIconInSecondaryButton: showIconInSecondaryButton, + #secondaryButtonTitle: secondaryButtonTitle, + #showIconInAdditionalButton: showIconInAdditionalButton, + #additionalButtonTitle: additionalButtonTitle, + #takesInput: takesInput, + #barrierColor: barrierColor, + #barrierDismissible: barrierDismissible, + #barrierLabel: barrierLabel, + #useSafeArea: useSafeArea, + #routeSettings: routeSettings, + #navigatorKey: navigatorKey, + #transitionBuilder: transitionBuilder, + #customData: customData, + #data: data, + }, + ), + returnValue: _i5.Future<_i2.DialogResponse?>.value(), + returnValueForMissingStub: _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + + @override + _i5.Future<_i2.DialogResponse?> showConfirmationDialog({ + String? title, + String? description, + String? cancelTitle = r'Cancel', + _i6.Color? cancelTitleColor, + String? confirmationTitle = r'Ok', + _i6.Color? confirmationTitleColor, + bool? barrierDismissible = false, + _i4.RouteSettings? routeSettings, + _i2.DialogPlatform? dialogPlatform, + }) => + (super.noSuchMethod( + Invocation.method( + #showConfirmationDialog, + [], + { + #title: title, + #description: description, + #cancelTitle: cancelTitle, + #cancelTitleColor: cancelTitleColor, + #confirmationTitle: confirmationTitle, + #confirmationTitleColor: confirmationTitleColor, + #barrierDismissible: barrierDismissible, + #routeSettings: routeSettings, + #dialogPlatform: dialogPlatform, + }, + ), + returnValue: _i5.Future<_i2.DialogResponse?>.value(), + returnValueForMissingStub: + _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + + @override + void completeDialog(_i2.DialogResponse? response) => + super.noSuchMethod( + Invocation.method( + #completeDialog, + [response], + ), + returnValueForMissingStub: null, + ); +} diff --git a/StudioProjects/yimaru_app/test/viewmodels/full_name_view_viewmodel_test.dart b/StudioProjects/yimaru_app/test/viewmodels/full_name_view_viewmodel_test.dart new file mode 100644 index 0000000..c33d474 --- /dev/null +++ b/StudioProjects/yimaru_app/test/viewmodels/full_name_view_viewmodel_test.dart @@ -0,0 +1,11 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:yimaru_app/app/app.locator.dart'; + +import '../helpers/test_helpers.dart'; + +void main() { + group('FullNameViewViewModel Tests -', () { + setUp(() => registerServices()); + tearDown(() => locator.reset()); + }); +} diff --git a/StudioProjects/yimaru_app/test/viewmodels/home_viewmodel_test.dart b/StudioProjects/yimaru_app/test/viewmodels/home_viewmodel_test.dart new file mode 100644 index 0000000..5405153 --- /dev/null +++ b/StudioProjects/yimaru_app/test/viewmodels/home_viewmodel_test.dart @@ -0,0 +1,44 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/mockito.dart'; +import 'package:yimaru_app/app/app.bottomsheets.dart'; +import 'package:yimaru_app/app/app.locator.dart'; +import 'package:yimaru_app/ui/common/app_strings.dart'; +import 'package:yimaru_app/ui/views/home/home_viewmodel.dart'; + +import '../helpers/test_helpers.dart'; + +void main() { + HomeViewModel getModel() => HomeViewModel(); + + group('HomeViewmodelTest -', () { + setUp(() => registerServices()); + tearDown(() => locator.reset()); + + group('incrementCounter -', () { + test('When called once should return Counter is: 1', () { + final model = getModel(); + model.incrementCounter(); + expect(model.counterLabel, 'Counter is: 1'); + }); + }); + + group('showBottomSheet -', () { + test( + 'When called, should show custom bottom sheet using notice variant', + () { + final bottomSheetService = getAndRegisterBottomSheetService(); + + final model = getModel(); + model.showBottomSheet(); + verify( + bottomSheetService.showCustomSheet( + variant: BottomSheetType.notice, + title: ksHomeBottomSheetTitle, + description: ksHomeBottomSheetDescription, + ), + ); + }, + ); + }); + }); +} diff --git a/StudioProjects/yimaru_app/test/viewmodels/info_alert_dialog_model_test.dart b/StudioProjects/yimaru_app/test/viewmodels/info_alert_dialog_model_test.dart new file mode 100644 index 0000000..98d1d0f --- /dev/null +++ b/StudioProjects/yimaru_app/test/viewmodels/info_alert_dialog_model_test.dart @@ -0,0 +1,11 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:yimaru_app/app/app.locator.dart'; + +import '../helpers/test_helpers.dart'; + +void main() { + group('InfoAlertDialogModel Tests -', () { + setUp(() => registerServices()); + tearDown(() => locator.reset()); + }); +} diff --git a/StudioProjects/yimaru_app/test/viewmodels/notice_sheet_model_test.dart b/StudioProjects/yimaru_app/test/viewmodels/notice_sheet_model_test.dart new file mode 100644 index 0000000..98d1d0f --- /dev/null +++ b/StudioProjects/yimaru_app/test/viewmodels/notice_sheet_model_test.dart @@ -0,0 +1,11 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:yimaru_app/app/app.locator.dart'; + +import '../helpers/test_helpers.dart'; + +void main() { + group('InfoAlertDialogModel Tests -', () { + setUp(() => registerServices()); + tearDown(() => locator.reset()); + }); +} diff --git a/StudioProjects/yimaru_app/test/viewmodels/onboarding_viewmodel_test.dart b/StudioProjects/yimaru_app/test/viewmodels/onboarding_viewmodel_test.dart new file mode 100644 index 0000000..4282556 --- /dev/null +++ b/StudioProjects/yimaru_app/test/viewmodels/onboarding_viewmodel_test.dart @@ -0,0 +1,11 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:yimaru_app/app/app.locator.dart'; + +import '../helpers/test_helpers.dart'; + +void main() { + group('OnboardingViewModel Tests -', () { + setUp(() => registerServices()); + tearDown(() => locator.reset()); + }); +} diff --git a/StudioProjects/yimaru_app/web/favicon.png b/StudioProjects/yimaru_app/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/StudioProjects/yimaru_app/web/favicon.png differ diff --git a/StudioProjects/yimaru_app/web/icons/Icon-192.png b/StudioProjects/yimaru_app/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/StudioProjects/yimaru_app/web/icons/Icon-192.png differ diff --git a/StudioProjects/yimaru_app/web/icons/Icon-512.png b/StudioProjects/yimaru_app/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/StudioProjects/yimaru_app/web/icons/Icon-512.png differ diff --git a/StudioProjects/yimaru_app/web/icons/Icon-maskable-192.png b/StudioProjects/yimaru_app/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/StudioProjects/yimaru_app/web/icons/Icon-maskable-192.png differ diff --git a/StudioProjects/yimaru_app/web/icons/Icon-maskable-512.png b/StudioProjects/yimaru_app/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/StudioProjects/yimaru_app/web/icons/Icon-maskable-512.png differ diff --git a/StudioProjects/yimaru_app/web/index.html b/StudioProjects/yimaru_app/web/index.html new file mode 100644 index 0000000..973ac20 --- /dev/null +++ b/StudioProjects/yimaru_app/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + yimaru_app + + + + + + diff --git a/StudioProjects/yimaru_app/web/manifest.json b/StudioProjects/yimaru_app/web/manifest.json new file mode 100644 index 0000000..eaa3083 --- /dev/null +++ b/StudioProjects/yimaru_app/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "yimaru_app", + "short_name": "yimaru_app", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/StudioProjects/yimaru_app/windows/.gitignore b/StudioProjects/yimaru_app/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/CMakeLists.txt b/StudioProjects/yimaru_app/windows/CMakeLists.txt new file mode 100644 index 0000000..6c27459 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(yimaru_app 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 "yimaru_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# 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/StudioProjects/yimaru_app/windows/flutter/CMakeLists.txt b/StudioProjects/yimaru_app/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# 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") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === 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" + ${FLUTTER_TARGET_PLATFORM} $ + 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/StudioProjects/yimaru_app/windows/flutter/generated_plugin_registrant.cc b/StudioProjects/yimaru_app/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/flutter/generated_plugin_registrant.h b/StudioProjects/yimaru_app/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/flutter/generated_plugins.cmake b/StudioProjects/yimaru_app/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/runner/CMakeLists.txt b/StudioProjects/yimaru_app/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/StudioProjects/yimaru_app/windows/runner/Runner.rc b/StudioProjects/yimaru_app/windows/runner/Runner.rc new file mode 100644 index 0000000..d6b24d4 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "yimaru_app" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "yimaru_app" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "yimaru_app.exe" "\0" + VALUE "ProductName", "yimaru_app" "\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/StudioProjects/yimaru_app/windows/runner/flutter_window.cpp b/StudioProjects/yimaru_app/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/StudioProjects/yimaru_app/windows/runner/flutter_window.h b/StudioProjects/yimaru_app/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/runner/main.cpp b/StudioProjects/yimaru_app/windows/runner/main.cpp new file mode 100644 index 0000000..1f36e7c --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"yimaru_app", 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/StudioProjects/yimaru_app/windows/runner/resource.h b/StudioProjects/yimaru_app/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/runner/resources/app_icon.ico b/StudioProjects/yimaru_app/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/StudioProjects/yimaru_app/windows/runner/resources/app_icon.ico differ diff --git a/StudioProjects/yimaru_app/windows/runner/runner.exe.manifest b/StudioProjects/yimaru_app/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/StudioProjects/yimaru_app/windows/runner/utils.cpp b/StudioProjects/yimaru_app/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/StudioProjects/yimaru_app/windows/runner/utils.h b/StudioProjects/yimaru_app/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/StudioProjects/yimaru_app/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/StudioProjects/yimaru_app/windows/runner/win32_window.cpp b/StudioProjects/yimaru_app/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/StudioProjects/yimaru_app/windows/runner/win32_window.h b/StudioProjects/yimaru_app/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/StudioProjects/yimaru_app/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_