Merge pull request #36 from wednesday-solutions/support_for_web

Adding support for web
wednesday-solutions · Oct 28, 2022 · 48fbff2 · 48fbff2
2 parents c592de6 + 1c5a641
commit 48fbff2
Show file tree

Hide file tree

Showing 26 changed files with 381 additions and 166 deletions.
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/lib/app.dart b/lib/app.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
@@ -42,7 +43,7 @@ Future _initialiseApp() async {
 
   EasyLocalization.logger.printer = customEasyLogger;
 
-  if (Platform.isAndroid) {
+  if (!kIsWeb && Platform.isAndroid) {
     try {
       FlutterDisplayMode.setHighRefreshRate();
     } on PlatformException catch (exception) {
@@ -67,4 +68,4 @@ void _initialiseGetIt() {
     ..interactorModule()
     ..presentationModule()
     ..navigationModule();
-}
+}
diff --git a/lib/domain/entity/base/datetime/date.dart b/lib/domain/entity/base/datetime/date.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'date.freezed.dart';

diff --git a/lib/domain/entity/base/datetime/date_time.dart b/lib/domain/entity/base/datetime/date_time.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'date_time.freezed.dart';

diff --git a/lib/domain/entity/base/datetime/time.dart b/lib/domain/entity/base/datetime/time.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'time.freezed.dart';

diff --git a/lib/domain/entity/base/result/result.dart b/lib/domain/entity/base/result/result.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'result.freezed.dart';

diff --git a/lib/presentation/destinations/weather/home/home_screen_intent.dart b/lib/presentation/destinations/weather/home/home_screen_intent.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_template/presentation/entity/intent/intent.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 

diff --git a/lib/presentation/destinations/weather/home/home_screen_state.dart b/lib/presentation/destinations/weather/home/home_screen_state.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_template/presentation/entity/base/ui_list_item.dart';
 import 'package:flutter_template/presentation/entity/base/ui_toolbar.dart';
 import 'package:flutter_template/presentation/entity/screen/screen_state.dart';

diff --git a/lib/presentation/entity/base/ui_result.dart b/lib/presentation/entity/base/ui_result.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'ui_result.freezed.dart';

diff --git a/lib/presentation/entity/effect/effect.dart b/lib/presentation/entity/effect/effect.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 

diff --git a/lib/presentation/entity/weather/ui_day_weather_heading.dart b/lib/presentation/entity/weather/ui_day_weather_heading.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_template/presentation/entity/base/ui_list_item.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 

diff --git a/lib/presentation/entity/weather/ui_weather.dart b/lib/presentation/entity/weather/ui_weather.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_template/presentation/entity/base/ui_list_item.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 

diff --git a/lib/services/base/database/app_database.dart b/lib/services/base/database/app_database.dart
@@ -1,23 +1,18 @@
-import 'dart:io';
-
 import 'package:drift/drift.dart';
-import 'package:drift/native.dart';
-import 'package:flutter_template/flavors/flavor_config.dart';
 import 'package:flutter_template/services/base/database/migrations.dart';
 import 'package:flutter_template/services/entity/open_weather/current_weather/local/local_current_weather.dart';
 import 'package:flutter_template/services/entity/open_weather/geo_coding/local/local_location.dart';
 import 'package:flutter_template/services/weather/local/weather_local_service_impl.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
+export 'connection/connection.dart';
 
 part 'app_database.g.dart';
 
 @DriftDatabase(
   tables: [LocalLocation, LocalCurrentWeather],
-  daos: [WeatherLocalServiceImpl],
+  daos: [WeatherLocalServiceImpl]
 )
 class AppDatabase extends _$AppDatabase {
-  AppDatabase() : super(_openConnection());
+  AppDatabase(QueryExecutor e) : super(e);
 
   @override
   int get schemaVersion => 1;
@@ -26,13 +21,3 @@ class AppDatabase extends _$AppDatabase {
   MigrationStrategy get migration => migrations();
 }
 
-LazyDatabase _openConnection() {
-  return LazyDatabase(() async {
-    final dbFolder = await getApplicationDocumentsDirectory();
-    final file = File(p.join(dbFolder.path, 'template_app_db.sqlite'));
-    return NativeDatabase(
-      file,
-      logStatements: FlavorConfig.instance.values.logSqlStatements,
-    );
-  });
-}
diff --git a/lib/services/base/database/connection/connection.dart b/lib/services/base/database/connection/connection.dart
@@ -0,0 +1,3 @@
+export 'unsupported.dart'
+  if (dart.library.js) 'web.dart'
+  if (dart.library.ffi) 'mobile.dart';
diff --git a/lib/services/base/database/connection/mobile.dart b/lib/services/base/database/connection/mobile.dart
@@ -0,0 +1,20 @@
+import 'dart:io';
+import 'package:drift/drift.dart';
+import 'package:flutter_template/flavors/flavor_config.dart';
+import 'package:flutter_template/services/base/database/app_database.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:drift/native.dart';
+import 'package:path/path.dart' as p;
+
+AppDatabase connect() {
+  final db = LazyDatabase(() async {
+    final dbFolder = await getApplicationDocumentsDirectory();
+    final file = File(p.join(dbFolder.path, 'template_app_db.sqlite'));
+    return NativeDatabase(
+      file,
+      logStatements: FlavorConfig.instance.values.logSqlStatements,
+    );
+  });
+
+  return AppDatabase(db);
+}
diff --git a/lib/services/base/database/connection/unsupported.dart b/lib/services/base/database/connection/unsupported.dart
@@ -0,0 +1,6 @@
+import 'package:flutter_template/services/base/database/app_database.dart';
+
+AppDatabase connect() {
+  throw UnsupportedError(
+      'No suitable database implementation was found on this platform.');
+}
diff --git a/lib/services/base/database/connection/web.dart b/lib/services/base/database/connection/web.dart
@@ -0,0 +1,7 @@
+
+import 'package:drift/web.dart';
+import 'package:flutter_template/services/base/database/app_database.dart';
+
+AppDatabase connect() {
+  return AppDatabase(WebDatabase('db'));
+}
diff --git a/lib/services/di/service_module.dart b/lib/services/di/service_module.dart
@@ -26,7 +26,7 @@ extension ServiceModule on GetIt {
     );
 
     // Drift
-    registerLazySingleton<AppDatabase>(() => AppDatabase());
+    registerLazySingleton<AppDatabase>(() => connect());
 
     // Shared Preferences
     registerLazySingleton<PreferencesService>(() => PreferencesServiceImpl(