diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index d53d03d1f..4f859fbfe 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -27,7 +27,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: distribution: 'zulu' java-version: '17' @@ -35,21 +35,23 @@ jobs: with: channel: beta - run: ./tool/flutter_ci_script_stable.sh + # Verify the Android add-to-app samples build and pass tests with the beta # channel. - android-build: - runs-on: ubuntu-latest - if: github.repository == 'flutter/samples' - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 - with: - distribution: 'zulu' - java-version: '17' - - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 - with: - channel: beta - - run: ./tool/android_ci_script.sh + # android-build: + # runs-on: ubuntu-latest + # if: github.repository == 'flutter/samples' + # steps: + # - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 + # with: + # distribution: 'zulu' + # java-version: '17' + # - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + # with: + # channel: beta + # - run: ./tool/android_ci_script.sh + # Verify the iOS add-to-app samples build and pass tests with the beta # channel. ios-build: @@ -57,7 +59,7 @@ jobs: if: github.repository == 'flutter/samples' steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9fb131a63..808c18581 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: distribution: 'zulu' java-version: '17' @@ -36,6 +36,7 @@ jobs: with: channel: ${{ matrix.flutter_version }} - run: ./tool/flutter_ci_script_${{ matrix.flutter_version }}.sh + web-samples-index: name: web/samples_index config check runs-on: ubuntu-latest @@ -46,25 +47,27 @@ jobs: dart pub get dart run grinder generate working-directory: web/samples_index - android-build: - runs-on: ubuntu-latest - if: github.repository == 'flutter/samples' - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 - with: - distribution: 'zulu' - java-version: '17' - - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 - with: - channel: stable - - run: ./tool/android_ci_script.sh + + # android-build: + # runs-on: ubuntu-latest + # if: github.repository == 'flutter/samples' + # steps: + # - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 + # with: + # distribution: 'zulu' + # java-version: '17' + # - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + # with: + # channel: stable + # - run: ./tool/android_ci_script.sh + ios-build: runs-on: macos-latest if: github.repository == 'flutter/samples' steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 5ec3cb391..0c96a21be 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -42,7 +42,7 @@ jobs: # Upload the results as artifacts (optional). - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: name: SARIF file path: results.sarif @@ -50,6 +50,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 + uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 with: sarif_file: results.sarif diff --git a/add_to_app/README.md b/add_to_app/README.md index 4963ede3a..1109a1321 100644 --- a/add_to_app/README.md +++ b/add_to_app/README.md @@ -51,14 +51,29 @@ module](https://docs.flutter.dev/add-to-app/debugging). This will allow you to hot reload, set breakpoints, and use DevTools and other debugging functionality, similar to a full Flutter app. -## Questions/issues +## Issues -If you have a general question about incorporating Flutter into an existing -iOS or Android app, the best places to go are: +If you run into an issue with the sample itself, please file an issue +in the [Flutter samples repo](https://github.com/flutter/samples/issues). -* [The FlutterDev Google Group](https://groups.google.com/forum/#!forum/flutter-dev) -* [The Flutter Gitter channel](https://gitter.im/flutter/flutter) -* [StackOverflow](https://stackoverflow.com/questions/tagged/flutter) -If you run into an issue with the sample itself, please file an issue -in the [main Flutter repo](https://github.com/flutter/flutter/issues). +## Updating Android samples and its dependencies + +1. Open the top level build.gradle file in Android Studio +2. Open “Upgrade Assistant” and click upgrade + +### Troubleshooting Android updates + +* If after upgrading it fails to build, try upgrading to a slightly less new version +* If there's an "Unknown class version exception " try setting the version of Java used by modifying JAVA_HOME +* If it still fails to build, check that the Flutter code referenced in the build is up-to-date and doesn't use discontinued plugins. (Common cases include “namespace”) +* The 'project structure' -> 'modules' view can be helpful in understanding the dependency tree. +* Once the app builds with the latest gradle/agp, update any deprecated usages in app/build.gradle + +* compileSdkVersion -> sdkVersion +* Update the target sdk version and read through each target sdk update +* Export broadcast receivers +* Update the way flutter is imported to use flutter gradle plugin +* https://flutter.dev/go/flutter-gradle-plugin-apply + +* **When updating an app that uses AAR as a Flutter module** -- In android studio update any android dependencies that are indicated as in yellow as old. Keep `androidx.test:runner`, `androidx.test.espresso:espresso-core`, and `androidx.test:core`, as defined in https://github.com/flutter/packages/tree/main/packages/espresso diff --git a/add_to_app/books/flutter_module_books/pubspec.yaml b/add_to_app/books/flutter_module_books/pubspec.yaml index 9b2e31fad..89f7d1118 100644 --- a/add_to_app/books/flutter_module_books/pubspec.yaml +++ b/add_to_app/books/flutter_module_books/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: dev_dependencies: analysis_defaults: path: ../../../analysis_defaults - pigeon: ">=11.0.0 <22.0.0" + pigeon: ">=11.0.0 <23.0.0" flutter_test: sdk: flutter diff --git a/add_to_app/fullscreen/README.md b/add_to_app/fullscreen/README.md index 89b040916..8abc792c8 100644 --- a/add_to_app/fullscreen/README.md +++ b/add_to_app/fullscreen/README.md @@ -38,6 +38,7 @@ you're building for both iOS and Android, with both toolchains installed): cd ../ios_fullscreen pod install open IOSFullScreen.xcworkspace + # Then, click "Run" in Xcode to launch the app into your Simulator or device ``` ## Requirements diff --git a/ai_recipe_generation/lib/features/prompt/prompt_screen.dart b/ai_recipe_generation/lib/features/prompt/prompt_screen.dart index 0abc8a2b4..a22aa57c0 100644 --- a/ai_recipe_generation/lib/features/prompt/prompt_screen.dart +++ b/ai_recipe_generation/lib/features/prompt/prompt_screen.dart @@ -223,7 +223,7 @@ class PromptScreen extends StatelessWidget { iconColor: Colors.black45, buttonBackgroundColor: Colors.transparent, hoverColor: - MarketplaceTheme.secondary.withOpacity(.1), + MarketplaceTheme.secondary.withAlpha(25), ), ), const Spacer(flex: 1), @@ -292,7 +292,7 @@ class PromptScreen extends StatelessWidget { icon: Symbols.restart_alt, iconColor: Colors.black45, buttonBackgroundColor: Colors.transparent, - hoverColor: MarketplaceTheme.secondary.withOpacity(.1), + hoverColor: MarketplaceTheme.secondary.withAlpha(25), ), ), const SizedBox(height: 200.0), @@ -322,7 +322,7 @@ class _FilterChipSection extends StatelessWidget { child: Container( height: 230, decoration: BoxDecoration( - color: Theme.of(context).splashColor.withOpacity(.1), + color: Theme.of(context).splashColor.withAlpha(25), border: Border.all( color: MarketplaceTheme.borderColor, ), diff --git a/ai_recipe_generation/lib/features/prompt/widgets/image_input_widget.dart b/ai_recipe_generation/lib/features/prompt/widgets/image_input_widget.dart index f1a269a75..70484a16a 100644 --- a/ai_recipe_generation/lib/features/prompt/widgets/image_input_widget.dart +++ b/ai_recipe_generation/lib/features/prompt/widgets/image_input_widget.dart @@ -201,7 +201,7 @@ class _CameraViewState extends State { right: 0, height: 89.5, child: Container( - color: Colors.black.withOpacity(.7), + color: Colors.black.withAlpha(179), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -247,7 +247,7 @@ class _CameraViewState extends State { right: 0, height: 150, child: Container( - color: Colors.black.withOpacity(.7), + color: Colors.black.withAlpha(179), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/ai_recipe_generation/lib/features/recipes/saved_recipes_screen.dart b/ai_recipe_generation/lib/features/recipes/saved_recipes_screen.dart index 567c70324..604ac64ad 100644 --- a/ai_recipe_generation/lib/features/recipes/saved_recipes_screen.dart +++ b/ai_recipe_generation/lib/features/recipes/saved_recipes_screen.dart @@ -193,7 +193,7 @@ class _ListTileState extends State<_ListTile> { bottomLeft: Radius.circular(MarketplaceTheme.defaultBorderRadius), ), - color: color.withOpacity(.3), + color: color.withAlpha(77), ), padding: const EdgeInsets.all(MarketplaceTheme.spacing7), child: Stack( diff --git a/ai_recipe_generation/lib/features/recipes/widgets/recipe_display_widget.dart b/ai_recipe_generation/lib/features/recipes/widgets/recipe_display_widget.dart index 780697a21..113f2015b 100644 --- a/ai_recipe_generation/lib/features/recipes/widgets/recipe_display_widget.dart +++ b/ai_recipe_generation/lib/features/recipes/widgets/recipe_display_widget.dart @@ -76,7 +76,7 @@ class RecipeDisplayWidget extends StatelessWidget { children: [ Container( padding: const EdgeInsets.all(MarketplaceTheme.defaultBorderRadius), - color: MarketplaceTheme.primary.withOpacity(.5), + color: MarketplaceTheme.primary.withAlpha(128), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -106,7 +106,7 @@ class RecipeDisplayWidget extends StatelessWidget { style: ButtonStyle( backgroundColor: WidgetStateColor.resolveWith((states) { if (states.contains(WidgetState.hovered)) { - return MarketplaceTheme.scrim.withOpacity(.6); + return MarketplaceTheme.scrim.withAlpha(153); } return Colors.white; }), diff --git a/ai_recipe_generation/lib/router.dart b/ai_recipe_generation/lib/router.dart index 9b1569b80..0ca954f95 100644 --- a/ai_recipe_generation/lib/router.dart +++ b/ai_recipe_generation/lib/router.dart @@ -35,9 +35,7 @@ class _AdaptiveRouterState extends State super.initState(); tabController = TabController(length: 2, vsync: this); _textStyle = MarketplaceTheme.heading1.copyWith( - color: Colors.black87.withOpacity( - 1.0, - ), + color: Colors.black87.withAlpha(255), ); scrollController = ScrollController(); @@ -60,7 +58,7 @@ class _AdaptiveRouterState extends State // By offset 200, ensure the text is transparent if (scrollController.offset > 200) { _textStyle = _textStyle.copyWith( - color: Colors.black87.withOpacity(0), + color: Colors.black87.withAlpha(0), ); return; } @@ -73,9 +71,7 @@ class _AdaptiveRouterState extends State if (value > 1) value = 1; if (value < 0) value = 0; _textStyle = _textStyle.copyWith( - color: Colors.black87.withOpacity( - value, - ), + color: Colors.black87.withAlpha((255 * value).ceil()), ); }); } diff --git a/ai_recipe_generation/lib/util/tap_recorder.dart b/ai_recipe_generation/lib/util/tap_recorder.dart index e3bf8cc69..d411473c5 100644 --- a/ai_recipe_generation/lib/util/tap_recorder.dart +++ b/ai_recipe_generation/lib/util/tap_recorder.dart @@ -96,9 +96,10 @@ class _RenderTapRecorder extends RenderProxyBox with _SilentTickerProvider { Rect.fromCircle(center: tap.localPosition, radius: _tapRadius)); final opacity = 1 - tap.animation.value; - canvas.drawShadow( - path, _shadowColor.withOpacity(opacity), _shadowElevation, true); - canvas.drawPath(path, Paint()..color = _tapColor.withOpacity(opacity)); + canvas.drawShadow(path, _shadowColor.withAlpha((2565 * opacity).ceil()), + _shadowElevation, true); + canvas.drawPath( + path, Paint()..color = _tapColor.withAlpha((2565 * opacity).ceil())); } } } diff --git a/ai_recipe_generation/lib/widgets/add_image_widget.dart b/ai_recipe_generation/lib/widgets/add_image_widget.dart index 5fa2efa85..8f1fe6dee 100644 --- a/ai_recipe_generation/lib/widgets/add_image_widget.dart +++ b/ai_recipe_generation/lib/widgets/add_image_widget.dart @@ -27,11 +27,11 @@ class _AddImageState extends State { var state = (hovered, tappedDown); return switch (state) { // tapped down state - (_, true) => MarketplaceTheme.secondary.withOpacity(.7), + (_, true) => MarketplaceTheme.secondary.withAlpha(179), // hovered - (true, _) => MarketplaceTheme.secondary.withOpacity(.3), + (true, _) => MarketplaceTheme.secondary.withAlpha(77), // base color - (_, _) => MarketplaceTheme.secondary.withOpacity(.3), + (_, _) => MarketplaceTheme.secondary.withAlpha(77), }; } diff --git a/ai_recipe_generation/lib/widgets/filter_chip_selection_input.dart b/ai_recipe_generation/lib/widgets/filter_chip_selection_input.dart index 829411149..5d403699c 100644 --- a/ai_recipe_generation/lib/widgets/filter_chip_selection_input.dart +++ b/ai_recipe_generation/lib/widgets/filter_chip_selection_input.dart @@ -51,10 +51,10 @@ class _CategorySelectionInputState return FilterChip( color: WidgetStateColor.resolveWith((states) { if (states.contains(WidgetState.hovered)) { - return MarketplaceTheme.secondary.withOpacity(.5); + return MarketplaceTheme.secondary.withAlpha(128); } if (states.contains(WidgetState.selected)) { - return MarketplaceTheme.secondary.withOpacity(.3); + return MarketplaceTheme.secondary.withAlpha(77); } return Theme.of(context).splashColor; }), diff --git a/ai_recipe_generation/lib/widgets/highlight_border_on_hover_widget.dart b/ai_recipe_generation/lib/widgets/highlight_border_on_hover_widget.dart index e9ab49635..d6fe3591c 100644 --- a/ai_recipe_generation/lib/widgets/highlight_border_on_hover_widget.dart +++ b/ai_recipe_generation/lib/widgets/highlight_border_on_hover_widget.dart @@ -38,7 +38,7 @@ class _HighlightBorderOnHoverWidgetState }, child: Container( decoration: BoxDecoration( - color: Theme.of(context).splashColor.withOpacity(.1), + color: Theme.of(context).splashColor.withAlpha(25), border: Border.all( color: hovered ? widget.color : MarketplaceTheme.borderColor, ), diff --git a/ai_recipe_generation/lib/widgets/marketplace_button_widget.dart b/ai_recipe_generation/lib/widgets/marketplace_button_widget.dart index 142540be9..53cce4aaa 100644 --- a/ai_recipe_generation/lib/widgets/marketplace_button_widget.dart +++ b/ai_recipe_generation/lib/widgets/marketplace_button_widget.dart @@ -55,10 +55,10 @@ class _MarketplaceButtonState extends State { backgroundColor: WidgetStateColor.resolveWith((states) { if (states.contains(WidgetState.hovered)) { return widget.hoverColor ?? - MarketplaceTheme.secondary.withOpacity(.3); + MarketplaceTheme.secondary.withAlpha(77); } return widget.buttonBackgroundColor ?? - Theme.of(context).splashColor.withOpacity(.3); + Theme.of(context).splashColor.withAlpha(77); }), shape: WidgetStateProperty.resolveWith( (states) { diff --git a/experimental/date_planner/.gitignore b/experimental/date_planner/.gitignore new file mode 100644 index 000000000..29a3a5017 --- /dev/null +++ b/experimental/date_planner/.gitignore @@ -0,0 +1,43 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/experimental/date_planner/.metadata b/experimental/date_planner/.metadata new file mode 100644 index 000000000..eeac26e64 --- /dev/null +++ b/experimental/date_planner/.metadata @@ -0,0 +1,30 @@ +# 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: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: ios + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/experimental/date_planner/README.md b/experimental/date_planner/README.md new file mode 100644 index 000000000..d28251c75 --- /dev/null +++ b/experimental/date_planner/README.md @@ -0,0 +1,3 @@ +An in-progress exploration of an iOS-style Date Planner app, +similar to the SwiftUI Tutorial app +[Date Planner](https://developer.apple.com/tutorials/sample-apps/dateplanner). diff --git a/experimental/date_planner/analysis_options.yaml b/experimental/date_planner/analysis_options.yaml new file mode 100644 index 000000000..0d2902135 --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/.gitignore b/experimental/date_planner/ios/.gitignore new file mode 100644 index 000000000..7a7f9873a --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/Flutter/AppFrameworkInfo.plist b/experimental/date_planner/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 000000000..7c5696400 --- /dev/null +++ b/experimental/date_planner/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 + 12.0 + + diff --git a/experimental/date_planner/ios/Flutter/Debug.xcconfig b/experimental/date_planner/ios/Flutter/Debug.xcconfig new file mode 100644 index 000000000..592ceee85 --- /dev/null +++ b/experimental/date_planner/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/experimental/date_planner/ios/Flutter/Release.xcconfig b/experimental/date_planner/ios/Flutter/Release.xcconfig new file mode 100644 index 000000000..592ceee85 --- /dev/null +++ b/experimental/date_planner/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/experimental/date_planner/ios/Runner.xcodeproj/project.pbxproj b/experimental/date_planner/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 000000000..a07b33e44 --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,619 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.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 = GAD6HE5MEM; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner.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 = 12.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 = 12.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 = GAD6HE5MEM; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner; + 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 = GAD6HE5MEM; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.datePlanner; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/experimental/date_planner/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/experimental/date_planner/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 000000000..8e3ca5dfe --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/experimental/date_planner/ios/Runner.xcworkspace/contents.xcworkspacedata b/experimental/date_planner/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..1d526a16e --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/experimental/date_planner/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/experimental/date_planner/ios/Runner/AppDelegate.swift b/experimental/date_planner/ios/Runner/AppDelegate.swift new file mode 100644 index 000000000..626664468 --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..d36b1fab2 --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 000000000..dc9ada472 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 000000000..7353c41ec Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 000000000..797d452e4 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 000000000..6ed2d933e Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 000000000..4cd7b0099 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 000000000..fe730945a Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 000000000..321773cd8 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 000000000..797d452e4 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 000000000..502f463a9 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 000000000..0ec303439 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 000000000..0ec303439 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 000000000..e9f5fea27 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 000000000..84ac32ae7 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 000000000..8953cba09 Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 000000000..0467bf12a Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 000000000..0bedcf2fd --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 000000000..9da19eaca Binary files /dev/null and b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/experimental/date_planner/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 000000000..89c2725b7 --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/ios/Runner/Base.lproj/LaunchScreen.storyboard b/experimental/date_planner/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..f2e259c7c --- /dev/null +++ b/experimental/date_planner/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/experimental/date_planner/ios/Runner/Base.lproj/Main.storyboard b/experimental/date_planner/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 000000000..f3c28516f --- /dev/null +++ b/experimental/date_planner/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/experimental/date_planner/ios/Runner/Info.plist b/experimental/date_planner/ios/Runner/Info.plist new file mode 100644 index 000000000..c836cd5dd --- /dev/null +++ b/experimental/date_planner/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Date Planner + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + date_planner + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/experimental/date_planner/ios/Runner/Runner-Bridging-Header.h b/experimental/date_planner/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 000000000..308a2a560 --- /dev/null +++ b/experimental/date_planner/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/experimental/date_planner/ios/RunnerTests/RunnerTests.swift b/experimental/date_planner/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..86a7c3b1b --- /dev/null +++ b/experimental/date_planner/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/experimental/date_planner/lib/color_options.dart b/experimental/date_planner/lib/color_options.dart new file mode 100644 index 000000000..9d13e5816 --- /dev/null +++ b/experimental/date_planner/lib/color_options.dart @@ -0,0 +1,28 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:math'; + +import 'package:flutter/cupertino.dart'; + +enum ColorOptions { + primary(CupertinoColors.black), + gray(CupertinoColors.lightBackgroundGray), + red(CupertinoColors.systemRed), + orange(CupertinoColors.systemOrange), + yellow(CupertinoColors.systemYellow), + green(CupertinoColors.systemGreen), + mint(CupertinoColors.systemMint), + cyan(CupertinoColors.systemCyan), + indigo(CupertinoColors.systemIndigo), + purple(CupertinoColors.systemPurple); + + final Color color; + static final _rnd = Random(); + + const ColorOptions(this.color); + + factory ColorOptions.random() => + ColorOptions.values[_rnd.nextInt(ColorOptions.values.length)]; +} diff --git a/experimental/date_planner/lib/event.dart b/experimental/date_planner/lib/event.dart new file mode 100644 index 000000000..1e3b05d0f --- /dev/null +++ b/experimental/date_planner/lib/event.dart @@ -0,0 +1,80 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; +import 'package:intl/intl.dart'; +import 'package:uuid/uuid.dart'; + +import 'color_options.dart'; +import 'event_task.dart'; + +class Event implements Comparable { + static const _uuid = Uuid(); + + final id = _uuid.v4(); + String title; + ColorOptions color; + IconData icon; + List tasks; + DateTime date; + + Event({ + required this.title, + ColorOptions? color, + this.icon = CupertinoIcons.add, + List? tasks, + DateTime? date, + }) : color = color ?? ColorOptions.random(), + tasks = tasks ?? [EventTask(text: '')], + date = date ?? DateTime.now(); + + Event copy() { + return Event( + title: title, + color: color, + icon: icon, + tasks: tasks, + date: date, + ); + } + + updateWith(Event e) { + title = e.title; + color = e.color; + icon = e.icon; + tasks = e.tasks; + date = e.date; + } + + int get remainingTaskCount => tasks.where((e) => !e.isCompleted).length; + + bool get isComplete => remainingTaskCount == 0; + + bool get isPast => DateTime.now().isAfter(date); + + bool get isWithinSevenDays => !isPast && date.isBefore(FromNow.sevenDays); + + bool get isWithinSevenToThirtyDays => + !isPast && !isWithinSevenDays && date.isBefore(FromNow.thirtyDays); + + bool get isDistant => date.isAfter(FromNow.thirtyDays); + + String get dateFormated => '${DateFormat.yMMMd().format(date)} at ' + '${DateFormat.Hm().format(date)}'; + + @override + int compareTo(Event other) => date.compareTo(other.date); +} + +class FromNow { + static DateTime get sevenDays => DateTime.now().add(const Duration(days: 7)); + + static DateTime get thirtyDays => + DateTime.now().add(const Duration(days: 30)); + + static DateTime roundedHours(int hours) { + final date = DateTime.now().add(Duration(hours: hours)); + return DateTime(date.year, date.month, date.day, date.hour); + } +} diff --git a/experimental/date_planner/lib/event_data.dart b/experimental/date_planner/lib/event_data.dart new file mode 100644 index 000000000..a3e16fa2c --- /dev/null +++ b/experimental/date_planner/lib/event_data.dart @@ -0,0 +1,162 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +import 'color_options.dart'; +import 'event.dart'; +import 'event_task.dart'; + +class EventData with ChangeNotifier { + static final _events = buildSampleData(); + + void add(Event event) { + _events.add(event); + notifyListeners(); + } + + void delete(Event event) { + _events.remove(event); + notifyListeners(); + } + + void update(Event original, Event updated) { + _events.firstWhere((e) => e.id == original.id).updateWith(updated); + notifyListeners(); + } + + void exists(Event event) => _events.contains(event); + + List sorted(Period period) => _events + .where( + (e) => switch (period) { + Period.nextSevenDays => e.isWithinSevenDays, + Period.nextThirtyDays => e.isWithinSevenToThirtyDays, + Period.past => e.isPast, + Period.future => e.isDistant, + }, + ) + .toList() + ..sort((e1, e2) => e1.date.compareTo(e2.date)); +} + +enum Period { + nextSevenDays(name: 'Next 7 Days'), + nextThirtyDays(name: 'Next 30 Days'), + future(name: 'Future'), + past(name: 'Past'); + + const Period({required this.name}); + + final String name; +} + +List buildSampleData() { + return [ + Event( + title: 'Maya\'s Birthday', + color: ColorOptions.red, + icon: CupertinoIcons.gift, + tasks: EventTask.buildList([ + 'Guava kombucha', + 'Paper cups and plates', + 'Cheese plate', + 'Party poppers', + ]), + date: FromNow.roundedHours(24 * 30), + ), + Event( + title: 'Pagliacci', + color: ColorOptions.yellow, + // TODO(mit-mit): Use the icon "theatermasks.fill". + icon: CupertinoIcons.thermometer_snowflake, + tasks: EventTask.buildList([ + 'Buy new tux', + 'Get tickets', + 'Pick up Carmen at the airport and bring her to the show', + ]), + date: FromNow.roundedHours(22), + ), + Event( + title: 'Doctor\'s Appointment', + // TODO(mit-mit): Use the icon "facemask.fill". + icon: CupertinoIcons.lab_flask_solid, + color: ColorOptions.indigo, + tasks: + EventTask.buildList(['Bring medical ID', 'Record heart rate data']), + date: FromNow.roundedHours(24 * 4), + ), + Event( + title: 'Camping Trip', + // TODO(mit-mit): Use the icon "leaf.fill". + icon: CupertinoIcons.leaf_arrow_circlepath, + color: ColorOptions.green, + tasks: EventTask.buildList([ + 'Find a sleeping bag', + 'Bug spray', + 'Paper towels', + 'Food for 4 meals', + 'Straw hat', + ]), + date: FromNow.roundedHours(36), + ), + Event( + title: 'Game Night', + icon: CupertinoIcons.gamecontroller_fill, + color: ColorOptions.cyan, + tasks: EventTask.buildList([ + 'Find a board game to bring', + 'Bring a desert to share', + ]), + date: FromNow.roundedHours(24 * 2), + ), + Event( + title: 'First Day of School', + // TODO(mit-mit): Use the icon "graduationcap.fill". + icon: CupertinoIcons.hammer, + color: ColorOptions.primary, + tasks: EventTask.buildList([ + 'Notebooks', + 'Pencils', + 'Binder', + 'First day of school outfit', + ]), + date: FromNow.roundedHours(24 * 365), + ), + Event( + title: 'Book Launch', + icon: CupertinoIcons.book_fill, + color: ColorOptions.purple, + tasks: EventTask.buildList([ + 'Finish first draft', + 'Send draft to editor', + 'Final read-through', + ]), + date: FromNow.roundedHours(24 * 365 * 2), + ), + Event( + title: 'WWDC', + // TODO(mit-mit): Use the icon "globe.americas.fill" + icon: CupertinoIcons.globe, + color: ColorOptions.gray, + tasks: EventTask.buildList([ + 'Watch Keynote', + 'Watch What\'s new in SwiftUI', + 'Go to DT developer labs', + 'Learn about Create ML', + ]), + date: DateTime(7, 6, 2021)), + Event( + title: 'Sayulita Trip', + icon: CupertinoIcons.briefcase_fill, + color: ColorOptions.orange, + tasks: EventTask.buildList([ + 'Buy plane tickets', + 'Get a new bathing suit', + 'Find a hotel room', + ]), + date: FromNow.roundedHours(24 * 19), + ), + ]; +} diff --git a/experimental/date_planner/lib/event_detail.dart b/experimental/date_planner/lib/event_detail.dart new file mode 100644 index 000000000..af27df96f --- /dev/null +++ b/experimental/date_planner/lib/event_detail.dart @@ -0,0 +1,157 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +import 'color_options.dart'; +import 'event.dart'; +import 'event_task.dart'; +import 'symbol_editor.dart'; +import 'task_row.dart'; + +class EventDetail extends StatefulWidget { + final Event event; + final bool isEditing; + + const EventDetail({ + super.key, + required this.event, + required this.isEditing, + }); + + @override + State createState() => _EventDetailState(); +} + +class _EventDetailState extends State { + final _eventText = TextEditingController(); + + @override + void initState() { + _eventText.text = widget.event.title; + super.initState(); + } + + @override + Widget build(BuildContext context) { + const titleStyle = TextStyle(fontWeight: FontWeight.bold, fontSize: 22); + final event = widget.event; + + // TODO(mit-mit): Investigate manual overriding of colors and padding. + return Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + Container( + padding: const EdgeInsets.fromLTRB(16, 8, 0, 0), + color: CupertinoColors.systemBackground, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + if (widget.isEditing) + CupertinoButton( + padding: EdgeInsets.zero, + minSize: 0, + onPressed: () { + Navigator.of(context) + .push( + CupertinoPageRoute<(IconData, ColorOptions)?>( + builder: (_) => SymbolEditor( + event.icon, + event.color, + ), + ), + ) + .then( + ((IconData, ColorOptions)? data) { + if (data != null) { + setState(() { + var (icon, color) = data; + event.icon = icon; + event.color = color; + }); + } + }, + ); + }, + child: Icon( + event.icon, + size: 28, + color: event.color.color, + ), + ), + if (!widget.isEditing) + Icon( + event.icon, + size: 28, + color: event.color.color, + ), + const SizedBox(width: 12), + if (widget.isEditing) + Expanded( + child: CupertinoTextField( + decoration: null, + padding: EdgeInsets.zero, + style: titleStyle, + controller: _eventText, + onChanged: (value) => event.title = value, + ), + ), + if (!widget.isEditing) Text(event.title, style: titleStyle), + ], + ), + const SizedBox(height: 12), + // TODO(mit-mit): Use a widget for picking a date. + // Issue: Blocked on not having the right calendar widget: + // https://github.com/flutter/flutter/issues/63693 + Text(event.dateFormated), + CupertinoListSection( + // TODO(mit-mit): The list of tasks should be left-flush with the date above. + margin: EdgeInsets.zero, + backgroundColor: CupertinoColors.systemBackground, + decoration: null, + header: const Text( + 'Tasks', + style: TextStyle( + color: CupertinoColors.black, + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + children: [ + for (EventTask t in event.tasks) + TaskRow( + task: t, + isEditing: widget.isEditing, + ), + if (widget.isEditing) + // TODO(mit-mit): CupertinoButton with icon support? + // Consider if CupertinoButton could support setting + // both a label and an icon directly: + // https://www.kodeco.com/books/swiftui-cookbook/v1.0/chapters/8-add-an-icon-to-a-button-in-swiftui + CupertinoButton( + child: const Row( + children: [ + Icon(CupertinoIcons.plus), + Text('Add task'), + ], + ), + onPressed: () { + setState(() { + event.tasks.add(EventTask(text: '')); + }); + }, + ), + ], + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/experimental/date_planner/lib/event_editor.dart b/experimental/date_planner/lib/event_editor.dart new file mode 100644 index 000000000..7b43da359 --- /dev/null +++ b/experimental/date_planner/lib/event_editor.dart @@ -0,0 +1,117 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +import 'event.dart'; +import 'event_detail.dart'; + +class EventEditor extends StatefulWidget { + final Event event; + final bool isNew; + const EventEditor({ + super.key, + required this.event, + required this.isNew, + }); + + @override + State createState() => _EventEditorState(); +} + +class _EventEditorState extends State { + late Event event; + late bool isNew; + late bool isEditing; + + @override + void initState() { + isNew = widget.isNew; + isEditing = isNew; + event = widget.event; + super.initState(); + } + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + backgroundColor: CupertinoColors.secondarySystemBackground, + navigationBar: CupertinoNavigationBar( + // TODO(mit-mit): Resolve manual padding issues. + // + // Note that even with the padding overriding below, the chevron/ + // back arrow doesn't seem to be far enough to the left. + // + // Is this maybe the issue here? + // https://github.com/flutter/flutter/issues/91715 + leading: isNew + ? CupertinoButton( + padding: EdgeInsets.zero, + child: const Text('Cancel'), + onPressed: () => Navigator.pop(context, null), + ) + : CupertinoButton( + padding: EdgeInsets.zero, + onPressed: () { + Navigator.pop(context, event); + }, + child: const Row( + children: [ + Icon(CupertinoIcons.back), + Text('Date Planner'), + ], + ), + ), + trailing: CupertinoButton( + padding: EdgeInsets.zero, + child: Text(isNew ? 'Add' : (isEditing ? 'Done' : 'Edit')), + onPressed: () { + if (isNew) { + Navigator.pop(context, event); + } else { + setState(() { + if (isEditing) { + isEditing = false; + } else { + isEditing = true; + } + }); + } + }, + ), + ), + // TODO(mit-mit): Why isn't SafeArea included by default? + child: SafeArea( + bottom: false, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + EventDetail( + event: event, + isEditing: isEditing, + ), + const Spacer(), + if (isEditing && !isNew) + ColoredBox( + color: CupertinoColors.white, + child: Column( + children: [ + CupertinoButton( + child: const Text('Delete Event'), + onPressed: () { + setState(() { + Navigator.pop(context, null); + }); + }, + ), + const SizedBox(height: 24), + ], + ), + ), + ], + ), + ), + ); + } +} diff --git a/experimental/date_planner/lib/event_list.dart b/experimental/date_planner/lib/event_list.dart new file mode 100644 index 000000000..5289138dd --- /dev/null +++ b/experimental/date_planner/lib/event_list.dart @@ -0,0 +1,99 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; +import 'package:provider/provider.dart'; + +import 'event.dart'; +import 'event_data.dart'; +import 'event_editor.dart'; +import 'event_row.dart'; + +class EventList extends StatelessWidget { + const EventList({super.key}); + + @override + Widget build(BuildContext context) { + return Consumer( + builder: (BuildContext context, EventData events, Widget? child) { + return CupertinoPageScaffold( + // TODO(mit-mit): Avoid having to pass nav bar manually. + // + // Would like to pass nav bar and body to CupertinoPageScaffold + // directly, similar to the Material Scaffold's `appBar` and `body` + // args. + // https://github.com/flutter/flutter/issues/149625 + child: CustomScrollView( + slivers: [ + CupertinoSliverNavigationBar( + largeTitle: const Text('Date Planner'), + trailing: CupertinoButton( + padding: EdgeInsets.zero, + child: const Icon(CupertinoIcons.plus), + onPressed: () async { + // Issue: Should go to a sheet, not a a full-screen page. + // Blocked on https://github.com/flutter/flutter/issues/42560. + Event? newEvent = await Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => EventEditor( + event: Event(title: 'New event'), + isNew: true, + ), + ), + ); + + if (newEvent != null) { + events.add(newEvent); + } + }, + ), + ), + SliverList.list( + children: [ + for (Period p in Period.values) + CupertinoListSection( + header: Text( + p.name.toUpperCase(), + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + children: [ + for (Event e in events.sorted(p)) + // TODO: Support swipe action for deleting. + // Should probably use Dismissable? + // https://api.flutter.dev/flutter/widgets/Dismissible-class.html + EventRow( + event: e, + onTap: () async { + Event? updatedEvent = + await Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => EventEditor( + event: e.copy(), + isNew: false, + ), + ), + ); + if (updatedEvent == null) { + // The editor passes back null when it deleted + // the element. + events.delete(e); + } else { + events.update(e, updatedEvent); + } + }, + ) + ], + ), + ], + ), + ], + ), + ); + }, + ); + } +} diff --git a/experimental/date_planner/lib/event_row.dart b/experimental/date_planner/lib/event_row.dart new file mode 100644 index 000000000..4d7c45b88 --- /dev/null +++ b/experimental/date_planner/lib/event_row.dart @@ -0,0 +1,52 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:flutter/cupertino.dart'; + +import 'event.dart'; + +class EventRow extends StatelessWidget { + const EventRow({ + super.key, + required this.event, + this.onTap, + }); + + final Event event; + final FutureOr Function()? onTap; + + @override + Widget build(BuildContext context) { + // TODO(mit-mit): The corners of the tiles should be rounded. + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: CupertinoListTile( + title: Text( + event.title, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + subtitle: Text(event.dateFormated), + leading: Icon( + event.icon, + size: 28, + color: event.color.color, + ), + trailing: Row( + children: [ + event.isComplete + ? const Icon(CupertinoIcons.check_mark) + : Text( + '${event.remainingTaskCount}', + style: const TextStyle(color: CupertinoColors.systemGrey), + ), + const CupertinoListTileChevron(), + ], + ), + onTap: onTap, + ), + ); + } +} diff --git a/experimental/date_planner/lib/event_symbol.dart b/experimental/date_planner/lib/event_symbol.dart new file mode 100644 index 000000000..fa2187243 --- /dev/null +++ b/experimental/date_planner/lib/event_symbol.dart @@ -0,0 +1,58 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +// TODO(mit-mit): Update when missing icons are added. +// https://github.com/flutter/flutter/issues/82634 +final eventSymbols = [ + CupertinoIcons.house_fill, + CupertinoIcons.ticket_fill, + CupertinoIcons.gamecontroller_fill, +//CupertinoIcons.theatermasks_fill, +//CupertinoIcons.ladybug_fill, +//CupertinoIcons.books.vertical_fill, +//CupertinoIcons.moon.zzz_fill, + CupertinoIcons.umbrella_fill, +//CupertinoIcons.paintbrush.pointed_fill, +//CupertinoIcons.leaf_fill, +//CupertinoIcons.globe.americas_fill, + CupertinoIcons.clock_fill, +//CupertinoIcons.building.2_fill, + CupertinoIcons.gift_fill, +//CupertinoIcons.graduationcap_fill, +//CupertinoIcons.heart.rectangle_fill, +//CupertinoIcons.phone.bubble.left_fill, +//CupertinoIcons.cloud.rain_fill, +//CupertinoIcons.building.columns_fill, +//CupertinoIcons.mic.circle_fill, +//CupertinoIcons.comb_fill, +//CupertinoIcons.person.3_fill, + CupertinoIcons.bell_fill, + CupertinoIcons.hammer_fill, + CupertinoIcons.star_fill, +//CupertinoIcons.crown_fill, + CupertinoIcons.briefcase_fill, +//CupertinoIcons.speaker.wave.3_fill, +//CupertinoIcons.tshirt_fill, + CupertinoIcons.tag_fill, + CupertinoIcons.airplane, +//CupertinoIcons.pawprint_fill, +//CupertinoIcons.case_fill, + CupertinoIcons.creditcard_fill, +//CupertinoIcons.infinity.circle_fill, +//CupertinoIcons.dice_fill, + CupertinoIcons.heart_fill, + CupertinoIcons.camera_fill, +//CupertinoIcons.bicycle, +//CupertinoIcons.radio_fill, + CupertinoIcons.car_fill, + CupertinoIcons.flag_fill, + CupertinoIcons.map_fill, +//CupertinoIcons.figure.wave, +//CupertinoIcons.mappin.and.ellipse, +//CupertinoIcons.facemask_fill, + CupertinoIcons.eyeglasses, + CupertinoIcons.tram_fill, +]; diff --git a/experimental/date_planner/lib/event_task.dart b/experimental/date_planner/lib/event_task.dart new file mode 100644 index 000000000..d41e3f512 --- /dev/null +++ b/experimental/date_planner/lib/event_task.dart @@ -0,0 +1,13 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +class EventTask { + String text; + bool isCompleted; + + EventTask({required this.text, this.isCompleted = false}); + + static List buildList(List taskDescriptions) => + [for (var task in taskDescriptions) EventTask(text: task)]; +} diff --git a/experimental/date_planner/lib/main.dart b/experimental/date_planner/lib/main.dart new file mode 100644 index 000000000..255bb20d9 --- /dev/null +++ b/experimental/date_planner/lib/main.dart @@ -0,0 +1,35 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; +import 'package:provider/provider.dart'; + +import 'event_data.dart'; +import 'event_list.dart'; + +void main() { + runApp( + ChangeNotifierProvider( + create: (context) => EventData(), + child: const DatePlannerApp(), + ), + ); +} + +CupertinoThemeData cupertinoLight = const CupertinoThemeData( + brightness: Brightness.light, + primaryColor: CupertinoColors.activeBlue, +); + +class DatePlannerApp extends StatelessWidget { + const DatePlannerApp({super.key}); + + @override + Widget build(BuildContext context) { + return CupertinoApp( + home: const EventList(), + theme: cupertinoLight, + ); + } +} diff --git a/experimental/date_planner/lib/symbol_editor.dart b/experimental/date_planner/lib/symbol_editor.dart new file mode 100644 index 000000000..fd19432be --- /dev/null +++ b/experimental/date_planner/lib/symbol_editor.dart @@ -0,0 +1,108 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +import 'color_options.dart'; +import 'event_symbol.dart'; + +class SymbolEditor extends StatefulWidget { + final IconData icon; + final ColorOptions color; + + const SymbolEditor(this.icon, this.color, {super.key}); + + @override + State createState() => _SymbolEditorState(); +} + +class _SymbolEditorState extends State { + late IconData _currentIcon = widget.icon; + late ColorOptions _currentColor = widget.color; + _SymbolEditorState(); + + @override + Widget build(BuildContext context) { + // TODO(mit-mit): Should use a Sheet + // https://github.com/flutter/flutter/issues/42560 + return CupertinoPageScaffold( + backgroundColor: CupertinoColors.white, + child: SafeArea( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + Row( + children: [ + const Spacer(), + CupertinoButton( + padding: EdgeInsets.zero, + child: const Text('Done'), + onPressed: () => + Navigator.pop(context, (_currentIcon, _currentColor)), + ), + ], + ), + const SizedBox(height: 16), + Icon( + _currentIcon, + size: 48, + color: _currentColor.color, + ), + const SizedBox(height: 32), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + for (ColorOptions color in ColorOptions.values) + // TODO(mit-mit): Circles should be bigger and have less padding between them. + CupertinoButton( + padding: EdgeInsets.zero, + minSize: 0, + child: Icon( + CupertinoIcons.circle_fill, + color: color.color, + ), + onPressed: () { + setState(() { + _currentColor = color; + }); + }, + ), + ], + ), + const SizedBox(height: 16), + // TODO(mit-mit): File issue for missing Cupertino Divider widget. + // Should have something similar to the Material devider. + // https://api.flutter.dev/flutter/material/Divider-class.html + const Text('. . . . . . . . . . . . . . . '), + const SizedBox(height: 16), + Expanded( + child: GridView.count( + primary: false, + crossAxisCount: 6, + mainAxisSpacing: 10, + children: [ + for (var icon in eventSymbols) + CupertinoButton( + padding: EdgeInsets.zero, + child: Icon( + icon, + size: 32, + ), + onPressed: () { + setState(() { + _currentIcon = icon; + }); + }, + ) + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/experimental/date_planner/lib/task_row.dart b/experimental/date_planner/lib/task_row.dart new file mode 100644 index 000000000..4c817ba07 --- /dev/null +++ b/experimental/date_planner/lib/task_row.dart @@ -0,0 +1,59 @@ +// Copyright 2024 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +import 'event_task.dart'; + +class TaskRow extends StatefulWidget { + final EventTask task; + final bool isEditing; + const TaskRow({super.key, required this.task, required this.isEditing}); + + @override + State createState() => _TaskRowState(); +} + +class _TaskRowState extends State { + final _taskText = TextEditingController(); + + @override + void initState() { + _taskText.text = widget.task.text; + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Row( + children: [ + CupertinoButton( + onPressed: widget.isEditing + ? () { + setState(() { + widget.task.isCompleted = !widget.task.isCompleted; + }); + } + : null, + child: Icon( + widget.task.isCompleted + ? CupertinoIcons.checkmark_circle_fill + : CupertinoIcons.circle, + color: CupertinoColors.black, + ), + ), + Expanded( + child: widget.isEditing + ? CupertinoTextField( + decoration: null, + padding: EdgeInsets.zero, + controller: _taskText, + onChanged: (value) => widget.task.text = value, + ) + : Text(widget.task.text), + ), + ], + ); + } +} diff --git a/experimental/date_planner/pubspec.yaml b/experimental/date_planner/pubspec.yaml new file mode 100644 index 000000000..3aa873810 --- /dev/null +++ b/experimental/date_planner/pubspec.yaml @@ -0,0 +1,18 @@ +name: date_planner +description: "An iOS-style date planner." +publish_to: 'none' # Remove this line if you wish to publish to pub.dev +version: 0.1.0 + +environment: + sdk: ^3.5.0 + +dependencies: + flutter: + sdk: flutter + cupertino_icons: ^1.0.8 + intl: + provider: + uuid: + +dev_dependencies: + flutter_lints: ^4.0.0 diff --git a/experimental/linting_tool/lib/theme/app_theme.dart b/experimental/linting_tool/lib/theme/app_theme.dart index c027f3222..fc1339e79 100644 --- a/experimental/linting_tool/lib/theme/app_theme.dart +++ b/experimental/linting_tool/lib/theme/app_theme.dart @@ -13,7 +13,7 @@ abstract class AppTheme { return base.copyWith( bottomSheetTheme: BottomSheetThemeData( backgroundColor: AppColors.blue700, - modalBackgroundColor: Colors.white.withOpacity(0.7), + modalBackgroundColor: Colors.white.withAlpha(179), ), navigationRailTheme: NavigationRailThemeData( backgroundColor: AppColors.blue700, @@ -53,7 +53,7 @@ abstract class AppTheme { return base.copyWith( bottomSheetTheme: BottomSheetThemeData( backgroundColor: AppColors.darkDrawerBackground, - modalBackgroundColor: Colors.black.withOpacity(0.7), + modalBackgroundColor: Colors.black.withAlpha(179), ), navigationRailTheme: NavigationRailThemeData( backgroundColor: AppColors.darkBottomAppBarBackground, @@ -102,9 +102,9 @@ abstract class AppTheme { Brightness brightness, ) { return ChipThemeData( - backgroundColor: primaryColor.withOpacity(0.12), - disabledColor: primaryColor.withOpacity(0.87), - selectedColor: primaryColor.withOpacity(0.05), + backgroundColor: primaryColor.withAlpha(31), + disabledColor: primaryColor.withAlpha(222), + selectedColor: primaryColor.withAlpha(12), secondarySelectedColor: chipBackground, padding: const EdgeInsets.all(4), shape: const StadiumBorder(), diff --git a/experimental/pedometer/example/pubspec.yaml b/experimental/pedometer/example/pubspec.yaml index 986cdfccc..47cdddd7c 100644 --- a/experimental/pedometer/example/pubspec.yaml +++ b/experimental/pedometer/example/pubspec.yaml @@ -41,8 +41,8 @@ dependencies: ffi: ^2.1.2 intl: ^0.19.0 - jni: ^0.10.1 - fl_chart: ^0.68.0 + jni: ^0.11.0 + fl_chart: ^0.69.0 dev_dependencies: flutter_test: diff --git a/experimental/pedometer/pubspec.yaml b/experimental/pedometer/pubspec.yaml index c98c48d9b..fef058d7f 100644 --- a/experimental/pedometer/pubspec.yaml +++ b/experimental/pedometer/pubspec.yaml @@ -10,12 +10,12 @@ dependencies: flutter: sdk: flutter plugin_platform_interface: ^2.1.8 - jni: ^0.10.1 + jni: ^0.11.0 ffi: ^2.1.2 dev_dependencies: ffigen: ^13.0.0 - jnigen: ^0.10.0 + jnigen: ^0.11.0 flutter_test: sdk: flutter flutter_lints: ^4.0.0 diff --git a/experimental/varfont_shader_puzzle/lib/components/wonky_char.dart b/experimental/varfont_shader_puzzle/lib/components/wonky_char.dart index b1c92508e..5390a858d 100644 --- a/experimental/varfont_shader_puzzle/lib/components/wonky_char.dart +++ b/experimental/varfont_shader_puzzle/lib/components/wonky_char.dart @@ -158,7 +158,6 @@ class WonkyCharState extends State '**ERROR** unrecognized property to animate: ${s.property}'); } } - break; } } // save refs to all curves just to persist in mem, don't need to touch them again diff --git a/experimental/web_dashboard/lib/src/api/mock.dart b/experimental/web_dashboard/lib/src/api/mock.dart index 17458dd9a..4a2d789e0 100644 --- a/experimental/web_dashboard/lib/src/api/mock.dart +++ b/experimental/web_dashboard/lib/src/api/mock.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'dart:math'; -import 'package:collection/collection.dart'; import 'package:uuid/uuid.dart' as uuid; import 'api.dart'; @@ -108,7 +107,7 @@ class MockEntryApi implements EntryApi { var list = _storage.keys .where((k) => k.startsWith(categoryId)) .map((k) => _storage[k]) - .whereNotNull() + .nonNulls .toList(); return list; } diff --git a/game_template/macos/Flutter/GeneratedPluginRegistrant.swift b/game_template/macos/Flutter/GeneratedPluginRegistrant.swift index a01151bd4..bae0dafcc 100644 --- a/game_template/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/game_template/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,6 +12,7 @@ import games_services import in_app_purchase_storekit import path_provider_foundation import shared_preferences_foundation +import webview_flutter_wkwebview func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin")) @@ -21,4 +22,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { InAppPurchasePlugin.register(with: registry.registrar(forPlugin: "InAppPurchasePlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin")) } diff --git a/material_3_demo/lib/component_screen.dart b/material_3_demo/lib/component_screen.dart index cddee8588..685137c33 100644 --- a/material_3_demo/lib/component_screen.dart +++ b/material_3_demo/lib/component_screen.dart @@ -2242,7 +2242,7 @@ class _MenusState extends State { ), Icon( selectedIcon?.icon, - color: selectedColor?.color ?? Colors.grey.withOpacity(0.5), + color: selectedColor?.color ?? Colors.grey.withAlpha(128), ) ], ), @@ -2568,10 +2568,8 @@ class ComponentGroupDecoration extends StatelessWidget { child: Card( margin: EdgeInsets.zero, elevation: 0, - color: Theme.of(context) - .colorScheme - .surfaceContainerHighest - .withOpacity(0.3), + color: + Theme.of(context).colorScheme.surfaceContainerHighest.withAlpha(77), child: Padding( padding: const EdgeInsets.symmetric(vertical: 20.0), child: Center( diff --git a/material_3_demo/test/component_screen_test.dart b/material_3_demo/test/component_screen_test.dart index b37642c32..dd85363f4 100644 --- a/material_3_demo/test/component_screen_test.dart +++ b/material_3_demo/test/component_screen_test.dart @@ -186,7 +186,7 @@ void main() { }); testWidgets( - 'Material version switches between Material3 and Material2 when' + 'Material version switches between Material3 and Material2 when ' 'the version icon is clicked', (tester) async { widgetSetup(tester, 450, windowHeight: 7000); await tester.pumpWidget(const App()); diff --git a/simplistic_editor/lib/basic_text_input_client.dart b/simplistic_editor/lib/basic_text_input_client.dart index 4f415eb6b..3e68189b1 100644 --- a/simplistic_editor/lib/basic_text_input_client.dart +++ b/simplistic_editor/lib/basic_text_input_client.dart @@ -1112,7 +1112,7 @@ class BasicTextInputClientState extends State minLines: null, expands: false, // expands to height of parent. strutStyle: null, - selectionColor: Colors.blue.withOpacity(0.40), + selectionColor: Colors.blue.withAlpha(102), textScaler: MediaQuery.textScalerOf(context), textAlign: TextAlign.left, textDirection: _textDirection, diff --git a/veggieseasons/.metadata b/veggieseasons/.metadata index e092c092b..9c1959ee0 100644 --- a/veggieseasons/.metadata +++ b/veggieseasons/.metadata @@ -4,7 +4,30 @@ # This file should be version controlled and should not be manually edited. version: - revision: 9299c02cf708497d6f72edda8efae0bb8340660e - channel: beta + revision: "5874a72aa4c779a02553007c47dacbefba2374dc" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + - platform: ios + create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + - platform: macos + create_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + base_revision: 5874a72aa4c779a02553007c47dacbefba2374dc + + # 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/veggieseasons/analysis_options.yaml b/veggieseasons/analysis_options.yaml index 13d6fe105..e99e9ce28 100644 --- a/veggieseasons/analysis_options.yaml +++ b/veggieseasons/analysis_options.yaml @@ -1 +1,5 @@ include: package:analysis_defaults/flutter.yaml + +linter: + rules: + - prefer_relative_imports \ No newline at end of file diff --git a/veggieseasons/ios/.gitignore b/veggieseasons/ios/.gitignore index 48744a871..7a7f9873a 100644 --- a/veggieseasons/ios/.gitignore +++ b/veggieseasons/ios/.gitignore @@ -1,3 +1,4 @@ +**/dgph *.mode1v3 *.mode2v3 *.moved-aside @@ -18,13 +19,13 @@ 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.* -/build/ # Exceptions to above rules. !default.mode1v3 diff --git a/veggieseasons/ios/Flutter/AppFrameworkInfo.plist b/veggieseasons/ios/Flutter/AppFrameworkInfo.plist index f2872cf47..7c5696400 100644 --- a/veggieseasons/ios/Flutter/AppFrameworkInfo.plist +++ b/veggieseasons/ios/Flutter/AppFrameworkInfo.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) + en CFBundleExecutable App CFBundleIdentifier @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 12.0 diff --git a/veggieseasons/ios/Flutter/Debug.xcconfig b/veggieseasons/ios/Flutter/Debug.xcconfig index b2f5fae9c..ec97fc6f3 100644 --- a/veggieseasons/ios/Flutter/Debug.xcconfig +++ b/veggieseasons/ios/Flutter/Debug.xcconfig @@ -1,3 +1,2 @@ #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/veggieseasons/ios/Flutter/Release.xcconfig b/veggieseasons/ios/Flutter/Release.xcconfig index 88c29144c..c4855bfe2 100644 --- a/veggieseasons/ios/Flutter/Release.xcconfig +++ b/veggieseasons/ios/Flutter/Release.xcconfig @@ -1,3 +1,2 @@ #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/veggieseasons/ios/Podfile b/veggieseasons/ios/Podfile index 1e8c3c90a..d97f17e22 100644 --- a/veggieseasons/ios/Podfile +++ b/veggieseasons/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -32,6 +32,9 @@ target 'Runner' do use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end end post_install do |installer| diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 10faccb9a..ab82aea2b 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -3,19 +3,31 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2E95CE9079F9F85ED7195813 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD80F83341224E3A8E331A3 /* 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 */; }; + 63DF5AF6EA7E5752FD193C17 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38D833D84C3CBFFBC2A61387 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + BDDC9E5BD53006E983AC444C /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C7D1011F5450B20EBA2923B /* Pods_RunnerTests.framework */; }; /* 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; @@ -30,14 +42,21 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0AD80F83341224E3A8E331A3 /* 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 = ""; }; + 1D00FE80EC6A4B68C8E227F8 /* 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 = ""; }; + 2E0D48114CA3C6D9CCFFEF16 /* 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 = ""; }; + 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; }; + 38D833D84C3CBFFBC2A61387 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 4AD930A692F4F8E268DBD0A5 /* 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 = ""; }; + 5C5AC2EFB5606C655AB6C34A /* 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 = ""; }; + 5C7D1011F5450B20EBA2923B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 67C3CA414545302E36760BB5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 971FE7CB47EC26D3DD304A6B /* 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 = ""; }; 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; }; @@ -45,8 +64,7 @@ 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 = ""; }; - AD1A5E1763BFC877DB2B446F /* 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 = ""; }; - FA5155759DF040A4C0CC04E0 /* 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 = ""; }; + FA6AACB3CDFE5B8D169FDAD3 /* 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,29 +72,50 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2E95CE9079F9F85ED7195813 /* Pods_Runner.framework in Frameworks */, + 63DF5AF6EA7E5752FD193C17 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C3870E06F7C4E0C4CA0F4C1C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + BDDC9E5BD53006E983AC444C /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 22B442D4168A7B892F29E026 /* Frameworks */ = { + 1AC2876AB73DE877F0C0B83B /* Pods */ = { isa = PBXGroup; children = ( - 0AD80F83341224E3A8E331A3 /* Pods_Runner.framework */, + 971FE7CB47EC26D3DD304A6B /* Pods-Runner.debug.xcconfig */, + 67C3CA414545302E36760BB5 /* Pods-Runner.release.xcconfig */, + 1D00FE80EC6A4B68C8E227F8 /* Pods-Runner.profile.xcconfig */, + 2E0D48114CA3C6D9CCFFEF16 /* Pods-RunnerTests.debug.xcconfig */, + FA6AACB3CDFE5B8D169FDAD3 /* Pods-RunnerTests.release.xcconfig */, + 5C5AC2EFB5606C655AB6C34A /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Frameworks; + path = RunnerTests; sourceTree = ""; }; - 7C8B7C066005877B50E89DBE /* Pods */ = { + 4968362A1680EFDF9222A5B5 /* Frameworks */ = { isa = PBXGroup; children = ( - AD1A5E1763BFC877DB2B446F /* Pods-Runner.debug.xcconfig */, - 4AD930A692F4F8E268DBD0A5 /* Pods-Runner.release.xcconfig */, - FA5155759DF040A4C0CC04E0 /* Pods-Runner.profile.xcconfig */, + 38D833D84C3CBFFBC2A61387 /* Pods_Runner.framework */, + 5C7D1011F5450B20EBA2923B /* Pods_RunnerTests.framework */, ); - path = Pods; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -96,8 +135,9 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 7C8B7C066005877B50E89DBE /* Pods */, - 22B442D4168A7B892F29E026 /* Frameworks */, + 331C8082294A63A400263BE5 /* RunnerTests */, + 1AC2876AB73DE877F0C0B83B /* Pods */, + 4968362A1680EFDF9222A5B5 /* Frameworks */, ); sourceTree = ""; }; @@ -105,6 +145,7 @@ isa = PBXGroup; children = ( 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -116,7 +157,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, @@ -125,28 +165,40 @@ path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + EEF989F59E37C6946EC40F1B /* [CP] Check Pods Manifest.lock */, + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + C3870E06F7C4E0C4CA0F4C1C /* 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 = ( - E3A3864E2B275E7A06552155 /* [CP] Check Pods Manifest.lock */, + 25194613EC4035A63337D2AA /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 8F50AE35C319C5A3612840AA /* [CP] Embed Pods Frameworks */, + 1F3480CB2DDBB3AE2233D2E2 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -163,9 +215,14 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; LastSwiftMigration = 1100; @@ -173,7 +230,7 @@ }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -186,11 +243,19 @@ 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; @@ -205,40 +270,64 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 1F3480CB2DDBB3AE2233D2E2 /* [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; + }; + 25194613EC4035A63337D2AA /* [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 = ( ); - name = "Thin Binary"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + 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; }; - 8F50AE35C319C5A3612840AA /* [CP] Embed Pods Frameworks */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "[CP] Embed Pods Frameworks"; + name = "Thin Binary"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -251,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - E3A3864E2B275E7A06552155 /* [CP] Check Pods Manifest.lock */ = { + EEF989F59E37C6946EC40F1B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -266,7 +355,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -276,6 +365,14 @@ /* 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; @@ -287,6 +384,14 @@ }; /* 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; @@ -311,6 +416,7 @@ 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++"; @@ -340,6 +446,7 @@ 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; @@ -348,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -363,19 +470,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 8; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = TC87DMJLQP; + ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.0; - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -383,10 +486,61 @@ }; name = Profile; }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E0D48114CA3C6D9CCFFEF16 /* 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 = dev.flutter.veggieseasons.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 = FA6AACB3CDFE5B8D169FDAD3 /* 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 = dev.flutter.veggieseasons.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 = 5C5AC2EFB5606C655AB6C34A /* 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 = dev.flutter.veggieseasons.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++"; @@ -416,6 +570,7 @@ 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; @@ -430,7 +585,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -442,6 +597,7 @@ 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++"; @@ -471,6 +627,7 @@ 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; @@ -479,11 +636,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -495,19 +653,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 8; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = TC87DMJLQP; + ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.0; - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -522,19 +676,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 8; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = TC87DMJLQP; + ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.0; - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -545,6 +695,16 @@ /* 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 = ( diff --git a/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/veggieseasons/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/veggieseasons/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/veggieseasons/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cfd..8e3ca5dfe 100644 --- a/veggieseasons/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/veggieseasons/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - + + + + + + - - + + + + PreviewsEnabled + + + diff --git a/veggieseasons/ios/Runner/AppDelegate.swift b/veggieseasons/ios/Runner/AppDelegate.swift index 70693e4a8..626664468 100644 --- a/veggieseasons/ios/Runner/AppDelegate.swift +++ b/veggieseasons/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/veggieseasons/ios/Runner/Base.lproj/Main.storyboard b/veggieseasons/ios/Runner/Base.lproj/Main.storyboard index 9025e9a9b..f3c28516f 100644 --- a/veggieseasons/ios/Runner/Base.lproj/Main.storyboard +++ b/veggieseasons/ios/Runner/Base.lproj/Main.storyboard @@ -8,7 +8,7 @@ - + diff --git a/veggieseasons/ios/Runner/Info.plist b/veggieseasons/ios/Runner/Info.plist index 79c219c0d..c985223fc 100644 --- a/veggieseasons/ios/Runner/Info.plist +++ b/veggieseasons/ios/Runner/Info.plist @@ -3,9 +3,9 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Veg. Seasons + Veggie Seasons CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + $(FLUTTER_BUILD_NAME) CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS UILaunchStoryboardName @@ -40,7 +40,9 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + diff --git a/veggieseasons/ios/RunnerTests/RunnerTests.swift b/veggieseasons/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..86a7c3b1b --- /dev/null +++ b/veggieseasons/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/veggieseasons/lib/data/app_state.dart b/veggieseasons/lib/data/app_state.dart index 34261d64e..9c802c001 100644 --- a/veggieseasons/lib/data/app_state.dart +++ b/veggieseasons/lib/data/app_state.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:veggieseasons/data/local_veggie_provider.dart'; -import 'package:veggieseasons/data/veggie.dart'; +import 'local_veggie_provider.dart'; +import 'veggie.dart'; class AppState extends ChangeNotifier { final List _veggies; diff --git a/veggieseasons/lib/data/local_veggie_provider.dart b/veggieseasons/lib/data/local_veggie_provider.dart index 5064bfcf4..454909d31 100644 --- a/veggieseasons/lib/data/local_veggie_provider.dart +++ b/veggieseasons/lib/data/local_veggie_provider.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/cupertino.dart'; -import 'package:veggieseasons/data/veggie.dart'; +import 'veggie.dart'; class LocalVeggieProvider { static List veggies = [ diff --git a/veggieseasons/lib/data/preferences.dart b/veggieseasons/lib/data/preferences.dart index 67a6dd3fd..5ae157669 100644 --- a/veggieseasons/lib/data/preferences.dart +++ b/veggieseasons/lib/data/preferences.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:veggieseasons/data/veggie.dart'; +import 'veggie.dart'; /// A model class that mirrors the options in [SettingsScreen] and stores data /// in shared preferences. diff --git a/veggieseasons/lib/main.dart b/veggieseasons/lib/main.dart index 4bd78bc5f..e50308ae8 100644 --- a/veggieseasons/lib/main.dart +++ b/veggieseasons/lib/main.dart @@ -9,18 +9,18 @@ import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/services.dart' show DeviceOrientation, SystemChrome; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/preferences.dart'; -import 'package:veggieseasons/screens/home.dart'; -import 'package:veggieseasons/styles.dart'; -import 'package:veggieseasons/widgets/fade_transition_page.dart'; import 'package:window_size/window_size.dart'; +import 'data/app_state.dart'; +import 'data/preferences.dart'; import 'screens/details.dart'; import 'screens/favorites.dart'; +import 'screens/home.dart'; import 'screens/list.dart'; import 'screens/search.dart'; import 'screens/settings.dart'; +import 'styles.dart'; +import 'widgets/veggie_seasons_page.dart'; void main() { WidgetsFlutterBinding.ensureInitialized(); @@ -136,7 +136,7 @@ class _VeggieAppState extends State with RestorationMixin { GoRoute( path: '/list', pageBuilder: (context, state) { - return FadeTransitionPage( + return VeggieSeasonsPage( key: state.pageKey, restorationId: 'route.list', child: const ListScreen(restorationId: 'list'), @@ -149,7 +149,7 @@ class _VeggieAppState extends State with RestorationMixin { GoRoute( path: '/favorites', pageBuilder: (context, state) { - return FadeTransitionPage( + return VeggieSeasonsPage( key: state.pageKey, restorationId: 'route.favorites', child: const FavoritesScreen(restorationId: 'favorites'), @@ -162,7 +162,7 @@ class _VeggieAppState extends State with RestorationMixin { GoRoute( path: '/search', pageBuilder: (context, state) { - return FadeTransitionPage( + return VeggieSeasonsPage( key: state.pageKey, restorationId: 'route.search', child: const SearchScreen(restorationId: 'search'), @@ -175,7 +175,7 @@ class _VeggieAppState extends State with RestorationMixin { GoRoute( path: '/settings', pageBuilder: (context, state) { - return FadeTransitionPage( + return VeggieSeasonsPage( key: state.pageKey, restorationId: 'route.settings', child: const SettingsScreen(restorationId: 'settings'), @@ -217,7 +217,6 @@ class _VeggieAppState extends State with RestorationMixin { final veggieId = int.parse(state.pathParameters['id']!); return CupertinoPage( restorationId: 'route.details', - fullscreenDialog: true, child: DetailsScreen( id: veggieId, restorationId: 'details', diff --git a/veggieseasons/lib/screens/details.dart b/veggieseasons/lib/screens/details.dart index e672fee8c..2290f4707 100644 --- a/veggieseasons/lib/screens/details.dart +++ b/veggieseasons/lib/screens/details.dart @@ -5,12 +5,11 @@ import 'package:flutter/cupertino.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/preferences.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; -import 'package:veggieseasons/widgets/close_button.dart'; -import 'package:veggieseasons/widgets/trivia.dart'; +import '../data/app_state.dart'; +import '../data/preferences.dart'; +import '../data/veggie.dart'; +import '../styles.dart'; +import '../widgets/detail_buttons.dart'; class ServingInfoChart extends StatelessWidget { const ServingInfoChart(this.veggie, this.prefs, {super.key}); @@ -43,113 +42,81 @@ class ServingInfoChart extends StatelessWidget { final themeData = CupertinoTheme.of(context); return Column( children: [ - const SizedBox(height: 16), - Align( - alignment: Alignment.centerLeft, - child: Padding( - padding: const EdgeInsets.only( - left: 9, - bottom: 4, + const SizedBox(height: 32), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Text( + 'Serving size', + style: Styles.detailsServingLabelText(themeData), ), - child: Text( - 'Serving info', + const Spacer(), + Text( + veggie.servingSize, + textAlign: TextAlign.end, style: CupertinoTheme.of(context).textTheme.textStyle, ), - ), + ], ), - Container( - decoration: BoxDecoration( - border: Border.all(color: Styles.servingInfoBorderColor), - ), - padding: const EdgeInsets.all(8), - child: Column( - children: [ - Table( - children: [ - TableRow( - children: [ - TableCell( - child: Text( - 'Serving size:', - style: Styles.detailsServingLabelText(themeData), - ), - ), - TableCell( - child: Text( - veggie.servingSize, - textAlign: TextAlign.end, - style: CupertinoTheme.of(context).textTheme.textStyle, - ), - ), - ], - ), - TableRow( - children: [ - TableCell( - child: Text( - 'Calories:', - style: Styles.detailsServingLabelText(themeData), - ), - ), - TableCell( - child: Text( - '${veggie.caloriesPerServing} kCal', - style: CupertinoTheme.of(context).textTheme.textStyle, - textAlign: TextAlign.end, - ), - ), - ], - ), - TableRow( - children: [ - TableCell( - child: Text( - 'Vitamin A:', - style: Styles.detailsServingLabelText(themeData), - ), - ), - TableCell( - child: _buildVitaminText( - veggie.vitaminAPercentage, - prefs.desiredCalories, - ), - ), - ], - ), - TableRow( - children: [ - TableCell( - child: Text( - 'Vitamin C:', - style: Styles.detailsServingLabelText(themeData), - ), - ), - TableCell( - child: _buildVitaminText( - veggie.vitaminCPercentage, - prefs.desiredCalories, - ), - ), - ], - ), - ], - ), - Padding( - padding: const EdgeInsets.only(top: 16), - child: FutureBuilder( - future: prefs.desiredCalories, - builder: (context, snapshot) { - return Text( - 'Percent daily values based on a diet of ' - '${snapshot.data ?? '2,000'} calories.', - style: Styles.detailsServingNoteText(themeData), - ); - }, - ), - ), - ], + const SizedBox(height: 24), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Text( + 'Calories', + style: Styles.detailsServingLabelText(themeData), + ), + const Spacer(), + Text( + '${veggie.caloriesPerServing} kCal', + style: CupertinoTheme.of(context).textTheme.textStyle, + textAlign: TextAlign.end, + ), + ], + ), + const SizedBox(height: 24), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Text( + 'Vitamin A', + style: Styles.detailsServingLabelText(themeData), + ), + const Spacer(), + _buildVitaminText( + veggie.vitaminAPercentage, + prefs.desiredCalories, + ), + ], + ), + const SizedBox(height: 24), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Text( + 'Vitamin C', + style: Styles.detailsServingLabelText(themeData), + ), + const Spacer(), + _buildVitaminText( + veggie.vitaminCPercentage, + prefs.desiredCalories, + ), + ], + ), + Padding( + padding: const EdgeInsets.only(top: 32), + child: FutureBuilder( + future: prefs.desiredCalories, + builder: (context, snapshot) { + return Text( + 'Percent daily values based on a diet of ' + '${snapshot.data ?? '2,000'} calories.', + style: Styles.detailsServingNoteText(themeData), + ); + }, ), - ) + ), ], ); } @@ -172,36 +139,6 @@ class InfoView extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Row( - mainAxisSize: MainAxisSize.max, - children: [ - FutureBuilder>( - future: prefs.preferredCategories, - builder: (context, snapshot) { - return Text( - veggie.categoryName!.toUpperCase(), - style: (snapshot.hasData && - snapshot.data!.contains(veggie.category)) - ? Styles.detailsPreferredCategoryText(themeData) - : themeData.textTheme.textStyle, - ); - }, - ), - const Spacer(), - for (Season season in veggie.seasons) ...[ - const SizedBox(width: 12), - Padding( - padding: Styles.seasonIconPadding[season]!, - child: Icon( - Styles.seasonIconData[season], - semanticLabel: seasonNames[season], - color: Styles.seasonColors[season], - ), - ), - ], - ], - ), - const SizedBox(height: 8), Text( veggie.name, style: Styles.detailsTitleText(themeData), @@ -211,62 +148,58 @@ class InfoView extends StatelessWidget { veggie.shortDescription, style: CupertinoTheme.of(context).textTheme.textStyle, ), - ServingInfoChart(veggie, prefs), - const SizedBox(height: 24), + const SizedBox(height: 16), + Text( + 'Seasons', + style: Styles.detailsServingLabelText(themeData), + ), + const SizedBox(height: 12), Row( - mainAxisSize: MainAxisSize.min, - children: [ - CupertinoSwitch( - value: veggie.isFavorite, - onChanged: (value) { - appState.setFavorite(id, value); - }, - ), - const SizedBox(width: 8), - Text( - 'Save to Garden', - style: CupertinoTheme.of(context).textTheme.textStyle, - ), + mainAxisSize: MainAxisSize.max, + children: [ + for (var season in Season.values) ...[ + const Spacer(), + Column( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Styles.seasonIconData[season], + color: veggie.seasons.contains(season) + ? Styles.seasonColors[season] + : const Color.fromRGBO(128, 128, 128, 1), + size: 24, + ), + const SizedBox(height: 4), + Text( + season.name.characters.first.toUpperCase() + + season.name.characters.skip(1).string, + style: Styles.minorText(CupertinoTheme.of(context)) + .copyWith(fontSize: 11), + ), + ], + ), + const Spacer(), + ], ], ), + ServingInfoChart(veggie, prefs), ], ), ); } } -class DetailsScreen extends StatefulWidget { +class DetailsScreen extends StatelessWidget { final int? id; final String? restorationId; const DetailsScreen({this.id, this.restorationId, super.key}); - @override - State createState() => _DetailsScreenState(); -} - -class _DetailsScreenState extends State with RestorationMixin { - final RestorableInt _selectedViewIndex = RestorableInt(0); - - @override - String? get restorationId => widget.restorationId; - - @override - void restoreState(RestorationBucket? oldBucket, bool initialRestore) { - registerForRestoration(_selectedViewIndex, 'tab'); - } - - @override - void dispose() { - _selectedViewIndex.dispose(); - super.dispose(); - } - Widget _buildHeader(BuildContext context, AppState model) { - final veggie = model.getVeggie(widget.id); + final veggie = model.getVeggie(id); return SizedBox( - height: 150, + height: 240, child: Stack( children: [ Positioned( @@ -287,6 +220,48 @@ class _DetailsScreenState extends State with RestorationMixin { }), ), ), + Positioned( + top: 16, + right: 16, + child: SafeArea( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + ShareButton( + () { + showCupertinoModalPopup( + context: context, + builder: (context) { + return CupertinoActionSheet( + title: Text('Share ${veggie.name}'), + message: Text(veggie.shortDescription), + actions: [ + CupertinoActionSheetAction( + onPressed: () { + Navigator.pop(context); + }, + child: const Text('OK'), + ), + ], + ); + }, + ); + }, + ), + const SizedBox(width: 8), + Builder(builder: (context) { + final appState = Provider.of(context); + final veggie = appState.getVeggie(id); + + return FavoriteButton( + () => appState.setFavorite(id, !veggie.isFavorite), + veggie.isFavorite, + ); + }), + ], + ), + ), + ), ], ), ); @@ -296,41 +271,22 @@ class _DetailsScreenState extends State with RestorationMixin { Widget build(BuildContext context) { final appState = Provider.of(context); - return UnmanagedRestorationScope( - bucket: bucket, - child: CupertinoPageScaffold( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: ListView( - restorationId: 'list', - children: [ - _buildHeader(context, appState), - const SizedBox(height: 20), - CupertinoSegmentedControl( - children: const { - 0: Text( - 'Facts & Info', - ), - 1: Text( - 'Trivia', - ) - }, - groupValue: _selectedViewIndex.value, - onValueChanged: (value) { - setState(() => _selectedViewIndex.value = value); - }, - ), - _selectedViewIndex.value == 0 - ? InfoView(widget.id) - : TriviaView(id: widget.id, restorationId: 'trivia'), - ], - ), + return CupertinoPageScaffold( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: ListView( + restorationId: 'list', + children: [ + _buildHeader(context, appState), + const SizedBox(height: 20), + InfoView(id), + ], ), - ], - ), + ), + ], ), ); } diff --git a/veggieseasons/lib/screens/favorites.dart b/veggieseasons/lib/screens/favorites.dart index e84502f9e..3f4bcf914 100644 --- a/veggieseasons/lib/screens/favorites.dart +++ b/veggieseasons/lib/screens/favorites.dart @@ -4,9 +4,9 @@ import 'package:flutter/cupertino.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/widgets/veggie_headline.dart'; +import '../data/app_state.dart'; +import '../data/veggie.dart'; +import '../widgets/veggie_headline.dart'; class FavoritesScreen extends StatelessWidget { const FavoritesScreen({this.restorationId, super.key}); diff --git a/veggieseasons/lib/screens/home.dart b/veggieseasons/lib/screens/home.dart index 901294bfd..123716eaa 100644 --- a/veggieseasons/lib/screens/home.dart +++ b/veggieseasons/lib/screens/home.dart @@ -5,6 +5,8 @@ import 'package:flutter/cupertino.dart'; import 'package:go_router/go_router.dart'; +const _bottomNavigationBarItemIconPadding = EdgeInsets.only(top: 4.0); + class HomeScreen extends StatelessWidget { const HomeScreen({ super.key, @@ -30,19 +32,31 @@ class HomeScreen extends StatelessWidget { currentIndex: index, items: const [ BottomNavigationBarItem( - icon: Icon(CupertinoIcons.home), + icon: Padding( + padding: _bottomNavigationBarItemIconPadding, + child: Icon(CupertinoIcons.home), + ), label: 'Home', ), BottomNavigationBarItem( - icon: Icon(CupertinoIcons.book), + icon: Padding( + padding: _bottomNavigationBarItemIconPadding, + child: Icon(CupertinoIcons.book), + ), label: 'My Garden', ), BottomNavigationBarItem( - icon: Icon(CupertinoIcons.search), + icon: Padding( + padding: _bottomNavigationBarItemIconPadding, + child: Icon(CupertinoIcons.search), + ), label: 'Search', ), BottomNavigationBarItem( - icon: Icon(CupertinoIcons.settings), + icon: Padding( + padding: _bottomNavigationBarItemIconPadding, + child: Icon(CupertinoIcons.settings), + ), label: 'Settings', ), ], diff --git a/veggieseasons/lib/screens/list.dart b/veggieseasons/lib/screens/list.dart index 6cb6da270..3408c05b3 100644 --- a/veggieseasons/lib/screens/list.dart +++ b/veggieseasons/lib/screens/list.dart @@ -4,20 +4,19 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; -import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/preferences.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; -import 'package:veggieseasons/widgets/veggie_card.dart'; +import '../data/app_state.dart'; +import '../data/preferences.dart'; +import '../data/veggie.dart'; +import '../styles.dart'; +import '../widgets/veggie_card.dart'; class ListScreen extends StatelessWidget { const ListScreen({this.restorationId, super.key}); final String? restorationId; - Widget _generateVeggieRow(Veggie veggie, Preferences prefs, + Widget _generateVeggieCard(Veggie veggie, Preferences prefs, {bool inSeason = true}) { return Padding( padding: const EdgeInsets.only(left: 16, right: 16, bottom: 24), @@ -35,8 +34,6 @@ class ListScreen extends StatelessWidget { return CupertinoTabView( restorationScopeId: restorationId, builder: (context) { - var dateString = DateFormat('MMMM y').format(DateTime.now()); - final appState = Provider.of(context); final prefs = Provider.of(context); final themeData = CupertinoTheme.of(context); @@ -52,18 +49,11 @@ class ListScreen extends StatelessWidget { if (index == 0) { return Padding( padding: const EdgeInsets.fromLTRB(16, 24, 16, 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(dateString.toUpperCase(), - style: Styles.minorText(themeData)), - Text('In season today', - style: Styles.headlineText(themeData)), - ], - ), + child: Text('In season today', + style: Styles.headlineText(themeData)), ); } else if (index <= appState.availableVeggies.length) { - return _generateVeggieRow( + return _generateVeggieCard( appState.availableVeggies[index - 1], prefs, ); @@ -76,7 +66,7 @@ class ListScreen extends StatelessWidget { } else { var relativeIndex = index - (appState.availableVeggies.length + 2); - return _generateVeggieRow( + return _generateVeggieCard( appState.unavailableVeggies[relativeIndex], prefs, inSeason: false); } diff --git a/veggieseasons/lib/screens/search.dart b/veggieseasons/lib/screens/search.dart index 0caa8186f..deb8dadb5 100644 --- a/veggieseasons/lib/screens/search.dart +++ b/veggieseasons/lib/screens/search.dart @@ -5,9 +5,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/widgets/veggie_headline.dart'; +import '../data/app_state.dart'; +import '../data/veggie.dart'; +import '../widgets/veggie_headline.dart'; class SearchScreen extends StatefulWidget { const SearchScreen({this.restorationId, super.key}); diff --git a/veggieseasons/lib/screens/settings.dart b/veggieseasons/lib/screens/settings.dart index 7e5a872fd..350b6735a 100644 --- a/veggieseasons/lib/screens/settings.dart +++ b/veggieseasons/lib/screens/settings.dart @@ -5,11 +5,9 @@ import 'package:flutter/cupertino.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/preferences.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; -import 'package:veggieseasons/widgets/settings_group.dart'; -import 'package:veggieseasons/widgets/settings_item.dart'; +import '../data/preferences.dart'; +import '../data/veggie.dart'; +import '../styles.dart'; class VeggieCategorySettingsScreen extends StatelessWidget { const VeggieCategorySettingsScreen({super.key, this.restorationId}); @@ -40,7 +38,7 @@ class VeggieCategorySettingsScreen extends StatelessWidget { child: FutureBuilder>( future: currentPrefs, builder: (context, snapshot) { - final items = []; + final tiles = []; for (final category in VeggieCategory.values) { CupertinoSwitch toggle; @@ -66,17 +64,20 @@ class VeggieCategorySettingsScreen extends StatelessWidget { ); } - items.add(SettingsItem( - label: veggieCategoryNames[category]!, - content: toggle, - )); + tiles.add( + CupertinoListTile.notched( + title: Text(veggieCategoryNames[category]!), + trailing: toggle, + ), + ); } return ListView( restorationId: 'list', children: [ - SettingsGroup( - items: items, + CupertinoListSection.insetGrouped( + hasLeading: false, + children: tiles, ), ], ); @@ -121,33 +122,39 @@ class CalorieSettingsScreen extends StatelessWidget { FutureBuilder( future: model.desiredCalories, builder: (context, snapshot) { - final steps = []; + final tiles = []; for (var cals = max; cals < min; cals += step) { - steps.add( - SettingsItem( - label: cals.toString(), - icon: SettingsIcon( - icon: Styles.checkIcon, + tiles.add( + CupertinoListTile.notched( + title: Text('$cals calories'), + trailing: SettingsIcon( + icon: CupertinoIcons.check_mark, foregroundColor: snapshot.hasData && snapshot.data == cals ? CupertinoColors.activeBlue : Styles.transparentColor, backgroundColor: Styles.transparentColor, ), - onPress: snapshot.hasData + onTap: snapshot.hasData ? () => model.setDesiredCalories(cals) : null, ), ); } - return SettingsGroup( - items: steps, - header: const SettingsGroupHeader('Available calorie levels'), - footer: - const SettingsGroupFooter('These are used for serving ' - 'calculations'), + return CupertinoListSection.insetGrouped( + header: Text( + 'Available calorie levels'.toUpperCase(), + style: Styles.settingsGroupHeaderText( + CupertinoTheme.of(context)), + ), + footer: Text( + 'These are used for serving calculations', + style: Styles.settingsGroupFooterText( + CupertinoTheme.of(context)), + ), + children: tiles, ); }, ), @@ -168,59 +175,50 @@ class SettingsScreen extends StatefulWidget { } class _SettingsScreenState extends State { - SettingsItem _buildCaloriesItem(BuildContext context, Preferences prefs) { - return SettingsItem( - label: 'Calorie Target', - icon: const SettingsIcon( - backgroundColor: Styles.iconBlue, + CupertinoListTile _buildCaloriesTile( + BuildContext context, Preferences prefs) { + return CupertinoListTile.notched( + leading: const SettingsIcon( + backgroundColor: CupertinoColors.systemBlue, icon: Styles.calorieIcon, ), - content: FutureBuilder( + title: const Text('Calorie Target'), + additionalInfo: FutureBuilder( future: prefs.desiredCalories, builder: (context, snapshot) { - return Row( - children: [ - Text( - snapshot.data?.toString() ?? '', - style: CupertinoTheme.of(context).textTheme.textStyle, - ), - const SizedBox(width: 8), - const SettingsNavigationIndicator(), - ], + return Text( + snapshot.data?.toString() ?? '', + style: CupertinoTheme.of(context).textTheme.textStyle, ); }, ), - onPress: () { - context.go('/settings/calories'); - }, + trailing: const CupertinoListTileChevron(), + onTap: () => context.go('/settings/calories'), ); } - SettingsItem _buildCategoriesItem(BuildContext context, Preferences prefs) { - return SettingsItem( - label: 'Preferred Categories', - subtitle: 'What types of veggies you prefer!', - icon: const SettingsIcon( - backgroundColor: Styles.iconGold, + CupertinoListTile _buildCategoriesTile( + BuildContext context, Preferences prefs) { + return CupertinoListTile.notched( + leading: const SettingsIcon( + backgroundColor: CupertinoColors.systemOrange, icon: Styles.preferenceIcon, ), - content: const SettingsNavigationIndicator(), - onPress: () { - context.go('/settings/categories'); - }, + title: const Text('Preferred Categories'), + trailing: const CupertinoListTileChevron(), + onTap: () => context.go('/settings/categories'), ); } - SettingsItem _buildRestoreDefaultsItem( + CupertinoListTile _buildRestoreDefaultsTile( BuildContext context, Preferences prefs) { - return SettingsItem( - label: 'Restore Defaults', - icon: const SettingsIcon( + return CupertinoListTile.notched( + leading: const SettingsIcon( backgroundColor: CupertinoColors.systemRed, icon: Styles.resetIcon, ), - content: const SettingsNavigationIndicator(), - onPress: () { + title: const Text('Restore Defaults'), + onTap: () { showCupertinoDialog( context: context, builder: (context) => CupertinoAlertDialog( @@ -254,36 +252,61 @@ class _SettingsScreenState extends State { Widget build(BuildContext context) { final prefs = Provider.of(context); - return RestorationScope( - restorationId: widget.restorationId, - child: CupertinoPageScaffold( - child: Container( - color: - Styles.scaffoldBackground(CupertinoTheme.brightnessOf(context)), - child: CustomScrollView( - restorationId: 'list', - slivers: [ - const CupertinoSliverNavigationBar( - largeTitle: Text('Settings'), - ), - SliverSafeArea( - top: false, - sliver: SliverList( - delegate: SliverChildListDelegate( - [ - SettingsGroup( - items: [ - _buildCaloriesItem(context, prefs), - _buildCategoriesItem(context, prefs), - _buildRestoreDefaultsItem(context, prefs), - ], - ), - ], - ), + return CupertinoPageScaffold( + backgroundColor: + Styles.scaffoldBackground(CupertinoTheme.brightnessOf(context)), + child: CustomScrollView( + slivers: [ + const CupertinoSliverNavigationBar( + largeTitle: Text('Settings'), + ), + SliverList( + delegate: SliverChildListDelegate( + [ + CupertinoListSection.insetGrouped( + children: [ + _buildCaloriesTile(context, prefs), + _buildCategoriesTile(context, prefs), + ], ), - ), - ], + CupertinoListSection.insetGrouped( + children: [ + _buildRestoreDefaultsTile(context, prefs), + ], + ), + ], + ), ), + ], + ), + ); + } +} + +class SettingsIcon extends StatelessWidget { + const SettingsIcon({ + required this.icon, + this.foregroundColor = CupertinoColors.white, + this.backgroundColor = CupertinoColors.black, + super.key, + }); + + final Color backgroundColor; + final Color foregroundColor; + final IconData icon; + + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + color: backgroundColor, + ), + child: Center( + child: Icon( + icon, + color: foregroundColor, + size: 20, ), ), ); diff --git a/veggieseasons/lib/styles.dart b/veggieseasons/lib/styles.dart index 71151fd6f..14650c129 100644 --- a/veggieseasons/lib/styles.dart +++ b/veggieseasons/lib/styles.dart @@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:veggieseasons/data/veggie.dart'; +import 'data/veggie.dart'; abstract class Styles { static CupertinoThemeData veggieThemeData = const CupertinoThemeData( @@ -14,7 +14,7 @@ abstract class Styles { fontSize: 16, fontWeight: FontWeight.normal, fontStyle: FontStyle.normal, - fontFamily: 'NotoSans', + fontFamily: 'CupertinoSystemText', letterSpacing: -0.41, decoration: TextDecoration.none, ), @@ -107,7 +107,7 @@ abstract class Styles { static TextStyle settingsGroupFooterText(CupertinoThemeData themeData) => themeData.textTheme.textStyle.copyWith( - color: Styles.settingsGroupSubtitle, + color: const Color(0xff777777), fontSize: 13, letterSpacing: -0.08, ); @@ -116,7 +116,7 @@ abstract class Styles { static Color? scaffoldBackground(Brightness brightness) => brightness == Brightness.light - ? CupertinoColors.lightBackgroundGray + ? CupertinoColors.extraLightBackgroundGray : null; static const frostedBackground = Color(0xccf8f8f8); @@ -203,12 +203,6 @@ abstract class Styles { static const Color settingsBackground = Color(0xffefeff4); - static const Color settingsGroupSubtitle = Color(0xff777777); - - static const Color iconBlue = Color(0xff0000ff); - - static const Color iconGold = Color(0xffdba800); - static const preferenceIcon = IconData( 0xf443, fontFamily: CupertinoIcons.iconFont, @@ -227,12 +221,6 @@ abstract class Styles { fontPackage: CupertinoIcons.iconFontPackage, ); - static const checkIcon = IconData( - 0xf383, - fontFamily: CupertinoIcons.iconFont, - fontPackage: CupertinoIcons.iconFontPackage, - ); - static const servingInfoBorderColor = Color(0xffb0b0b0); static const ColorFilter desaturatedColorFilter = diff --git a/veggieseasons/lib/widgets/close_button.dart b/veggieseasons/lib/widgets/detail_buttons.dart similarity index 72% rename from veggieseasons/lib/widgets/close_button.dart rename to veggieseasons/lib/widgets/detail_buttons.dart index 7eb11891c..58294502c 100644 --- a/veggieseasons/lib/widgets/close_button.dart +++ b/veggieseasons/lib/widgets/detail_buttons.dart @@ -5,7 +5,7 @@ import 'dart:ui' as ui; import 'package:flutter/cupertino.dart'; -import 'package:veggieseasons/styles.dart'; +import '../styles.dart'; /// Partially overlays and then blurs its child's background. class FrostedBox extends StatelessWidget { @@ -75,17 +75,38 @@ class _ColorChangingIconState } } -/// A simple "close this modal" button that invokes a callback when pressed. -class CloseButton extends StatefulWidget { - const CloseButton(this.onPressed, {super.key}); +/// A close button that invokes a callback when pressed. +class CloseButton extends _DetailPageButton { + const CloseButton(VoidCallback onPressed, {super.key}) + : super(onPressed, CupertinoIcons.chevron_back); +} + +/// A share button that invokes a callback when pressed. +class ShareButton extends _DetailPageButton { + const ShareButton(VoidCallback onPressed, {super.key}) + : super(onPressed, CupertinoIcons.share); +} + +/// A favorite button that invokes a callback when pressed. +class FavoriteButton extends _DetailPageButton { + const FavoriteButton(VoidCallback onPressed, bool isFavorite, {super.key}) + : super( + onPressed, + isFavorite ? CupertinoIcons.heart_fill : CupertinoIcons.heart, + ); +} + +class _DetailPageButton extends StatefulWidget { + const _DetailPageButton(this.onPressed, this.icon, {super.key}); final VoidCallback onPressed; + final IconData icon; @override - State createState() => _CloseButtonState(); + State<_DetailPageButton> createState() => _DetailPageButtonState(); } -class _CloseButtonState extends State { +class _DetailPageButtonState extends State<_DetailPageButton> { bool tapInProgress = false; @override @@ -111,7 +132,7 @@ class _CloseButtonState extends State { ), child: Center( child: ColorChangingIcon( - CupertinoIcons.clear_thick, + widget.icon, duration: const Duration(milliseconds: 300), color: tapInProgress ? Styles.closeButtonPressed diff --git a/veggieseasons/lib/widgets/fade_transition_page.dart b/veggieseasons/lib/widgets/fade_transition_page.dart deleted file mode 100644 index 066ca5d89..000000000 --- a/veggieseasons/lib/widgets/fade_transition_page.dart +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2021, the Flutter project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -import 'package:flutter/cupertino.dart'; - -class FadeTransitionPage extends Page { - final Widget child; - final Duration duration; - - const FadeTransitionPage({ - super.key, - required this.child, - this.duration = const Duration(milliseconds: 300), - super.restorationId, - }); - - @override - Route createRoute(BuildContext context) => - PageBasedFadeTransitionRoute(this); -} - -class PageBasedFadeTransitionRoute extends PageRoute { - PageBasedFadeTransitionRoute(FadeTransitionPage page) - : super(settings: page); - - FadeTransitionPage get _page => settings as FadeTransitionPage; - - @override - Color? get barrierColor => null; - - @override - String? get barrierLabel => null; - - @override - Duration get transitionDuration => _page.duration; - - @override - Duration get reverseTransitionDuration => _page.duration; - - @override - bool get maintainState => true; - - @override - Widget buildPage( - BuildContext context, - Animation animation, - Animation secondaryAnimation, - ) { - return _page.child; - } - - @override - Widget buildTransitions( - BuildContext context, - Animation animation, - Animation secondaryAnimation, - Widget child, - ) { - final tween = CurveTween(curve: Curves.easeInOut); - return FadeTransition( - opacity: animation.drive(tween), - child: _page.child, - ); - } -} diff --git a/veggieseasons/lib/widgets/settings_group.dart b/veggieseasons/lib/widgets/settings_group.dart deleted file mode 100644 index da5cd95a0..000000000 --- a/veggieseasons/lib/widgets/settings_group.dart +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright 2018 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/cupertino.dart'; -import 'package:veggieseasons/styles.dart'; - -import 'settings_item.dart'; - -// The widgets in this file present a group of Cupertino-style settings items to -// the user. In the future, the Cupertino package in the Flutter SDK will -// include dedicated widgets for this purpose, but for now they're done here. -// -// See https://github.com/flutter/flutter/projects/29 for more info. - -class SettingsGroupHeader extends StatelessWidget { - const SettingsGroupHeader(this.title, {super.key}); - - final String title; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only( - left: 15, - right: 15, - bottom: 6, - ), - child: Text( - title.toUpperCase(), - style: Styles.settingsGroupHeaderText(CupertinoTheme.of(context)), - ), - ); - } -} - -class SettingsGroupFooter extends StatelessWidget { - const SettingsGroupFooter(this.title, {super.key}); - - final String title; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only( - left: 15, - right: 15, - top: 7.5, - ), - child: Text(title, - style: Styles.settingsGroupFooterText(CupertinoTheme.of(context))), - ); - } -} - -class SettingsGroup extends StatelessWidget { - SettingsGroup({ - required this.items, - this.header, - this.footer, - super.key, - }) : assert(items.isNotEmpty); - - final List items; - final Widget? header; - final Widget? footer; - @override - Widget build(BuildContext context) { - var brightness = CupertinoTheme.brightnessOf(context); - final dividedItems = [items[0]]; - for (var i = 1; i < items.length; i++) { - dividedItems.add(Container( - color: Styles.settingsLineation(brightness), - height: 0.3, - )); - dividedItems.add(items[i]); - } - - return Padding( - padding: EdgeInsets.only( - top: header == null ? 35 : 22, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (header != null) header!, - Container( - decoration: BoxDecoration( - color: CupertinoColors.white, - border: Border( - top: BorderSide( - color: Styles.settingsLineation(brightness), - width: 0, - ), - bottom: BorderSide( - color: Styles.settingsLineation(brightness), - width: 0, - ), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: dividedItems, - ), - ), - if (footer != null) footer!, - ], - ), - ); - } -} diff --git a/veggieseasons/lib/widgets/settings_item.dart b/veggieseasons/lib/widgets/settings_item.dart deleted file mode 100644 index b503e0dee..000000000 --- a/veggieseasons/lib/widgets/settings_item.dart +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2018 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import 'package:flutter/cupertino.dart'; -import 'package:veggieseasons/styles.dart'; - -// The widgets in this file present a Cupertino-style settings item to the user. -// In the future, the Cupertino package in the Flutter SDK will include -// dedicated widgets for this purpose, but for now they're done here. -// -// See https://github.com/flutter/flutter/projects/29 for more info. - -typedef SettingsItemCallback = FutureOr Function(); - -class SettingsNavigationIndicator extends StatelessWidget { - const SettingsNavigationIndicator({super.key}); - - @override - Widget build(BuildContext context) { - return const Icon( - CupertinoIcons.forward, - color: Styles.settingsMediumGray, - size: 21, - ); - } -} - -class SettingsIcon extends StatelessWidget { - const SettingsIcon({ - required this.icon, - this.foregroundColor = CupertinoColors.white, - this.backgroundColor = CupertinoColors.black, - super.key, - }); - - final Color backgroundColor; - final Color foregroundColor; - final IconData icon; - - @override - Widget build(BuildContext context) { - return Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - color: backgroundColor, - ), - child: Center( - child: Icon( - icon, - color: foregroundColor, - size: 20, - ), - ), - ); - } -} - -class SettingsItem extends StatefulWidget { - const SettingsItem({ - required this.label, - this.icon, - this.content, - this.subtitle, - this.onPress, - super.key, - }); - - final String label; - final Widget? icon; - final Widget? content; - final String? subtitle; - final SettingsItemCallback? onPress; - - @override - State createState() => _SettingsItemState(); -} - -class _SettingsItemState extends State { - bool pressed = false; - - @override - Widget build(BuildContext context) { - var themeData = CupertinoTheme.of(context); - var brightness = CupertinoTheme.brightnessOf(context); - return AnimatedContainer( - duration: const Duration(milliseconds: 200), - color: Styles.settingsItemColor(brightness), - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () async { - if (widget.onPress != null) { - setState(() { - pressed = true; - }); - await widget.onPress!(); - Future.delayed( - const Duration(milliseconds: 150), - () { - setState(() { - pressed = false; - }); - }, - ); - } - }, - child: SizedBox( - height: widget.subtitle == null ? 44 : 57, - child: Row( - children: [ - if (widget.icon != null) - Padding( - padding: const EdgeInsets.only( - left: 15, - bottom: 2, - ), - child: SizedBox( - height: 29, - width: 29, - child: widget.icon, - ), - ), - Expanded( - child: Padding( - padding: const EdgeInsets.only( - left: 15, - ), - child: widget.subtitle != null - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const SizedBox(height: 8.5), - Text(widget.label, - style: themeData.textTheme.textStyle), - const SizedBox(height: 4), - Text( - widget.subtitle!, - style: Styles.settingsItemSubtitleText(themeData), - ), - ], - ) - : Padding( - padding: const EdgeInsets.only(top: 1.5), - child: Text(widget.label, - style: themeData.textTheme.textStyle), - ), - ), - ), - Padding( - padding: const EdgeInsets.only(right: 11), - child: widget.content ?? Container(), - ), - ], - ), - ), - ), - ); - } -} diff --git a/veggieseasons/lib/widgets/trivia.dart b/veggieseasons/lib/widgets/trivia.dart deleted file mode 100644 index 74583c310..000000000 --- a/veggieseasons/lib/widgets/trivia.dart +++ /dev/null @@ -1,249 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:provider/provider.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; - -/// Presents a series of trivia questions about a particular widget, and tracks -/// the user's score. -class TriviaView extends StatefulWidget { - final int? id; - final String? restorationId; - - const TriviaView({this.id, this.restorationId, super.key}); - - @override - State createState() => _TriviaViewState(); -} - -/// Possible states of the game. -enum PlayerStatus { - readyToAnswer, - wasCorrect, - wasIncorrect, -} - -class _TriviaViewState extends State with RestorationMixin { - /// Current app state. This is used to fetch veggie data. - late AppState appState; - - /// The veggie trivia about which to show. - late Veggie veggie; - - /// Index of the current trivia question. - RestorableInt triviaIndex = RestorableInt(0); - - /// User's score on the current veggie. - RestorableInt score = RestorableInt(0); - - /// Trivia question currently being displayed. - Trivia get currentTrivia => veggie.trivia[triviaIndex.value]; - - /// The current state of the game. - _RestorablePlayerStatus status = - _RestorablePlayerStatus(PlayerStatus.readyToAnswer); - - @override - String? get restorationId => widget.restorationId; - - @override - void restoreState(RestorationBucket? oldBucket, bool initialRestore) { - registerForRestoration(triviaIndex, 'index'); - registerForRestoration(score, 'score'); - registerForRestoration(status, 'status'); - } - - // Called at init and again if any dependencies (read: InheritedWidgets) on - // on which this object relies are changed. - @override - void didChangeDependencies() { - super.didChangeDependencies(); - - final newAppState = Provider.of(context); - - setState(() { - appState = newAppState; - veggie = appState.getVeggie(widget.id); - }); - } - - // Called when the widget associated with this object is swapped out for a new - // one. If the new widget has a different Veggie ID value, the state object - // needs to do a little work to reset itself for the new Veggie. - @override - void didUpdateWidget(TriviaView oldWidget) { - super.didUpdateWidget(oldWidget); - - if (oldWidget.id != widget.id) { - setState(() { - veggie = appState.getVeggie(widget.id); - }); - - _resetGame(); - } - } - - @override - void dispose() { - triviaIndex.dispose(); - score.dispose(); - status.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - if (triviaIndex.value >= veggie.trivia.length) { - return _buildFinishedView(); - } else if (status.value == PlayerStatus.readyToAnswer) { - return _buildQuestionView(); - } else { - return _buildResultView(); - } - } - - void _resetGame() { - setState(() { - triviaIndex.value = 0; - score.value = 0; - status.value = PlayerStatus.readyToAnswer; - }); - } - - void _processAnswer(int answerIndex) { - setState(() { - if (answerIndex == currentTrivia.correctAnswerIndex) { - status.value = PlayerStatus.wasCorrect; - score.value++; - } else { - status.value = PlayerStatus.wasIncorrect; - } - }); - } - - // Widget shown when the game is over. It includes the score and a button to - // restart everything. - Widget _buildFinishedView() { - final themeData = CupertinoTheme.of(context); - - return Padding( - padding: const EdgeInsets.all(32), - child: Column( - children: [ - Text( - 'All done!', - style: Styles.triviaFinishedTitleText(themeData), - ), - const SizedBox(height: 16), - Text('You answered', style: themeData.textTheme.textStyle), - Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - textBaseline: TextBaseline.alphabetic, - children: [ - Text( - '${score.value}', - style: Styles.triviaFinishedBigText(themeData), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Text(' of ', style: themeData.textTheme.textStyle), - ), - Text( - '${veggie.trivia.length}', - style: Styles.triviaFinishedBigText(themeData), - ), - ], - ), - Text('questions correctly!', style: themeData.textTheme.textStyle), - const SizedBox(height: 16), - CupertinoButton( - child: const Text('Try Again'), - onPressed: () => _resetGame(), - ), - ], - ), - ); - } - - // Presents the current trivia's question and answer choices. - Widget _buildQuestionView() { - return Padding( - padding: const EdgeInsets.all(16), - child: Column( - children: [ - const SizedBox(height: 16), - Text( - currentTrivia.question, - style: CupertinoTheme.of(context).textTheme.textStyle, - ), - const SizedBox(height: 32), - for (int i = 0; i < currentTrivia.answers.length; i++) - Padding( - padding: const EdgeInsets.all(8), - child: CupertinoButton( - color: CupertinoColors.activeBlue, - child: Text( - currentTrivia.answers[i], - textAlign: TextAlign.center, - ), - onPressed: () => _processAnswer(i), - ), - ), - ], - ), - ); - } - - // Shows whether the last answer was right or wrong and prompts the user to - // continue through the game. - Widget _buildResultView() { - return Padding( - padding: const EdgeInsets.all(32), - child: Column( - children: [ - Text( - status.value == PlayerStatus.wasCorrect - ? 'That\'s right!' - : 'Sorry, that wasn\'t the right answer.', - style: CupertinoTheme.of(context).textTheme.textStyle, - ), - const SizedBox(height: 16), - CupertinoButton( - child: const Text('Next Question'), - onPressed: () => setState(() { - triviaIndex.value++; - status.value = PlayerStatus.readyToAnswer; - }), - ), - ], - ), - ); - } -} - -class _RestorablePlayerStatus extends RestorableValue { - _RestorablePlayerStatus(this._defaultValue); - - final PlayerStatus _defaultValue; - - @override - PlayerStatus createDefaultValue() { - return _defaultValue; - } - - @override - PlayerStatus fromPrimitives(Object? data) { - return PlayerStatus.values[data as int]; - } - - @override - Object toPrimitives() { - return value.index; - } - - @override - void didUpdateValue(PlayerStatus? oldValue) { - notifyListeners(); - } -} diff --git a/veggieseasons/lib/widgets/veggie_card.dart b/veggieseasons/lib/widgets/veggie_card.dart index bf6dd154f..21ba68589 100644 --- a/veggieseasons/lib/widgets/veggie_card.dart +++ b/veggieseasons/lib/widgets/veggie_card.dart @@ -2,51 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui' as ui; - import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; - -class FrostyBackground extends StatelessWidget { - const FrostyBackground({ - this.color, - this.intensity = 25, - this.child, - super.key, - }); - - final Color? color; - final double intensity; - final Widget? child; - - @override - Widget build(BuildContext context) { - return ClipRect( - child: BackdropFilter( - filter: ui.ImageFilter.blur(sigmaX: intensity, sigmaY: intensity), - child: DecoratedBox( - decoration: BoxDecoration( - color: color, - ), - child: child, - ), - ), - ); - } -} +import '../data/veggie.dart'; +import '../styles.dart'; /// A Card-like Widget that responds to tap events by animating changes to its /// elevation and invoking an optional [onPressed] callback. -class PressableCard extends StatefulWidget { +class PressableCard extends StatelessWidget { const PressableCard({ required this.child, - this.borderRadius = const BorderRadius.all(Radius.circular(5)), - this.upElevation = 2, - this.downElevation = 0, - this.shadowColor = CupertinoColors.black, - this.duration = const Duration(milliseconds: 100), + this.borderRadius = const BorderRadius.all(Radius.circular(16)), this.onPressed, super.key, }); @@ -57,42 +24,17 @@ class PressableCard extends StatefulWidget { final BorderRadius borderRadius; - final double upElevation; - - final double downElevation; - - final Color shadowColor; - - final Duration duration; - - @override - State createState() => _PressableCardState(); -} - -class _PressableCardState extends State { - bool cardIsDown = false; - @override Widget build(BuildContext context) { return GestureDetector( - onTap: () { - setState(() => cardIsDown = false); - if (widget.onPressed != null) { - widget.onPressed!(); - } - }, - onTapDown: (details) => setState(() => cardIsDown = true), - onTapCancel: () => setState(() => cardIsDown = false), - child: AnimatedPhysicalModel( - elevation: cardIsDown ? widget.downElevation : widget.upElevation, - borderRadius: widget.borderRadius, - shape: BoxShape.rectangle, - shadowColor: widget.shadowColor, - duration: widget.duration, - color: CupertinoColors.lightBackgroundGray, + onTap: onPressed, + child: Container( + decoration: BoxDecoration( + borderRadius: borderRadius, + ), child: ClipRRect( - borderRadius: widget.borderRadius, - child: widget.child, + borderRadius: borderRadius, + child: child, ), ), ); @@ -115,10 +57,10 @@ class VeggieCard extends StatelessWidget { Widget _buildDetails(BuildContext context) { final themeData = CupertinoTheme.of(context); - return FrostyBackground( - color: const Color(0x90ffffff), + return Container( + color: Colors.white, child: Padding( - padding: const EdgeInsets.all(16), + padding: const EdgeInsets.fromLTRB(20, 16, 16, 20), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -126,6 +68,7 @@ class VeggieCard extends StatelessWidget { veggie.name, style: Styles.cardTitleText(themeData), ), + const SizedBox(height: 8), Text( veggie.shortDescription, style: Styles.cardDescriptionText(themeData), diff --git a/veggieseasons/lib/widgets/veggie_headline.dart b/veggieseasons/lib/widgets/veggie_headline.dart index c0c00c300..2ef52bef5 100644 --- a/veggieseasons/lib/widgets/veggie_headline.dart +++ b/veggieseasons/lib/widgets/veggie_headline.dart @@ -4,8 +4,8 @@ import 'package:flutter/cupertino.dart'; import 'package:go_router/go_router.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/styles.dart'; +import '../data/veggie.dart'; +import '../styles.dart'; class ZoomClipAssetImage extends StatelessWidget { const ZoomClipAssetImage({ diff --git a/veggieseasons/lib/widgets/veggie_seasons_page.dart b/veggieseasons/lib/widgets/veggie_seasons_page.dart new file mode 100644 index 000000000..76f240219 --- /dev/null +++ b/veggieseasons/lib/widgets/veggie_seasons_page.dart @@ -0,0 +1,45 @@ +// Copyright 2024, the Flutter project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'package:flutter/cupertino.dart'; + +class VeggieSeasonsPage extends Page { + final Widget child; + + const VeggieSeasonsPage({ + super.key, + required this.child, + super.restorationId, + }); + + @override + VeggieSeasonsPageRoute createRoute(BuildContext context) => + VeggieSeasonsPageRoute(this); +} + +class VeggieSeasonsPageRoute extends PageRoute { + VeggieSeasonsPageRoute(VeggieSeasonsPage page) : super(settings: page); + + VeggieSeasonsPage get _page => settings as VeggieSeasonsPage; + + @override + Color? get barrierColor => null; + + @override + String? get barrierLabel => null; + + @override + bool get maintainState => true; + + @override + Duration get transitionDuration => Duration.zero; + + @override + Widget buildPage( + BuildContext context, + Animation animation, + Animation secondaryAnimation, + ) => + _page.child; +} diff --git a/veggieseasons/macos/.gitignore b/veggieseasons/macos/.gitignore index d2fd37723..746adbb6b 100644 --- a/veggieseasons/macos/.gitignore +++ b/veggieseasons/macos/.gitignore @@ -3,4 +3,5 @@ **/Pods/ # Xcode-related +**/dgph **/xcuserdata/ diff --git a/veggieseasons/macos/Flutter/Flutter-Debug.xcconfig b/veggieseasons/macos/Flutter/Flutter-Debug.xcconfig index 785633d3a..4b81f9b2d 100644 --- a/veggieseasons/macos/Flutter/Flutter-Debug.xcconfig +++ b/veggieseasons/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/veggieseasons/macos/Flutter/Flutter-Release.xcconfig b/veggieseasons/macos/Flutter/Flutter-Release.xcconfig index 5fba960c3..5caa9d157 100644 --- a/veggieseasons/macos/Flutter/Flutter-Release.xcconfig +++ b/veggieseasons/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/veggieseasons/macos/Podfile b/veggieseasons/macos/Podfile index dade8dfad..c795730db 100644 --- a/veggieseasons/macos/Podfile +++ b/veggieseasons/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -31,6 +31,9 @@ target 'Runner' do use_modular_headers! flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end end post_install do |installer| diff --git a/veggieseasons/macos/Runner.xcodeproj/project.pbxproj b/veggieseasons/macos/Runner.xcodeproj/project.pbxproj index 805b71cd9..3beb54829 100644 --- a/veggieseasons/macos/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -21,15 +21,24 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 0C591566BA30BFA6D780386A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EE22A708C4E7F94406AFD15 /* Pods_Runner.framework */; }; + 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 */; }; - 439430BC46E7EA4F4AD30C97 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71048CE912B6CDDD9D17E4AB /* Pods_Runner.framework */; }; + AEA6F424A1A42303F9A597C0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBED630FEBB9A18F27C8E814 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 33CC10E52044A3C60003C045 /* Project object */; @@ -53,6 +62,8 @@ /* 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 /* veggieseasons.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = veggieseasons.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,26 +78,46 @@ 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 = ""; }; - 58E49E1CFF302F91C6924BD4 /* 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 = ""; }; - 5D2B960855C47BF6E34C2800 /* 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 = ""; }; - 71048CE912B6CDDD9D17E4AB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 413A4F2B0013AFEC349AB2C5 /* 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 = ""; }; + 4D8AF33CD5C878ED37254D67 /* 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 = ""; }; + 4EE22A708C4E7F94406AFD15 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 67C24EB68B67E166AAF91AFC /* 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 = ""; }; 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 = ""; }; - A3B1F279691DA4B9DC4B9D64 /* 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 = ""; }; + A5460BC7374C6E7592B1FF3E /* 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 = ""; }; + C1FB72C1E9B25422AFEB740F /* 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 = ""; }; + C518FFB7BDFCCDF5D96D3B89 /* 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 = ""; }; + DBED630FEBB9A18F27C8E814 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + AEA6F424A1A42303F9A597C0 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 33CC10EA2044A3C60003C045 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 439430BC46E7EA4F4AD30C97 /* Pods_Runner.framework in Frameworks */, + 0C591566BA30BFA6D780386A /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; 33BA886A226E78AF003329D5 /* Configs */ = { isa = PBXGroup; children = ( @@ -103,9 +134,10 @@ children = ( 33FAB671232836740065AC1E /* Runner */, 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 34AD685A2B6FBB3AF5835725 /* Pods */, + 91771D8FA5A30CAEDA51E26A /* Pods */, ); sourceTree = ""; }; @@ -113,6 +145,7 @@ isa = PBXGroup; children = ( 33CC10ED2044A3C60003C045 /* veggieseasons.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -152,12 +185,15 @@ path = Runner; sourceTree = ""; }; - 34AD685A2B6FBB3AF5835725 /* Pods */ = { + 91771D8FA5A30CAEDA51E26A /* Pods */ = { isa = PBXGroup; children = ( - A3B1F279691DA4B9DC4B9D64 /* Pods-Runner.debug.xcconfig */, - 58E49E1CFF302F91C6924BD4 /* Pods-Runner.release.xcconfig */, - 5D2B960855C47BF6E34C2800 /* Pods-Runner.profile.xcconfig */, + A5460BC7374C6E7592B1FF3E /* Pods-Runner.debug.xcconfig */, + C518FFB7BDFCCDF5D96D3B89 /* Pods-Runner.release.xcconfig */, + 4D8AF33CD5C878ED37254D67 /* Pods-Runner.profile.xcconfig */, + 413A4F2B0013AFEC349AB2C5 /* Pods-RunnerTests.debug.xcconfig */, + C1FB72C1E9B25422AFEB740F /* Pods-RunnerTests.release.xcconfig */, + 67C24EB68B67E166AAF91AFC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -166,7 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 71048CE912B6CDDD9D17E4AB /* Pods_Runner.framework */, + 4EE22A708C4E7F94406AFD15 /* Pods_Runner.framework */, + DBED630FEBB9A18F27C8E814 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -174,17 +211,36 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + A9DCAE5A5FC2DAC764BF600F /* [CP] Check Pods Manifest.lock */, + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 33CC10EC2044A3C60003C045 /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - B2073D6D55F6001DEC2B62B9 /* [CP] Check Pods Manifest.lock */, + 6233C4FEDE0E579A6F92072D /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6849C1ABF60468666D275EC3 /* [CP] Embed Pods Frameworks */, + 6AA72EDC93A2C61F5DA982D4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -202,10 +258,15 @@ 33CC10E52044A3C60003C045 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; - ORGANIZATIONNAME = "The Flutter Authors"; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; 33CC10EC2044A3C60003C045 = { CreatedOnToolsVersion = 9.2; LastSwiftMigration = 1100; @@ -223,7 +284,7 @@ }; }; buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 8.0"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -236,12 +297,20 @@ 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; @@ -256,6 +325,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -289,27 +359,48 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 6849C1ABF60468666D275EC3 /* [CP] Embed Pods Frameworks */ = { + 6233C4FEDE0E579A6F92072D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/shared_preferences_macos/shared_preferences_macos.framework", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_macos.framework", + "$(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; + }; + 6AA72EDC93A2C61F5DA982D4 /* [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; }; - B2073D6D55F6001DEC2B62B9 /* [CP] Check Pods Manifest.lock */ = { + A9DCAE5A5FC2DAC764BF600F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -324,7 +415,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -334,6 +425,14 @@ /* 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; @@ -347,6 +446,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; @@ -367,11 +471,57 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 413A4F2B0013AFEC349AB2C5 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/veggieseasons.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/veggieseasons"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C1FB72C1E9B25422AFEB740F /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/veggieseasons.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/veggieseasons"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 67C24EB68B67E166AAF91AFC /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/veggieseasons.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/veggieseasons"; + }; + 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"; @@ -395,9 +545,11 @@ 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; @@ -405,7 +557,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -422,10 +574,6 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter/ephemeral", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -449,6 +597,7 @@ 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"; @@ -472,9 +621,11 @@ 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; @@ -488,7 +639,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -502,6 +653,7 @@ 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"; @@ -525,9 +677,11 @@ 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; @@ -535,7 +689,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -552,10 +706,6 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter/ephemeral", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -576,10 +726,6 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter/ephemeral", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -609,6 +755,16 @@ /* 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 = ( diff --git a/veggieseasons/macos/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/veggieseasons/macos/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 764c74b8d..000000000 --- a/veggieseasons/macos/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/veggieseasons/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/veggieseasons/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 506ccd3d4..4c2163854 100644 --- a/veggieseasons/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/veggieseasons/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - + + + + + + - - Bool { return true diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7c..82b6f9d9a 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc1642..13b35eba5 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be6138..0a3f5fa40 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df2..bdb57226d 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a65286..f083318e0 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a72613..326c0e72c 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2dd..2f1632cfd 100644 Binary files a/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/veggieseasons/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/veggieseasons/macos/Runner/Base.lproj/MainMenu.xib b/veggieseasons/macos/Runner/Base.lproj/MainMenu.xib index 537341abf..80e867a4e 100644 --- a/veggieseasons/macos/Runner/Base.lproj/MainMenu.xib +++ b/veggieseasons/macos/Runner/Base.lproj/MainMenu.xib @@ -323,6 +323,10 @@ + + + + diff --git a/veggieseasons/macos/Runner/Configs/AppInfo.xcconfig b/veggieseasons/macos/Runner/Configs/AppInfo.xcconfig index 0464163fd..04ab23a4b 100644 --- a/veggieseasons/macos/Runner/Configs/AppInfo.xcconfig +++ b/veggieseasons/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = veggieseasons // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons +PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.veggieseasons // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2020 dev.flutter. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2024 dev.flutter. All rights reserved. diff --git a/veggieseasons/macos/Runner/MainFlutterWindow.swift b/veggieseasons/macos/Runner/MainFlutterWindow.swift index 2722837ec..3cc05eb23 100644 --- a/veggieseasons/macos/Runner/MainFlutterWindow.swift +++ b/veggieseasons/macos/Runner/MainFlutterWindow.swift @@ -3,7 +3,7 @@ import FlutterMacOS class MainFlutterWindow: NSWindow { override func awakeFromNib() { - let flutterViewController = FlutterViewController.init() + let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true) diff --git a/veggieseasons/macos/RunnerTests/RunnerTests.swift b/veggieseasons/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 000000000..61f3bd1fc --- /dev/null +++ b/veggieseasons/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/veggieseasons/test/restoration_test.dart b/veggieseasons/test/restoration_test.dart deleted file mode 100644 index 82ea77421..000000000 --- a/veggieseasons/test/restoration_test.dart +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright 2018 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/cupertino.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:shared_preferences/shared_preferences.dart'; -import 'package:veggieseasons/data/app_state.dart'; -import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/main.dart'; - -void main() { - testWidgets('restoration smoke test', (tester) async { - SharedPreferences.setMockInitialValues({}); - AppState.debugCurrentSeason = Season.autumn; - - await tester.pumpWidget( - const RootRestorationScope( - restorationId: 'root', - child: VeggieApp(), - ), - ); - - expect(find.text('In season today'), findsOneWidget); - expect(find.text('Grapes'), findsNothing); - expect(find.text('Figs'), findsNothing); - await tester.scrollUntilVisible(find.text('Grapes'), 100); - expect(find.text('In season today'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - expect(find.text('Grapes'), findsOneWidget); - - // Scroll offset of "Home" is restored. - await tester.restartAndRestore(); - expect(find.text('In season today'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - expect(find.text('Grapes'), findsOneWidget); - - // Open details page for "Figs". - await tester.tap(find.text('Figs')); - await tester.pumpAndSettle(); - - expect(find.text('Grapes'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - expect(find.text('Serving info'), findsOneWidget); - expect(tester.widget(find.byType(CupertinoSwitch)).value, - isFalse); - await tester.tap(find.byType(CupertinoSwitch)); - await tester.pumpAndSettle(); - expect(tester.widget(find.byType(CupertinoSwitch)).value, - isTrue); - - // Current details page is restored. - await tester.restartAndRestore(); - expect(find.text('Grapes'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - expect(find.text('Serving info'), findsOneWidget); - expect(tester.widget(find.byType(CupertinoSwitch)).value, - isTrue); - - await tester.tap(find.text('Trivia')); - await tester.pumpAndSettle(); - expect(find.text('Serving info'), findsNothing); - expect( - find.text("Which of these isn't a variety of figs?"), findsOneWidget); - - // Restores to trivia page. - await tester.restartAndRestore(); - expect(find.text('Serving info'), findsNothing); - expect( - find.text("Which of these isn't a variety of figs?"), findsOneWidget); - - await tester.tap(find.text('Brown Turkey')); - await tester.pumpAndSettle(); - expect(find.text("Which of these isn't a variety of figs?"), findsNothing); - expect(find.text('Next Question'), findsOneWidget); - - // Restores trivia state. - await tester.restartAndRestore(); - expect(find.text("Which of these isn't a variety of figs?"), findsNothing); - expect(find.text('Next Question'), findsOneWidget); - - // Close details page. - tester.state(find.byType(Navigator).last).pop(); - await tester.pumpAndSettle(); - expect(find.text('Trivia'), findsNothing); - - // Old scroll offset is still preserved. - expect(find.text('Grapes'), findsOneWidget); - expect(find.text('Figs'), findsOneWidget); - - await tester.restartAndRestore(); - expect(find.text('Grapes'), findsOneWidget); - expect(find.text('Figs'), findsOneWidget); - - // Go to the garden. - await tester.tap(find.text('My Garden')); - await tester.pumpAndSettle(); - - expect(find.text('My Garden'), - findsNWidgets(2)); // Name of the tap & title of page. - expect(find.text('Grapes'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - - // Restores the current selected tab. - await tester.restartAndRestore(); - expect(find.text('My Garden'), - findsNWidgets(2)); // Name of the tap & title of page. - expect(find.text('Grapes'), findsNothing); - expect(find.text('Figs'), findsOneWidget); - expect(find.text('Apples'), findsNothing); - - // Go to "Search". - await tester.tap(find.text('Search')); - await tester.pumpAndSettle(); - - expect(find.text('Apples'), findsOneWidget); - expect(find.text('Tangelo'), findsNothing); - await tester.enterText( - find.byType(CupertinoTextField).hitTestable(), 'Tan'); - await tester.pumpAndSettle(); - expect(find.text('Apples'), findsNothing); - expect(find.text('Tangelo'), findsOneWidget); - expect(find.text('Tan').hitTestable(), findsOneWidget); - - // Restores search text and result. - await tester.restartAndRestore(); - expect(find.text('Apples'), findsNothing); - expect(find.text('Tangelo'), findsOneWidget); - expect(find.text('Tan').hitTestable(), findsOneWidget); // search text - - expect(find.text('Serving info'), findsNothing); - - // Open a details page from search - await tester.tap(find.text('Tangelo')); - await tester.pumpAndSettle(); - - expect(find.text('Tangelo'), findsOneWidget); - expect(find.text('Serving info'), findsOneWidget); - - // Restores details page - await tester.restartAndRestore(); - expect(find.text('Tangelo'), findsOneWidget); - expect(find.text('Serving info'), findsOneWidget); - - // Go back to search page, is also restored - tester.state(find.byType(Navigator).last).pop(); - await tester.pumpAndSettle(); - - expect(find.text('Serving info'), findsNothing); - expect(find.text('Apples'), findsNothing); - expect(find.text('Tangelo'), findsOneWidget); - expect(find.text('Tan').hitTestable(), findsOneWidget); // search text - - expect(find.text('Calorie Target'), findsNothing); - - // Go to "Settings". - await tester.tap(find.text('Settings')); - await tester.pumpAndSettle(); - expect(find.text('Calorie Target'), findsOneWidget); - - await tester.restartAndRestore(); - expect(find.text('Calorie Target'), findsOneWidget); - - expect(find.text('AVAILABLE CALORIE LEVELS'), findsNothing); - - // Go to calorie target selection. - await tester.tap(find.text('Calorie Target')); - await tester.pumpAndSettle(); - expect(find.text('AVAILABLE CALORIE LEVELS'), findsOneWidget); - - await tester.restartAndRestore(); - expect(find.text('AVAILABLE CALORIE LEVELS'), findsOneWidget); - - // Go back to settings main screen. - tester.state(find.byType(Navigator).last).pop(); - await tester.pumpAndSettle(); - expect(find.text('AVAILABLE CALORIE LEVELS'), findsNothing); - expect(find.text('Allium'), findsNothing); - - // Go to preferred categories selection. - await tester.tap(find.text('Preferred Categories')); - await tester.pumpAndSettle(); - expect(find.text('Calorie Target'), findsNothing); - expect(find.text('Allium'), findsOneWidget); - - await tester.restartAndRestore(); - expect(find.text('Allium'), findsOneWidget); - - // Go back to settings main screen. - tester.state(find.byType(Navigator).last).pop(); - await tester.pumpAndSettle(); - expect(find.text('Allium'), findsNothing); - expect(find.text('Preferred Categories'), findsOneWidget); - expect(find.text('Calorie Target'), findsOneWidget); - }); -} diff --git a/web_embedding/ng-flutter/package.json b/web_embedding/ng-flutter/package.json index 5563fb61e..dc25acc8e 100644 --- a/web_embedding/ng-flutter/package.json +++ b/web_embedding/ng-flutter/package.json @@ -23,7 +23,7 @@ "@angular/router": "^18.0.1", "rxjs": "~7.8.1", "tslib": "^2.6.2", - "zone.js": "~0.14.6" + "zone.js": "~0.15.0" }, "devDependencies": { "@angular-devkit/build-angular": "^18.0.2",