From 6fe234f4c7fe5253f42c9168036a16fad6d28134 Mon Sep 17 00:00:00 2001
From: Shawn <shawn@gskinner.com>
Date: Sat, 17 Dec 2022 15:11:54 -0700
Subject: [PATCH] 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 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/lib/logic/app_logic.dart b/lib/logic/app_logic.dart
index 48900654..f3c535b1 100644
--- a/lib/logic/app_logic.dart
+++ b/lib/logic/app_logic.dart
@@ -11,7 +11,7 @@ class AppLogic {
   /// The router will use this to prevent redirects while bootstrapping.
   bool isBootstrapComplete = false;
 
-  bool get isDesktopOrTablet => PlatformInfo.isDesktopOrWeb || deviceSize.shortestSide > 500;
+  bool get isDesktopOrTablet => PlatformInfo.isDesktopOrWeb || deviceSize.shortestSide > 480;
 
   /// Support portrait and landscape on desktop, web and tablets. Stick to portrait for phones.
   /// A return value of null indicated both orientations are supported.
@@ -25,6 +25,7 @@ class AppLogic {
   /// Initialize the app and all main actors.
   /// Loads settings, sets up services etc.
   Future<void> bootstrap() async {
+    debugPrint('bootstrap app, deviceSize: $deviceSize, isTablet: $isDesktopOrTablet');
     // Default error handler
     FlutterError.onError = _handleFlutterError;
 
diff --git a/lib/ui/screens/wonder_details/wonder_details_tab_menu.dart b/lib/ui/screens/wonder_details/wonder_details_tab_menu.dart
index 08ae5636..375a86ea 100644
--- a/lib/ui/screens/wonder_details/wonder_details_tab_menu.dart
+++ b/lib/ui/screens/wonder_details/wonder_details_tab_menu.dart
@@ -120,12 +120,11 @@ class _TabBtn extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     bool selected = tabController.index == index;
-
     final MaterialLocalizations localizations = MaterialLocalizations.of(context);
     final iconImgPath = '${ImagePaths.common}/tab-$iconImg${selected ? '-active' : ''}.png';
     String tabLabel = localizations.tabLabel(tabIndex: index + 1, tabCount: tabController.length);
     tabLabel = '$label: $tabLabel';
-    final double btnWidth = (context.widthPx / 6).clamp(70, 120);
+    final double btnWidth = (context.widthPx / 6).clamp(50, 120);
     return MergeSemantics(
       child: Semantics(
         selected: selected,
diff --git a/lib/ui/wonder_illustrations/common/illustration_piece.dart b/lib/ui/wonder_illustrations/common/illustration_piece.dart
index c7ba1a01..00159175 100644
--- a/lib/ui/wonder_illustrations/common/illustration_piece.dart
+++ b/lib/ui/wonder_illustrations/common/illustration_piece.dart
@@ -87,7 +87,7 @@ class _IllustrationPieceState extends State<IllustrationPiece> {
             final config = wonderBuilder.widget.config;
             Widget img = Image.asset(imgPath, opacity: anim, fit: BoxFit.fitHeight);
             // Add overflow box so image doesn't get clipped as we translate it around
-            img = OverflowBox(maxWidth: 2000, child: img);
+            img = OverflowBox(maxWidth: 2500, child: img);
 
             final double introZoom = (widget.initialScale - 1) * (1 - curvedAnim);
 
diff --git a/pubspec.lock b/pubspec.lock
index 808dbd67..e23bd9d3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -664,10 +664,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.14"
   material_color_utilities:
     dependency: transitive
     description:
@@ -768,10 +768,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_drawing:
     dependency: transitive
     description:
@@ -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: c9282698e2982b6c3817037554e52f99d4daba493e8028f8112a83d68ccd0b12
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.15"
+    version: "0.4.17"
   timing:
     dependency: transitive
     description: