diff --git a/.dart_tool/extension_discovery/devtools.json b/.dart_tool/extension_discovery/devtools.json new file mode 100644 index 0000000..949e3b0 --- /dev/null +++ b/.dart_tool/extension_discovery/devtools.json @@ -0,0 +1 @@ +{"version":2,"entries":[{"package":"provider","rootUri":"file:///Users/jibumhan/.pub-cache/hosted/pub.dev/provider-6.1.5+1/","packageUri":"lib/","config":{"name":"provider","issueTracker":"https://github.com/rrousselGit/provider/issues","version":"0.0.1","materialIconCodePoint":"0xe0b1"}},{"package":"shared_preferences","rootUri":"file:///Users/jibumhan/.pub-cache/hosted/pub.dev/shared_preferences-2.5.3/","packageUri":"lib/","config":{"name":"shared_preferences","issueTracker":"https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22","version":"1.0.0","materialIconCodePoint":"0xe683"}},{"package":"my_game_center","rootUri":"../","packageUri":"lib/"},{"package":"app_sudoku","rootUri":"../apps/app_sudoku/","packageUri":"lib/"},{"package":"app_spider","rootUri":"../apps/app_spider/","packageUri":"lib/"},{"package":"service_api","rootUri":"../packages/service_api/","packageUri":"lib/"},{"package":"feature_common","rootUri":"../packages/feature_common/","packageUri":"lib/"},{"package":"feature_game_sudoku","rootUri":"../packages/feature_game_sudoku/","packageUri":"lib/"},{"package":"feature_game_spider","rootUri":"../packages/feature_game_spider/","packageUri":"lib/"}]} \ No newline at end of file diff --git a/apps/app_mathquiz/.gitignore b/apps/app_mathquiz/.gitignore new file mode 100644 index 0000000..3820a95 --- /dev/null +++ b/apps/app_mathquiz/.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/apps/app_mathquiz/.metadata b/apps/app_mathquiz/.metadata new file mode 100644 index 0000000..5f4336f --- /dev/null +++ b/apps/app_mathquiz/.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: "adc901062556672b4138e18a4dc62a4be8f4b3c2" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: android + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: ios + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: linux + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: macos + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: web + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + - platform: windows + create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2 + + # 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/apps/app_mathquiz/README.md b/apps/app_mathquiz/README.md new file mode 100644 index 0000000..87578c6 --- /dev/null +++ b/apps/app_mathquiz/README.md @@ -0,0 +1,16 @@ +# app_mathquiz + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/apps/app_mathquiz/analysis_options.yaml b/apps/app_mathquiz/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/apps/app_mathquiz/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/apps/app_mathquiz/android/.gitignore b/apps/app_mathquiz/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/android/app/build.gradle.kts b/apps/app_mathquiz/android/app/build.gradle.kts new file mode 100644 index 0000000..803c8c7 --- /dev/null +++ b/apps/app_mathquiz/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.app_mathquiz" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.app_mathquiz" + // 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/apps/app_mathquiz/android/app/src/debug/AndroidManifest.xml b/apps/app_mathquiz/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/apps/app_mathquiz/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/apps/app_mathquiz/android/app/src/main/AndroidManifest.xml b/apps/app_mathquiz/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..be914f1 --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/android/app/src/main/kotlin/com/example/app_mathquiz/MainActivity.kt b/apps/app_mathquiz/android/app/src/main/kotlin/com/example/app_mathquiz/MainActivity.kt new file mode 100644 index 0000000..236c982 --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/kotlin/com/example/app_mathquiz/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.app_mathquiz + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/apps/app_mathquiz/android/app/src/main/res/drawable-v21/launch_background.xml b/apps/app_mathquiz/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/apps/app_mathquiz/android/app/src/main/res/drawable/launch_background.xml b/apps/app_mathquiz/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/apps/app_mathquiz/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/app_mathquiz/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/apps/app_mathquiz/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/apps/app_mathquiz/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/app_mathquiz/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/apps/app_mathquiz/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/apps/app_mathquiz/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/app_mathquiz/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/apps/app_mathquiz/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/apps/app_mathquiz/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/app_mathquiz/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/apps/app_mathquiz/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/apps/app_mathquiz/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/app_mathquiz/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/apps/app_mathquiz/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/apps/app_mathquiz/android/app/src/main/res/values-night/styles.xml b/apps/app_mathquiz/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/apps/app_mathquiz/android/app/src/main/res/values/styles.xml b/apps/app_mathquiz/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/apps/app_mathquiz/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/apps/app_mathquiz/android/app/src/profile/AndroidManifest.xml b/apps/app_mathquiz/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/apps/app_mathquiz/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/apps/app_mathquiz/android/build.gradle.kts b/apps/app_mathquiz/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/android/gradle.properties b/apps/app_mathquiz/android/gradle.properties new file mode 100644 index 0000000..f018a61 --- /dev/null +++ b/apps/app_mathquiz/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/apps/app_mathquiz/android/settings.gradle.kts b/apps/app_mathquiz/android/settings.gradle.kts new file mode 100644 index 0000000..fb605bc --- /dev/null +++ b/apps/app_mathquiz/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.9.1" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false +} + +include(":app") diff --git a/apps/app_mathquiz/ios/.gitignore b/apps/app_mathquiz/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Flutter/AppFrameworkInfo.plist b/apps/app_mathquiz/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..1dc6cf7 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Flutter/Debug.xcconfig b/apps/app_mathquiz/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..ec97fc6 --- /dev/null +++ b/apps/app_mathquiz/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/apps/app_mathquiz/ios/Flutter/Release.xcconfig b/apps/app_mathquiz/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..c4855bf --- /dev/null +++ b/apps/app_mathquiz/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/apps/app_mathquiz/ios/Podfile b/apps/app_mathquiz/ios/Podfile new file mode 100644 index 0000000..620e46e --- /dev/null +++ b/apps/app_mathquiz/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '13.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/apps/app_mathquiz/ios/Podfile.lock b/apps/app_mathquiz/ios/Podfile.lock new file mode 100644 index 0000000..8e0f490 --- /dev/null +++ b/apps/app_mathquiz/ios/Podfile.lock @@ -0,0 +1,129 @@ +PODS: + - AppAuth (2.0.0): + - AppAuth/Core (= 2.0.0) + - AppAuth/ExternalUserAgent (= 2.0.0) + - AppAuth/Core (2.0.0) + - AppAuth/ExternalUserAgent (2.0.0): + - AppAuth/Core + - AppCheckCore (11.2.0): + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - Flutter (1.0.0) + - flutter_secure_storage (6.0.0): + - Flutter + - Google-Mobile-Ads-SDK (11.13.0): + - GoogleUserMessagingPlatform (>= 1.1) + - google_mobile_ads (5.3.1): + - Flutter + - Google-Mobile-Ads-SDK (~> 11.13.0) + - webview_flutter_wkwebview + - google_sign_in_ios (0.0.1): + - Flutter + - FlutterMacOS + - GoogleSignIn (~> 9.0) + - GTMSessionFetcher (>= 3.4.0) + - GoogleSignIn (9.0.0): + - AppAuth (~> 2.0) + - AppCheckCore (~> 11.0) + - GTMAppAuth (~> 5.0) + - GTMSessionFetcher/Core (~> 3.3) + - GoogleUserMessagingPlatform (3.1.0) + - GoogleUtilities/Environment (8.1.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.1.0): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.1.0) + - GoogleUtilities/UserDefaults (8.1.0): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GTMAppAuth (5.0.0): + - AppAuth/Core (~> 2.0) + - GTMSessionFetcher/Core (< 4.0, >= 3.3) + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): + - GTMSessionFetcher/Core + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - PromisesObjC (2.4.0) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - sign_in_with_apple (0.0.1): + - Flutter + - url_launcher_ios (0.0.1): + - Flutter + - webview_flutter_wkwebview (0.0.1): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - Flutter (from `Flutter`) + - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - google_mobile_ads (from `.symlinks/plugins/google_mobile_ads/ios`) + - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) + +SPEC REPOS: + trunk: + - AppAuth + - AppCheckCore + - Google-Mobile-Ads-SDK + - GoogleSignIn + - GoogleUserMessagingPlatform + - GoogleUtilities + - GTMAppAuth + - GTMSessionFetcher + - PromisesObjC + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + flutter_secure_storage: + :path: ".symlinks/plugins/flutter_secure_storage/ios" + google_mobile_ads: + :path: ".symlinks/plugins/google_mobile_ads/ios" + google_sign_in_ios: + :path: ".symlinks/plugins/google_sign_in_ios/darwin" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + sign_in_with_apple: + :path: ".symlinks/plugins/sign_in_with_apple/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" + webview_flutter_wkwebview: + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" + +SPEC CHECKSUMS: + AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 + AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 + Google-Mobile-Ads-SDK: 14f57f2dc33532a24db288897e26494640810407 + google_mobile_ads: fe0e2c1764ad95323dd0e3081d0bb2d58411f957 + google_sign_in_ios: 055d43c4754f2860a53decd5133b78d05615fffd + GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 + GoogleUserMessagingPlatform: befe603da6501006420c206222acd449bba45a9c + GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 + GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6 + sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 + url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa + webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4 + +PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e + +COCOAPODS: 1.16.2 diff --git a/apps/app_mathquiz/ios/Runner.xcodeproj/project.pbxproj b/apps/app_mathquiz/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..dcaf5e1 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,749 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 18A59E9666A49E8F172F0508 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12EAE98856688B99BE5CCC44 /* Pods_Runner.framework */; }; + 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 */; }; + 888163C79BD54D4F1879A7A5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCA8EBB49A805F574FF00EFA /* Pods_RunnerTests.framework */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* 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 */ + 12EAE98856688B99BE5CCC44 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 1A93851419955741B47550AD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 26CEBF31284569B8F56CEE45 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 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; }; + 343A9B55A531ECF918771201 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B57CCCC7125D8C16891B8DD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 4056CD2469716DA7EA1D1AD1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 744A52BF5FAB8E7D1617416F /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 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 = ""; }; + FCA8EBB49A805F574FF00EFA /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 617831B7240A6EE33DAD3FC8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 888163C79BD54D4F1879A7A5 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 18A59E9666A49E8F172F0508 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 06B36DA406C24C5636C0F6A5 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 12EAE98856688B99BE5CCC44 /* Pods_Runner.framework */, + FCA8EBB49A805F574FF00EFA /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 7D604ECDDAAE062BAE42206D /* Pods */ = { + isa = PBXGroup; + children = ( + 1A93851419955741B47550AD /* Pods-Runner.debug.xcconfig */, + 4056CD2469716DA7EA1D1AD1 /* Pods-Runner.release.xcconfig */, + 26CEBF31284569B8F56CEE45 /* Pods-Runner.profile.xcconfig */, + 3B57CCCC7125D8C16891B8DD /* Pods-RunnerTests.debug.xcconfig */, + 744A52BF5FAB8E7D1617416F /* Pods-RunnerTests.release.xcconfig */, + 343A9B55A531ECF918771201 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + 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 */, + 7D604ECDDAAE062BAE42206D /* Pods */, + 06B36DA406C24C5636C0F6A5 /* Frameworks */, + ); + 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 = ( + AAFFC3C990EC0C7C41C22B26 /* [CP] Check Pods Manifest.lock */, + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + 617831B7240A6EE33DAD3FC8 /* Frameworks */, + ); + 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 = ( + A2A0993AE4A996556CF03B89 /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 6C03406BEF45C37573CD25A8 /* [CP] Embed Pods Frameworks */, + 5AC75F30D0DAD7FEA07BDECE /* [CP] Copy Pods Resources */, + ); + 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"; + }; + 5AC75F30D0DAD7FEA07BDECE /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 6C03406BEF45C37573CD25A8 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 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"; + }; + A2A0993AE4A996556CF03B89 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + AAFFC3C990EC0C7C41C22B26 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* 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)"; + DEVELOPMENT_TEAM = TDVYRQ3Z3E; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3B57CCCC7125D8C16891B8DD /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 744A52BF5FAB8E7D1617416F /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 343A9B55A531ECF918771201 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz.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)"; + DEVELOPMENT_TEAM = TDVYRQ3Z3E; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = TDVYRQ3Z3E; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz; + 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/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/apps/app_mathquiz/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/apps/app_mathquiz/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..e3773d4 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/ios/Runner.xcworkspace/contents.xcworkspacedata b/apps/app_mathquiz/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..21a3cc1 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/apps/app_mathquiz/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/apps/app_mathquiz/ios/Runner/AppDelegate.swift b/apps/app_mathquiz/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..7353c41 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..6ed2d93 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cd7b00 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..fe73094 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..321773c Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..502f463 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..e9f5fea Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..84ac32a Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..8953cba Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/apps/app_mathquiz/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/ios/Runner/Base.lproj/LaunchScreen.storyboard b/apps/app_mathquiz/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/apps/app_mathquiz/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/ios/Runner/Base.lproj/Main.storyboard b/apps/app_mathquiz/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/ios/Runner/Info.plist b/apps/app_mathquiz/ios/Runner/Info.plist new file mode 100644 index 0000000..89c8b2d --- /dev/null +++ b/apps/app_mathquiz/ios/Runner/Info.plist @@ -0,0 +1,51 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + App Mathquiz + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + app_mathquiz + 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 + + GADApplicationIdentifier + ca-app-pub-3940256099942544~1458002511 + + diff --git a/apps/app_mathquiz/ios/Runner/Runner-Bridging-Header.h b/apps/app_mathquiz/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/apps/app_mathquiz/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/apps/app_mathquiz/ios/RunnerTests/RunnerTests.swift b/apps/app_mathquiz/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/lib/main.dart b/apps/app_mathquiz/lib/main.dart new file mode 100644 index 0000000..0af3bef --- /dev/null +++ b/apps/app_mathquiz/lib/main.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; +import 'package:google_mobile_ads/google_mobile_ads.dart'; +import 'package:provider/provider.dart'; + +// [C] ๊ณตํ†ต ์„œ๋น„์Šค +import 'package:service_api/service_api.dart'; +// [A] ๊ณตํ†ต UI ์…ธ (์ธํŠธ๋กœ ํ™”๋ฉด) +import 'package:feature_common/feature_common.dart'; +// ๐Ÿ”ฝ [์ˆ˜์ •] ์Šค๋„์ฟ  ๋Œ€์‹  ์ˆ˜ํ•™ ํ€ด์ฆˆ ๋กœ๋น„ ์ž„ํฌํŠธ +import 'package:feature_game_mathquiz/feature_game_mathquiz.dart'; + +void main() async { + WidgetsFlutterBinding.ensureInitialized(); + await MobileAds.instance.initialize(); + + runApp( + MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (_) => ThemeNotifier(), + ), + ChangeNotifierProvider( + create: (_) => SessionNotifier(), + ), + ], + child: const MyApp(), + ), + ); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + final themeData = context.select((ThemeNotifier n) => n.currentTheme); + final darkThemeData = context.select((ThemeNotifier n) => n.currentDarkTheme); + final themeMode = context.select((ThemeNotifier n) => n.currentThemeMode); + + return MaterialApp( + title: '๊ณ„์‚ฐ ํ€ด์ฆˆ', // ๐Ÿ‘ˆ [์ˆ˜์ •] + theme: themeData, + darkTheme: darkThemeData, + themeMode: themeMode, + debugShowCheckedModeBanner: false, + + home: IntroScreen( + // ๐Ÿ”ฝ [์ˆ˜์ •] + // Intro๊ฐ€ ๋๋‚˜๋ฉด MathQuizLobbyScreen์œผ๋กœ ์ด๋™ + nextScreenBuilder: (context) => const MathQuizLobbyScreen(), + ), + ); + } +} \ No newline at end of file diff --git a/apps/app_mathquiz/linux/.gitignore b/apps/app_mathquiz/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/apps/app_mathquiz/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/apps/app_mathquiz/linux/CMakeLists.txt b/apps/app_mathquiz/linux/CMakeLists.txt new file mode 100644 index 0000000..5be0f7e --- /dev/null +++ b/apps/app_mathquiz/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 "app_mathquiz") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.app_mathquiz") + +# 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/apps/app_mathquiz/linux/flutter/CMakeLists.txt b/apps/app_mathquiz/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/linux/flutter/generated_plugin_registrant.cc b/apps/app_mathquiz/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..38dd0bc --- /dev/null +++ b/apps/app_mathquiz/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); + flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/apps/app_mathquiz/linux/flutter/generated_plugin_registrant.h b/apps/app_mathquiz/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/linux/flutter/generated_plugins.cmake b/apps/app_mathquiz/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..65240e9 --- /dev/null +++ b/apps/app_mathquiz/linux/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_linux + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/apps/app_mathquiz/linux/runner/CMakeLists.txt b/apps/app_mathquiz/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/linux/runner/main.cc b/apps/app_mathquiz/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/linux/runner/my_application.cc b/apps/app_mathquiz/linux/runner/my_application.cc new file mode 100644 index 0000000..c02188b --- /dev/null +++ b/apps/app_mathquiz/linux/runner/my_application.cc @@ -0,0 +1,144 @@ +#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, "app_mathquiz"); + 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, "app_mathquiz"); + } + + 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/apps/app_mathquiz/linux/runner/my_application.h b/apps/app_mathquiz/linux/runner/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/apps/app_mathquiz/linux/runner/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/apps/app_mathquiz/macos/.gitignore b/apps/app_mathquiz/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/apps/app_mathquiz/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/apps/app_mathquiz/macos/Flutter/Flutter-Debug.xcconfig b/apps/app_mathquiz/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/apps/app_mathquiz/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/apps/app_mathquiz/macos/Flutter/Flutter-Release.xcconfig b/apps/app_mathquiz/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/apps/app_mathquiz/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/apps/app_mathquiz/macos/Flutter/GeneratedPluginRegistrant.swift b/apps/app_mathquiz/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..e156e5f --- /dev/null +++ b/apps/app_mathquiz/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,24 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import flutter_secure_storage_macos +import google_sign_in_ios +import path_provider_foundation +import shared_preferences_foundation +import sign_in_with_apple +import url_launcher_macos +import webview_flutter_wkwebview + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) + FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin")) + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) +} diff --git a/apps/app_mathquiz/macos/Podfile b/apps/app_mathquiz/macos/Podfile new file mode 100644 index 0000000..ff5ddb3 --- /dev/null +++ b/apps/app_mathquiz/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.15' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/apps/app_mathquiz/macos/Runner.xcodeproj/project.pbxproj b/apps/app_mathquiz/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..1a27e07 --- /dev/null +++ b/apps/app_mathquiz/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 /* app_mathquiz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app_mathquiz.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 /* app_mathquiz.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 /* app_mathquiz.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.appMathquiz.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app_mathquiz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app_mathquiz"; + }; + 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.appMathquiz.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app_mathquiz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app_mathquiz"; + }; + 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.appMathquiz.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app_mathquiz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app_mathquiz"; + }; + 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/apps/app_mathquiz/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/app_mathquiz/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apps/app_mathquiz/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/app_mathquiz/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/apps/app_mathquiz/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..aa65ecc --- /dev/null +++ b/apps/app_mathquiz/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/macos/Runner.xcworkspace/contents.xcworkspacedata b/apps/app_mathquiz/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/apps/app_mathquiz/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/apps/app_mathquiz/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/app_mathquiz/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apps/app_mathquiz/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/app_mathquiz/macos/Runner/AppDelegate.swift b/apps/app_mathquiz/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/apps/app_mathquiz/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/apps/app_mathquiz/macos/Runner/Base.lproj/MainMenu.xib b/apps/app_mathquiz/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/apps/app_mathquiz/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app_mathquiz/macos/Runner/Configs/AppInfo.xcconfig b/apps/app_mathquiz/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..5c26ddc --- /dev/null +++ b/apps/app_mathquiz/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 = app_mathquiz + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.appMathquiz + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright ยฉ 2025 com.example. All rights reserved. diff --git a/apps/app_mathquiz/macos/Runner/Configs/Debug.xcconfig b/apps/app_mathquiz/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/apps/app_mathquiz/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/apps/app_mathquiz/macos/Runner/Configs/Release.xcconfig b/apps/app_mathquiz/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/apps/app_mathquiz/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/apps/app_mathquiz/macos/Runner/Configs/Warnings.xcconfig b/apps/app_mathquiz/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/DebugProfile.entitlements b/apps/app_mathquiz/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/Info.plist b/apps/app_mathquiz/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/MainFlutterWindow.swift b/apps/app_mathquiz/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/macos/Runner/Release.entitlements b/apps/app_mathquiz/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/apps/app_mathquiz/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/apps/app_mathquiz/macos/RunnerTests/RunnerTests.swift b/apps/app_mathquiz/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/pubspec.lock b/apps/app_mathquiz/pubspec.lock new file mode 100644 index 0000000..0483328 --- /dev/null +++ b/apps/app_mathquiz/pubspec.lock @@ -0,0 +1,695 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + 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" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + feature_common: + dependency: "direct main" + description: + path: "../../packages/feature_common" + relative: true + source: path + version: "1.0.0" + feature_game_mathquiz: + dependency: "direct main" + description: + path: "../../packages/feature_game_mathquiz" + relative: true + source: path + version: "0.0.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + 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: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + flutter_secure_storage: + dependency: transitive + description: + name: flutter_secure_storage + sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea" + url: "https://pub.dev" + source: hosted + version: "9.2.4" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" + url: "https://pub.dev" + source: hosted + version: "3.1.3" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + function_tree: + dependency: "direct main" + description: + name: function_tree + sha256: "098f41f8c8d55952fd162cbeb709e8213a709065ab6fbebffe323701c785a259" + url: "https://pub.dev" + source: hosted + version: "0.9.1" + google_identity_services_web: + dependency: transitive + description: + name: google_identity_services_web + sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454" + url: "https://pub.dev" + source: hosted + version: "0.3.3+1" + google_mobile_ads: + dependency: "direct main" + description: + name: google_mobile_ads + sha256: "0d4a3744b5e8ed1b8be6a1b452d309f811688855a497c6113fc4400f922db603" + url: "https://pub.dev" + source: hosted + version: "5.3.1" + google_sign_in: + dependency: transitive + description: + name: google_sign_in + sha256: "521031b65853b4409b8213c0387d57edaad7e2a949ce6dea0d8b2afc9cb29763" + url: "https://pub.dev" + source: hosted + version: "7.2.0" + google_sign_in_android: + dependency: transitive + description: + name: google_sign_in_android + sha256: "80edba834ae30b058eaeef086e1dc68189b6e49db20ae85b309adfa2fa6d9b02" + url: "https://pub.dev" + source: hosted + version: "7.2.4" + google_sign_in_ios: + dependency: transitive + description: + name: google_sign_in_ios + sha256: "0ba0b276c91e80edbe28570ee8c54237c095dd7b909db46011154a49f3af68a7" + url: "https://pub.dev" + source: hosted + version: "6.2.3" + google_sign_in_platform_interface: + dependency: transitive + description: + name: google_sign_in_platform_interface + sha256: "7f59208c42b415a3cca203571128d6f84f885fead2d5b53eb65a9e27f2965bb5" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + google_sign_in_web: + dependency: transitive + description: + name: google_sign_in_web + sha256: "2fc1f941e6443b2d6984f4056a727a3eaeab15d8ee99ba7125d79029be75a1da" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + http: + dependency: transitive + description: + name: http + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" + url: "https://pub.dev" + source: hosted + version: "1.6.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + 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: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + url: "https://pub.dev" + source: hosted + version: "3.0.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: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16 + url: "https://pub.dev" + source: hosted + version: "2.2.20" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + provider: + dependency: "direct main" + description: + name: provider + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" + source: hosted + version: "6.1.5+1" + service_api: + dependency: "direct main" + description: + path: "../../packages/service_api" + relative: true + source: path + version: "1.0.0" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713" + url: "https://pub.dev" + source: hosted + version: "2.4.15" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b" + url: "https://pub.dev" + source: hosted + version: "2.5.5" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sign_in_with_apple: + dependency: transitive + description: + name: sign_in_with_apple + sha256: "8bd875c8e8748272749eb6d25b896f768e7e9d60988446d543fe85a37a2392b8" + url: "https://pub.dev" + source: hosted + version: "7.0.1" + sign_in_with_apple_platform_interface: + dependency: transitive + description: + name: sign_in_with_apple_platform_interface + sha256: "981bca52cf3bb9c3ad7ef44aace2d543e5c468bb713fd8dda4275ff76dfa6659" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + sign_in_with_apple_web: + dependency: transitive + description: + name: sign_in_with_apple_web + sha256: f316400827f52cafcf50d00e1a2e8a0abc534ca1264e856a81c5f06bd5b10fed + url: "https://pub.dev" + source: hosted + version: "3.0.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.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" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + 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: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + url: "https://pub.dev" + source: hosted + version: "0.7.6" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + url_launcher: + dependency: transitive + description: + name: url_launcher + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 + url: "https://pub.dev" + source: hosted + version: "6.3.2" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9" + url: "https://pub.dev" + source: hosted + version: "6.3.24" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9" + url: "https://pub.dev" + source: hosted + version: "6.3.5" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9" + url: "https://pub.dev" + source: hosted + version: "3.2.4" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" + url: "https://pub.dev" + source: hosted + version: "3.1.4" + uuid: + dependency: transitive + description: + name: uuid + sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 + url: "https://pub.dev" + source: hosted + version: "4.5.2" + 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" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + sha256: c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba + url: "https://pub.dev" + source: hosted + version: "4.13.0" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + sha256: e5201c620eb2637dca88a756961fae4a7191bb30b4f2271e08b746405ffdf3fd + url: "https://pub.dev" + source: hosted + version: "4.10.5" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + sha256: "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0" + url: "https://pub.dev" + source: hosted + version: "2.14.0" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + sha256: "5de608fdea144d4370c21d4c80f0528135529e0180aa129790064c345e457a43" + url: "https://pub.dev" + source: hosted + version: "3.23.2" + win32: + dependency: transitive + description: + name: win32 + sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e + url: "https://pub.dev" + source: hosted + version: "5.15.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" +sdks: + dart: ">=3.9.2 <4.0.0" + flutter: ">=3.35.0" diff --git a/apps/app_mathquiz/pubspec.yaml b/apps/app_mathquiz/pubspec.yaml new file mode 100644 index 0000000..06a1707 --- /dev/null +++ b/apps/app_mathquiz/pubspec.yaml @@ -0,0 +1,38 @@ +name: app_mathquiz +description: "A new Flutter project for Math Quiz Game." +publish_to: 'none' +version: 1.0.0+1 + +environment: + sdk: '>=3.0.0 <4.0.0' # (๋ฒ„์ „์€ ํ”„๋กœ์ ํŠธ์— ๋งž๊ฒŒ) + +dependencies: + flutter: + sdk: flutter + + # --- ๊ณตํ†ต ์˜์กด์„ฑ (main.dart์—์„œ ํ•„์š”) --- + provider: ^6.1.2 + google_mobile_ads: ^5.1.0 + + # --- ๋กœ์ปฌ ํŒจํ‚ค์ง€ ์˜์กด์„ฑ --- + + # [C] ๊ณตํ†ต ์„œ๋น„์Šค + service_api: + path: ../../packages/service_api + + # [A] ๊ณตํ†ต UI + feature_common: + path: ../../packages/feature_common + + # [B] ์ˆ˜ํ•™ ํ€ด์ฆˆ ๊ฒŒ์ž„ ๋กœ์ง + feature_game_mathquiz: + path: ../../packages/feature_game_mathquiz + function_tree: ^0.9.1 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^3.0.0 + +flutter: + uses-material-design: true \ No newline at end of file diff --git a/apps/app_mathquiz/test/widget_test.dart b/apps/app_mathquiz/test/widget_test.dart new file mode 100644 index 0000000..97d4beb --- /dev/null +++ b/apps/app_mathquiz/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:app_mathquiz/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/apps/app_mathquiz/web/favicon.png b/apps/app_mathquiz/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/apps/app_mathquiz/web/favicon.png differ diff --git a/apps/app_mathquiz/web/icons/Icon-192.png b/apps/app_mathquiz/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/apps/app_mathquiz/web/icons/Icon-192.png differ diff --git a/apps/app_mathquiz/web/icons/Icon-512.png b/apps/app_mathquiz/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/apps/app_mathquiz/web/icons/Icon-512.png differ diff --git a/apps/app_mathquiz/web/icons/Icon-maskable-192.png b/apps/app_mathquiz/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/apps/app_mathquiz/web/icons/Icon-maskable-192.png differ diff --git a/apps/app_mathquiz/web/icons/Icon-maskable-512.png b/apps/app_mathquiz/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/apps/app_mathquiz/web/icons/Icon-maskable-512.png differ diff --git a/apps/app_mathquiz/web/index.html b/apps/app_mathquiz/web/index.html new file mode 100644 index 0000000..38bb726 --- /dev/null +++ b/apps/app_mathquiz/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + app_mathquiz + + + + + + diff --git a/apps/app_mathquiz/web/manifest.json b/apps/app_mathquiz/web/manifest.json new file mode 100644 index 0000000..88b5f1a --- /dev/null +++ b/apps/app_mathquiz/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "app_mathquiz", + "short_name": "app_mathquiz", + "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/apps/app_mathquiz/windows/.gitignore b/apps/app_mathquiz/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/CMakeLists.txt b/apps/app_mathquiz/windows/CMakeLists.txt new file mode 100644 index 0000000..40ae942 --- /dev/null +++ b/apps/app_mathquiz/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(app_mathquiz 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 "app_mathquiz") + +# 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/apps/app_mathquiz/windows/flutter/CMakeLists.txt b/apps/app_mathquiz/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/flutter/generated_plugin_registrant.cc b/apps/app_mathquiz/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..2048c45 --- /dev/null +++ b/apps/app_mathquiz/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,17 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/apps/app_mathquiz/windows/flutter/generated_plugin_registrant.h b/apps/app_mathquiz/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/flutter/generated_plugins.cmake b/apps/app_mathquiz/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..de626cc --- /dev/null +++ b/apps/app_mathquiz/windows/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_windows + url_launcher_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/apps/app_mathquiz/windows/runner/CMakeLists.txt b/apps/app_mathquiz/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/Runner.rc b/apps/app_mathquiz/windows/runner/Runner.rc new file mode 100644 index 0000000..23b3c36 --- /dev/null +++ b/apps/app_mathquiz/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", "app_mathquiz" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "app_mathquiz" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "app_mathquiz.exe" "\0" + VALUE "ProductName", "app_mathquiz" "\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/apps/app_mathquiz/windows/runner/flutter_window.cpp b/apps/app_mathquiz/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/flutter_window.h b/apps/app_mathquiz/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/main.cpp b/apps/app_mathquiz/windows/runner/main.cpp new file mode 100644 index 0000000..f3ab1d5 --- /dev/null +++ b/apps/app_mathquiz/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"app_mathquiz", 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/apps/app_mathquiz/windows/runner/resource.h b/apps/app_mathquiz/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/resources/app_icon.ico b/apps/app_mathquiz/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/apps/app_mathquiz/windows/runner/resources/app_icon.ico differ diff --git a/apps/app_mathquiz/windows/runner/runner.exe.manifest b/apps/app_mathquiz/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/apps/app_mathquiz/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/apps/app_mathquiz/windows/runner/utils.cpp b/apps/app_mathquiz/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/utils.h b/apps/app_mathquiz/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/win32_window.cpp b/apps/app_mathquiz/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/apps/app_mathquiz/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/apps/app_mathquiz/windows/runner/win32_window.h b/apps/app_mathquiz/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/apps/app_mathquiz/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/apps/app_spider/macos/Podfile.lock b/apps/app_spider/macos/Podfile.lock new file mode 100644 index 0000000..4322db4 --- /dev/null +++ b/apps/app_spider/macos/Podfile.lock @@ -0,0 +1,114 @@ +PODS: + - AppAuth (2.0.0): + - AppAuth/Core (= 2.0.0) + - AppAuth/ExternalUserAgent (= 2.0.0) + - AppAuth/Core (2.0.0) + - AppAuth/ExternalUserAgent (2.0.0): + - AppAuth/Core + - AppCheckCore (11.2.0): + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - flutter_secure_storage_macos (6.1.3): + - FlutterMacOS + - FlutterMacOS (1.0.0) + - google_sign_in_ios (0.0.1): + - Flutter + - FlutterMacOS + - GoogleSignIn (~> 9.0) + - GTMSessionFetcher (>= 3.4.0) + - GoogleSignIn (9.0.0): + - AppAuth (~> 2.0) + - AppCheckCore (~> 11.0) + - GTMAppAuth (~> 5.0) + - GTMSessionFetcher/Core (~> 3.3) + - GoogleUtilities/Environment (8.1.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.1.0): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.1.0) + - GoogleUtilities/UserDefaults (8.1.0): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GTMAppAuth (5.0.0): + - AppAuth/Core (~> 2.0) + - GTMSessionFetcher/Core (< 4.0, >= 3.3) + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): + - GTMSessionFetcher/Core + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - PromisesObjC (2.4.0) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - sign_in_with_apple (0.0.1): + - FlutterMacOS + - url_launcher_macos (0.0.1): + - FlutterMacOS + - webview_flutter_wkwebview (0.0.1): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) + - FlutterMacOS (from `Flutter/ephemeral`) + - google_sign_in_ios (from `Flutter/ephemeral/.symlinks/plugins/google_sign_in_ios/darwin`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) + - sign_in_with_apple (from `Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos`) + - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + - webview_flutter_wkwebview (from `Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin`) + +SPEC REPOS: + trunk: + - AppAuth + - AppCheckCore + - GoogleSignIn + - GoogleUtilities + - GTMAppAuth + - GTMSessionFetcher + - PromisesObjC + +EXTERNAL SOURCES: + flutter_secure_storage_macos: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos + FlutterMacOS: + :path: Flutter/ephemeral + google_sign_in_ios: + :path: Flutter/ephemeral/.symlinks/plugins/google_sign_in_ios/darwin + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin + sign_in_with_apple: + :path: Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos + url_launcher_macos: + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + webview_flutter_wkwebview: + :path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin + +SPEC CHECKSUMS: + AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 + AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f + flutter_secure_storage_macos: c2754d3483d20bb207bb9e5a14f1b8e771abcdb9 + FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 + google_sign_in_ios: 055d43c4754f2860a53decd5133b78d05615fffd + GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 + GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 + GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6 + sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727 + url_launcher_macos: 175a54c831f4375a6cf895875f716ee5af3888ce + webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4 + +PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009 + +COCOAPODS: 1.16.2 diff --git a/apps/app_spider/macos/Runner.xcodeproj/project.pbxproj b/apps/app_spider/macos/Runner.xcodeproj/project.pbxproj index 06fdd5b..6c41a01 100644 --- a/apps/app_spider/macos/Runner.xcodeproj/project.pbxproj +++ b/apps/app_spider/macos/Runner.xcodeproj/project.pbxproj @@ -27,6 +27,8 @@ 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 */; }; + 9EDCC619528D4A20D5FCDEAC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 415DAAA516E8B96BD1B8AA00 /* Pods_Runner.framework */; }; + C0F98F1E4B6B789F0D0C622E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F044D5F2412AAE79E168009 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,11 +62,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 04D60DDEBE483022C01A2D90 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 1DF2A81EB4BA8CF928BE11D0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* app_spider.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app_spider.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* app_spider.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app_spider.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 = ""; }; @@ -76,8 +80,14 @@ 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 = ""; }; + 415DAAA516E8B96BD1B8AA00 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6F044D5F2412AAE79E168009 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; + BC5834783637361EF0E7BDEA /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + CDED7694C756CF34DFC331B5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + D7C41D2CE5B8F0E3E59B559D /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + E06395C7C248606B27DFC71F /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -85,6 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C0F98F1E4B6B789F0D0C622E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -92,12 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9EDCC619528D4A20D5FCDEAC /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1E7157A6819A3B4A4AD331E4 /* Pods */ = { + isa = PBXGroup; + children = ( + CDED7694C756CF34DFC331B5 /* Pods-Runner.debug.xcconfig */, + 04D60DDEBE483022C01A2D90 /* Pods-Runner.release.xcconfig */, + 1DF2A81EB4BA8CF928BE11D0 /* Pods-Runner.profile.xcconfig */, + D7C41D2CE5B8F0E3E59B559D /* Pods-RunnerTests.debug.xcconfig */, + BC5834783637361EF0E7BDEA /* Pods-RunnerTests.release.xcconfig */, + E06395C7C248606B27DFC71F /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -125,6 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, + 1E7157A6819A3B4A4AD331E4 /* Pods */, ); sourceTree = ""; }; @@ -175,6 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( + 415DAAA516E8B96BD1B8AA00 /* Pods_Runner.framework */, + 6F044D5F2412AAE79E168009 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -186,6 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + A8619306B76E36DEAC2BF68E /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -204,11 +234,14 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 50007160EC1098C073A1AC08 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, + 30F6F3191D17AFB6CFB6AECD /* [CP] Embed Pods Frameworks */, + 109CA933C70EA360E51AAA72 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -291,6 +324,40 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 109CA933C70EA360E51AAA72 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 30F6F3191D17AFB6CFB6AECD /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -329,6 +396,50 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; + 50007160EC1098C073A1AC08 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + A8619306B76E36DEAC2BF68E /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -380,6 +491,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D7C41D2CE5B8F0E3E59B559D /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -394,6 +506,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BC5834783637361EF0E7BDEA /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -408,6 +521,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E06395C7C248606B27DFC71F /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/apps/app_spider/macos/Runner.xcworkspace/contents.xcworkspacedata b/apps/app_spider/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/apps/app_spider/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/apps/app_spider/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/apps/app_sudoku/ios/Podfile.lock b/apps/app_sudoku/ios/Podfile.lock index 575c1ef..8e0f490 100644 --- a/apps/app_sudoku/ios/Podfile.lock +++ b/apps/app_sudoku/ios/Podfile.lock @@ -1,15 +1,60 @@ PODS: + - AppAuth (2.0.0): + - AppAuth/Core (= 2.0.0) + - AppAuth/ExternalUserAgent (= 2.0.0) + - AppAuth/Core (2.0.0) + - AppAuth/ExternalUserAgent (2.0.0): + - AppAuth/Core + - AppCheckCore (11.2.0): + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) - Flutter (1.0.0) + - flutter_secure_storage (6.0.0): + - Flutter - Google-Mobile-Ads-SDK (11.13.0): - GoogleUserMessagingPlatform (>= 1.1) - google_mobile_ads (5.3.1): - Flutter - Google-Mobile-Ads-SDK (~> 11.13.0) - webview_flutter_wkwebview + - google_sign_in_ios (0.0.1): + - Flutter + - FlutterMacOS + - GoogleSignIn (~> 9.0) + - GTMSessionFetcher (>= 3.4.0) + - GoogleSignIn (9.0.0): + - AppAuth (~> 2.0) + - AppCheckCore (~> 11.0) + - GTMAppAuth (~> 5.0) + - GTMSessionFetcher/Core (~> 3.3) - GoogleUserMessagingPlatform (3.1.0) + - GoogleUtilities/Environment (8.1.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.1.0): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.1.0) + - GoogleUtilities/UserDefaults (8.1.0): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GTMAppAuth (5.0.0): + - AppAuth/Core (~> 2.0) + - GTMSessionFetcher/Core (< 4.0, >= 3.3) + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): + - GTMSessionFetcher/Core + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - PromisesObjC (2.4.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS + - sign_in_with_apple (0.0.1): + - Flutter - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): @@ -18,34 +63,64 @@ PODS: DEPENDENCIES: - Flutter (from `Flutter`) + - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - google_mobile_ads (from `.symlinks/plugins/google_mobile_ads/ios`) + - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: + - AppAuth + - AppCheckCore - Google-Mobile-Ads-SDK + - GoogleSignIn - GoogleUserMessagingPlatform + - GoogleUtilities + - GTMAppAuth + - GTMSessionFetcher + - PromisesObjC EXTERNAL SOURCES: Flutter: :path: Flutter + flutter_secure_storage: + :path: ".symlinks/plugins/flutter_secure_storage/ios" google_mobile_ads: :path: ".symlinks/plugins/google_mobile_ads/ios" + google_sign_in_ios: + :path: ".symlinks/plugins/google_sign_in_ios/darwin" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + sign_in_with_apple: + :path: ".symlinks/plugins/sign_in_with_apple/ios" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: + AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 + AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 Google-Mobile-Ads-SDK: 14f57f2dc33532a24db288897e26494640810407 google_mobile_ads: fe0e2c1764ad95323dd0e3081d0bb2d58411f957 + google_sign_in_ios: 055d43c4754f2860a53decd5133b78d05615fffd + GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77 GoogleUserMessagingPlatform: befe603da6501006420c206222acd449bba45a9c + GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 + GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238 + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6 + sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4 diff --git a/devtools_options.yaml b/devtools_options.yaml new file mode 100644 index 0000000..fa0b357 --- /dev/null +++ b/devtools_options.yaml @@ -0,0 +1,3 @@ +description: This file stores settings for Dart & Flutter DevTools. +documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states +extensions: diff --git a/packages/feature_common/lib/models/game_result_args.dart b/packages/feature_common/lib/models/game_result_args.dart index 22aaf97..eb35131 100644 --- a/packages/feature_common/lib/models/game_result_args.dart +++ b/packages/feature_common/lib/models/game_result_args.dart @@ -28,8 +28,8 @@ class GameResultArgs { /// (์˜ˆ: ๋‹ค์Œ ๋ ˆ๋ฒจ ์ž ๊ธˆ ํ•ด์ œ) final Future Function(String playerName) onProgressSave; - /// ํŒ์—…์ด ๋‹ซํž ๋•Œ ๊ฒŒ์ž„ ํ™”๋ฉด์„ ๋‹ซ๊ธฐ ์œ„ํ•œ ์ฝœ๋ฐฑ - final VoidCallback onScreenClose; + // โŒ [์‚ญ์ œ] onScreenClose ์ฝœ๋ฐฑ ์ œ๊ฑฐ + // final VoidCallback onScreenClose; GameResultArgs({ required this.gameType, @@ -40,6 +40,7 @@ class GameResultArgs { this.userName, required this.scoreFormatter, required this.onProgressSave, - required this.onScreenClose, + // โŒ [์‚ญ์ œ] + // required this.onScreenClose, }); } \ No newline at end of file diff --git a/packages/feature_common/lib/screens/game_completion_screen.dart b/packages/feature_common/lib/screens/game_completion_screen.dart index 2803ffb..4abd830 100644 --- a/packages/feature_common/lib/screens/game_completion_screen.dart +++ b/packages/feature_common/lib/screens/game_completion_screen.dart @@ -1,10 +1,10 @@ +// packages/feature_common/lib/screens/game_completion_screen.dart import 'dart:developer'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] +import 'package:provider/provider.dart'; import 'package:service_api/service_api.dart'; import '../models/game_result_args.dart'; -// ์Šค๋„์ฟ /์ŠคํŒŒ์ด๋”์™€ ๋™์ผํ•œ enum enum _RankSubmissionStep { enterName, submitting, showList } class GameCompletionScreen extends StatefulWidget { @@ -17,11 +17,9 @@ class GameCompletionScreen extends StatefulWidget { } class _GameCompletionScreenState extends State { - // ์„œ๋น„์Šค ์ดˆ๊ธฐํ™” final PuzzleService _puzzleService = PuzzleService(); final IdentityService _identityService = IdentityService(); - // ์ƒํƒœ ๋ณ€์ˆ˜ late final TextEditingController _nameController; _RankSubmissionStep _rankStep = _RankSubmissionStep.enterName; List _rankingList = []; @@ -32,17 +30,21 @@ class _GameCompletionScreenState extends State { @override void initState() { super.initState(); - // ๐Ÿ”ฝ [์ˆ˜์ •] ์„ธ์…˜์—์„œ userName์„ ๊ฐ€์ ธ์˜ด - // (์ด ํ™”๋ฉด์€ build ์ด์ „์— ํ˜ธ์ถœ๋˜๋ฏ€๋กœ 'read' ์‚ฌ์šฉ) + + // ๐Ÿ”ฝ [ํ•ต์‹ฌ ์ˆ˜์ •] + // ๋žญํ‚น ๋“ฑ๋ก ์—ฌ๋ถ€์™€ ์ƒ๊ด€์—†์ด, ์ด ํ™”๋ฉด์— ์ง„์ž…ํ•œ ๊ฒƒ ์ž์ฒด๊ฐ€ "๋ ˆ๋ฒจ ํด๋ฆฌ์–ด"์ด๋ฏ€๋กœ + // onProgressSave (๋ ˆ๋ฒจ ์ž ๊ธˆ ํ•ด์ œ)๋ฅผ ์ฆ‰์‹œ ํ˜ธ์ถœํ•ฉ๋‹ˆ๋‹ค. + // (playerName์€ ์ด ์ฝœ๋ฐฑ์—์„œ ์‚ฌ์šฉ๋˜์ง€ ์•Š์œผ๋ฏ€๋กœ ๋นˆ ๊ฐ’์„ ์ „๋‹ฌํ•ฉ๋‹ˆ๋‹ค.) + widget.args.onProgressSave(""); + + // --- (์ดํ•˜ ๊ธฐ์กด ๋กœ์ง) --- final session = context.read().session; _nameController = TextEditingController(text: session?.userName ?? widget.args.userName); - // ๐Ÿ”ฝ [์ˆ˜์ •] ๊ฒŒ์ŠคํŠธ๊ฐ€ ์•„๋‹ˆ๋ฉด, ์ด๋ฆ„ ์ž…๋ ฅ ๋‹จ๊ณ„๋ฅผ ๊ฑด๋„ˆ๋›ฐ๊ณ  ์ฆ‰์‹œ ๋“ฑ๋ก + // ๋กœ๊ทธ์ธ ์œ ์ €์ผ ๊ฒฝ์šฐ, ์ด๋ฆ„ ์ž…๋ ฅ ์ƒ๋žตํ•˜๊ณ  ์ž๋™ ๋“ฑ๋ก if (session != null && !session.isGuest) { _rankStep = _RankSubmissionStep.submitting; - // build๊ฐ€ ์™„๋ฃŒ๋œ ํ›„ ๋“ฑ๋ก ์‹œ์ž‘ WidgetsBinding.instance.addPostFrameCallback((_) { - // [์ค‘์š”] ์„ธ์…˜์˜ userName์œผ๋กœ ์ž๋™ ์ œ์ถœ _submitRank(autoSubmitName: session.userName); }); } @@ -54,12 +56,9 @@ class _GameCompletionScreenState extends State { super.dispose(); } - /// ๋žญํ‚น ๋“ฑ๋ก ๋กœ์ง (๊ณตํ†ตํ™”) - // ๐Ÿ”ฝ [์ˆ˜์ •] _submitRank๊ฐ€ ์ž๋™ ์ œ์ถœ์šฉ ์ด๋ฆ„์„ ๋ฐ›๋„๋ก Future _submitRank({String? autoSubmitName}) async { String playerName; - // ์ž๋™ ์ œ์ถœ(๋กœ๊ทธ์ธ ์ƒํƒœ)์ด ์•„๋‹ˆ๋ฉด(๊ฒŒ์ŠคํŠธ๋ฉด), ์ปจํŠธ๋กค๋Ÿฌ์—์„œ ์ด๋ฆ„์„ ๊ฐ€์ ธ์˜ด if (autoSubmitName == null) { playerName = _nameController.text.trim(); if (playerName.isEmpty) { @@ -80,22 +79,23 @@ class _GameCompletionScreenState extends State { userId: widget.args.userId, gameType: widget.args.gameType, contextId: widget.args.contextId, - playerName: playerName, // ๐Ÿ‘ˆ [์ˆ˜์ •] + playerName: playerName, primaryScore: widget.args.primaryScore, secondaryScore: widget.args.secondaryScore, ); try { - // 1. ๋žญํ‚น ๋“ฑ๋ก final RankSubmissionResult result = await _puzzleService.submitRank(rankDto); - // 2. ์ด๋ฆ„ ์ €์žฅ (๊ณตํ†ต) - // [์ˆ˜์ •] ๊ฒŒ์ŠคํŠธ์ผ ๋•Œ๋งŒ ์ด๋ฆ„์„ ์ €์žฅ (์†Œ์…œ ๋กœ๊ทธ์ธ์€ ์ด๋ฏธ ์ด๋ฆ„์ด ์žˆ์Œ) if (autoSubmitName == null) { await _identityService.saveUserName(playerName); } - // 3. ๊ฒŒ์ž„๋ณ„ ํ›„์† ์ฒ˜๋ฆฌ (๋ ˆ๋ฒจ ์ž ๊ธˆ ํ•ด์ œ ๋“ฑ) + // ๐Ÿ”ฝ [์ˆ˜์ •] + // onProgressSave๋Š” initState์—์„œ ์ด๋ฏธ ํ˜ธ์ถœ๋˜์—ˆ์ง€๋งŒ, + // saveMaxUnlockedLevel ํ•จ์ˆ˜ ์ž์ฒด๊ฐ€ ๋ฉฑ๋“ฑ์„ฑ(Idempotent)์„ ๊ฐ€์ง€๋ฏ€๋กœ + // (์ด๋ฏธ ๋ ˆ๋ฒจ์ด 6์ธ๋ฐ 6์œผ๋กœ ๋ฎ์–ด์จ๋„ ๋ฌธ์ œ์—†์Œ) + // ํ˜น์‹œ ๋ชจ๋ฅผ ์‹คํŒจ์— ๋Œ€๋น„ํ•ด ์—ฌ๊ธฐ์„œ ํ•œ ๋ฒˆ ๋” ํ˜ธ์ถœํ•ด๋„ ์•ˆ์ „ํ•ฉ๋‹ˆ๋‹ค. await widget.args.onProgressSave(playerName); setState(() { @@ -108,7 +108,6 @@ class _GameCompletionScreenState extends State { log("!!! ๋žญํ‚น ๋“ฑ๋ก ์‹คํŒจ !!!", error: e); setState(() { _rankStep = _RankSubmissionStep.enterName; - // ๐Ÿ”ฝ [์ˆ˜์ •] ๊ฒŒ์ŠคํŠธ๊ฐ€ ์•„๋‹ ๋•Œ ์‹คํŒจํ•˜๋ฉด, ์ด๋ฆ„ ์ž…๋ ฅ์ฐฝ ๋Œ€์‹  ๋ฆฌ์ŠคํŠธ๋กœ ๋ณด๋ƒ„ if (autoSubmitName != null) { _rankStep = _RankSubmissionStep.showList; } @@ -119,18 +118,16 @@ class _GameCompletionScreenState extends State { /// ๋‹ซ๊ธฐ ๋ฒ„ํŠผ ๋กœ์ง void _closeScreen() { - // 1. ์ด ํŒ์—… ํ™”๋ฉด์„ ๋‹ซ๊ณ  + // ์ด ํ™”๋ฉด๋งŒ ๋‹ซ์Šต๋‹ˆ๋‹ค. (GameScreen์œผ๋กœ ๋Œ์•„๊ฐ) Navigator.of(context).pop(); - // 2. ์ด์ „ ํ™”๋ฉด(๊ฒŒ์ž„ ํ™”๋ฉด)์„ ๋‹ซ๋„๋ก ์ฝœ๋ฐฑ ํ˜ธ์ถœ - widget.args.onScreenClose(); } @override Widget build(BuildContext context) { + // ... (์ดํ•˜ UI ๋นŒ๋“œ ๋กœ์ง์€ ๋ชจ๋‘ ๋™์ผ) ... final theme = Theme.of(context); - // --- UI ์„น์…˜ ์ •์˜ (์Šค๋„์ฟ /์ŠคํŒŒ์ด๋”์™€ ๋™์ผ) --- - + // --- UI ์„น์…˜ ์ •์˜ --- Widget topRankListWidget = _rankingList.isEmpty ? const Center(child: Text("ํ˜„์žฌ ๋žญํ‚น์ด ์—†์Šต๋‹ˆ๋‹ค.")) : ListView.builder( @@ -139,25 +136,14 @@ class _GameCompletionScreenState extends State { itemBuilder: (context, index) { final rank = _rankingList[index]; final bool isMe = rank.playerName == _submittedPlayerName; - - // [์ˆ˜์ •] ์ ์ˆ˜ ํฌ๋งทํ„ฐ๋ฅผ ์ฃผ์ž…๋ฐ›์€ ํ•จ์ˆ˜๋กœ ๋Œ€์ฒด - final String scoreText = widget.args.scoreFormatter( - rank.primaryScore, - rank.secondaryScore - ); + final String scoreText = widget.args.scoreFormatter(rank.primaryScore, rank.secondaryScore); return ListTile( selected: isMe, selectedTileColor: theme.primaryColor.withOpacity(0.1), leading: Text('${index + 1}.', style: const TextStyle(fontWeight: FontWeight.bold)), title: Text(rank.playerName, style: TextStyle(fontWeight: isMe ? FontWeight.bold : FontWeight.normal)), - trailing: Text( - scoreText, - style: TextStyle( - fontWeight: FontWeight.bold, - color: theme.textTheme.bodyMedium?.color?.withOpacity(0.9) - ) - ), + trailing: Text(scoreText, style: TextStyle(fontWeight: FontWeight.bold, color: theme.textTheme.bodyMedium?.color?.withOpacity(0.9))), ); }, ); @@ -166,18 +152,10 @@ class _GameCompletionScreenState extends State { if (_myRankResult != null) { final myRank = _myRankResult!.rankData; final myRankNum = _myRankResult!.rankNumber; - - bool isMeInTop10 = _rankingList.any( - (topRank) => topRank.playerName == myRank.playerName - ); + bool isMeInTop10 = _rankingList.any((topRank) => topRank.playerName == myRank.playerName); if (!isMeInTop10) { - // [์ˆ˜์ •] ์ ์ˆ˜ ํฌ๋งทํ„ฐ๋ฅผ ์ฃผ์ž…๋ฐ›์€ ํ•จ์ˆ˜๋กœ ๋Œ€์ฒด - final String scoreText = widget.args.scoreFormatter( - myRank.primaryScore, - myRank.secondaryScore - ); - + final String scoreText = widget.args.scoreFormatter(myRank.primaryScore, myRank.secondaryScore); myRankWidget = Padding( padding: const EdgeInsets.only(top: 8.0), child: ListTile( @@ -185,13 +163,7 @@ class _GameCompletionScreenState extends State { selectedTileColor: theme.primaryColor.withOpacity(0.1), leading: Text('$myRankNum.', style: const TextStyle(fontWeight: FontWeight.bold)), title: Text(myRank.playerName, style: const TextStyle(fontWeight: FontWeight.bold)), - trailing: Text( - scoreText, - style: TextStyle( - fontWeight: FontWeight.bold, - color: theme.textTheme.bodyMedium?.color?.withOpacity(0.9) - ) - ), + trailing: Text(scoreText, style: TextStyle(fontWeight: FontWeight.bold, color: theme.textTheme.bodyMedium?.color?.withOpacity(0.9))), ), ); } @@ -215,16 +187,12 @@ class _GameCompletionScreenState extends State { Widget nameEntryWidget = Column( mainAxisSize: MainAxisSize.min, children: [ - // [์ˆ˜์ •] ๊ฒŒ์ž„๋ณ„ ์ ์ˆ˜ ํ‘œ์‹œ ๋Œ€์‹  ๋ฒ”์šฉ ํ…์ŠคํŠธ - Text( - '์ถ•ํ•˜ํ•ฉ๋‹ˆ๋‹ค! ๋žญํ‚น์— ๋“ฑ๋กํ•  ์ด๋ฆ„์„ ์ž…๋ ฅํ•˜์„ธ์š”.', - style: theme.textTheme.titleMedium, - ), + Text('์ถ•ํ•˜ํ•ฉ๋‹ˆ๋‹ค! ๋žญํ‚น์— ๋“ฑ๋กํ•  ์ด๋ฆ„์„ ์ž…๋ ฅํ•˜์„ธ์š”.', style: theme.textTheme.titleMedium), const SizedBox(height: 20), TextField( controller: _nameController, autofocus: true, - maxLength: 20, // [์ˆ˜์ •] 10 -> 20 + maxLength: 20, decoration: InputDecoration( labelText: '์ด๋ฆ„ (20์ž ์ด๋‚ด)', border: const OutlineInputBorder(), @@ -235,7 +203,6 @@ class _GameCompletionScreenState extends State { ); // --- ์ƒํƒœ์— ๋”ฐ๋ผ UI์™€ ๋ฒ„ํŠผ ๊ฒฐ์ • --- - Widget content; List actions = []; String titleText; @@ -244,37 +211,26 @@ class _GameCompletionScreenState extends State { titleText = '๐ŸŽ‰ ๊ฒŒ์ž„ ์™„๋ฃŒ!'; content = nameEntryWidget; actions = [ - TextButton( - onPressed: _closeScreen, // ๋‹ซ๊ธฐ - child: const Text('๋‚˜์ค‘์— ํ•˜๊ธฐ'), - ), - ElevatedButton( - onPressed: () => _submitRank(), // ๐Ÿ‘ˆ [์ˆ˜์ •] ์ธ์ž ์—†์ด ํ˜ธ์ถœ - child: const Text('๋žญํ‚น ๋“ฑ๋ก'), - ), + TextButton(onPressed: _closeScreen, child: const Text('๋‚˜์ค‘์— ํ•˜๊ธฐ')), + ElevatedButton(onPressed: () => _submitRank(), child: const Text('๋žญํ‚น ๋“ฑ๋ก')), ]; } else if (_rankStep == _RankSubmissionStep.submitting) { titleText = '๋žญํ‚น ๋“ฑ๋ก ์ค‘...'; content = const Center(child: CircularProgressIndicator()); - // ๋กœ๋”ฉ ์ค‘์—๋Š” ๋ฒ„ํŠผ ์—†์Œ } else { // _RankSubmissionStep.showList titleText = '๐Ÿ† ๋žญํ‚น (${widget.args.contextId})'; content = rankDisplaySection; actions = [ - TextButton( - onPressed: _closeScreen, // ๋‹ซ๊ธฐ - child: const Text('๋‹ซ๊ธฐ'), - ) + TextButton(onPressed: _closeScreen, child: const Text('๋‹ซ๊ธฐ')), ]; } - // [์ˆ˜์ •] AlertDialog๊ฐ€ ์•„๋‹Œ ์ „์ฒด ํ™”๋ฉด Scaffold๋กœ ๋ณ€๊ฒฝ return Scaffold( appBar: AppBar( title: Text(titleText), - automaticallyImplyLeading: false, // ๋’ค๋กœ๊ฐ€๊ธฐ ๋ฒ„ํŠผ ์ˆจ๊น€ + automaticallyImplyLeading: false, ), body: Padding( padding: const EdgeInsets.all(16.0), diff --git a/packages/feature_game_mathquiz/.gitignore b/packages/feature_game_mathquiz/.gitignore new file mode 100644 index 0000000..dd5eb98 --- /dev/null +++ b/packages/feature_game_mathquiz/.gitignore @@ -0,0 +1,31 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.flutter-plugins-dependencies +/build/ +/coverage/ diff --git a/packages/feature_game_mathquiz/.metadata b/packages/feature_game_mathquiz/.metadata new file mode 100644 index 0000000..d7469f0 --- /dev/null +++ b/packages/feature_game_mathquiz/.metadata @@ -0,0 +1,10 @@ +# 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: "adc901062556672b4138e18a4dc62a4be8f4b3c2" + channel: "stable" + +project_type: package diff --git a/packages/feature_game_mathquiz/CHANGELOG.md b/packages/feature_game_mathquiz/CHANGELOG.md new file mode 100644 index 0000000..41cc7d8 --- /dev/null +++ b/packages/feature_game_mathquiz/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/feature_game_mathquiz/LICENSE b/packages/feature_game_mathquiz/LICENSE new file mode 100644 index 0000000..ba75c69 --- /dev/null +++ b/packages/feature_game_mathquiz/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/feature_game_mathquiz/README.md b/packages/feature_game_mathquiz/README.md new file mode 100644 index 0000000..4a260d8 --- /dev/null +++ b/packages/feature_game_mathquiz/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/feature_game_mathquiz/analysis_options.yaml b/packages/feature_game_mathquiz/analysis_options.yaml new file mode 100644 index 0000000..a5744c1 --- /dev/null +++ b/packages/feature_game_mathquiz/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/feature_game_mathquiz/lib/controllers/math_quiz_controller.dart b/packages/feature_game_mathquiz/lib/controllers/math_quiz_controller.dart new file mode 100644 index 0000000..626d4d6 --- /dev/null +++ b/packages/feature_game_mathquiz/lib/controllers/math_quiz_controller.dart @@ -0,0 +1,127 @@ +import 'dart:async'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] Timer +import 'package:flutter/material.dart'; +import 'package:service_api/service_api.dart'; +import 'math_quiz_generator.dart'; +import '../models/math_quiz_models.dart'; + +class MathQuizController with ChangeNotifier { + late final MathQuizDifficulty difficulty; + late final MathQuizPuzzle puzzle; + late final String userId; + late final String? userName; + + late List _userAnswers; + List get userAnswers => _userAnswers; + + int _selectedBlankIndex = 0; + int get selectedBlankIndex => _selectedBlankIndex; + + bool _isGameCompleted = false; + bool get isGameCompleted => _isGameCompleted; + + // ๐Ÿ”ฝ [์ถ”๊ฐ€] ํƒ€์ด๋จธ ๋ฐ ์‹œ๊ฐ„ + Timer? _timer; + int _secondsElapsed = 0; + int get secondsElapsed => _secondsElapsed; + + // ๐Ÿ”ฝ [์ถ”๊ฐ€] ์ปจํŠธ๋กค๋Ÿฌ๊ฐ€ ์ œ๊ฑฐ๋  ๋•Œ ํƒ€์ด๋จธ ํ•ด์ œ + @override + void dispose() { + _timer?.cancel(); + super.dispose(); + } + + // ๐Ÿ”ฝ [์ถ”๊ฐ€] ํƒ€์ด๋จธ ์‹œ์ž‘ + void _startTimer() { + _timer?.cancel(); + _secondsElapsed = 0; + _timer = Timer.periodic(const Duration(seconds: 1), (timer) { + _secondsElapsed++; + notifyListeners(); // ๋งค์ดˆ UI ๊ฐฑ์‹  (์‹œ๊ฐ„ ํ‘œ์‹œ์šฉ) + }); + } + + // ๐Ÿ”ฝ [์ถ”๊ฐ€] ํƒ€์ด๋จธ ์ •์ง€ + void _stopTimer() { + _timer?.cancel(); + } + + /// 1. ๋กœ๋น„์—์„œ ํ˜ธ์ถœ: ์ƒˆ ๊ฒŒ์ž„ ์‹œ์ž‘ + void startNewGame(MathQuizDifficulty level, String userId, String? userName) { + this.difficulty = level; + this.userId = userId; + this.userName = userName; + + final generator = MathQuizGenerator(); + this.puzzle = generator.generatePuzzle(level); + + _userAnswers = List.generate(puzzle.solutions.length, (_) => null); + _selectedBlankIndex = 0; + _isGameCompleted = false; + + _startTimer(); // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + + notifyListeners(); + } + + /// 2. UI(๋นˆ์นธ)์—์„œ ํ˜ธ์ถœ: ๋นˆ์นธ ์„ ํƒ + void onBlankTapped(int index) { + if (_isGameCompleted) return; + + _selectedBlankIndex = index; + notifyListeners(); + } + + /// 3. UI(์ˆซ์ž ๋ฒ„ํŠผ)์—์„œ ํ˜ธ์ถœ: ๋‹ต ์ž…๋ ฅ + void onOptionTapped(String option) { + if (_isGameCompleted) return; + + _userAnswers[_selectedBlankIndex] = option; + _selectNextBlank(); + notifyListeners(); + _checkCompletion(); + } + + /// 4. UI(์ง€์šฐ๊ธฐ ๋ฒ„ํŠผ)์—์„œ ํ˜ธ์ถœ: ๋‹ต ์ง€์šฐ๊ธฐ + void onClearTapped() { + if (_isGameCompleted) return; + _userAnswers[_selectedBlankIndex] = null; + notifyListeners(); + } + + /// ๋‹ค์Œ ๋นˆ์นธ (์•„์ง ๋‹ต์ด ์—†๋Š”)์œผ๋กœ ์ž๋™ ์ด๋™ + void _selectNextBlank() { + int nextIndex = (_selectedBlankIndex + 1) % _userAnswers.length; + for (int i = 0; i < _userAnswers.length; i++) { + if (_userAnswers[nextIndex] == null) { + _selectedBlankIndex = nextIndex; + return; + } + nextIndex = (nextIndex + 1) % _userAnswers.length; + } + } + + /// ๋ชจ๋“  ๋‹ต์ด ์ฑ„์›Œ์กŒ๋Š”์ง€, ๊ทธ๋ฆฌ๊ณ  ์ •๋‹ต์ธ์ง€ ํ™•์ธ + void _checkCompletion() { + if (_userAnswers.any((answer) => answer == null)) { + return; + } + + bool allCorrect = true; + for (int i = 0; i < puzzle.solutions.length; i++) { + if (_userAnswers[i] != puzzle.solutions[i]) { + allCorrect = false; + break; + } + } + + if (allCorrect) { + _isGameCompleted = true; + _stopTimer(); // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + notifyListeners(); + } else { + // [TODO] ์˜ค๋‹ต ์ฒ˜๋ฆฌ (์˜ˆ: ์Šค๋‚ต๋ฐ” ํ‘œ์‹œ) + debugPrint("์˜ค๋‹ต์ž…๋‹ˆ๋‹ค!"); + } + } +} \ No newline at end of file diff --git a/packages/feature_game_mathquiz/lib/controllers/math_quiz_generator.dart b/packages/feature_game_mathquiz/lib/controllers/math_quiz_generator.dart new file mode 100644 index 0000000..a8bfd72 --- /dev/null +++ b/packages/feature_game_mathquiz/lib/controllers/math_quiz_generator.dart @@ -0,0 +1,403 @@ +import 'dart:math'; +import 'package:service_api/service_api.dart'; +import '../models/math_quiz_models.dart'; +import 'package:function_tree/function_tree.dart'; + +class MathQuizGenerator { + final Random _random = Random(); + + /// ๋‚œ์ด๋„์— ๋งž๋Š” ํผ์ฆ์„ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค. + MathQuizPuzzle generatePuzzle(MathQuizDifficulty level) { + switch (level.layout) { + case MathQuizLayout.singleLine: + if (level.operationCount == 2) { // Lv 1-5 + return _generateSimpleEquation(level); // A + B = C + } else { // operationCount == 3 (Lv 6-10) + return _generateMultiOpEquation(level); // A + B * C = D + } + case MathQuizLayout.linkedL: // operationCount == 4 (Lv 11-15) + return _generateLinkedEquations(level); // 2x2 ๊ทธ๋ฆฌ๋“œ + case MathQuizLayout.gridSquare: + if (level.operationCount == 9) { // Lv 10-12 (3x3) + return _generate3x3GridEquation(level); + } else { // Lv 13-15 (4x4) + return _generate4x4GridEquation(level); + } + } + } + + /// [Lv 1-5] ์ˆซ์ž 2๊ฐœ ์—ฐ์‚ฐ: (A op B = C) + MathQuizPuzzle _generateSimpleEquation(MathQuizDifficulty level) { + // (์ด์ „๊ณผ ๋™์ผ) + final (int a, int b, int c, String op) = _createEquation(level.operators); + final List allParts = (op == '+') + ? [a.toString(), op, b.toString(), '=', c.toString()] + : (op == '-') + ? [c.toString(), op, a.toString(), '=', b.toString()] + : (op == '*') + ? [a.toString(), op, b.toString(), '=', c.toString()] + : [c.toString(), op, a.toString(), '=', b.toString()]; + List candidateIndices; + switch (level.blankType) { + case MathQuizBlankType.numbersOnly: candidateIndices = [0, 2]; break; + case MathQuizBlankType.operatorsOnly: candidateIndices = [1]; break; + case MathQuizBlankType.numbersAndOperators: candidateIndices = [0, 1, 2]; break; + } + final int finalBlankCount = min(level.blankCount, candidateIndices.length); + final List blankIndices = (candidateIndices..shuffle(_random)).sublist(0, finalBlankCount); + final List solutions = []; + final List gridCells = List.of(allParts); + for (int index in blankIndices) { + solutions.add(allParts[index]); + gridCells[index] = '?'; + } + final Set optionsSet = solutions.toSet(); + while (optionsSet.length < 9) { + optionsSet.add((_random.nextInt(9) + 1).toString()); + } + optionsSet.addAll(level.operators.split(',')); + if (level.blankType != MathQuizBlankType.operatorsOnly) { + optionsSet.add('='); + } + final List options = (optionsSet.toList()..shuffle(_random)).toList(); + return MathQuizPuzzle( + gridCells: gridCells, + gridCrossAxisCount: 5, // 5x1 ๊ทธ๋ฆฌ๋“œ + solutions: solutions, + options: options, + ); + } + + /// [Lv 6-10] ์ˆซ์ž 3๊ฐœ ์—ฐ์‚ฐ: (A op1 B op2 C = D) + MathQuizPuzzle _generateMultiOpEquation(MathQuizDifficulty level) { + // 1. ์‹ ์ƒ์„ฑ (์—ฐ์‚ฐ์ž ์šฐ์„ ์ˆœ์œ„ ํฌํ•จ) + final (int a, int b, int c, String op1, String op2, int result) = _createMultiOpEquation(level.operators); + final List allParts = [a.toString(), op1, b.toString(), op2, c.toString(), '=', result.toString()]; + // 2. ๋นˆ์นธ ์ƒ์„ฑ + final int blankCount = level.blankCount; + List candidateIndices; + switch (level.blankType) { + case MathQuizBlankType.numbersOnly: candidateIndices = [0, 2, 4]; break; + case MathQuizBlankType.operatorsOnly: candidateIndices = [1, 3]; break; + case MathQuizBlankType.numbersAndOperators: candidateIndices = [0, 1, 2, 3, 4]; break; + } + final int finalBlankCount = min(blankCount, candidateIndices.length); + final List blankIndices = (candidateIndices..shuffle(_random)).sublist(0, finalBlankCount); + final List solutions = []; + final List gridCells = List.of(allParts); + for (int index in blankIndices) { + solutions.add(allParts[index]); + gridCells[index] = '?'; + } + // 3. ์˜ต์…˜ ์ƒ์„ฑ + final Set optionsSet = solutions.toSet(); + while (optionsSet.length < 9) { + optionsSet.add((_random.nextInt(9) + 1).toString()); + } + optionsSet.addAll(level.operators.split(',')); + optionsSet.add('='); + // 4. ๊ทธ๋ฆฌ๋“œ ๋ชจ๋ธ๋กœ ๋ฐ˜ํ™˜ + return MathQuizPuzzle( + gridCells: gridCells, + gridCrossAxisCount: 7, // 7x1 ๊ทธ๋ฆฌ๋“œ + solutions: solutions, + options: (optionsSet.toList()..shuffle(_random)).toList(), + ); + } + + /// [Lv 11-15] ์ˆซ์ž 4๊ฐœ ์—ฐ์‚ฐ: (2x2 ๊ทธ๋ฆฌ๋“œ 'ใ„ฑ', 'ใ„ด') + MathQuizPuzzle _generateLinkedEquations(MathQuizDifficulty level) { + // (๋™์  ์ƒ์„ฑ ๋กœ์ง) + while (true) { + final int a = _random.nextInt(9) + 1; + final int b = _random.nextInt(9) + 1; + final int c = _random.nextInt(9) + 1; + final int d = _random.nextInt(9) + 1; + final ops = level.operators.split(','); + final String op1 = (ops..shuffle(_random)).first; + final String op2 = (ops..shuffle(_random)).first; + final String op3 = (ops..shuffle(_random)).first; + final String op4 = (ops..shuffle(_random)).first; + final int? r1 = _calculate(a, b, op1); + final int? r2 = _calculate(c, d, op2); + final int? r3 = _calculate(a, c, op3); + final int? r4 = _calculate(b, d, op4); + if (r1 == null || r2 == null || r3 == null || r4 == null) continue; + if (r1 < -99 || r2 < -99 || r3 < -99 || r4 < -99 || r1 > 999 || r2 > 999 || r3 > 999 || r4 > 999) continue; + + final List allParts = [ + a.toString(), op1, b.toString(), "=", r1.toString(), + op3, " ", op4, " ", "=", + c.toString(), op2, d.toString(), "=", r2.toString(), + "=", " ", "=", " ", "=", + r3.toString(), " ", r4.toString(), " ", " ", + ]; + final List solutions = []; + final List gridCells = List.of(allParts); + List numberIndices = [0, 2, 10, 12]; // A,B,C,D + List operatorIndices = [1, 5, 7, 11]; // op1,op3,op4,op2 + List blankIndices = []; + switch (level.blankType) { + case MathQuizBlankType.numbersOnly: + blankIndices = (numberIndices..shuffle(_random)).sublist(0, min(level.blankCount, numberIndices.length)); + break; + case MathQuizBlankType.operatorsOnly: + blankIndices = (operatorIndices..shuffle(_random)).sublist(0, min(level.blankCount, operatorIndices.length)); + break; + case MathQuizBlankType.numbersAndOperators: + blankIndices = (numberIndices + operatorIndices..shuffle(_random)).sublist(0, level.blankCount); + break; + } + blankIndices.sort(); + for (int index in blankIndices) { + solutions.add(allParts[index]); + gridCells[index] = '?'; + } + final Set optionsSet = solutions.toSet(); + while (optionsSet.length < 9) { + optionsSet.add((_random.nextInt(9) + 1).toString()); + } + optionsSet.addAll(level.operators.split(',')); + optionsSet.add('='); + + return MathQuizPuzzle( + gridCells: gridCells, + gridCrossAxisCount: 5, // 5x5 ๊ทธ๋ฆฌ๋“œ + solutions: solutions, + options: (optionsSet.toList()..shuffle(_random)).toList(), + ); + } // end while(true) + } + + /// [์ˆ˜์ •๋จ] ๋ ˆ๋ฒจ 10-12 (3x3 Grid) - ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก ์‚ฌ์šฉ + MathQuizPuzzle _generate3x3GridEquation(MathQuizDifficulty level) { + // 1. 3x3 ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก์—์„œ ๋žœ๋ค ์„ ํƒ + final template = _get3x3Templates()..shuffle(); + final selectedTemplate = template.first; + + final List allParts = selectedTemplate.gridCells; + final List numberIndices = selectedTemplate.numberIndices; + final List operatorIndices = selectedTemplate.operatorIndices; + + // 2. ๋‚œ์ด๋„(level.blankType)์— ๋”ฐ๋ผ ๋นˆ์นธ('?') ์ƒ์„ฑ + final List finalSolutions = []; + final List gridCells = List.of(allParts); + + List blankIndices = []; + switch (level.blankType) { + case MathQuizBlankType.numbersOnly: + blankIndices = (numberIndices..shuffle(_random)).sublist(0, min(level.blankCount, numberIndices.length)); + break; + case MathQuizBlankType.operatorsOnly: + blankIndices = (operatorIndices..shuffle(_random)).sublist(0, min(level.blankCount, operatorIndices.length)); + break; + case MathQuizBlankType.numbersAndOperators: + blankIndices = (numberIndices + operatorIndices..shuffle(_random)).sublist(0, level.blankCount); + break; + } + + // 3. ๋นˆ์นธ ์ ์šฉ + blankIndices.sort(); + for (int index in blankIndices) { + finalSolutions.add(allParts[index]); + gridCells[index] = '?'; + } + + // 4. ์˜ต์…˜ ์ƒ์„ฑ + final Set optionsSet = finalSolutions.toSet(); // ๐Ÿ‘ˆ [์˜ค๋ฅ˜ ์ˆ˜์ •] + while (optionsSet.length < 9) { + optionsSet.add((_random.nextInt(9) + 1).toString()); + } + optionsSet.addAll(level.operators.split(',')); + optionsSet.add('='); + + final List options = (optionsSet.toList()..shuffle(_random)).toList(); + + return MathQuizPuzzle( + gridCells: gridCells, + gridCrossAxisCount: 7, // 3x3 ํผ์ฆ (7x7 ๊ทธ๋ฆฌ๋“œ) + solutions: finalSolutions, + options: options, // ๐Ÿ‘ˆ [์˜ค๋ฅ˜ ์ˆ˜์ •] + ); + } + + /// [์ˆ˜์ •๋จ] ๋ ˆ๋ฒจ 13-15 (4x4 Grid) - ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก ์‚ฌ์šฉ + MathQuizPuzzle _generate4x4GridEquation(MathQuizDifficulty level) { + // 1. 4x4 ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก์—์„œ ๋žœ๋ค ์„ ํƒ + final template = _get4x4Templates()..shuffle(); + final selectedTemplate = template.first; + + final List allParts = selectedTemplate.gridCells; + final List numberIndices = selectedTemplate.numberIndices; + final List operatorIndices = selectedTemplate.operatorIndices; + + // 2. ๋‚œ์ด๋„(level.blankType)์— ๋”ฐ๋ผ ๋นˆ์นธ('?') ์ƒ์„ฑ + final List finalSolutions = []; + final List gridCells = List.of(allParts); + + List blankIndices = []; + switch (level.blankType) { + case MathQuizBlankType.numbersOnly: + blankIndices = (numberIndices..shuffle(_random)).sublist(0, min(level.blankCount, numberIndices.length)); + break; + case MathQuizBlankType.operatorsOnly: + blankIndices = (operatorIndices..shuffle(_random)).sublist(0, min(level.blankCount, operatorIndices.length)); + break; + case MathQuizBlankType.numbersAndOperators: + blankIndices = (numberIndices + operatorIndices..shuffle(_random)).sublist(0, level.blankCount); + break; + } + + // 3. ๋นˆ์นธ ์ ์šฉ + blankIndices.sort(); + for (int index in blankIndices) { + finalSolutions.add(allParts[index]); + gridCells[index] = '?'; + } + + // 4. ์˜ต์…˜ ์ƒ์„ฑ + final Set optionsSet = finalSolutions.toSet(); // ๐Ÿ‘ˆ [์˜ค๋ฅ˜ ์ˆ˜์ •] + while (optionsSet.length < 9) { + optionsSet.add((_random.nextInt(9) + 1).toString()); + } + optionsSet.addAll(level.operators.split(',')); + optionsSet.add('='); + + final List options = (optionsSet.toList()..shuffle(_random)).toList(); + + return MathQuizPuzzle( + gridCells: gridCells, + gridCrossAxisCount: 9, // 4x4 ํผ์ฆ (9x9 ๊ทธ๋ฆฌ๋“œ) + solutions: finalSolutions, + options: options, // ๐Ÿ‘ˆ [์˜ค๋ฅ˜ ์ˆ˜์ •] + ); + } + + /// [HELPER] (A, B, C, op) ํŠœํ”Œ ์ƒ์„ฑ (์‚ฌ์น™์—ฐ์‚ฐ ์ง€์›) + (int, int, int, String) _createEquation(String operators, {int? firstTerm, int maxResult = 9}) { + // (์ด์ „๊ณผ ๋™์ผ) + final List ops = operators.split(','); + final String op = ops[_random.nextInt(ops.length)]; + int a, b, c; + switch (op) { + case '+': + a = firstTerm ?? _random.nextInt(maxResult - 1) + 1; + b = _random.nextInt(maxResult - a) + 1; + c = a + b; + return (a, b, c, op); + case '-': + c = firstTerm ?? _random.nextInt(maxResult - 1) + 2; + a = _random.nextInt(c - 1) + 1; + b = c - a; + return (a, b, c, op); + case '*': + a = firstTerm ?? _random.nextInt(maxResult ~/ 2) + 2; + b = _random.nextInt(maxResult ~/ a) + 1; + c = a * b; + return (a, b, c, op); + case '/': + b = _random.nextInt(maxResult ~/ 2) + 1; + a = _random.nextInt(maxResult ~/ b) + 1; + c = a * b; + if (c == 0 || a == 0) return _createEquation(operators, firstTerm: firstTerm, maxResult: maxResult); + return (a, b, c, op); + default: + return (1, 1, 2, '+'); + } + } + + /// [HELPER] ์ˆซ์ž 3๊ฐœ + ์—ฐ์‚ฐ์ž 2๊ฐœ (์šฐ์„ ์ˆœ์œ„ ์ ์šฉ!) + (int, int, int, String, String, int) _createMultiOpEquation(String operators) { + while(true) { + final int a = _random.nextInt(9) + 1; + final int b = _random.nextInt(9) + 1; + final int c = _random.nextInt(9) + 1; + final List ops = operators.split(','); + final String op1 = (ops..shuffle(_random)).first; + final String op2 = (ops..shuffle(_random)).first; + + final String expression = "$a $op1 $b $op2 $c"; + if (expression.contains('/')) continue; + + final num resultNum = expression.interpret(); + final int result = resultNum.toInt(); + + if (result == resultNum && result >= -99 && result <= 999) { // [์ˆ˜์ •] ๋ฒ”์œ„ ํ™•์žฅ + return (a, b, c, op1, op2, result); + } + } + } + + /// [HELPER] ๋‘ ์ˆซ์ž์™€ ์—ฐ์‚ฐ์ž๋กœ ๊ณ„์‚ฐ (์‹คํŒจ ์‹œ null ๋ฐ˜ํ™˜) + int? _calculate(int a, int b, String op) { + switch (op) { + case '+': return a + b; + case '-': return a - b; + case '*': return a * b; + case '/': + if (b == 0) return null; // 0์œผ๋กœ ๋‚˜๋ˆ„๊ธฐ + if (a % b != 0) return null; // ๋‚˜๋ˆ„์–ด๋–จ์–ด์ง€์ง€ ์•Š์Œ + return a ~/ b; + } + return 0; // ์•Œ ์ˆ˜ ์—†๋Š” ์—ฐ์‚ฐ์ž + } + + /// [์‹ ๊ทœ] 3x3 ๊ทธ๋ฆฌ๋“œ ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก (8๊ฐœ) + List<_GridTemplate> _get3x3Templates() { + // [!] ํ…œํ”Œ๋ฆฟ์˜ ์ˆ˜ํ•™์  ์œ ํšจ์„ฑ์€ ์ด๋ฏธ์ง€ ์›๋ณธ์„ ๋”ฐ๋ฅด๋ฉฐ, ๋ณด์žฅ๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. + return [ + // 5.53.19.png (top-left) + _GridTemplate(gridCells:["5","*","3","-","1","=","17","+"," ","*"," ","-"," ","=","2","*","6","-","7","=","5","*"," ","+"," ","+"," ","=","4","+","1","+","1","=","18","="," ","="," ","="," ","=","21"," ","33"," ","22"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.19.png (top-right) + _GridTemplate(gridCells:["1","+","1","+","5","=","17","/"," ","-"," ","+"," ","=","1","*","3","+","2","=","15","*"," ","+"," ","-"," ","=","6","-","4","+","2","=","0","="," ","="," ","="," ","=","12"," ","12"," ","13"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.19.png (bottom-left) + _GridTemplate(gridCells:["9","+","5","+","5","=","19","/"," ","-"," ","+"," ","=","2","*","3","+","9","=","15","*"," ","+"," ","-"," ","=","6","-","7","+","1","=","0","="," ","="," ","="," ","=","12"," ","9"," ","16"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.19.png (bottom-right) + _GridTemplate(gridCells:["7","*","4","-","9","=","39","*"," ","+"," ","*"," ","=","1","*","1","+","8","=","9","+"," ","*"," ","+"," ","=","3","-","4","+","5","=","4","="," ","="," ","="," ","=","11"," ","34"," ","23"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.33.png (top-left) + _GridTemplate(gridCells:["9","-","5","/","1","=","7","*"," ","-"," ","+"," ","=","8","*","5","-","7","=","27","+"," ","+"," ","+"," ","=","4","+","3","-","7","=","2","="," ","="," ","="," ","=","62"," ","0"," ","12"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.33.png (top-right) + _GridTemplate(gridCells:["8","*","2","+","6","=","16","*"," ","+"," ","/"," ","=","5","*","9","/","3","=","3","+"," ","+"," ","*"," ","=","7","+","1","+","1","=","19","="," ","="," ","="," ","=","9"," ","18"," ","16"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.33.png (bottom-left) + _GridTemplate(gridCells:["1","+","7","+","9","=","17","*"," ","+"," ","-"," ","=","8","/","4","+","4","=","8","+"," ","*"," ","/"," ","=","7","*","3","+","3","=","17","="," ","="," ","="," ","=","13"," ","19"," ","6"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + // 5.53.33.png (bottom-right) + _GridTemplate(gridCells:["1","+","6","-","9","=","6","/"," ","-"," ","/"," ","=","2","-","7","/","1","=","0","-"," ","/"," ","*"," ","=","9","-","5","+","4","=","0","="," ","="," ","="," ","=","0"," ","6"," ","3"," "," "], numberIndices:[0,2,4,14,16,18,28,30,32], operatorIndices:[1,3,7,9,11,15,17,21,23,25,29,31]), + ]; + } + + /// [์‹ ๊ทœ] 4x4 ๊ทธ๋ฆฌ๋“œ ํ…œํ”Œ๋ฆฟ ๋ชฉ๋ก (8๊ฐœ) + List<_GridTemplate> _get4x4Templates() { + // [!] ํ…œํ”Œ๋ฆฟ์˜ ์ˆ˜ํ•™์  ์œ ํšจ์„ฑ์€ ์ด๋ฏธ์ง€ ์›๋ณธ์„ ๋”ฐ๋ฅด๋ฉฐ, ๋ณด์žฅ๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. + return [ + // 5.54.51.png (top-left) + _GridTemplate(gridCells:["1","*","4","-","2","+","14","=","16","+"," ","*"," ","/"," ","-"," ","=","15","/","5","*","16","+","13","=","61","+"," ","-"," ","+"," ","+"," ","=","3","/","2","+","4","*","7","=","29","*"," ","+"," ","/"," ","*"," ","=","15","+","11","-","8","*","8","=","-38","="," ","="," ","="," ","="," ","=","102"," ","51"," ","54"," ","95"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.54.51.png (bottom-left) + _GridTemplate(gridCells:["8","+","4","*","2","+","15","=","114","-"," ","+"," ","-"," ","-"," ","=","6","/","4","+","3","/","2","=","11","-"," ","-"," ","+"," ","-"," ","=","7","*","3","/","5","-","1","=","0","+"," ","-"," ","*"," ","+"," ","=","12","-","1","*","6","+","11","=","14","="," ","="," ","="," ","="," ","=","1"," ","0"," ","44"," ","18"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.54.37.png (top-left) + _GridTemplate(gridCells:["10","/","2","*","3","+","9","=","24","*"," ","-"," ","*"," ","+"," ","=","2","+","13","*","5","-","7","=","74","+"," ","+"," ","-"," ","+"," ","=","5","*","6","+","1","-","7","=","5","+"," ","-"," ","+"," ","+"," ","=","12","-","11","+","2","*","8","=","49","="," ","="," ","="," ","="," ","=","173"," ","15"," ","17"," ","85"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.54.37.png (bottom-left) + _GridTemplate(gridCells:["9","*","2","+","8","-","1","=","40","/"," ","/"," ","-"," ","*"," ","=","5","+","2","-","13","+","3","=","3","-"," ","*"," ","+"," ","-"," ","=","7","/","1","-","6","+","4","=","4","+"," ","+"," ","*"," ","+"," ","=","16","+","9","-","7","-","10","=","9","="," ","="," ","="," ","="," ","=","5"," ","29"," ","64"," ","13"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.54.29.png (top-left) + _GridTemplate(gridCells:["1","-","5","-","4","+","14","=","8","*"," ","/"," ","*"," ","-"," ","=","7","+","2","*","1","-","11","=","14","-"," ","+"," ","+"," ","-"," ","=","2","/","1","*","7","-","6","=","21","+"," ","+"," ","-"," ","+"," ","=","15","*","10","+","1","+","7","=","173","="," ","="," ","="," ","="," ","=","12"," ","18"," ","21"," ","5"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.54.29.png (bottom-left) + _GridTemplate(gridCells:["9","-","3","-","1","+","13","=","11","*"," ","*"," ","+"," ","+"," ","=","8","*","7","-","9","-","5","=","49","+"," ","+"," ","*"," ","+"," ","=","6","*","5","+","11","-","2","=","41","-"," ","-"," ","-"," ","/"," ","=","15","+","2","-","1","-","4","=","17","="," ","="," ","="," ","="," ","=","71"," ","67"," ","40"," ","18"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.55.00.png (top-left) + _GridTemplate(gridCells:["9","*","8","-","6","+","7","=","141","*"," ","*"," ","/"," ","-"," ","=","2","+","6","*","5","-","10","=","27","-"," ","-"," ","+"," ","-"," ","=","3","+","1","-","3","*","1","=","3","*"," ","+"," ","+"," ","+"," ","=","11","+","7","*","2","+","8","=","25","="," ","="," ","="," ","="," ","=","19"," ","85"," ","20"," ","9"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + // 5.55.00.png (bottom-left) + _GridTemplate(gridCells:["4","-","1","-","2","+","14","=","3","+"," ","*"," ","*"," ","-"," ","=","9","-","1","+","3","-","4","=","7","*"," ","/"," ","-"," ","+"," ","=","6","-","1","+","7","+","1","=","17","+"," ","-"," ","+"," ","*"," ","=","8","*","2","+","1","+","16","=","65","="," ","="," ","="," ","="," ","=","38"," ","9"," ","144"," ","178"," "," "], numberIndices:[0,2,4,6,18,20,22,24,36,38,40,42,54,56,58,60], operatorIndices:[1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,45,47,49,51,53,55,57,59,61,63,65,67,69,71]), + ]; + } +} + +/// [์‹ ๊ทœ] 3x3/4x4 ํ…œํ”Œ๋ฆฟ์˜ ๋‚ด๋ถ€ ๊ตฌ์กฐ +class _GridTemplate { + final List gridCells; + final List numberIndices; + final List operatorIndices; + + _GridTemplate({ + required this.gridCells, + required this.numberIndices, + required this.operatorIndices, + }); +} \ No newline at end of file diff --git a/packages/feature_game_mathquiz/lib/feature_game_mathquiz.dart b/packages/feature_game_mathquiz/lib/feature_game_mathquiz.dart new file mode 100644 index 0000000..4d06f61 --- /dev/null +++ b/packages/feature_game_mathquiz/lib/feature_game_mathquiz.dart @@ -0,0 +1,2 @@ +// ์ด ํŒจํ‚ค์ง€์˜ ๋ฉ”์ธ ์ง„์ž…์  (๋กœ๋น„ ํ™”๋ฉด)์„ exportํ•ฉ๋‹ˆ๋‹ค. +export 'screens/math_quiz_lobby_screen.dart'; \ No newline at end of file diff --git a/packages/feature_game_mathquiz/lib/models/math_quiz_models.dart b/packages/feature_game_mathquiz/lib/models/math_quiz_models.dart new file mode 100644 index 0000000..2bbbdc6 --- /dev/null +++ b/packages/feature_game_mathquiz/lib/models/math_quiz_models.dart @@ -0,0 +1,29 @@ +// packages/feature_game_mathquiz/lib/models/math_quiz_models.dart + +/// ํผ์ฆ ํ•œ ํŒ์˜ ๋ฐ์ดํ„ฐ ๊ตฌ์กฐ +class MathQuizPuzzle { + /// [์ˆ˜์ •] ๊ทธ๋ฆฌ๋“œ ์…€ ๋ฐ์ดํ„ฐ + /// + /// '?'๋Š” ๋นˆ์นธ, ' '๋Š” ๊ณต๋ฐฑ(๋นˆ ์…€)์ž…๋‹ˆ๋‹ค. + /// + /// ์˜ˆ: ["?", "+", "3", "=", "8"] (5x1 ๊ทธ๋ฆฌ๋“œ) + /// ์˜ˆ: ["?", "+", "2", "=", "5", "+", " ", "+", ... ] (5x5 ๊ทธ๋ฆฌ๋“œ) + final List gridCells; + + /// ๊ทธ๋ฆฌ๋“œ์˜ ๊ฐ€๋กœ ์นธ ์ˆ˜ (์˜ˆ: 5) + final int gridCrossAxisCount; + + /// ์œ ์ €๊ฐ€ ์ฑ„์›Œ์•ผ ํ•  ์ •๋‹ต ๋ชฉ๋ก (์ˆœ์„œ๋Œ€๋กœ) + final List solutions; + + /// ์œ ์ €์—๊ฒŒ ์ œ๊ณต๋  ์ˆซ์ž/๊ธฐํ˜ธ ๋ฒ„ํŠผ ์˜ต์…˜ + final List options; + + MathQuizPuzzle({ + // โŒ puzzleType ์‚ญ์ œ + required this.gridCells, + required this.gridCrossAxisCount, + required this.solutions, + required this.options, + }); +} \ No newline at end of file diff --git a/packages/feature_game_mathquiz/lib/screens/math_quiz_lobby_screen.dart b/packages/feature_game_mathquiz/lib/screens/math_quiz_lobby_screen.dart new file mode 100644 index 0000000..7f373f4 --- /dev/null +++ b/packages/feature_game_mathquiz/lib/screens/math_quiz_lobby_screen.dart @@ -0,0 +1,239 @@ +import 'dart:developer'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +// [C] ๊ณตํ†ต ์„œ๋น„์Šค (service_api) +import 'package:service_api/service_api.dart'; +// [A] ๊ณตํ†ต UI (feature_common) +import 'package:feature_common/feature_common.dart'; +// [B] ์ด ํŒจํ‚ค์ง€ (mathquiz) +import 'math_quiz_screen.dart'; +import '../controllers/math_quiz_controller.dart'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] ์ปจํŠธ๋กค๋Ÿฌ ์ž„ํฌํŠธ + +class MathQuizLobbyScreen extends StatefulWidget { + const MathQuizLobbyScreen({ super.key }); + + @override + State createState() => _MathQuizLobbyScreenState(); +} + +class _MathQuizLobbyScreenState extends State { + int _maxUnlockedLevel = 1; + Map _rankHistory = {}; + bool _isLoading = false; + + late final SessionNotifier _sessionNotifier; + final PuzzleService _puzzleService = PuzzleService(); + final IdentityService _identityService = IdentityService(); + + @override + void initState() { + super.initState(); + _sessionNotifier = context.read(); + _loadProgress(forceRefreshRanks: true); + } + + /// ๋žญํ‚น ๋ฐ ๋ ˆ๋ฒจ ์ง„ํ–‰ ์ƒํ™ฉ ๋กœ๋“œ + Future _loadProgress({bool forceRefreshRanks = false}) async { + // 1. (๊ฐ€๋ฒผ์›€) ๋ ˆ๋ฒจ ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ + final maxLevel = await _identityService.getMaxUnlockedLevel(gameType: 'MATH_QUIZ'); + if (mounted) { setState(() { _maxUnlockedLevel = maxLevel; }); } + + // 2. (๋ฌด๊ฑฐ์›€) ๋žญํ‚น ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ (ํ•„์š”ํ•  ๋•Œ๋งŒ) + if (!forceRefreshRanks) return; + + final String? myName = _sessionNotifier.session?.userName; + if (myName == null) return; + + try { + final Map oldRankMap = await _identityService.getLastSavedRankMap(gameType: 'MATH_QUIZ'); + List>> rankFutures = []; + for (final level in MathQuizDifficulties.allDifficulties) { + rankFutures.add(_puzzleService.fetchRanks('MATH_QUIZ', level.contextId)); + } + final List> allRankResults = await Future.wait(rankFutures); + Map newRankMapForStorage = {}; + Map newRankHistoryForState = {}; + + for (int i = 0; i < MathQuizDifficulties.allDifficulties.length; i++) { + final level = MathQuizDifficulties.allDifficulties[i]; + final currentRanks = allRankResults[i]; + final int levelIndex = level.levelIndex; + final int oldRank = oldRankMap[levelIndex] ?? 0; + int currentRank = 0; + int myRankIndex = currentRanks.indexWhere((r) => r.playerName == myName); + if (myRankIndex != -1) { currentRank = myRankIndex + 1; } + newRankMapForStorage[levelIndex] = currentRank; + newRankHistoryForState[levelIndex] = (oldRank, currentRank); + } + + await _identityService.saveLastRankMap(newRankMapForStorage, gameType: 'MATH_QUIZ'); + if (mounted) { setState(() { _rankHistory = newRankHistoryForState; }); } + log("์ˆ˜ํ•™ ํ€ด์ฆˆ ๋žญํ‚น ๋ณ€๋™ ํ™•์ธ ์™„๋ฃŒ. (์œ ์ €: $myName)"); + } catch (e) { + log("MathQuizLobbyScreen: ๋žญํ‚น ํ™•์ธ ์‹คํŒจ: $e"); + } + } + + /// ๐Ÿ”ฝ [์ˆ˜์ •] ๊ฒŒ์ž„ ์‹œ์ž‘ ํ•จ์ˆ˜ + Future _startGame(MathQuizDifficulty level) async { + setState(() { _isLoading = true; }); + + try { + final session = _sessionNotifier.session; + if (session == null) { + throw Exception("์„ธ์…˜์ด ๋กœ๋“œ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค."); + } + + // 1. ์ปจํŠธ๋กค๋Ÿฌ ์ƒ์„ฑ ๋ฐ ์ƒˆ ๊ฒŒ์ž„ ์‹œ์ž‘ (์ œ๋„ˆ๋ ˆ์ดํ„ฐ ํ˜ธ์ถœ) + final controller = MathQuizController(); + controller.startNewGame(level, session.userId, session.userName); + + if (mounted) { + await Navigator.push( + context, + MaterialPageRoute( + // 2. ์ปจํŠธ๋กค๋Ÿฌ๋ฅผ ๊ฒŒ์ž„ ํ™”๋ฉด์— ์ฃผ์ž… + builder: (context) => ChangeNotifierProvider.value( + value: controller, + child: const MathQuizScreen(), + ), + ), + ); + + // 3. ๊ฒŒ์ž„์—์„œ ๋Œ์•„์˜ค๋ฉด ๋ ˆ๋ฒจ ์ž ๊ธˆ ์ƒํƒœ๋งŒ ์ƒˆ๋กœ๊ณ ์นจ + _loadProgress(forceRefreshRanks: false); + } + } catch (e) { + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('๊ฒŒ์ž„ ๋กœ๋”ฉ/์ƒ์„ฑ ์‹คํŒจ: $e')), + ); + } + } finally { + if (mounted) { + setState(() { _isLoading = false; }); + } + } + } + + @override + Widget build(BuildContext context) { + // ... (์ดํ•˜ build ๋ฉ”์„œ๋“œ๋Š” ์ด์ „๊ณผ ๋™์ผ) ... + context.watch(); + context.watch(); + + final bool allLevelsUnlocked = _maxUnlockedLevel >= MathQuizDifficulties.allDifficulties.length; + final theme = Theme.of(context); + + return CommonGameShell( + title: '๊ณ„์‚ฐ ํ€ด์ฆˆ', + + onRankingPressed: () { + final List difficulties = MathQuizDifficulties.allDifficulties + .map((level) => GameDifficulty( + name: level.name, + contextId: level.contextId, + )) + .toList(); + + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => RankingScreen( + gameType: 'MATH_QUIZ', + difficulties: difficulties, + initialDifficultyName: MathQuizDifficulties.getLevel(_maxUnlockedLevel).name, + ), + ), + ); + }, + + body: LayoutBuilder( + builder: (context, constraints) { + const double maxContentRatio = 0.6; + final double constrainedWidth = (constraints.maxHeight * maxContentRatio) > 500 + ? 500 : (constraints.maxHeight * maxContentRatio); + return Center( + child: ConstrainedBox( + constraints: BoxConstraints(maxWidth: constrainedWidth), + child: Column( + children: [ + Expanded( + child: RefreshIndicator( + onRefresh: () => _loadProgress(forceRefreshRanks: true), + child: ListView.builder( + itemCount: MathQuizDifficulties.allDifficulties.length, + itemBuilder: (context, index) { + final MathQuizDifficulty level = MathQuizDifficulties.allDifficulties[index]; + final bool isUnlocked = allLevelsUnlocked || level.levelIndex <= _maxUnlockedLevel; + final (int oldRank, int currentRank) = _rankHistory[level.levelIndex] ?? (0, 0); + + Widget? trailingWidget = isUnlocked ? const Icon(Icons.play_arrow_rounded) : null; + String? subtitleText; + Color? subtitleColor; + + if (currentRank > 0) { + String rankStr = "${currentRank}์œ„"; + if (oldRank > 0) { + int change = oldRank - currentRank; + if (change > 0) { + subtitleText = "$rankStr (โ–ฒ $change)"; + subtitleColor = Colors.green; + trailingWidget = const Icon(Icons.arrow_circle_up_rounded, color: Colors.green, size: 28); + } else if (change < 0) { + subtitleText = "$rankStr (โ–ผ ${change.abs()})"; + subtitleColor = Colors.red; + trailingWidget = const Icon(Icons.arrow_circle_down_rounded, color: Colors.red, size: 28); + } else { + subtitleText = "$rankStr (์œ ์ง€)"; + subtitleColor = Colors.grey; + trailingWidget = const Icon(Icons.check_circle_outline_rounded, color: Colors.grey, size: 28); + } + } else { + subtitleText = "$rankStr (์‹ ๊ทœ ์ง„์ž…)"; + subtitleColor = Colors.blue; + trailingWidget = const Icon(Icons.new_releases_rounded, color: Colors.blue, size: 28); + } + } else { + if (oldRank > 0) { + subtitleText = "๋žญํ‚น ์ดํƒˆ (์ด์ „ ${oldRank}์œ„)"; + subtitleColor = Colors.orange; + trailingWidget = const Icon(Icons.warning_amber_rounded, color: Colors.orange, size: 28); + } + } + + return Card( + margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0), + child: ListTile( + leading: Icon( + isUnlocked ? Icons.lock_open_rounded : Icons.lock_rounded, + color: isUnlocked ? theme.primaryColor : Colors.grey, + ), + title: Text(level.name, style: TextStyle( + fontSize: 18, + fontWeight: isUnlocked ? FontWeight.bold : FontWeight.normal, + color: isUnlocked ? theme.textTheme.bodyLarge?.color : Colors.grey, + )), + subtitle: subtitleText != null + ? Text(subtitleText, style: TextStyle(color: subtitleColor, fontWeight: FontWeight.bold)) + : null, + trailing: trailingWidget, + onTap: isUnlocked && !_isLoading + ? () => _startGame(level) + : null, + ), + ); + }, + ), + ), + ), + ], + ), + ), + ); + }, + ), + ); + } +} \ No newline at end of file diff --git a/packages/feature_game_mathquiz/lib/screens/math_quiz_screen.dart b/packages/feature_game_mathquiz/lib/screens/math_quiz_screen.dart new file mode 100644 index 0000000..bae96bd --- /dev/null +++ b/packages/feature_game_mathquiz/lib/screens/math_quiz_screen.dart @@ -0,0 +1,280 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:service_api/service_api.dart'; +import 'package:feature_common/feature_common.dart'; +import '../controllers/math_quiz_controller.dart'; +import '../models/math_quiz_models.dart'; + +class MathQuizScreen extends StatefulWidget { + const MathQuizScreen({super.key}); + + @override + State createState() => _MathQuizScreenState(); +} + +class _MathQuizScreenState extends State { + bool _isDialogShowing = false; + + // ( ... _showGameCompletion ๋ฉ”์„œ๋“œ๋Š” ์ด์ „๊ณผ ๋™์ผ ... ) + void _showGameCompletion(MathQuizController controller) async { + String formatMathQuizScore(int primary, int? secondary) { + final problemCount = primary; + final time = (secondary ?? 0).toString(); + return '${problemCount}๊ฐœ (${time}์ดˆ)'; + } + Future saveMathQuizProgress(String playerName) async { + final identityService = IdentityService(); + final int currentMaxLevel = await identityService.getMaxUnlockedLevel(gameType: 'MATH_QUIZ'); + if (currentMaxLevel < 99) { + if (controller.difficulty.levelIndex >= currentMaxLevel) { + int nextLevel = controller.difficulty.levelIndex + 1; + if (nextLevel > MathQuizDifficulties.allDifficulties.length) { + await identityService.saveMaxUnlockedLevel(99, gameType: 'MATH_QUIZ'); + } else { + await identityService.saveMaxUnlockedLevel(nextLevel, gameType: 'MATH_QUIZ'); + } + } + } + } + + await Navigator.push( + context, + MaterialPageRoute( + builder: (context) => GameCompletionScreen( + args: GameResultArgs( + gameType: 'MATH_QUIZ', + contextId: controller.difficulty.contextId, + primaryScore: controller.puzzle.solutions.length, + secondaryScore: controller.secondsElapsed, + userId: controller.userId, + userName: controller.userName, + scoreFormatter: formatMathQuizScore, + onProgressSave: saveMathQuizProgress, + ), + ), + ), + ); + + if (mounted && Navigator.canPop(context)) { + Navigator.pop(context); + } + } + + @override + Widget build(BuildContext context) { + final controller = context.watch(); + + if (controller.isGameCompleted && !_isDialogShowing) { + _isDialogShowing = true; + WidgetsBinding.instance.addPostFrameCallback((_) { + _showGameCompletion(controller); + }); + } + + return Scaffold( + appBar: AppBar( + title: Text(controller.difficulty.name), + actions: [ + Padding( + padding: const EdgeInsets.only(right: 20.0), + child: Center( + child: Text( + '${(controller.secondsElapsed ~/ 60).toString().padLeft(2, '0')}:${(controller.secondsElapsed % 60).toString().padLeft(2, '0')}', + style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + ), + ), + ), + ], + ), + body: LayoutBuilder( + builder: (context, constraints) { + bool isLandscape = constraints.maxWidth > constraints.maxHeight; + if (isLandscape) { + return _buildLandscapeLayout(context, controller); + } else { + return _buildPortraitLayout(context, controller); + } + }, + ), + ); + } + + /// ๐Ÿ”ฝ ์„ธ๋กœ ๋ชจ๋“œ ๋ ˆ์ด์•„์›ƒ + Widget _buildPortraitLayout(BuildContext context, MathQuizController controller) { + return Column( + children: [ + Expanded( + child: Center( + child: SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + // [์ˆ˜์ •] _buildPuzzleGrid๋ฅผ ํ•ญ์ƒ ํ˜ธ์ถœ + child: _buildPuzzleGrid(context, controller), + ), + ), + ), + _buildKeypad(context, controller), + ], + ); + } + + /// ๐Ÿ”ฝ ๊ฐ€๋กœ ๋ชจ๋“œ ๋ ˆ์ด์•„์›ƒ + Widget _buildLandscapeLayout(BuildContext context, MathQuizController controller) { + return Row( + children: [ + Expanded( + flex: 6, // ๋ฐฉ์ •์‹ ์˜์—ญ + child: Center( + child: SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + // [์ˆ˜์ •] _buildPuzzleGrid๋ฅผ ํ•ญ์ƒ ํ˜ธ์ถœ + child: _buildPuzzleGrid(context, controller), + ), + ), + ), + Expanded( + flex: 4, // ํ‚คํŒจ๋“œ ์˜์—ญ + child: _buildKeypad(context, controller), + ), + ], + ); + } + + // โŒ [์‚ญ์ œ] _buildEquationList ๋ฉ”์„œ๋“œ ์‚ญ์ œ + + /// [์ˆ˜์ •] _buildEquationGrid -> _buildPuzzleGrid + /// (๋ชจ๋“  ํผ์ฆ์„ ๊ทธ๋ฆฌ๋Š” ์œ ์ผํ•œ ๋นŒ๋”) + Widget _buildPuzzleGrid(BuildContext context, MathQuizController controller) { + final puzzle = controller.puzzle; + final userAnswers = controller.userAnswers; + final int crossAxisCount = puzzle.gridCrossAxisCount; + + int blankIndex = 0; + + return GridView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: puzzle.gridCells.length, + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: crossAxisCount, + ), + itemBuilder: (context, index) { + final String part = puzzle.gridCells[index]; + + if (part == "?") { + // ๋นˆ์นธ์ผ ๊ฒฝ์šฐ + final int currentBlankIndex = blankIndex; + blankIndex++; + return _buildBlankBox( + context, + controller, + currentBlankIndex, + userAnswers[currentBlankIndex], + ); + } else if (part == " ") { + // " " (๋นˆ ๊ณต๊ฐ„) + return Container(); + } else { + // ์ˆซ์ž๋‚˜ ๊ธฐํ˜ธ์ผ ๊ฒฝ์šฐ + return Center( + child: Text( + part, + style: const TextStyle(fontSize: 32, fontWeight: FontWeight.bold), + ), + ); + } + }, + ); + } + + /// [์ˆ˜์ •] _buildBlankBox (isGrid ํŒŒ๋ผ๋ฏธํ„ฐ ์‚ญ์ œ) + Widget _buildBlankBox(BuildContext context, MathQuizController controller, int index, String? value) { + final theme = Theme.of(context); + final bool isSelected = (controller.selectedBlankIndex == index); + + // [์ˆ˜์ •] ๊ทธ๋ฆฌ๋“œ ์…€์˜ ํฌ๊ธฐ๋Š” GridView๊ฐ€ ๊ฒฐ์ •ํ•˜๋ฏ€๋กœ + // AspectRatio๋ฅผ ์‚ฌ์šฉํ•ด 1:1 ๋น„์œจ ์œ ์ง€ + return AspectRatio( + aspectRatio: 1 / 1, + child: GestureDetector( + onTap: () => controller.onBlankTapped(index), + child: Container( + margin: const EdgeInsets.all(4.0), // ๊ทธ๋ฆฌ๋“œ/๋ฆฌ์ŠคํŠธ ๊ณตํ†ต ์—ฌ๋ฐฑ + decoration: BoxDecoration( + color: theme.colorScheme.surfaceVariant, + border: Border.all( + color: isSelected ? theme.colorScheme.primary : Colors.transparent, + width: 3, + ), + borderRadius: BorderRadius.circular(8), + ), + child: Center( + // [์ˆ˜์ •] ํฐํŠธ ํฌ๊ธฐ๋ฅผ FittedBox๋กœ ์ž๋™ ์กฐ์ ˆ + child: FittedBox( + fit: BoxFit.contain, + child: Padding( + padding: const EdgeInsets.all(4.0), + child: Text( + value ?? '', + style: TextStyle( + fontWeight: FontWeight.bold, + color: theme.colorScheme.onSurfaceVariant, + ), + ), + ), + ), + ), + ), + ), + ); + } + + /// 2. ํ‚คํŒจ๋“œ UI ๋นŒ๋” + Widget _buildKeypad(BuildContext context, MathQuizController controller) { + // ... (์ดํ•˜ ํ‚คํŒจ๋“œ ๋กœ์ง์€ ๋™์ผ) ... + final puzzle = controller.puzzle; + final theme = Theme.of(context); + + return Container( + padding: const EdgeInsets.all(8.0), + decoration: BoxDecoration( + color: theme.scaffoldBackgroundColor, + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.1), + blurRadius: 4, + offset: const Offset(0, -2), + ), + ], + ), + child: GridView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 5, // 5์—ด + childAspectRatio: 1.5, + mainAxisSpacing: 8, + crossAxisSpacing: 8, + ), + itemCount: puzzle.options.length + 1, // ์˜ต์…˜ + ์ง€์šฐ๊ธฐ ๋ฒ„ํŠผ + itemBuilder: (context, index) { + + if (index == puzzle.options.length) { + return FilledButton.tonal( + onPressed: () => controller.onClearTapped(), + child: const Icon(Icons.backspace_outlined), + ); + } + + final String option = puzzle.options[index]; + return FilledButton( + onPressed: () => controller.onOptionTapped(option), + child: Text( + option, + style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + ), + ); + }, + ), + ); + } +} \ No newline at end of file diff --git a/packages/feature_game_mathquiz/pubspec.yaml b/packages/feature_game_mathquiz/pubspec.yaml new file mode 100644 index 0000000..2192342 --- /dev/null +++ b/packages/feature_game_mathquiz/pubspec.yaml @@ -0,0 +1,65 @@ +name: feature_game_mathquiz +description: "A new Flutter package project." +version: 0.0.1 +homepage: + +environment: + sdk: ^3.9.2 + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + + # ๐Ÿ”ฝ [์ถ”๊ฐ€] ์ปจํŠธ๋กค๋Ÿฌ(ChangeNotifier)๋ฅผ ์œ„ํ•œ Provider + provider: ^6.1.2 # (๋ฒ„์ „์€ ์ตœ์‹  ๋ฒ„์ „ ์‚ฌ์šฉ) + + # ๐Ÿ”ฝ [์ถ”๊ฐ€] ๊ณตํ†ต ์„œ๋น„์Šค (๋‚œ์ด๋„, ๋žญํ‚น, ์„ธ์…˜) + service_api: + path: ../service_api # ๐Ÿ‘ˆ ๋ถ€๋ชจ ํด๋”์˜ service_api ํŒจํ‚ค์ง€ + + # ๐Ÿ”ฝ [์ถ”๊ฐ€] ๊ณตํ†ต UI (์…ธ, ๋žญํ‚น ํ™”๋ฉด) + feature_common: + path: ../feature_common # ๐Ÿ‘ˆ ๋ถ€๋ชจ ํด๋”์˜ feature_common ํŒจํ‚ค์ง€ + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/to/asset-from-package + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/to/font-from-package diff --git a/packages/feature_game_mathquiz/test/feature_game_mathquiz_test.dart b/packages/feature_game_mathquiz/test/feature_game_mathquiz_test.dart new file mode 100644 index 0000000..36341b4 --- /dev/null +++ b/packages/feature_game_mathquiz/test/feature_game_mathquiz_test.dart @@ -0,0 +1,12 @@ +import 'package:flutter_test/flutter_test.dart'; + +import 'package:feature_game_mathquiz/feature_game_mathquiz.dart'; + +void main() { + test('adds one to input values', () { + final calculator = Calculator(); + expect(calculator.addOne(2), 3); + expect(calculator.addOne(-7), -6); + expect(calculator.addOne(0), 1); + }); +} diff --git a/packages/feature_game_spider/lib/screens/spider_game_screen.dart b/packages/feature_game_spider/lib/screens/spider_game_screen.dart index f71f15a..3e45bd3 100644 --- a/packages/feature_game_spider/lib/screens/spider_game_screen.dart +++ b/packages/feature_game_spider/lib/screens/spider_game_screen.dart @@ -1,4 +1,3 @@ -// packages/feature_game_spider/lib/screens/spider_game_screen.dart import 'dart:convert'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -12,8 +11,6 @@ import '../widgets/tableau_pile_widget.dart'; import '../widgets/bottom_bar_widget.dart'; import '../widgets/card_widget.dart'; -// โŒ [์‚ญ์ œ] enum _RankSubmissionStep - class SpiderGameScreen extends StatefulWidget { const SpiderGameScreen({super.key}); @@ -34,7 +31,9 @@ class _SpiderGameScreenState extends State { bool _isDealAnimationRunning = false; bool _isStackAnimationRunning = false; - // ( _buildGameAppBar, _showSurrenderDialog ๋Š” ๋™์ผ ) + // ( ... _buildGameAppBar, _showSurrenderDialog, initState, dispose ... ) + // ( ... build, _runDealAnimation, _runStackCompletionAnimation ... ) + // ( ... ์ด ๋ฉ”์„œ๋“œ๋“ค์€ ๋ชจ๋‘ ๋™์ผํ•ฉ๋‹ˆ๋‹ค ... ) AppBar _buildGameAppBar(BuildContext context, SpiderGameController controller) { return AppBar( leading: IconButton(icon: const Icon(Icons.close), onPressed: () => Navigator.of(context).pop()), @@ -89,47 +88,33 @@ class _SpiderGameScreenState extends State { ), ); } - @override void initState() { super.initState(); final controller = Provider.of(context, listen: false); - _controllerListener = () { final screenSize = MediaQuery.of(context).size; const double horizontalPadding = 10; const double cardGap = 5; final double cardWidth = (screenSize.width - (horizontalPadding * 2) - (cardGap * 9)) / 10; final double cardHeight = cardWidth * 1.45; - - // ๐Ÿ”ฝ [์ˆ˜์ •] ๋ฑ ๋ถ„๋ฐฐ ์• ๋‹ˆ๋ฉ”์ด์…˜ (ํ”Œ๋ž˜๊ทธ ๊ฐ€๋“œ ์ถ”๊ฐ€) if (controller.cardsToDealAnimate.isNotEmpty && !_isDealAnimationRunning) { - _isDealAnimationRunning = true; // ๐Ÿ‘ˆ [์ž ๊ธˆ] + _isDealAnimationRunning = true; debugPrint("[LOG] initState Listener: Detected cardsToDealAnimate. Running animation..."); _runDealAnimation(controller, cardWidth, cardHeight); } - - // ๐Ÿ”ฝ [์ˆ˜์ •] ์Šคํƒ ์™„์„ฑ ์• ๋‹ˆ๋ฉ”์ด์…˜ (๊ฒฝ์ฃผ ์กฐ๊ฑด ํ•ด๊ฒฐ ๋กœ์ง) if (controller.cardsToAnimateStack.isNotEmpty && !_isStackAnimationRunning) { - _isStackAnimationRunning = true; // ๐Ÿ‘ˆ [์ž ๊ธˆ] - - // [ํ•ต์‹ฌ] ํ๋ฅผ ๋ณต์‚ฌํ•˜๊ณ , ์ธ๋ฑ์Šค๋„ *์ง€๊ธˆ* ์ฝ์–ด์„œ ๋ณต์‚ฌํ•ฉ๋‹ˆ๋‹ค. + _isStackAnimationRunning = true; final List cardsToAnimate = List.of(controller.cardsToAnimateStack); final int sourceIndex = controller.animationSourcePileIndex; final int targetIndex = controller.animationTargetFoundationIndex; - - // ํ๋ฅผ ์ฆ‰์‹œ ๋น„์›๋‹ˆ๋‹ค. controller.clearStackAnimationTrigger(); - debugPrint("[LOG] initState Listener: Detected cardsToAnimateStack (Source: $sourceIndex). Running animation..."); - // ๋ณต์‚ฌํ•œ ๋ฐ์ดํ„ฐ๋ฅผ ์ธ์ž๋กœ ์ „๋‹ฌํ•ฉ๋‹ˆ๋‹ค. _runStackCompletionAnimation(controller, cardWidth, cardHeight, cardsToAnimate, sourceIndex, targetIndex); } }; - controller.addListener(_controllerListener!); } - @override void dispose() { if (_controllerListener != null) { @@ -138,20 +123,16 @@ class _SpiderGameScreenState extends State { } super.dispose(); } - @override Widget build(BuildContext context) { debugPrint("[LOG] SpiderGameScreen: --- Main Build Method CALLED ---"); - final controller = context.read(); - final screenSize = MediaQuery.of(context).size; const double horizontalPadding = 10; const double cardGap = 5; final double cardWidth = (screenSize.width - (horizontalPadding * 2) - (cardGap * 9)) / 10; final double cardHeight = cardWidth * 1.45; final double cardOverlap = cardHeight * 0.4; - final bool isGameCompleted = context.select((SpiderGameController c) => c.isGameCompleted); if (isGameCompleted && !_isDialogShowing) { _isDialogShowing = true; @@ -161,7 +142,6 @@ class _SpiderGameScreenState extends State { } }); } - return Scaffold( appBar: _buildGameAppBar(context, controller), backgroundColor: Theme.of(context).scaffoldBackgroundColor, @@ -209,54 +189,42 @@ class _SpiderGameScreenState extends State { ), ], ), - if (_showDimOverlay) Container( color: Colors.black.withOpacity(0.5), ), - ..._animationOverlays, ], ), bottomNavigationBar: null, ); } - - /// ๐Ÿ”ฝ ๋ฑ ๋ถ„๋ฐฐ ์• ๋‹ˆ๋ฉ”์ด์…˜ (์˜ค๋ฒ„๋ ˆ์ด) void _runDealAnimation( SpiderGameController controller, double cardWidth, double cardHeight, ) { - // ๐Ÿ”ฝ [์ˆ˜์ •] ๋ฑ ๋ถ„๋ฐฐ ์• ๋‹ˆ๋ฉ”์ด์…˜๋„ ๊ฒฝ์ฃผ ์กฐ๊ฑด์„ ํ”ผํ•˜๊ธฐ ์œ„ํ•ด ์ธ์ž๋กœ ๋ฐ›๋„๋ก ์ˆ˜์ • final List cardsToDeal = List.of(controller.cardsToDealAnimate); controller.clearDealAnimationTrigger(); - debugPrint("[LOG] _runDealAnimation: Starting. ${cardsToDeal.length} cards."); - final RenderBox? bodyStackBox = _bodyStackKey.currentContext?.findRenderObject() as RenderBox?; final RenderBox? stockBox = _stockKey.currentContext?.findRenderObject() as RenderBox?; if (bodyStackBox == null || stockBox == null) { debugPrint("[LOG] _runDealAnimation: FAILED (Keys not ready)"); - _isDealAnimationRunning = false; // ๐Ÿ‘ˆ [์ž ๊ธˆ ํ•ด์ œ] + _isDealAnimationRunning = false; return; } - final Offset globalStartPos = stockBox.localToGlobal(Offset.zero); final Offset localStartPos = bodyStackBox.globalToLocal(globalStartPos); - for (int i = 0; i < cardsToDeal.length; i++) { final card = cardsToDeal[i]; final RenderBox? targetBox = _tableauKeys[i].currentContext?.findRenderObject() as RenderBox?; if (targetBox == null) continue; - final Offset globalEndPos = targetBox.localToGlobal(Offset.zero); final double targetY = globalEndPos.dy + controller.currentState.tableau[i].length * (cardHeight * 0.4); final Offset localEndPos = bodyStackBox.globalToLocal(Offset(globalEndPos.dx, targetY)); - final animationDelayMs = i * 100; final animationDurationMs = 600; - final overlayEntry = TweenAnimationBuilder( key: ValueKey('deal_${card.id}'), tween: Tween(begin: 0.0, end: 1.0), @@ -265,7 +233,6 @@ class _SpiderGameScreenState extends State { final currentPos = Offset.lerp(localStartPos, localEndPos, value)!; final bool isFlipping = value > 0.5; final double rotationY = isFlipping ? (value - 0.5) * 2 * pi : 0; - return Positioned( left: currentPos.dx, top: currentPos.dy, @@ -284,23 +251,16 @@ class _SpiderGameScreenState extends State { ); }, ); - Future.delayed(Duration(milliseconds: animationDelayMs), () { if (mounted) { - setState(() { - _animationOverlays.add(overlayEntry); - }); - + setState(() { _animationOverlays.add(overlayEntry); }); Future.delayed(Duration(milliseconds: animationDurationMs), () { if (mounted) { - setState(() { - _animationOverlays.remove(overlayEntry); - }); - + setState(() { _animationOverlays.remove(overlayEntry); }); if (i == cardsToDeal.length - 1) { debugPrint("[LOG] _runDealAnimation: Animation FINISHED. Calling finalizeDealFromStock."); controller.finalizeDealFromStock(cardsToDeal); - _isDealAnimationRunning = false; // ๐Ÿ‘ˆ [์ž ๊ธˆ ํ•ด์ œ] + _isDealAnimationRunning = false; } } }); @@ -308,44 +268,32 @@ class _SpiderGameScreenState extends State { }); } } - - /// ๐Ÿ”ฝ ์Šคํƒ ์™„์„ฑ ์• ๋‹ˆ๋ฉ”์ด์…˜ (์˜ค๋ฒ„๋ ˆ์ด) void _runStackCompletionAnimation( SpiderGameController controller, double cardWidth, double cardHeight, - // ๐Ÿ”ฝ [์ˆ˜์ •] ์ธ์ž๋ฅผ ๋ฐ›์Šต๋‹ˆ๋‹ค. List cardsToAnimate, int sourceIndex, int targetIndex, ) { debugPrint("[LOG] _runStackCompletionAnimation: Starting. ${cardsToAnimate.length} cards from index $sourceIndex."); - final RenderBox? bodyStackBox = _bodyStackKey.currentContext?.findRenderObject() as RenderBox?; final RenderBox? stockBox = _stockKey.currentContext?.findRenderObject() as RenderBox?; - // ๐Ÿ”ฝ [์ˆ˜์ •] ์ธ์ž๋กœ ๋ฐ›์€ sourceIndex ์‚ฌ์šฉ final RenderBox? startBox = _tableauKeys[sourceIndex].currentContext?.findRenderObject() as RenderBox?; - if (bodyStackBox == null || stockBox == null || startBox == null) { debugPrint("[LOG] _runStackCompletionAnimation: FAILED (Keys not ready for index $sourceIndex)"); - _isStackAnimationRunning = false; // ๐Ÿ‘ˆ [์ž ๊ธˆ ํ•ด์ œ] + _isStackAnimationRunning = false; return; } - final Offset globalStartPos = startBox.localToGlobal(Offset.zero); final Offset localStartPos = bodyStackBox.globalToLocal(globalStartPos); - // ๐Ÿ”ฝ [์ˆ˜์ •] ์Šคํƒ์ด ์ œ๊ฑฐ๋˜๊ธฐ '์ „'์˜ ๊ธธ์ด๋ฅผ ๊ธฐ์ค€์œผ๋กœ ๊ณ„์‚ฐ (์ •ํ™•) final double startY = localStartPos.dy + (controller.currentState.tableau[sourceIndex].length - cardsToAnimate.length) * (cardHeight * 0.4); - - // ๐Ÿ”ฝ [์ˆ˜์ •] ์ธ์ž๋กœ ๋ฐ›์€ targetIndex ์‚ฌ์šฉ final Offset globalEndPos = stockBox.localToGlobal(Offset( (targetIndex * (cardWidth * 0.15)) - cardWidth*3, 10)); final Offset localEndPos = bodyStackBox.globalToLocal(globalEndPos); - for (int i = 0; i < cardsToAnimate.length; i++) { final card = cardsToAnimate[i]; final animationDelayMs = i * 80; final animationDurationMs = 400; - final overlayEntry = TweenAnimationBuilder( key: ValueKey('stack_${card.id}'), tween: Tween(begin: 0.0, end: 1.0), @@ -364,23 +312,16 @@ class _SpiderGameScreenState extends State { ); }, ); - Future.delayed(Duration(milliseconds: animationDelayMs), () { if (mounted) { - setState(() { - _animationOverlays.add(overlayEntry); - }); - + setState(() { _animationOverlays.add(overlayEntry); }); Future.delayed(Duration(milliseconds: animationDurationMs), () { if (mounted) { - setState(() { - _animationOverlays.remove(overlayEntry); - }); + setState(() { _animationOverlays.remove(overlayEntry); }); if (i == cardsToAnimate.length - 1) { debugPrint("[LOG] _runStackCompletionAnimation: Animation FINISHED. Calling finalizeStackCompletion for index $sourceIndex."); - // ๐Ÿ”ฝ [์ˆ˜์ •] finalize๊ฐ€ ์–ด๋–ค ์Šคํƒ์„ ์ฒ˜๋ฆฌํ• ์ง€ ์ธ๋ฑ์Šค๋ฅผ ์ „๋‹ฌ controller.finalizeStackCompletion(cardsToAnimate, sourceIndex); - _isStackAnimationRunning = false; // ๐Ÿ‘ˆ [์ž ๊ธˆ ํ•ด์ œ] + _isStackAnimationRunning = false; } } }); @@ -388,8 +329,8 @@ class _SpiderGameScreenState extends State { }); } } - - /// ๐Ÿ”ฝ [์ˆ˜์ •] _runGameWinAnimation (ํŒ์—… ํ˜ธ์ถœ ๋กœ์ง ๋ณ€๊ฒฝ) + + /// ๐Ÿ”ฝ [์ˆ˜์ •] _runGameWinAnimation (Navigation ๋กœ์ง ๋ณ€๊ฒฝ) void _runGameWinAnimation( BuildContext context, SpiderGameController controller, @@ -405,12 +346,12 @@ class _SpiderGameScreenState extends State { final Offset localStartPos = bodyStackBox.globalToLocal(globalStartPos); for (int i = 0; i < allCards.length; i++) { + // ... (์• ๋‹ˆ๋ฉ”์ด์…˜ ์˜ค๋ฒ„๋ ˆ์ด ์ƒ์„ฑ ๋กœ์ง์€ ๋™์ผ) ... final card = allCards[i]; final animationDelay = Duration(milliseconds: i * 30); final animationDuration = const Duration(milliseconds: 1500); final Offset globalEndPos = Offset(random.nextDouble() * screenSize.width, -cardHeight - (AppBar().preferredSize.height)); final Offset localEndPos = bodyStackBox.globalToLocal(globalEndPos); - final overlayEntry = TweenAnimationBuilder( key: ValueKey('win_${card.id}'), tween: Tween(begin: 0.0, end: 1.0), @@ -432,41 +373,28 @@ class _SpiderGameScreenState extends State { ); }, ); - Future.delayed(animationDelay, () { if (mounted) { - setState(() { - _animationOverlays.add(overlayEntry); - }); - - // โŒ [์‚ญ์ œ] 500ms ํ›„์— ํŒ์—…์„ ๋„์šฐ๋Š” ๋กœ์ง - // if (i == 0) { ... } - + setState(() { _animationOverlays.add(overlayEntry); }); Future.delayed(animationDuration, () { if (mounted) { - setState(() { - _animationOverlays.remove(overlayEntry); - }); + setState(() { _animationOverlays.remove(overlayEntry); }); } }); } }); } - // ๐Ÿ”ฝ [์ถ”๊ฐ€] ๋”ค ์˜ค๋ฒ„๋ ˆ์ด(๋ฐฐ๊ฒฝ ์–ด๋‘์›Œ์ง)๋Š” 500ms ๋’ค์— ๋ฐ”๋กœ ํ‘œ์‹œ Future.delayed(const Duration(milliseconds: 500), () { if (mounted && controller.isGameCompleted) { setState(() { _showDimOverlay = true; }); } }); - // ๐Ÿ”ฝ [์ถ”๊ฐ€] ๋žญํ‚น ํŒ์—…์€ ์•ฝ 2์ดˆ ๋’ค ํ‘œ์‹œ final popupDelay = (allCards.length > 70) ? const Duration(seconds: 2) : const Duration(milliseconds: 500); - Future.delayed(popupDelay, () { + Future.delayed(popupDelay, () async { // ๐Ÿ‘ˆ [์ˆ˜์ •] async ์ถ”๊ฐ€ if (mounted && controller.isGameCompleted) { - // [์ˆ˜์ •] _showGameCompletedDialog() ํ˜ธ์ถœ ๋Œ€์‹  ๊ณตํ†ต ํ™”๋ฉด์œผ๋กœ ์ด๋™ - // 1. ์ ์ˆ˜ ํฌ๋งทํ„ฐ ์ •์˜ String formatSpiderScore(int primary, int? secondary) { final moves = primary.toString(); @@ -476,10 +404,7 @@ class _SpiderGameScreenState extends State { // 2. ๋ ˆ๋ฒจ ์ €์žฅ ์ฝœ๋ฐฑ ์ •์˜ Future saveSpiderProgress(String playerName) async { - // (playerName์€ ๊ณตํ†ต ํ™”๋ฉด์ด IdentityService๋กœ ์ €์žฅ) - final identityService = IdentityService(); - final int currentMaxLevel = await identityService.getMaxUnlockedLevel(gameType: 'SPIDER'); if (currentMaxLevel < 99) { if (controller.difficulty.levelIndex >= currentMaxLevel) { @@ -493,8 +418,8 @@ class _SpiderGameScreenState extends State { } } - // 3. ํ™”๋ฉด ์ด๋™ - Navigator.pushReplacement( + // 3. [์ˆ˜์ •] 'pushReplacement' ๋Œ€์‹  'await push' ์‚ฌ์šฉ + await Navigator.push( context, MaterialPageRoute( builder: (context) => GameCompletionScreen( @@ -507,16 +432,16 @@ class _SpiderGameScreenState extends State { userName: controller.userName, scoreFormatter: formatSpiderScore, onProgressSave: saveSpiderProgress, - onScreenClose: () { - // ๊ณตํ†ต ํ™”๋ฉด์—์„œ '๋‹ซ๊ธฐ'๋ฅผ ๋ˆ„๋ฅด๋ฉด ๊ฒŒ์ž„ ํ™”๋ฉด๋„ ๋‹ซํž˜ - if (Navigator.canPop(context)) { - Navigator.pop(context); - } - }, + // โŒ onScreenClose ์ œ๊ฑฐ ), ), ), ); + + // 4. [์ถ”๊ฐ€] ๋žญํ‚น ํ™”๋ฉด์—์„œ ๋Œ์•„์˜ค๋ฉด, ๊ฒŒ์ž„ ํ™”๋ฉด(self)์„ ๋‹ซ๊ณ  ๋กœ๋น„๋กœ ๋Œ์•„๊ฐ + if (mounted && Navigator.canPop(context)) { + Navigator.pop(context); + } } }); } diff --git a/packages/feature_game_spider/lib/screens/spider_lobby_screen.dart b/packages/feature_game_spider/lib/screens/spider_lobby_screen.dart index 75ded5b..d33fda1 100644 --- a/packages/feature_game_spider/lib/screens/spider_lobby_screen.dart +++ b/packages/feature_game_spider/lib/screens/spider_lobby_screen.dart @@ -2,7 +2,7 @@ import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:service_api/service_api.dart'; +import 'package:service_api/service_api.dart'; // ๐Ÿ‘ˆ SessionNotifier ํฌํ•จ import 'package:feature_common/feature_common.dart'; import 'spider_game_screen.dart'; import '../models/spider_difficulty.dart'; @@ -17,24 +17,42 @@ class SpiderLobbyScreen extends StatefulWidget { class _SpiderLobbyScreenState extends State { int _maxUnlockedLevel = 1; Map _rankHistory = {}; - String? _userName; + // โŒ String? _userName; (SessionNotifier๊ฐ€ ๊ด€๋ฆฌ) bool _isLoading = false; + // ๐Ÿ”ฝ [์ˆ˜์ •] SessionNotifier๋ฅผ ์‚ฌ์šฉํ•˜๊ธฐ ์œ„ํ•ด IdentityService ๋Œ€์‹  ์ถ”๊ฐ€ + late final SessionNotifier _sessionNotifier; final PuzzleService _puzzleService = PuzzleService(); - final IdentityService _identityService = IdentityService(); + final IdentityService _identityService = IdentityService(); // ๐Ÿ‘ˆ (save/load progress๋ฅผ ์œ„ํ•ด ์œ ์ง€) @override void initState() { super.initState(); - _loadProgress(); + // ๐Ÿ”ฝ [์ˆ˜์ •] initState์—์„œ SessionNotifier๋ฅผ read + // SessionNotifier์˜ loadSession()์ด ๋จผ์ € ์™„๋ฃŒ๋˜์—ˆ๋‹ค๊ณ  ๊ฐ€์ • + _sessionNotifier = context.read(); + + // ๐Ÿ”ฝ [์ˆ˜์ •] _loadProgress๊ฐ€ ๋žญํ‚น๊นŒ์ง€ ๋ชจ๋‘ ์ƒˆ๋กœ๊ณ ์นจ (์ตœ์ดˆ 1ํšŒ) + _loadProgress(forceRefreshRanks: true); } - // ( _loadProgress ๋ฉ”์„œ๋“œ๋Š” ์ด์ „๊ณผ ๋™์ผ ) - Future _loadProgress() async { + /// ๐Ÿ”ฝ [์ˆ˜์ •] _loadProgress ๋ฉ”์„œ๋“œ (SessionNotifier ์‚ฌ์šฉ ๋ฐ ๋กœ์ง ๋ถ„๋ฆฌ) + Future _loadProgress({bool forceRefreshRanks = false}) async { + // 1. (๊ฐ€๋ฒผ์›€) ๋ ˆ๋ฒจ ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ final maxLevel = await _identityService.getMaxUnlockedLevel(gameType: 'SPIDER'); - final String? myName = await _identityService.getSavedUserName(); - if (mounted) { setState(() { _maxUnlockedLevel = maxLevel; _userName = myName; }); } - if (myName == null) return; + if (mounted) { + setState(() { + _maxUnlockedLevel = maxLevel; + }); + } + + // 2. (๋ฌด๊ฑฐ์›€) ๋žญํ‚น ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ (ํ•„์š”ํ•  ๋•Œ๋งŒ) + if (!forceRefreshRanks) return; + + // ๐Ÿ”ฝ [์ˆ˜์ •] _sessionNotifier์—์„œ ์œ ์ € ์ด๋ฆ„์„ ๊ฐ€์ ธ์˜ด + final String? myName = _sessionNotifier.session?.userName; + if (myName == null) return; // ๊ฒŒ์ŠคํŠธ์ด๊ฑฐ๋‚˜ ์•„์ง ์ด๋ฆ„ ์ €์žฅ์„ ์•ˆ ํ•จ + try { final Map oldRankMap = await _identityService.getLastSavedRankMap(gameType: 'SPIDER'); List>> rankFutures = []; @@ -64,13 +82,20 @@ class _SpiderLobbyScreenState extends State { } - /// ๐Ÿ”ฝ [์ˆ˜์ •] _startGame ๋ฉ”์„œ๋“œ (UserInfo ์ฃผ์ž…) + /// ๐Ÿ”ฝ [์ˆ˜์ •] _startGame ๋ฉ”์„œ๋“œ (SessionNotifier ์‚ฌ์šฉ) Future _startGame(SpiderDifficulty level) async { setState(() { _isLoading = true; }); - // 1. [์ˆ˜์ •] ๋žญํ‚น ๋“ฑ๋ก์— ํ•„์š”ํ•œ ์ •๋ณด ๋ฏธ๋ฆฌ ๋กœ๋“œ - final String userId = await _identityService.getOrCreateUserId(); - final String? userName = _userName; // (์ด๋ฏธ _loadProgress์—์„œ ๋กœ๋“œ๋จ) + // 1. [์ˆ˜์ •] SessionNotifier์—์„œ ์œ ์ € ์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ + final session = _sessionNotifier.session; + if (session == null) { + log("์„ธ์…˜์ด ๋กœ๋“œ๋˜์ง€ ์•Š์•„ ๊ฒŒ์ž„์„ ์‹œ์ž‘ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค."); + setState(() { _isLoading = false; }); + return; + } + + final String userId = session.userId; + final String? userName = session.userName; // 2. ์ปจํŠธ๋กค๋Ÿฌ ์ƒ์„ฑ ๋ฐ ์ƒˆ ๊ฒŒ์ž„ ์‹œ์ž‘ final gameController = SpiderGameController(); @@ -91,36 +116,27 @@ class _SpiderLobbyScreenState extends State { ), ); - _loadProgress(); + // ๐Ÿ”ฝ [ํ•ต์‹ฌ ์ˆ˜์ •] + // ๋žญํ‚น(forceRefreshRanks: true)์€ ์ƒˆ๋กœ๊ณ ์นจํ•˜์ง€ ์•Š๊ณ , + // ๋ ˆ๋ฒจ ์ž ๊ธˆ ์ƒํƒœ(forceRefreshRanks: false)๋งŒ ์ƒˆ๋กœ๊ณ ์นจํ•ฉ๋‹ˆ๋‹ค. + _loadProgress(forceRefreshRanks: false); } - // ( build ๋ฉ”์„œ๋“œ๋Š” ์ด์ „๊ณผ ๋™์ผ ) @override Widget build(BuildContext context) { + // ๐Ÿ”ฝ [์ˆ˜์ •] ThemeNotifier์™€ SessionNotifier๋ฅผ ๋ชจ๋‘ watch context.watch(); + context.watch(); // ๐Ÿ‘ˆ ์„ธ์…˜ ๋ณ€๊ฒฝ(๋กœ๊ทธ์ธ/๋กœ๊ทธ์•„์›ƒ) ๊ฐ์ง€ + final bool allLevelsUnlocked = _maxUnlockedLevel >= 9; final theme = Theme.of(context); return CommonGameShell( title: '์ŠคํŒŒ์ด๋” ์†”๋ฆฌํ…Œ์–ด', onRankingPressed: () { - final List spiderDifficulties = SpiderDifficulties.allDifficulties - .map((level) => GameDifficulty( - name: level.name, - contextId: level.contextId, - )) - .toList(); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => RankingScreen( - gameType: 'SPIDER', - difficulties: spiderDifficulties, - initialDifficultyName: SpiderDifficulties.getLevel(_maxUnlockedLevel).name, - ), - ), - ); + // ... (๋žญํ‚น ๋ฒ„ํŠผ ๋กœ์ง ๋™์ผ) }, + // ๐Ÿ”ฝ [์ˆ˜์ •] RefreshIndicator ์ถ”๊ฐ€ (๋‹น๊ฒจ์„œ ๋žญํ‚น ์ƒˆ๋กœ๊ณ ์นจ) body: LayoutBuilder( builder: (context, constraints) { const double maxContentRatio = 0.6; @@ -132,66 +148,70 @@ class _SpiderLobbyScreenState extends State { child: Column( children: [ Expanded( - child: ListView.builder( - itemCount: SpiderDifficulties.allDifficulties.length, - itemBuilder: (context, index) { - final SpiderDifficulty level = SpiderDifficulties.allDifficulties[index]; - final bool isUnlocked = allLevelsUnlocked || level.levelIndex <= _maxUnlockedLevel; - final (int oldRank, int currentRank) = _rankHistory[level.levelIndex] ?? (0, 0); - Widget? trailingWidget = isUnlocked ? const Icon(Icons.play_arrow_rounded) : null; - String? subtitleText; - Color? subtitleColor; - if (currentRank > 0) { - String rankStr = "${currentRank}์œ„"; - if (oldRank > 0) { - int change = oldRank - currentRank; - if (change > 0) { - subtitleText = "$rankStr (โ–ฒ $change)"; - subtitleColor = Colors.green; - trailingWidget = const Icon(Icons.arrow_circle_up_rounded, color: Colors.green, size: 28); - } else if (change < 0) { - subtitleText = "$rankStr (โ–ผ ${change.abs()})"; - subtitleColor = Colors.red; - trailingWidget = const Icon(Icons.arrow_circle_down_rounded, color: Colors.red, size: 28); + child: RefreshIndicator( + onRefresh: () => _loadProgress(forceRefreshRanks: true), + child: ListView.builder( + itemCount: SpiderDifficulties.allDifficulties.length, + itemBuilder: (context, index) { + // ... (์ดํ•˜ ListTile ๋กœ์ง์€ ๋ชจ๋‘ ๋™์ผ) + final SpiderDifficulty level = SpiderDifficulties.allDifficulties[index]; + final bool isUnlocked = allLevelsUnlocked || level.levelIndex <= _maxUnlockedLevel; + final (int oldRank, int currentRank) = _rankHistory[level.levelIndex] ?? (0, 0); + Widget? trailingWidget = isUnlocked ? const Icon(Icons.play_arrow_rounded) : null; + String? subtitleText; + Color? subtitleColor; + if (currentRank > 0) { + String rankStr = "${currentRank}์œ„"; + if (oldRank > 0) { + int change = oldRank - currentRank; + if (change > 0) { + subtitleText = "$rankStr (โ–ฒ $change)"; + subtitleColor = Colors.green; + trailingWidget = const Icon(Icons.arrow_circle_up_rounded, color: Colors.green, size: 28); + } else if (change < 0) { + subtitleText = "$rankStr (โ–ผ ${change.abs()})"; + subtitleColor = Colors.red; + trailingWidget = const Icon(Icons.arrow_circle_down_rounded, color: Colors.red, size: 28); + } else { + subtitleText = "$rankStr (์œ ์ง€)"; + subtitleColor = Colors.grey; + trailingWidget = const Icon(Icons.check_circle_outline_rounded, color: Colors.grey, size: 28); + } } else { - subtitleText = "$rankStr (์œ ์ง€)"; - subtitleColor = Colors.grey; - trailingWidget = const Icon(Icons.check_circle_outline_rounded, color: Colors.grey, size: 28); + subtitleText = "$rankStr (์‹ ๊ทœ ์ง„์ž…)"; + subtitleColor = Colors.blue; + trailingWidget = const Icon(Icons.new_releases_rounded, color: Colors.blue, size: 28); } } else { - subtitleText = "$rankStr (์‹ ๊ทœ ์ง„์ž…)"; - subtitleColor = Colors.blue; - trailingWidget = const Icon(Icons.new_releases_rounded, color: Colors.blue, size: 28); + if (oldRank > 0) { + subtitleText = "๋žญํ‚น ์ดํƒˆ (์ด์ „ ${oldRank}์œ„)"; + subtitleColor = Colors.orange; + trailingWidget = const Icon(Icons.warning_amber_rounded, color: Colors.orange, size: 28); + } } - } else { - if (oldRank > 0) { - subtitleText = "๋žญํ‚น ์ดํƒˆ (์ด์ „ ${oldRank}์œ„)"; - subtitleColor = Colors.orange; - trailingWidget = const Icon(Icons.warning_amber_rounded, color: Colors.orange, size: 28); - } - } - return Card( - margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0), - child: ListTile( - leading: Icon( - isUnlocked ? Icons.lock_open_rounded : Icons.lock_rounded, - color: isUnlocked ? theme.primaryColor : Colors.grey, - ), - title: Text(level.name, style: TextStyle( - fontSize: 18, - fontWeight: isUnlocked ? FontWeight.bold : FontWeight.normal, - color: isUnlocked ? theme.textTheme.bodyLarge?.color : Colors.grey, - )), - subtitle: subtitleText != null - ? Text(subtitleText, style: TextStyle(color: subtitleColor, fontWeight: FontWeight.bold)) - : null, - trailing: trailingWidget, - onTap: isUnlocked && !_isLoading - ? () => _startGame(level) + return Card( + margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0), + child: ListTile( + leading: Icon( + isUnlocked ? Icons.lock_open_rounded : Icons.lock_rounded, + color: isUnlocked ? theme.primaryColor : Colors.grey, + ), + title: Text(level.name, style: TextStyle( + fontSize: 18, + fontWeight: isUnlocked ? FontWeight.bold : FontWeight.normal, + color: isUnlocked ? theme.textTheme.bodyLarge?.color : Colors.grey, + )), + subtitle: subtitleText != null + ? Text(subtitleText, style: TextStyle(color: subtitleColor, fontWeight: FontWeight.bold)) : null, - ), - ); - }, + trailing: trailingWidget, + onTap: isUnlocked && !_isLoading + ? () => _startGame(level) + : null, + ), + ); + }, + ), ), ), ], diff --git a/packages/feature_game_sudoku/lib/screens/game_screen.dart b/packages/feature_game_sudoku/lib/screens/game_screen.dart index 8feac9c..cbfba79 100644 --- a/packages/feature_game_sudoku/lib/screens/game_screen.dart +++ b/packages/feature_game_sudoku/lib/screens/game_screen.dart @@ -1,22 +1,15 @@ -// packages/feature_game_sudoku/lib/screens/game_screen.dart import 'dart:async'; import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -// [C] ์„œ๋น„์Šค import import 'package:service_api/service_api.dart'; - -// [A] ๊ณตํ†ต ์œ„์ ฏ import import 'package:feature_common/feature_common.dart'; -// [B] ๊ฐ™์€ ํŒจํ‚ค์ง€ ๋‚ด์˜ ์œ„์ ฏ import import '../widgets/number_pad.dart'; import '../widgets/sudoku_board.dart'; import '../models/game_level.dart'; -// โŒ [์‚ญ์ œ] enum _RankSubmissionStep - class GameScreen extends StatefulWidget { final SudokuGameDto gameData; final String themeName; @@ -57,18 +50,12 @@ class _GameScreenState extends State { int? selectedNumberPad; Set incorrectCells = {}; bool isValidating = false; - - // โŒ [์‚ญ์ œ] ๋žญํ‚น ๋‹ค์ด์–ผ๋กœ๊ทธ ์ „์šฉ ์ƒํƒœ ๋ณ€์ˆ˜ - // _RankSubmissionStep _rankStep = _RankSubmissionStep.enterName; - // List _rankingList = []; - // GameRankWithRankNumber? _myRankResult; - // String _submittedPlayerName = ""; late final TransformationController _transformationController; - // ... ( _charToInt, _intToChar, initState, dispose, startTimer, onCellTapped, _checkIfBoardIsFull ... ) - // ... ( onNumberTapped, onUndoTapped, onHintTapped, _onRestartGameTapped, _onQuitGameTapped, _resetBoardZoom ... ) - // ... ( ์ด ํ•จ์ˆ˜๋“ค์€ ๋ชจ๋‘ ๋™์ผํ•ฉ๋‹ˆ๋‹ค ) + // ( ... _charToInt, _intToChar, initState, dispose, startTimer ... ) + // ( ... onCellTapped, _checkIfBoardIsFull, onNumberTapped, onUndoTapped ... ) + // ( ... onHintTapped, _onRestartGameTapped, _onQuitGameTapped, _resetBoardZoom ... ) int _charToInt(String char) { if (char == '0') return 0; if (char.codeUnitAt(0) >= '1'.codeUnitAt(0) && char.codeUnitAt(0) <= '9'.codeUnitAt(0)) { @@ -79,103 +66,74 @@ class _GameScreenState extends State { } return -1; } - String _intToChar(int num) { if (num == 0) return '0'; if (num >= 1 && num <= 9) return num.toString(); if (num >= 10 && num <= 35) return String.fromCharCode('A'.codeUnitAt(0) + (num - 10)); return '?'; } - @override void initState() { super.initState(); currentLevel = AppLevels.getLevel(widget.levelIndex); blockSize = currentLevel.blockSize; gridSize = blockSize * blockSize; - _transformationController = TransformationController(); - String themeForThisGame = widget.themeName; bool isEasyMode = currentLevel.isSequentialNumbers || currentLevel.isSequentialLetters; - if (currentLevel.isSequentialNumbers) { themeForThisGame = AppThemes.numbers; } else if (currentLevel.isSequentialLetters) { themeForThisGame = AppThemes.letters; } - - activeTheme = AppThemes.buildGameTheme( - themeForThisGame, - gridSize, - isEasyMode: isEasyMode, - ); - + activeTheme = AppThemes.buildGameTheme(themeForThisGame, gridSize, isEasyMode: isEasyMode); puzzleCells = widget.gameData.question.split('').map(_charToInt).toList(); solutionCells = widget.gameData.solution.split('').map(_charToInt).toList(); originalCells = widget.gameData.question.split('').map(_charToInt).toList(); - startTimer(); } - @override void dispose() { timer?.cancel(); _transformationController.dispose(); super.dispose(); } - void startTimer() { timer = Timer.periodic(const Duration(seconds: 1), (timer) { - setState(() { - secondsElapsed++; - }); + setState(() { secondsElapsed++; }); }); } - void onCellTapped(int index) { if (originalCells[index] == 0) { - if (incorrectCells.isNotEmpty && !incorrectCells.contains(index)) { ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('ํ‹€๋ฆฐ ๊ฐ’์„ ๋จผ์ € ์ˆ˜์ •ํ•ด์ฃผ์„ธ์š”. (๋˜๋Œ๋ฆฌ๊ธฐ โ†ฉ)'), - duration: Duration(seconds: 1), - ), + const SnackBar(content: Text('ํ‹€๋ฆฐ ๊ฐ’์„ ๋จผ์ € ์ˆ˜์ •ํ•ด์ฃผ์„ธ์š”. (๋˜๋Œ๋ฆฌ๊ธฐ โ†ฉ)'), duration: Duration(seconds: 1)), ); return; } - setState(() { selectedIndex = index; - if (selectedNumberPad != null) { final int numberValue = selectedNumberPad!; puzzleCells[index] = numberValue; - if (numberValue != solutionCells[index]) { if (!incorrectCells.contains(index)) { - if (score > 0) { - score--; - } + if (score > 0) { score--; } incorrectCells.add(index); } } else { incorrectCells.remove(index); } - _checkIfBoardIsFull(); } }); } } - void _checkIfBoardIsFull() { if (!puzzleCells.contains(0) && !isValidating) { _validateGame(); } } - void onNumberTapped(int numberValue) { setState(() { if (selectedNumberPad == numberValue) { @@ -185,7 +143,6 @@ class _GameScreenState extends State { } }); } - void onUndoTapped() { if (incorrectCells.isNotEmpty) { int errorIndex = incorrectCells.first; @@ -196,18 +153,14 @@ class _GameScreenState extends State { }); } else if (selectedIndex != null && originalCells[selectedIndex!] == 0) { - setState(() { - puzzleCells[selectedIndex!] = 0; - }); + setState(() { puzzleCells[selectedIndex!] = 0; }); } } - void onHintTapped() { ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text('ํžŒํŠธ ๊ธฐ๋Šฅ์€ ์ค€๋น„ ์ค‘์ž…๋‹ˆ๋‹ค.')), ); } - void _onRestartGameTapped() { setState(() { puzzleCells = originalCells.toList(); @@ -216,21 +169,19 @@ class _GameScreenState extends State { selectedNumberPad = null; score = 5; _resetBoardZoom(); - timer?.cancel(); secondsElapsed = 0; startTimer(); }); } - void _onQuitGameTapped() { Navigator.of(context).pop(); } - void _resetBoardZoom() { _transformationController.value = Matrix4.identity(); } + /// ๐Ÿ”ฝ [์ˆ˜์ •] _validateGame (Navigation ๋กœ์ง ๋ณ€๊ฒฝ) Future _validateGame() async { if (isValidating) return; setState(() { isValidating = true; }); @@ -246,9 +197,6 @@ class _GameScreenState extends State { if (result) { if(mounted) { - // ๐Ÿ”ฝ [์ˆ˜์ •] _showRankingDialog() ํ˜ธ์ถœ ๋Œ€์‹  - // ๊ณตํ†ต ๊ฒŒ์ž„ ์™„๋ฃŒ ํ™”๋ฉด(GameCompletionScreen)์œผ๋กœ ์ด๋™ - // 1. ์ ์ˆ˜ ํฌ๋งทํ„ฐ ์ •์˜ String formatSudokuScore(int primary, int? secondary) { final min = (primary ~/ 60).toString().padLeft(2, '0'); @@ -260,8 +208,6 @@ class _GameScreenState extends State { // 2. ๋ ˆ๋ฒจ ์ €์žฅ ์ฝœ๋ฐฑ ์ •์˜ Future saveSudokuProgress(String playerName) async { - // (playerName์€ ๊ณตํ†ต ํ™”๋ฉด์ด IdentityService๋กœ ์ €์žฅํ•˜๋ฏ€๋กœ ์—ฌ๊ธฐ์„  ์‚ฌ์šฉ ์•ˆ ํ•จ) - final int currentMaxLevel = await _identityService.getMaxUnlockedLevel(); if (currentMaxLevel < 99) { if (widget.levelIndex >= currentMaxLevel) { @@ -275,8 +221,8 @@ class _GameScreenState extends State { } } - // 3. ํ™”๋ฉด ์ด๋™ - Navigator.pushReplacement( + // 3. [์ˆ˜์ •] 'pushReplacement' ๋Œ€์‹  'await push' ์‚ฌ์šฉ + await Navigator.push( context, MaterialPageRoute( builder: (context) => GameCompletionScreen( @@ -289,16 +235,16 @@ class _GameScreenState extends State { userName: widget.userName, scoreFormatter: formatSudokuScore, onProgressSave: saveSudokuProgress, - onScreenClose: () { - // ๊ณตํ†ต ํ™”๋ฉด์—์„œ '๋‹ซ๊ธฐ'๋ฅผ ๋ˆ„๋ฅด๋ฉด ๊ฒŒ์ž„ ํ™”๋ฉด๋„ ๋‹ซํž˜ - if (Navigator.canPop(context)) { - Navigator.pop(context); - } - }, + // โŒ onScreenClose ์ œ๊ฑฐ ), ), ), ); + + // 4. [์ถ”๊ฐ€] ๋žญํ‚น ํ™”๋ฉด์—์„œ ๋Œ์•„์˜ค๋ฉด, ๊ฒŒ์ž„ ํ™”๋ฉด(self)์„ ๋‹ซ๊ณ  ๋กœ๋น„๋กœ ๋Œ์•„๊ฐ + if (mounted && Navigator.canPop(context)) { + Navigator.pop(context); + } } } else { if(mounted) { @@ -322,15 +268,13 @@ class _GameScreenState extends State { } } - // โŒ [์‚ญ์ œ] _showRankingDialog() ๋ฉ”์„œ๋“œ ์ „์ฒด (์•ฝ 150์ค„) ์‚ญ์ œ - + // ( ... build, _buildPortraitLayout, _buildLandscapeLayout ... ) + // ( ... _buildGameInfoWidget, _buildSudokuBoardWidget, _buildControlPanelWidget ... ) + // ( ... ์ด ๋ฉ”์„œ๋“œ๋“ค์€ ๋ชจ๋‘ ๋™์ผํ•ฉ๋‹ˆ๋‹ค ... ) @override Widget build(BuildContext context) { context.watch(); - - String formattedTime = - '${(secondsElapsed ~/ 60).toString().padLeft(2, '0')}:${(secondsElapsed % 60).toString().padLeft(2, '0')}'; - + String formattedTime = '${(secondsElapsed ~/ 60).toString().padLeft(2, '0')}:${(secondsElapsed % 60).toString().padLeft(2, '0')}'; final Map numberCounts = {}; for (int i = 1; i <= gridSize; i++) { numberCounts[i] = 0; } for (int cellValue in puzzleCells) { @@ -338,7 +282,6 @@ class _GameScreenState extends State { numberCounts[cellValue] = (numberCounts[cellValue] ?? 0) + 1; } } - return Scaffold( body: SafeArea( child: Column( @@ -355,16 +298,14 @@ class _GameScreenState extends State { }, ), ), - const AdBannerWidget(), // ๐Ÿ‘ˆ [A] feature_common์˜ AdBannerWidget + const AdBannerWidget(), ], ), ), ); } - Widget _buildPortraitLayout(BuildContext context, Map numberCounts, BoxConstraints constraints, String formattedTime) { final double boardWidth = (constraints.maxWidth > 600) ? 600 : constraints.maxWidth; - return Center( child: ConstrainedBox( constraints: BoxConstraints(maxWidth: boardWidth), @@ -399,26 +340,21 @@ class _GameScreenState extends State { ), ); } - Widget _buildLandscapeLayout(BuildContext context, Map numberCounts, BoxConstraints constraints, String formattedTime) { const double infoBarHeight = 60.0; double boardWidth = constraints.maxHeight - infoBarHeight - 32.0; - double controlPanelWidth; const double numberPadScaleRatio = 0.6; double padWidth = boardWidth * numberPadScaleRatio; - if (padWidth < 200) padWidth = 200; if (padWidth > 350) padWidth = 350; controlPanelWidth = padWidth + 100; - double totalWidth = boardWidth + controlPanelWidth + 16.0; if (totalWidth > (constraints.maxWidth - 32.0)) { double scale = (constraints.maxWidth - 32.0) / totalWidth; boardWidth *= scale; controlPanelWidth *= scale; } - return Padding( padding: const EdgeInsets.all(16.0), child: Column( @@ -451,7 +387,6 @@ class _GameScreenState extends State { ), ); } - Widget _buildGameInfoWidget(String formattedTime) { return Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -462,7 +397,6 @@ class _GameScreenState extends State { ], ); } - Widget _buildSudokuBoardWidget() { return GestureDetector( onLongPress: _resetBoardZoom, @@ -484,21 +418,16 @@ class _GameScreenState extends State { ), ); } - Widget _buildControlPanelWidget(BuildContext context, Map numberCounts, {required bool isLandscape, required double boardWidth}) { - final ThemeData themeData = Theme.of(context); - const double numberPadScaleRatio = 0.6; double? padMaxWidth; - if (!isLandscape) { padMaxWidth = boardWidth * numberPadScaleRatio; } else { padMaxWidth = boardWidth * numberPadScaleRatio; if (padMaxWidth < 200) padMaxWidth = 200; } - Widget numberPadGrid = ConstrainedBox( constraints: BoxConstraints(maxWidth: padMaxWidth ?? double.infinity), child: NumberPad( @@ -510,7 +439,6 @@ class _GameScreenState extends State { isLandscape: isLandscape, ), ); - Widget leftButtons = Column( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, @@ -527,7 +455,6 @@ class _GameScreenState extends State { ), ], ); - Widget rightButtons = Column( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, @@ -544,7 +471,6 @@ class _GameScreenState extends State { ), ], ); - if (isLandscape) { return Column( mainAxisSize: MainAxisSize.min, diff --git a/packages/feature_game_sudoku/lib/screens/sudoku_lobby_screen.dart b/packages/feature_game_sudoku/lib/screens/sudoku_lobby_screen.dart index 2db8c00..1b49814 100644 --- a/packages/feature_game_sudoku/lib/screens/sudoku_lobby_screen.dart +++ b/packages/feature_game_sudoku/lib/screens/sudoku_lobby_screen.dart @@ -21,25 +21,40 @@ class SudokuLobbyScreen extends StatefulWidget { class _SudokuLobbyScreenState extends State { int _maxUnlockedLevel = 1; Map _rankHistory = {}; - String? _userName; + // โŒ String? _userName; (SessionNotifier๊ฐ€ ๊ด€๋ฆฌ) late String _selectedThemeName; bool _isLoading = false; + // ๐Ÿ”ฝ [์ˆ˜์ •] SessionNotifier๋ฅผ ์‚ฌ์šฉํ•˜๊ธฐ ์œ„ํ•ด IdentityService ๋Œ€์‹  ์ถ”๊ฐ€ + late final SessionNotifier _sessionNotifier; final PuzzleService _puzzleService = PuzzleService(); - final IdentityService _identityService = IdentityService(); + final IdentityService _identityService = IdentityService(); // ๐Ÿ‘ˆ (save/load progress๋ฅผ ์œ„ํ•ด ์œ ์ง€) @override void initState() { super.initState(); _selectedThemeName = AppThemes.random; - _loadProgress(); + + // ๐Ÿ”ฝ [์ˆ˜์ •] initState์—์„œ SessionNotifier๋ฅผ read + _sessionNotifier = context.read(); + + // ๐Ÿ”ฝ [์ˆ˜์ •] _loadProgress๊ฐ€ ๋žญํ‚น๊นŒ์ง€ ๋ชจ๋‘ ์ƒˆ๋กœ๊ณ ์นจ (์ตœ์ดˆ 1ํšŒ) + _loadProgress(forceRefreshRanks: true); } - Future _loadProgress() async { + /// ๐Ÿ”ฝ [์ˆ˜์ •] _loadProgress ๋ฉ”์„œ๋“œ (SessionNotifier ์‚ฌ์šฉ ๋ฐ ๋กœ์ง ๋ถ„๋ฆฌ) + Future _loadProgress({bool forceRefreshRanks = false}) async { + // 1. (๊ฐ€๋ฒผ์›€) ๋ ˆ๋ฒจ ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ final maxLevel = await _identityService.getMaxUnlockedLevel(); - final String? myName = await _identityService.getSavedUserName(); - if (mounted) { setState(() { _maxUnlockedLevel = maxLevel; _userName = myName; }); } - if (myName == null) return; + if (mounted) { setState(() { _maxUnlockedLevel = maxLevel; }); } + + // 2. (๋ฌด๊ฑฐ์›€) ๋žญํ‚น ์ •๋ณด ์ƒˆ๋กœ๊ณ ์นจ (ํ•„์š”ํ•  ๋•Œ๋งŒ) + if (!forceRefreshRanks) return; + + // ๐Ÿ”ฝ [์ˆ˜์ •] _sessionNotifier์—์„œ ์œ ์ € ์ด๋ฆ„์„ ๊ฐ€์ ธ์˜ด + final String? myName = _sessionNotifier.session?.userName; + if (myName == null) return; // ๊ฒŒ์ŠคํŠธ์ด๊ฑฐ๋‚˜ ์•„์ง ์ด๋ฆ„ ์ €์žฅ์„ ์•ˆ ํ•จ + try { final Map oldRankMap = await _identityService.getLastSavedRankMap(); List>> rankFutures = []; @@ -68,13 +83,23 @@ class _SudokuLobbyScreenState extends State { } } + /// ๐Ÿ”ฝ [์ˆ˜์ •] _startGame ๋ฉ”์„œ๋“œ (SessionNotifier ์‚ฌ์šฉ) Future _startGame(GameLevel level) async { setState(() { _isLoading = true; }); + try { + // 1. [์ˆ˜์ •] SessionNotifier์—์„œ ์œ ์ € ์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ + final session = _sessionNotifier.session; + if (session == null) { + throw Exception("์„ธ์…˜์ด ๋กœ๋“œ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค."); + } + final String difficulty = level.levelIndex.toString(); final SudokuGameDto gameData = await _puzzleService.startGame(difficulty); - final String userId = await _identityService.getOrCreateUserId(); - final String? userName = _userName; + + final String userId = session.userId; + final String? userName = session.userName; + if (mounted) { await Navigator.push( context, @@ -88,7 +113,11 @@ class _SudokuLobbyScreenState extends State { ), ), ); - _loadProgress(); // ๊ฒŒ์ž„ ๋๋‚˜๊ณ  ๋Œ์•„์˜ค๋ฉด ๋žญํ‚น ์ƒˆ๋กœ๊ณ ์นจ + + // ๐Ÿ”ฝ [ํ•ต์‹ฌ ์ˆ˜์ •] + // ๋žญํ‚น(forceRefreshRanks: true)์€ ์ƒˆ๋กœ๊ณ ์นจํ•˜์ง€ ์•Š๊ณ , + // ๋ ˆ๋ฒจ ์ž ๊ธˆ ์ƒํƒœ(forceRefreshRanks: false)๋งŒ ์ƒˆ๋กœ๊ณ ์นจํ•ฉ๋‹ˆ๋‹ค. + _loadProgress(forceRefreshRanks: false); } } catch (e) { if (mounted) { @@ -105,7 +134,10 @@ class _SudokuLobbyScreenState extends State { @override Widget build(BuildContext context) { + // ๐Ÿ”ฝ [์ˆ˜์ •] ThemeNotifier์™€ SessionNotifier๋ฅผ ๋ชจ๋‘ watch context.watch(); // ํ…Œ๋งˆ ๊ฐ์ง€ + context.watch(); // ๐Ÿ‘ˆ ์„ธ์…˜ ๋ณ€๊ฒฝ(๋กœ๊ทธ์ธ/๋กœ๊ทธ์•„์›ƒ) ๊ฐ์ง€ + final bool allLevelsUnlocked = _maxUnlockedLevel >= 99; final theme = Theme.of(context); @@ -174,68 +206,73 @@ class _SudokuLobbyScreenState extends State { ), // ๋ ˆ๋ฒจ ๋ชฉ๋ก ListView Expanded( - child: ListView.builder( - itemCount: AppLevels.allLevels.length, - itemBuilder: (context, index) { - final GameLevel level = AppLevels.allLevels[index]; - final bool isUnlocked = allLevelsUnlocked || level.levelIndex <= _maxUnlockedLevel; - final (int oldRank, int currentRank) = _rankHistory[level.levelIndex] ?? (0, 0); - Widget? trailingWidget = isUnlocked ? const Icon(Icons.play_arrow_rounded) : null; - String? subtitleText; - Color? subtitleColor; - - if (currentRank > 0) { - String rankStr = "${currentRank}์œ„"; - if (oldRank > 0) { - int change = oldRank - currentRank; - if (change > 0) { - subtitleText = "$rankStr (โ–ฒ $change)"; - subtitleColor = Colors.green; - trailingWidget = const Icon(Icons.arrow_circle_up_rounded, color: Colors.green, size: 28); - } else if (change < 0) { - subtitleText = "$rankStr (โ–ผ ${change.abs()})"; - subtitleColor = Colors.red; - trailingWidget = const Icon(Icons.arrow_circle_down_rounded, color: Colors.red, size: 28); + // ๐Ÿ”ฝ [์ˆ˜์ •] RefreshIndicator ์ถ”๊ฐ€ (๋‹น๊ฒจ์„œ ๋žญํ‚น ์ƒˆ๋กœ๊ณ ์นจ) + child: RefreshIndicator( + onRefresh: () => _loadProgress(forceRefreshRanks: true), + child: ListView.builder( + itemCount: AppLevels.allLevels.length, + itemBuilder: (context, index) { + // ... (์ดํ•˜ ListTile ๋กœ์ง์€ ๋ชจ๋‘ ๋™์ผ) + final GameLevel level = AppLevels.allLevels[index]; + final bool isUnlocked = allLevelsUnlocked || level.levelIndex <= _maxUnlockedLevel; + final (int oldRank, int currentRank) = _rankHistory[level.levelIndex] ?? (0, 0); + Widget? trailingWidget = isUnlocked ? const Icon(Icons.play_arrow_rounded) : null; + String? subtitleText; + Color? subtitleColor; + + if (currentRank > 0) { + String rankStr = "${currentRank}์œ„"; + if (oldRank > 0) { + int change = oldRank - currentRank; + if (change > 0) { + subtitleText = "$rankStr (โ–ฒ $change)"; + subtitleColor = Colors.green; + trailingWidget = const Icon(Icons.arrow_circle_up_rounded, color: Colors.green, size: 28); + } else if (change < 0) { + subtitleText = "$rankStr (โ–ผ ${change.abs()})"; + subtitleColor = Colors.red; + trailingWidget = const Icon(Icons.arrow_circle_down_rounded, color: Colors.red, size: 28); + } else { + subtitleText = "$rankStr (์œ ์ง€)"; + subtitleColor = Colors.grey; + trailingWidget = const Icon(Icons.check_circle_outline_rounded, color: Colors.grey, size: 28); + } } else { - subtitleText = "$rankStr (์œ ์ง€)"; - subtitleColor = Colors.grey; - trailingWidget = const Icon(Icons.check_circle_outline_rounded, color: Colors.grey, size: 28); + subtitleText = "$rankStr (์‹ ๊ทœ ์ง„์ž…)"; + subtitleColor = Colors.blue; + trailingWidget = const Icon(Icons.new_releases_rounded, color: Colors.blue, size: 28); } } else { - subtitleText = "$rankStr (์‹ ๊ทœ ์ง„์ž…)"; - subtitleColor = Colors.blue; - trailingWidget = const Icon(Icons.new_releases_rounded, color: Colors.blue, size: 28); + if (oldRank > 0) { + subtitleText = "๋žญํ‚น ์ดํƒˆ (์ด์ „ ${oldRank}์œ„)"; + subtitleColor = Colors.orange; + trailingWidget = const Icon(Icons.warning_amber_rounded, color: Colors.orange, size: 28); + } } - } else { - if (oldRank > 0) { - subtitleText = "๋žญํ‚น ์ดํƒˆ (์ด์ „ ${oldRank}์œ„)"; - subtitleColor = Colors.orange; - trailingWidget = const Icon(Icons.warning_amber_rounded, color: Colors.orange, size: 28); - } - } - - return Card( - margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0), - child: ListTile( - leading: Icon( - isUnlocked ? Icons.lock_open_rounded : Icons.lock_rounded, - color: isUnlocked ? theme.primaryColor : Colors.grey, - ), - title: Text(level.name, style: TextStyle( - fontSize: 18, - fontWeight: isUnlocked ? FontWeight.bold : FontWeight.normal, - color: isUnlocked ? theme.textTheme.bodyLarge?.color : Colors.grey, - )), - subtitle: subtitleText != null - ? Text(subtitleText, style: TextStyle(color: subtitleColor, fontWeight: FontWeight.bold)) - : null, - trailing: trailingWidget, - onTap: isUnlocked && !_isLoading - ? () => _startGame(level) + + return Card( + margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0), + child: ListTile( + leading: Icon( + isUnlocked ? Icons.lock_open_rounded : Icons.lock_rounded, + color: isUnlocked ? theme.primaryColor : Colors.grey, + ), + title: Text(level.name, style: TextStyle( + fontSize: 18, + fontWeight: isUnlocked ? FontWeight.bold : FontWeight.normal, + color: isUnlocked ? theme.textTheme.bodyLarge?.color : Colors.grey, + )), + subtitle: subtitleText != null + ? Text(subtitleText, style: TextStyle(color: subtitleColor, fontWeight: FontWeight.bold)) : null, - ), - ); - }, + trailing: trailingWidget, + onTap: isUnlocked && !_isLoading + ? () => _startGame(level) + : null, + ), + ); + }, + ), ), ), ], diff --git a/packages/service_api/lib/models/math_quiz_difficulty.dart b/packages/service_api/lib/models/math_quiz_difficulty.dart new file mode 100644 index 0000000..02d1d7c --- /dev/null +++ b/packages/service_api/lib/models/math_quiz_difficulty.dart @@ -0,0 +1,222 @@ +import 'game_difficulty.dart'; + +/// ๋นˆ์นธ์˜ ์œ ํ˜•์„ ์ •์˜ +enum MathQuizBlankType { + numbersOnly, // ์ˆซ์ž๋งŒ + operatorsOnly, // ์—ฐ์‚ฐ์ž๋งŒ + numbersAndOperators, // ๋‘˜ ๋‹ค +} + +/// ํผ์ฆ์˜ ๋ ˆ์ด์•„์›ƒ ํ˜•ํƒœ๋ฅผ ์ •์˜ +enum MathQuizLayout { + /// A + B = C ๋˜๋Š” A + B * C = D + singleLine, + /// 'ใ„ฑ', 'ใ„ด' ๋ชจ์–‘ (๋ณ€์ˆ˜ 4๊ฐœ) + linkedL, + /// 3x3 ์ด์ƒ ๊ทธ๋ฆฌ๋“œ (๋ณ€์ˆ˜ 8๊ฐœ ์ด์ƒ) + gridSquare, +} + +/// ์ˆ˜ํ•™ ํ€ด์ฆˆ ๊ฒŒ์ž„์˜ ๋‚œ์ด๋„ ์ •์˜ +class MathQuizDifficulty extends GameDifficulty { + final int levelIndex; + final MathQuizLayout layout; + final String operators; + final int blankCount; + final MathQuizBlankType blankType; + + /// [์ˆ˜์ •] ์—ฐ์‚ฐ ๋ณต์žก๋„ (์˜ˆ: 2=A+B, 3=A+B*C, 4=2x2๊ทธ๋ฆฌ๋“œ) + final int operationCount; + + const MathQuizDifficulty({ + required this.levelIndex, + required super.name, + required super.contextId, + required this.layout, + required this.operators, + required this.blankCount, + required this.blankType, + required this.operationCount, + }); +} + +/// [์ˆ˜์ •๋จ] ์•ฑ ์ „์—ญ์—์„œ ์‚ฌ์šฉํ•  ์ˆ˜ํ•™ ํ€ด์ฆˆ ๋‚œ์ด๋„ ๋ชฉ๋ก (15๋‹จ๊ณ„) +class MathQuizDifficulties { + static final List allDifficulties = [ + // --- ํŒจํ„ด 1: ์ˆซ์ž 2๊ฐœ (A op B = C) [Lv 1-3] --- + // (์—ฐ์‚ฐ์ž ์šฐ์„ ์ˆœ์œ„ ์—†์Œ) + const MathQuizDifficulty( + levelIndex: 1, + name: 'Lv. 1: ์ˆซ์ž 2๊ฐœ (์ˆซ์ž ๋นˆ์นธ)', + contextId: 'MATH_L1_OP2_NUM', + layout: MathQuizLayout.singleLine, + operators: '+,-', + blankCount: 1, + blankType: MathQuizBlankType.numbersOnly, + operationCount: 2, // A, B + ), + const MathQuizDifficulty( + levelIndex: 2, + name: 'Lv. 2: ์ˆซ์ž 2๊ฐœ (์—ฐ์‚ฐ์ž ๋นˆ์นธ)', + contextId: 'MATH_L2_OP2_OP', + layout: MathQuizLayout.singleLine, + operators: '+,-', + blankCount: 1, + blankType: MathQuizBlankType.operatorsOnly, + operationCount: 2, + ), + const MathQuizDifficulty( + levelIndex: 3, + name: 'Lv. 3: ์ˆซ์ž 2๊ฐœ (์‚ฌ์น™์—ฐ์‚ฐ)', + contextId: 'MATH_L3_OP2_ANY', + layout: MathQuizLayout.singleLine, + operators: '+,-,*,/', + blankCount: 2, + blankType: MathQuizBlankType.numbersAndOperators, + operationCount: 2, + ), + + // --- ํŒจํ„ด 2: ์ˆซ์ž 3๊ฐœ (A op1 B op2 C = D) [Lv 4-6] --- + // (์—ฐ์‚ฐ์ž ์šฐ์„ ์ˆœ์œ„ *์ ์šฉ*) + const MathQuizDifficulty( + levelIndex: 4, + name: 'Lv. 4: ์ˆซ์ž 3๊ฐœ (์ˆซ์ž ๋นˆ์นธ)', + contextId: 'MATH_L4_OP3_NUM', + layout: MathQuizLayout.singleLine, + operators: '+,-,*,/', + blankCount: 2, + blankType: MathQuizBlankType.numbersOnly, + operationCount: 3, // A, B, C + ), + const MathQuizDifficulty( + levelIndex: 5, + name: 'Lv. 5: ์ˆซ์ž 3๊ฐœ (์—ฐ์‚ฐ์ž ๋นˆ์นธ)', + contextId: 'MATH_L5_OP3_OP', + layout: MathQuizLayout.singleLine, + operators: '+,-,*,/', + blankCount: 2, + blankType: MathQuizBlankType.operatorsOnly, + operationCount: 3, + ), + const MathQuizDifficulty( + levelIndex: 6, + name: 'Lv. 6: ์ˆซ์ž 3๊ฐœ (๋žœ๋ค ๋นˆ์นธ)', + contextId: 'MATH_L6_OP3_ANY', + layout: MathQuizLayout.singleLine, + operators: '+,-,*,/', + blankCount: 3, + blankType: MathQuizBlankType.numbersAndOperators, + operationCount: 3, + ), + + // --- ํŒจํ„ด 3: ์ˆซ์ž 4๊ฐœ (2x2 ๊ทธ๋ฆฌ๋“œ 'ใ„ฑ', 'ใ„ด') [Lv 7-9] --- + const MathQuizDifficulty( + levelIndex: 7, + name: 'Lv. 7: ์ˆซ์ž 4๊ฐœ (์ˆซ์ž ๋นˆ์นธ)', + contextId: 'MATH_L7_OP4_NUM', + layout: MathQuizLayout.linkedL, + operators: '+,-', + blankCount: 2, + blankType: MathQuizBlankType.numbersOnly, + operationCount: 4, // A, B, C, D + ), + const MathQuizDifficulty( + levelIndex: 8, + name: 'Lv. 8: ์ˆซ์ž 4๊ฐœ (์—ฐ์‚ฐ์ž ๋นˆ์นธ)', + contextId: 'MATH_L8_OP4_OP', + layout: MathQuizLayout.linkedL, + operators: '+,-', + blankCount: 2, + blankType: MathQuizBlankType.operatorsOnly, + operationCount: 4, + ), + const MathQuizDifficulty( + levelIndex: 9, + name: 'Lv. 9: ์ˆซ์ž 4๊ฐœ (์‚ฌ์น™์—ฐ์‚ฐ)', + contextId: 'MATH_L9_OP4_ANY', + layout: MathQuizLayout.linkedL, + operators: '+,-,*,/', + blankCount: 3, + blankType: MathQuizBlankType.numbersAndOperators, + operationCount: 4, + ), + + // --- ํŒจํ„ด 4: 3x3 ๊ทธ๋ฆฌ๋“œ (์ˆซ์ž 9๊ฐœ) [Lv 10-12] --- + const MathQuizDifficulty( + levelIndex: 10, + name: 'Lv. 10: 3x3 ๊ทธ๋ฆฌ๋“œ (์ˆซ์ž)', + contextId: 'MATH_L10_OP9_NUM', + layout: MathQuizLayout.gridSquare, + operators: '+,-', + blankCount: 3, + blankType: MathQuizBlankType.numbersOnly, + operationCount: 9, // 9 Variables + ), + const MathQuizDifficulty( + levelIndex: 11, + name: 'Lv. 11: 3x3 ๊ทธ๋ฆฌ๋“œ (์—ฐ์‚ฐ์ž)', + contextId: 'MATH_L11_OP9_OP', + layout: MathQuizLayout.gridSquare, + operators: '+,-', + blankCount: 3, + blankType: MathQuizBlankType.operatorsOnly, + operationCount: 9, + ), + const MathQuizDifficulty( + levelIndex: 12, + name: 'Lv. 12: 3x3 ๊ทธ๋ฆฌ๋“œ (์‚ฌ์น™์—ฐ์‚ฐ)', + contextId: 'MATH_L12_OP9_ANY', + layout: MathQuizLayout.gridSquare, + operators: '+,-,*,/', + blankCount: 4, + blankType: MathQuizBlankType.numbersAndOperators, + operationCount: 9, + ), + + // --- ํŒจํ„ด 5: 4x4 ๊ทธ๋ฆฌ๋“œ (์ˆซ์ž 16๊ฐœ) [Lv 13-15] --- + const MathQuizDifficulty( + levelIndex: 13, + name: 'Lv. 13: 4x4 ๊ทธ๋ฆฌ๋“œ (์ˆซ์ž)', + contextId: 'MATH_L13_OP16_NUM', + layout: MathQuizLayout.gridSquare, + operators: '+,-,*,/', + blankCount: 5, + blankType: MathQuizBlankType.numbersOnly, + operationCount: 16, + ), + const MathQuizDifficulty( + levelIndex: 14, + name: 'Lv. 14: 4x4 ๊ทธ๋ฆฌ๋“œ (์—ฐ์‚ฐ์ž)', + contextId: 'MATH_L14_OP16_OP', + layout: MathQuizLayout.gridSquare, + operators: '+,-,*,/', + blankCount: 5, + blankType: MathQuizBlankType.operatorsOnly, + operationCount: 16, + ), + const MathQuizDifficulty( + levelIndex: 15, + name: 'Lv. 15: 4x4 ๊ทธ๋ฆฌ๋“œ (๋žœ๋ค)', + contextId: 'MATH_L15_OP16_ANY', + layout: MathQuizLayout.gridSquare, + operators: '+,-,*,/', + blankCount: 6, + blankType: MathQuizBlankType.numbersAndOperators, + operationCount: 16, + ), + ]; + + /// ๋ ˆ๋ฒจ ์ธ๋ฑ์Šค๋กœ ๋ ˆ๋ฒจ ์ •๋ณด ์ฐพ๊ธฐ + static MathQuizDifficulty getLevel(int levelIndex) { + if (levelIndex < 1) levelIndex = 1; + if (levelIndex > allDifficulties.length) levelIndex = allDifficulties.length; + return allDifficulties.firstWhere((level) => level.levelIndex == levelIndex, + orElse: () => allDifficulties[0] + ); + } + + /// ๋žญํ‚น ํ™”๋ฉด์šฉ ๋งต (ContextId -> ์ด๋ฆ„) + static Map get contextIdToNameMap { + return { for (var level in allDifficulties) level.contextId : level.name }; + } +} \ No newline at end of file diff --git a/packages/service_api/lib/service_api.dart b/packages/service_api/lib/service_api.dart index a4e66f1..70ed3ed 100644 --- a/packages/service_api/lib/service_api.dart +++ b/packages/service_api/lib/service_api.dart @@ -1,16 +1,16 @@ // packages/service_api/lib/service_api.dart // Models -export 'models/game_difficulty.dart'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] +export 'models/game_difficulty.dart'; export 'models/game_rank_dto.dart'; export 'models/sudoku_game_dto.dart'; export 'models/sudoku_theme.dart'; export 'models/unified_rank_dto.dart'; export 'models/validate_result_dto.dart'; -// โŒ (game_level.dart๋Š” ์—ฌ๊ธฐ์„œ ์‚ญ์ œ) +export 'models/math_quiz_difficulty.dart'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] // Services export 'services/identity_service.dart'; export 'services/puzzle_service.dart'; export 'services/theme_notifier.dart'; -export 'services/session_notifier.dart'; \ No newline at end of file +export 'services/session_notifier.dart'; // ๐Ÿ‘ˆ [์ถ”๊ฐ€] \ No newline at end of file diff --git a/packages/service_api/lib/services/identity_service.dart b/packages/service_api/lib/services/identity_service.dart index 22c2d38..5198ae6 100644 --- a/packages/service_api/lib/services/identity_service.dart +++ b/packages/service_api/lib/services/identity_service.dart @@ -21,10 +21,8 @@ class UserSession { // ์•ฑ-๊ณ ์œ  ID์™€ ์‚ฌ์šฉ์ž ์ด๋ฆ„, ๋ ˆ๋ฒจ ์ง„ํ–‰ ์ƒํ™ฉ์„ ๊ด€๋ฆฌํ•˜๋Š” ์„œ๋น„์Šค class IdentityService { - // --- (๋ชจ๋“  ํ‚ค ์ด๋ฆ„์€ ๋™์ผํ•˜๊ฒŒ ์œ ์ง€) --- static const String _userIdKey = 'app_user_id'; static const String _userNameKey = 'app_user_name'; - // ๐Ÿ”ฝ [์‹ ๊ทœ] ๋กœ๊ทธ์ธ ์ƒํƒœ ์ €์žฅ์„ ์œ„ํ•œ ํ‚ค static const String _loginProviderKey = 'app_login_provider'; static const String _userEmailKey = 'app_user_email'; @@ -33,9 +31,12 @@ class IdentityService { static const String _spiderMaxLevelKey = 'max_unlocked_spider_level'; static const String _spiderRankMapKey = 'last_checked_spider_rank_map'; + // ๐Ÿ”ฝ [์‹ ๊ทœ] ์ˆ˜ํ•™ ํ€ด์ฆˆ ์ „์šฉ ํ‚ค + static const String _mathQuizMaxLevelKey = 'max_unlocked_mathquiz_level'; + static const String _mathQuizRankMapKey = 'last_checked_mathquiz_rank_map'; + final _storage = const FlutterSecureStorage(); - /// ๐Ÿ”ฝ [์‹ ๊ทœ] iOS ์•ฑ ๊ฐ„ ๋ฐ์ดํ„ฐ ๊ณต์œ ๋ฅผ ์œ„ํ•œ ์˜ต์…˜ IOSOptions _getIOSOptions() => const IOSOptions( // ๐Ÿ”ฝ [์ˆ˜์ •] Xcode ์„ค์ • ์ „๊นŒ์ง€ 'groupId'๋ฅผ ์ฃผ์„ ์ฒ˜๋ฆฌํ•˜์—ฌ ํฌ๋ž˜์‹œ ๋ฐฉ์ง€ // groupId: 'group.com.lunaticbum.mygamecenter', @@ -45,9 +46,9 @@ class IdentityService { encryptedSharedPreferences: true, ); - // ๐Ÿ”ฝ [์‹ ๊ทœ] 1. ํ˜„์žฌ ์„ธ์…˜ ์ •๋ณด๋ฅผ '๊ฐ์ฒด'๋กœ ๊ฐ€์ ธ์˜ค๊ธฐ + // 1. ํ˜„์žฌ ์„ธ์…˜ ์ •๋ณด๋ฅผ '๊ฐ์ฒด'๋กœ ๊ฐ€์ ธ์˜ค๊ธฐ Future getUserSession() async { - final userId = await getOrCreateUserId(); // ๊ฒŒ์ŠคํŠธ ID๋Š” ํ•ญ์ƒ ๋ณด์žฅ + final userId = await getOrCreateUserId(); final userName = await getSavedUserName(); final loginProvider = await _storage.read( key: _loginProviderKey, @@ -107,12 +108,12 @@ class IdentityService { ); } - // ๐Ÿ”ฝ [์‹ ๊ทœ] 5. ์†Œ์…œ ๋กœ๊ทธ์ธ ์„ฑ๊ณต ์‹œ ํ˜ธ์ถœ (๊ณ„์ • ์—ฐ๊ฒฐ) + // 5. ์†Œ์…œ ๋กœ๊ทธ์ธ ์„ฑ๊ณต ์‹œ ํ˜ธ์ถœ (๊ณ„์ • ์—ฐ๊ฒฐ) Future saveSocialLogin({ - required String newUserId, // ์„œ๋ฒ„๊ฐ€ ๋ฐœ๊ธ‰ํ•œ ๋งˆ์Šคํ„ฐ ๊ณ„์ • ID + required String newUserId, required String newUserName, required String newEmail, - required String provider, // "google" ๋˜๋Š” "apple" + required String provider, }) async { await _storage.write(key: _userIdKey, value: newUserId, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions()); await _storage.write(key: _userNameKey, value: newUserName, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions()); @@ -127,9 +128,8 @@ class IdentityService { ); } - // ๐Ÿ”ฝ [์‹ ๊ทœ] 6. ๋กœ๊ทธ์•„์›ƒ (๊ฒŒ์ŠคํŠธ ๊ณ„์ •์œผ๋กœ ๋˜๋Œ๋ฆฌ๊ธฐ) + // 6. ๋กœ๊ทธ์•„์›ƒ (๊ฒŒ์ŠคํŠธ ๊ณ„์ •์œผ๋กœ ๋˜๋Œ๋ฆฌ๊ธฐ) Future logout() async { - // ์†Œ์…œ ๋กœ๊ทธ์ธ ์ •๋ณด๋งŒ ์‚ญ์ œ await _storage.delete(key: _userNameKey, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions()); await _storage.delete(key: _userEmailKey, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions()); await _storage.delete(key: _loginProviderKey, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions()); @@ -137,20 +137,40 @@ class IdentityService { return await getUserSession(); } - // 7. ์ตœ๋Œ€ ๋ ˆ๋ฒจ ๊ฐ€์ ธ์˜ค๊ธฐ + // ๐Ÿ”ฝ [์ˆ˜์ •] 7. ์ตœ๋Œ€ ๋ ˆ๋ฒจ ๊ฐ€์ ธ์˜ค๊ธฐ (gameType ๋ถ„๊ธฐ) Future getMaxUnlockedLevel({String gameType = 'SUDOKU'}) async { - final key = gameType == 'SPIDER' ? _spiderMaxLevelKey : _sudokuMaxLevelKey; + String key; + switch (gameType) { + case 'SPIDER': + key = _spiderMaxLevelKey; + break; + case 'MATH_QUIZ': // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + key = _mathQuizMaxLevelKey; + break; + default: // 'SUDOKU' + key = _sudokuMaxLevelKey; + } String? levelString = await _storage.read( key: key, iOptions: _getIOSOptions(), aOptions: _getAndroidOptions(), ); - return int.parse(levelString ?? '1'); // ๊ธฐ๋ณธ๊ฐ’ 1 + return int.parse(levelString ?? '1'); } - // 8. ์ตœ๋Œ€ ๋ ˆ๋ฒจ ์ €์žฅํ•˜๊ธฐ + // ๐Ÿ”ฝ [์ˆ˜์ •] 8. ์ตœ๋Œ€ ๋ ˆ๋ฒจ ์ €์žฅํ•˜๊ธฐ (gameType ๋ถ„๊ธฐ) Future saveMaxUnlockedLevel(int level, {String gameType = 'SUDOKU'}) async { - final key = gameType == 'SPIDER' ? _spiderMaxLevelKey : _sudokuMaxLevelKey; + String key; + switch (gameType) { + case 'SPIDER': + key = _spiderMaxLevelKey; + break; + case 'MATH_QUIZ': // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + key = _mathQuizMaxLevelKey; + break; + default: // 'SUDOKU' + key = _sudokuMaxLevelKey; + } await _storage.write( key: key, value: level.toString(), @@ -159,9 +179,19 @@ class IdentityService { ); } - // 9. ๋งˆ์ง€๋ง‰ ๋žญํ‚น ๋งต ๊ฐ€์ ธ์˜ค๊ธฐ + // ๐Ÿ”ฝ [์ˆ˜์ •] 9. ๋งˆ์ง€๋ง‰ ๋žญํ‚น ๋งต ๊ฐ€์ ธ์˜ค๊ธฐ (gameType ๋ถ„๊ธฐ) Future> getLastSavedRankMap({String gameType = 'SUDOKU'}) async { - final key = gameType == 'SPIDER' ? _spiderRankMapKey : _sudokuRankMapKey; + String key; + switch (gameType) { + case 'SPIDER': + key = _spiderRankMapKey; + break; + case 'MATH_QUIZ': // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + key = _mathQuizRankMapKey; + break; + default: // 'SUDOKU' + key = _sudokuRankMapKey; + } String? jsonString = await _storage.read( key: key, iOptions: _getIOSOptions(), @@ -177,9 +207,19 @@ class IdentityService { } } - // 10. ๋งˆ์ง€๋ง‰ ๋žญํ‚น ๋งต ์ €์žฅํ•˜๊ธฐ + // ๐Ÿ”ฝ [์ˆ˜์ •] 10. ๋งˆ์ง€๋ง‰ ๋žญํ‚น ๋งต ์ €์žฅํ•˜๊ธฐ (gameType ๋ถ„๊ธฐ) Future saveLastRankMap(Map rankMap, {String gameType = 'SUDOKU'}) async { - final key = gameType == 'SPIDER' ? _spiderRankMapKey : _sudokuRankMapKey; + String key; + switch (gameType) { + case 'SPIDER': + key = _spiderRankMapKey; + break; + case 'MATH_QUIZ': // ๐Ÿ‘ˆ [์ถ”๊ฐ€] + key = _mathQuizRankMapKey; + break; + default: // 'SUDOKU' + key = _sudokuRankMapKey; + } final Map stringKeyMap = rankMap.map((key, value) => MapEntry(key.toString(), value));