From 883bfaed88c2c5b7a9aaebc198b27db9dd450cff Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 09:32:25 -0700 Subject: [PATCH 01/10] Add privacy url to about-us --- .../screens/home_menu/about_dialog_content.dart | 15 ++++++++++----- lib/ui/screens/home_menu/home_menu.dart | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/ui/screens/home_menu/about_dialog_content.dart b/lib/ui/screens/home_menu/about_dialog_content.dart index 61fcb2ac..28291763 100644 --- a/lib/ui/screens/home_menu/about_dialog_content.dart +++ b/lib/ui/screens/home_menu/about_dialog_content.dart @@ -53,21 +53,26 @@ class AboutDialogContent extends StatelessWidget { '{gskinnerUrl}': [$strings.homeMenuAboutGskinner, 'https://gskinner.com/flutter'], }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutLearn('{wonderousUrl}'), linkSupplants: { + ...buildSpan('${$strings.homeMenuAboutLearn('{wonderousUrl}')} ', linkSupplants: { '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://wonderous.app'], }), - ...buildSpan('\n\n'), ...buildSpan($strings.homeMenuAboutSource('{githubUrl}'), linkSupplants: { - '{githubUrl}': [$strings.homeMenuAboutRepo, 'https://github.com/gskinnerTeam/flutter-wonderous-app'], + '{githubUrl}': [ + '${$strings.homeMenuAboutRepo}', + 'https://github.com/gskinnerTeam/flutter-wonderous-app' + ], }), + ...buildSpan(' As explained in our {privacyUrl} we do no collect any personal information.', + linkSupplants: { + '{privacyUrl}': ['Privacy Policy', 'https://flutter.gskinner.com/privacy'], + }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutPublic('{metUrl}'), linkSupplants: { + ...buildSpan('${$strings.homeMenuAboutPublic('{metUrl}')} ', linkSupplants: { '{metUrl}': [ $strings.homeMenuAboutMet, 'https://www.metmuseum.org/about-the-met/policies-and-documents/open-access' ], }), - ...buildSpan('\n\n'), ...buildSpan($strings.homeMenuAboutPhotography('{unsplashUrl}'), linkSupplants: { '{unsplashUrl}': [$strings.homeMenuAboutUnsplash, 'https://unsplash.com/@gskinner/collections'], }), diff --git a/lib/ui/screens/home_menu/home_menu.dart b/lib/ui/screens/home_menu/home_menu.dart index f607cfc4..9a77cff0 100644 --- a/lib/ui/screens/home_menu/home_menu.dart +++ b/lib/ui/screens/home_menu/home_menu.dart @@ -13,6 +13,8 @@ class HomeMenu extends StatelessWidget { void _handleAboutPressed(BuildContext context) async { PackageInfo packageInfo = await PackageInfo.fromPlatform(); + // ignore: use_build_context_synchronously + if (!context.mounted) return; showAboutDialog( context: context, applicationName: $strings.appName, From da99b66301ff56734bb3cf771aa5302bd420683f Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 09:33:26 -0700 Subject: [PATCH 02/10] Cleanup about dialog --- lib/ui/screens/home_menu/about_dialog_content.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/ui/screens/home_menu/about_dialog_content.dart b/lib/ui/screens/home_menu/about_dialog_content.dart index 28291763..7d082292 100644 --- a/lib/ui/screens/home_menu/about_dialog_content.dart +++ b/lib/ui/screens/home_menu/about_dialog_content.dart @@ -57,10 +57,7 @@ class AboutDialogContent extends StatelessWidget { '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://wonderous.app'], }), ...buildSpan($strings.homeMenuAboutSource('{githubUrl}'), linkSupplants: { - '{githubUrl}': [ - '${$strings.homeMenuAboutRepo}', - 'https://github.com/gskinnerTeam/flutter-wonderous-app' - ], + '{githubUrl}': [($strings.homeMenuAboutRepo), 'https://github.com/gskinnerTeam/flutter-wonderous-app'], }), ...buildSpan(' As explained in our {privacyUrl} we do no collect any personal information.', linkSupplants: { From 0e9f4353b06ad730538e87361ef72270445d8e57 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 09:35:12 -0700 Subject: [PATCH 03/10] editorial tweaks --- lib/ui/screens/editorial/editorial_screen.dart | 1 - lib/ui/screens/editorial/widgets/_scrolling_content.dart | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ui/screens/editorial/editorial_screen.dart b/lib/ui/screens/editorial/editorial_screen.dart index be22eddd..6804aefb 100644 --- a/lib/ui/screens/editorial/editorial_screen.dart +++ b/lib/ui/screens/editorial/editorial_screen.dart @@ -111,7 +111,6 @@ class _WonderEditorialScreenState extends State { primary: false, controller: _scroller, scrollBehavior: ScrollConfiguration.of(context).copyWith(), - cacheExtent: 1000, slivers: [ /// Invisible padding at the top of the list, so the illustration shows through the btm SliverToBoxAdapter( diff --git a/lib/ui/screens/editorial/widgets/_scrolling_content.dart b/lib/ui/screens/editorial/widgets/_scrolling_content.dart index 8b3c649c..00e4f98f 100644 --- a/lib/ui/screens/editorial/widgets/_scrolling_content.dart +++ b/lib/ui/screens/editorial/widgets/_scrolling_content.dart @@ -134,7 +134,7 @@ class _ScrollingContent extends StatelessWidget { buildText(data.locationInfo2), ]), Gap($styles.insets.md), - _MapsThumbnail(data, height: 200), + _MapsThumbnail(data, height: 400), Gap($styles.insets.md), ..._contentSection([Center(child: buildHiddenCollectible(slot: 3))]), ]), From 7c52440feb3073a812d07266e6bd6632746ccae1 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 09:45:26 -0700 Subject: [PATCH 04/10] Optimize imports --- lib/_tools/artifact_search_helper.dart | 2 +- lib/common_libs.dart | 5 ++--- .../artifact_carousel_screen.dart | 3 +-- .../artifact_details/artifact_details_screen.dart | 1 - .../collectible_found_screen.dart | 2 +- lib/ui/screens/collection/collection_screen.dart | 1 - lib/ui/screens/home/wonders_home_screen.dart | 1 - lib/ui/screens/timeline/timeline_screen.dart | 2 +- .../colosseum_illustration.dart | 15 +++++++-------- .../common/animated_clouds.dart | 1 + 10 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/_tools/artifact_search_helper.dart b/lib/_tools/artifact_search_helper.dart index 4acd9644..1171c75f 100644 --- a/lib/_tools/artifact_search_helper.dart +++ b/lib/_tools/artifact_search_helper.dart @@ -5,9 +5,9 @@ import 'dart:collection'; import 'dart:convert'; import 'dart:io'; +import 'package:http/http.dart' as http; import 'package:path_provider/path_provider.dart'; import 'package:wonders/common_libs.dart'; -import 'package:http/http.dart' as http; import 'package:wonders/logic/data/wonder_data.dart'; import 'package:wonders/logic/data/wonders_data/search/search_data.dart'; diff --git a/lib/common_libs.dart b/lib/common_libs.dart index 54f17731..219104d1 100644 --- a/lib/common_libs.dart +++ b/lib/common_libs.dart @@ -7,6 +7,7 @@ export 'package:extra_alignments/extra_alignments.dart'; export 'package:flextras/flextras.dart'; export 'package:flutter/material.dart'; export 'package:flutter/services.dart'; +export 'package:flutter_animate/flutter_animate.dart'; export 'package:gap/gap.dart'; export 'package:get_it/get_it.dart'; export 'package:get_it_mixin/get_it_mixin.dart'; @@ -22,9 +23,7 @@ export 'package:wonders/logic/settings_logic.dart'; export 'package:wonders/main.dart'; export 'package:wonders/router.dart'; export 'package:wonders/styles/styles.dart'; +export 'package:wonders/ui/common/controls/app_image.dart'; export 'package:wonders/ui/common/controls/buttons.dart'; export 'package:wonders/ui/common/controls/circle_buttons.dart'; export 'package:wonders/ui/common/controls/scroll_decorator.dart'; -export 'package:wonders/ui/common/controls/app_image.dart'; -export 'package:wonders/ui/common/listenable_builder.dart'; -export 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart index 2d6525c7..b55c34c8 100644 --- a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart +++ b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart @@ -1,4 +1,3 @@ -import 'dart:math' as math; import 'dart:ui'; import 'package:wonders/common_libs.dart'; @@ -9,8 +8,8 @@ import 'package:wonders/ui/common/controls/simple_header.dart'; import 'package:wonders/ui/common/static_text_scale.dart'; part 'widgets/_blurred_image_bg.dart'; -part 'widgets/_collapsing_carousel_item.dart'; part 'widgets/_bottom_text_content.dart'; +part 'widgets/_collapsing_carousel_item.dart'; class ArtifactCarouselScreen extends StatefulWidget { final WonderType type; diff --git a/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart b/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart index 0e92c2ba..2e430c1f 100644 --- a/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart +++ b/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart @@ -1,5 +1,4 @@ import 'package:wonders/common_libs.dart'; -import 'package:wonders/logic/common/string_utils.dart'; import 'package:wonders/logic/data/artifact_data.dart'; import 'package:wonders/ui/common/compass_divider.dart'; import 'package:wonders/ui/common/controls/app_loading_indicator.dart'; diff --git a/lib/ui/screens/collectible_found/collectible_found_screen.dart b/lib/ui/screens/collectible_found/collectible_found_screen.dart index 42384047..217f52ef 100644 --- a/lib/ui/screens/collectible_found/collectible_found_screen.dart +++ b/lib/ui/screens/collectible_found/collectible_found_screen.dart @@ -1,6 +1,6 @@ +import 'package:particle_field/particle_field.dart'; import 'package:wonders/common_libs.dart'; import 'package:wonders/logic/data/collectible_data.dart'; -import 'package:particle_field/particle_field.dart'; import 'package:wonders/ui/common/centered_box.dart'; part 'widgets/_animated_ribbon.dart'; diff --git a/lib/ui/screens/collection/collection_screen.dart b/lib/ui/screens/collection/collection_screen.dart index 14067f94..ca4fc66d 100644 --- a/lib/ui/screens/collection/collection_screen.dart +++ b/lib/ui/screens/collection/collection_screen.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:wonders/common_libs.dart'; import 'package:wonders/logic/collectibles_logic.dart'; -import 'package:wonders/logic/common/string_utils.dart'; import 'package:wonders/logic/data/collectible_data.dart'; import 'package:wonders/logic/data/wonder_data.dart'; import 'package:wonders/ui/common/centered_box.dart'; diff --git a/lib/ui/screens/home/wonders_home_screen.dart b/lib/ui/screens/home/wonders_home_screen.dart index 349ad5e2..bae6e4fd 100644 --- a/lib/ui/screens/home/wonders_home_screen.dart +++ b/lib/ui/screens/home/wonders_home_screen.dart @@ -1,5 +1,4 @@ import 'package:wonders/common_libs.dart'; -import 'package:wonders/logic/common/string_utils.dart'; import 'package:wonders/logic/data/wonder_data.dart'; import 'package:wonders/ui/common/app_icons.dart'; import 'package:wonders/ui/common/controls/app_page_indicator.dart'; diff --git a/lib/ui/screens/timeline/timeline_screen.dart b/lib/ui/screens/timeline/timeline_screen.dart index 7e20656f..e61281d4 100644 --- a/lib/ui/screens/timeline/timeline_screen.dart +++ b/lib/ui/screens/timeline/timeline_screen.dart @@ -16,6 +16,7 @@ import 'package:wonders/ui/common/timeline_event_card.dart'; import 'package:wonders/ui/common/utils/app_haptics.dart'; import 'package:wonders/ui/common/wonders_timeline_builder.dart'; +part 'widgets/_animated_era_text.dart'; part 'widgets/_bottom_scrubber.dart'; part 'widgets/_dashed_divider_with_year.dart'; part 'widgets/_event_markers.dart'; @@ -24,7 +25,6 @@ part 'widgets/_scrolling_viewport.dart'; part 'widgets/_scrolling_viewport_controller.dart'; part 'widgets/_timeline_section.dart'; part 'widgets/_year_markers.dart'; -part 'widgets/_animated_era_text.dart'; class TimelineScreen extends StatefulWidget { final WonderType? type; diff --git a/lib/ui/wonder_illustrations/colosseum_illustration.dart b/lib/ui/wonder_illustrations/colosseum_illustration.dart index 68ff54ea..2bad0dcd 100644 --- a/lib/ui/wonder_illustrations/colosseum_illustration.dart +++ b/lib/ui/wonder_illustrations/colosseum_illustration.dart @@ -2,7 +2,6 @@ import 'package:wonders/common_libs.dart'; import 'package:wonders/ui/common/fade_color_transition.dart'; import 'package:wonders/ui/wonder_illustrations/common/illustration_piece.dart'; import 'package:wonders/ui/wonder_illustrations/common/paint_textures.dart'; -import 'package:wonders/ui/wonder_illustrations/common/wonder_hero.dart'; import 'package:wonders/ui/wonder_illustrations/common/wonder_illustration_builder.dart'; import 'package:wonders/ui/wonder_illustrations/common/wonder_illustration_config.dart'; @@ -47,13 +46,13 @@ class ColosseumIllustration extends StatelessWidget { List _buildMg(BuildContext context, Animation anim) { return [ - IllustrationPiece( - fileName: 'colosseum.png', - enableHero: true, - heightFactor: .6, - minHeight: 200, - zoomAmt: .15, - fractionalOffset: Offset(0, config.shortMode ? .10: -.1), + IllustrationPiece( + fileName: 'colosseum.png', + enableHero: true, + heightFactor: .6, + minHeight: 200, + zoomAmt: .15, + fractionalOffset: Offset(0, config.shortMode ? .10 : -.1), ) ]; } diff --git a/lib/ui/wonder_illustrations/common/animated_clouds.dart b/lib/ui/wonder_illustrations/common/animated_clouds.dart index 44d0a94a..7568ff31 100644 --- a/lib/ui/wonder_illustrations/common/animated_clouds.dart +++ b/lib/ui/wonder_illustrations/common/animated_clouds.dart @@ -1,4 +1,5 @@ import 'dart:async'; + import 'package:wonders/common_libs.dart'; import 'package:wonders/ui/common/utils/context_utils.dart'; From bb911cc5d6272a4c845fb4af326aa1fd1e94552b Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 10:12:50 -0700 Subject: [PATCH 05/10] Fix issues with aboutUs urls --- lib/ui/screens/home_menu/about_dialog_content.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ui/screens/home_menu/about_dialog_content.dart b/lib/ui/screens/home_menu/about_dialog_content.dart index 7d082292..3f659954 100644 --- a/lib/ui/screens/home_menu/about_dialog_content.dart +++ b/lib/ui/screens/home_menu/about_dialog_content.dart @@ -54,14 +54,14 @@ class AboutDialogContent extends StatelessWidget { }), ...buildSpan('\n\n'), ...buildSpan('${$strings.homeMenuAboutLearn('{wonderousUrl}')} ', linkSupplants: { - '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://wonderous.app'], + '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://flutter.gskinner.com/wonderous/'], }), ...buildSpan($strings.homeMenuAboutSource('{githubUrl}'), linkSupplants: { '{githubUrl}': [($strings.homeMenuAboutRepo), 'https://github.com/gskinnerTeam/flutter-wonderous-app'], }), ...buildSpan(' As explained in our {privacyUrl} we do no collect any personal information.', linkSupplants: { - '{privacyUrl}': ['Privacy Policy', 'https://flutter.gskinner.com/privacy'], + '{privacyUrl}': ['Privacy Policy', 'https://flutter.gskinner.com/wonderous/privacy/'], }), ...buildSpan('\n\n'), ...buildSpan('${$strings.homeMenuAboutPublic('{metUrl}')} ', linkSupplants: { From b226f02f2a89529659867fabe8f36551b1e94870 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 10:16:51 -0700 Subject: [PATCH 06/10] Version bump --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- release_notes.txt | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 808dbd67..7348aa21 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1149,10 +1149,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" sync_http: dependency: transitive description: @@ -1173,10 +1173,10 @@ packages: dependency: transitive description: name: test_api - sha256: c9aba3b3dbfe8878845dfab5fa096eb8de7b62231baeeb1cea8e3ee81ca8c6d8 + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.dev" source: hosted - version: "0.4.15" + version: "0.4.16" timing: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 13c540e0..564b51c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: wonders description: Explore the famous wonders of the world. publish_to: "none" -version: 2.0.2 +version: 2.0.3 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/release_notes.txt b/release_notes.txt index 10b2ec06..f922eef0 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,6 +1,8 @@ -# 2.0.0 +# 2.0.3 - Add support for widescreen tablet devices -- Various polish and improvements +- Various improvements / polish +- Add privacy policy link +- Fix for rendering issues on Timeline / Editorial # 1.9.7 - Updated impeller version From b52dc8419b1e96260e8eb17217f8deabb7ff383c Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 10:23:40 -0700 Subject: [PATCH 07/10] Update release notes --- release_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/release_notes.txt b/release_notes.txt index f922eef0..12917140 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -3,6 +3,7 @@ - Various improvements / polish - Add privacy policy link - Fix for rendering issues on Timeline / Editorial + - Uses Flutter 3.7 Candidate 5 # 1.9.7 - Updated impeller version From 0512a3406e591a55925b6046f129447865255a34 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 12 Dec 2022 13:45:41 -0700 Subject: [PATCH 08/10] Fix build issues on Android --- .../flutter/flutter_wonders_app/MainActivity.kt | 6 ------ .../kotlin/com/gskinner/wonders/MainActivity.kt | 15 --------------- .../Flutter/ephemeral/Flutter-Generated.xcconfig | 8 ++++---- .../ephemeral/flutter_export_environment.sh | 8 ++++---- 4 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt delete mode 100644 android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt diff --git a/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt b/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt deleted file mode 100644 index babf1c44..00000000 --- a/android/app/src/main/kotlin/com/gskinner/flutter/flutter_wonders_app/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.gskinner.flutter.flutter_wonders_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt b/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt deleted file mode 100644 index 6c98efb9..00000000 --- a/android/app/src/main/kotlin/com/gskinner/wonders/MainActivity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.gskinner.flutter.wonders - -import android.os.Bundle -import com.google.android.gms.maps.MapsInitializer -import com.google.android.gms.maps.OnMapsSdkInitializedCallback -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity(), OnMapsSdkInitializedCallback { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - MapsInitializer.initialize(applicationContext, MapsInitializer.Renderer.LATEST, this) - } - - override fun onMapsSdkInitialized(p0: MapsInitializer.Renderer) {} -} diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index 28393795..a4c49085 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -1,10 +1,10 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=C:\_dev\sdks\flutter -FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app +FLUTTER_ROOT=/Users/shawn/Dev/flutter +FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=1.9.7 -FLUTTER_BUILD_NUMBER=1.9.7 +FLUTTER_BUILD_NAME=2.0.3 +FLUTTER_BUILD_NUMBER=2.0.3 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh index c6874b00..bc10aa9a 100755 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -1,11 +1,11 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=C:\_dev\sdks\flutter" -export "FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app" +export "FLUTTER_ROOT=/Users/shawn/Dev/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/shawn/Dev/gskinner/flutter-wonders-app" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" -export "FLUTTER_BUILD_NAME=1.9.7" -export "FLUTTER_BUILD_NUMBER=1.9.7" +export "FLUTTER_BUILD_NAME=2.0.3" +export "FLUTTER_BUILD_NUMBER=2.0.3" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" From d838149bfc57587aca27eca1447511620e70b38f Mon Sep 17 00:00:00 2001 From: Shawn Date: Fri, 16 Dec 2022 17:02:30 -0700 Subject: [PATCH 09/10] Update release notes --- pubspec.lock | 8 ++++---- release_notes.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 7348aa21..808dbd67 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1149,10 +1149,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.1.1" sync_http: dependency: transitive description: @@ -1173,10 +1173,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: c9aba3b3dbfe8878845dfab5fa096eb8de7b62231baeeb1cea8e3ee81ca8c6d8 url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.4.15" timing: dependency: transitive description: diff --git a/release_notes.txt b/release_notes.txt index 12917140..87a0dc5e 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,5 +1,5 @@ # 2.0.3 -- Add support for widescreen tablet devices +- Add support for landscape tablet devices - Various improvements / polish - Add privacy policy link - Fix for rendering issues on Timeline / Editorial From 6fe234f4c7fe5253f42c9168036a16fad6d28134 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sat, 17 Dec 2022 15:11:54 -0700 Subject: [PATCH 10/10] Update supported landscape devices, fix RTE error on MachuPicchu and ultra-wide monitors. --- android/app/src/main/AndroidManifest.xml | 2 +- lib/logic/app_logic.dart | 3 ++- .../wonder_details/wonder_details_tab_menu.dart | 3 +-- .../common/illustration_piece.dart | 2 +- pubspec.lock | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 18c08c91..0cdefbdc 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,9 +12,9 @@