Merge pull request #66 from appunite/fix/android-build

fix: prepare for iOS release
appunite · Jul 25, 2024 · e5f8a1b · e5f8a1b
2 parents b5c709b + 7c972d2
commit e5f8a1b
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 66 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -79,4 +79,5 @@ flutter {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-pay:16.0.3'
+    implementation 'com.android.support:multidex:1.0.3'
 }
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -475,6 +475,8 @@
 				DEVELOPMENT_TEAM = WWNLSUFXTJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "Better World - Save the Planet";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.educational-games";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -655,6 +657,8 @@
 				DEVELOPMENT_TEAM = WWNLSUFXTJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "Better World - Save the Planet";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.educational-games";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -679,6 +683,8 @@
 				DEVELOPMENT_TEAM = WWNLSUFXTJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "Better World - Save the Planet";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.educational-games";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -34,18 +34,12 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+	<key>UIRequiresFullScreen</key>
+	<false/>
 	<key>UIStatusBarHidden</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>

diff --git a/lib/connectivity/connectivity_controller.dart b/lib/connectivity/connectivity_controller.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,5 +1,3 @@
-import 'package:better_world/connectivity/connectivity_controller.dart';
-import 'package:better_world/connectivity/no_connection_screen.dart';
 import 'package:better_world/player_progress/persistence/database_persistence.dart';
 import 'package:better_world/player_progress/persistence/firebase_persistence.dart';
 import 'package:better_world/player_progress/persistence/local_player_persistence.dart';
@@ -75,9 +73,6 @@ class BetterWorldGame extends StatelessWidget {
               localStorage: localPlayerPersistence,
             ),
           ),
-          ChangeNotifierProvider(
-            create: (context) => ConnectivityController(),
-          ),
           Provider(create: (_) => SettingsController()),
           ProxyProvider2<SettingsController, AppLifecycleStateNotifier, AudioController>(
             // Ensures that music starts immediately.
@@ -99,14 +94,6 @@ class BetterWorldGame extends StatelessWidget {
               routeInformationProvider: router.routeInformationProvider,
               routeInformationParser: router.routeInformationParser,
               routerDelegate: router.routerDelegate,
-              builder: (context, child) {
-                final connectivityController = context.watch<ConnectivityController>();
-                if (connectivityController.isConnected) {
-                  return child!;
-                } else {
-                  return const NoConnectionScreen();
-                }
-              },
               scrollBehavior: const MaterialScrollBehavior().copyWith(
                 dragDevices: {
                   PointerDeviceKind.mouse,

diff --git a/lib/main_map/map_animation.dart b/lib/main_map/map_animation.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:better_world/audio/audio_controller.dart';
 import 'package:better_world/audio/sounds.dart';
 import 'package:better_world/challenges/lights_out_challenge/lights_out_challenge_screen.dart';
@@ -11,7 +9,6 @@ import 'package:better_world/challenges/trees_challenge/trees_challenge_screen.d
 import 'package:better_world/common/asset_paths.dart';
 import 'package:better_world/player_progress/entities/challenges_entity.dart';
 import 'package:better_world/player_progress/player_progress_controller.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
@@ -149,7 +146,7 @@ class _MapAnimationState extends State<MapAnimation> {
   Widget build(BuildContext context) {
     return RiveAnimation.asset(
       AssetPaths.mapAnimation,
-      fit: kIsWeb || Platform.isMacOS ? BoxFit.contain : BoxFit.cover,
+      fit: BoxFit.contain,
       artboard: 'map',
       onInit: _onInit,
     );

diff --git a/lib/style/const_values.dart b/lib/style/const_values.dart
@@ -1,15 +1,12 @@
-import 'dart:io';
-
 import 'package:better_world/common/asset_paths.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 final BorderRadius borderRadius12 = BorderRadius.circular(12);
 final BorderRadius borderRadius16 = BorderRadius.circular(16);
 final BorderRadius borderRadius24 = BorderRadius.circular(24);
 final BorderRadius borderRadius32 = BorderRadius.circular(32);
 
-bool displayAdditionalPadding = kIsWeb || Platform.isMacOS || Platform.isAndroid;
+bool displayAdditionalPadding = true; // kIsWeb || Platform.isMacOS || Platform.isAndroid;
 
 const gameCompletedBadgeTitle = 'World Hero';
 const gameCompletedBadgeDescription =

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,7 +7,6 @@ import Foundation
 
 import audioplayers_darwin
 import cloud_firestore
-import connectivity_plus
 import firebase_core
 import package_info_plus
 import path_provider_foundation
@@ -19,7 +18,6 @@ import wakelock_plus
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
   FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin"))
-  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -14,7 +14,6 @@ dependencies:
   audioplayers: ^5.2.1
   cloud_firestore: ^4.17.0
   confetti: ^0.7.0
-  connecteo: 2.2.1
   cupertino_icons: ^1.0.6
   device_preview: ^1.1.0
   fake_cloud_firestore: ^2.4.9
@@ -35,7 +34,7 @@ dependencies:
   mocktail: ^1.0.3
   nes_ui: ^0.10.0
   overlay_tutorial: ^3.0.0
-  package_info_plus: ^7.0.0
+  package_info_plus: any
   pausable_timer: ^3.1.0+3
   provider: ^6.0.5
   rive: ^0.12.4

diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -8,7 +8,6 @@
 
 #include <audioplayers_windows/audioplayers_windows_plugin.h>
 #include <cloud_firestore/cloud_firestore_plugin_c_api.h>
-#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
 #include <rive_common/rive_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -18,8 +17,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin"));
   CloudFirestorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("CloudFirestorePluginCApi"));
-  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   RivePluginRegisterWithRegistrar(

diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -5,7 +5,6 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   audioplayers_windows
   cloud_firestore
-  connectivity_plus
   firebase_core
   rive_common
   url_launcher_windows