diff --git a/lib/app_db.dart b/lib/app_db.dart index 3a914962..11166485 100644 --- a/lib/app_db.dart +++ b/lib/app_db.dart @@ -29,7 +29,7 @@ class AppDb { /// Open the database static Future _open() async { - final dbFactory = platform.MyApp.getDbFactory(); + final dbFactory = platform.getDbFactory(); return dbFactory.open(dbName, version: 1, onUpgradeNeeded: (event) { final db = event.database; if (event.oldVersion < 1) { diff --git a/lib/main.dart b/lib/main.dart index 2a8065ab..8df0e6f2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,9 +8,8 @@ import 'package:kiwi/kiwi.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/metadata_task_manager.dart'; -import 'package:nc_photos/mobile/platform.dart' - if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; import 'package:nc_photos/pref.dart'; +import 'package:nc_photos/widget/my_app.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -21,7 +20,7 @@ void main() async { _initKiwi(); _initEquatable(); - runApp(platform.MyApp()); + runApp(MyApp()); } void _initLog() { diff --git a/lib/mobile/db_util.dart b/lib/mobile/db_util.dart new file mode 100644 index 00000000..806c78e8 --- /dev/null +++ b/lib/mobile/db_util.dart @@ -0,0 +1,4 @@ +import 'package:idb_sqflite/idb_sqflite.dart'; +import 'package:sqflite/sqflite.dart'; + +IdbFactory getDbFactory() => getIdbFactorySqflite(databaseFactory); diff --git a/lib/mobile/my_app.dart b/lib/mobile/my_app.dart deleted file mode 100644 index 75f9abb2..00000000 --- a/lib/mobile/my_app.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'package:idb_sqflite/idb_sqflite.dart'; -import 'package:nc_photos/widget/my_app.dart' as itf; -import 'package:sqflite/sqflite.dart'; - -class MyApp extends itf.MyApp { - static IdbFactory getDbFactory() => getIdbFactorySqflite(databaseFactory); -} diff --git a/lib/mobile/platform.dart b/lib/mobile/platform.dart index b2817d62..604bf631 100644 --- a/lib/mobile/platform.dart +++ b/lib/mobile/platform.dart @@ -1,3 +1,3 @@ +export 'db_util.dart'; export 'downloader.dart'; export 'metadata_loader.dart'; -export 'my_app.dart'; diff --git a/lib/web/db_util.dart b/lib/web/db_util.dart new file mode 100644 index 00000000..4f51c308 --- /dev/null +++ b/lib/web/db_util.dart @@ -0,0 +1,4 @@ +import 'package:idb_shim/idb_browser.dart'; +import 'package:idb_shim/idb_shim.dart'; + +IdbFactory getDbFactory() => getIdbFactory(); diff --git a/lib/web/my_app.dart b/lib/web/my_app.dart deleted file mode 100644 index de7b8728..00000000 --- a/lib/web/my_app.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'package:idb_shim/idb_browser.dart'; -import 'package:idb_shim/idb_shim.dart'; -import 'package:nc_photos/widget/my_app.dart' as itf; - -class MyApp extends itf.MyApp { - static IdbFactory getDbFactory() => getIdbFactory(); -} diff --git a/lib/web/platform.dart b/lib/web/platform.dart index b2817d62..604bf631 100644 --- a/lib/web/platform.dart +++ b/lib/web/platform.dart @@ -1,3 +1,3 @@ +export 'db_util.dart'; export 'downloader.dart'; export 'metadata_loader.dart'; -export 'my_app.dart'; diff --git a/lib/widget/my_app.dart b/lib/widget/my_app.dart index 8fbe7f3e..8b05fbdf 100644 --- a/lib/widget/my_app.dart +++ b/lib/widget/my_app.dart @@ -14,7 +14,7 @@ import 'package:nc_photos/widget/sign_in.dart'; import 'package:nc_photos/widget/splash.dart'; import 'package:nc_photos/widget/viewer.dart'; -abstract class MyApp extends StatelessWidget implements SnackBarHandler { +class MyApp extends StatelessWidget implements SnackBarHandler { MyApp() { SnackBarManager().registerHandler(this); }