Massive dir refactoring

BhasherBEL · Jun 14, 2023 · 4accbd5 · 4accbd5
1 parent 5f3cb34
commit 4accbd5
Show file tree

Hide file tree

Showing 61 changed files with 472 additions and 486 deletions.
diff --git a/lib/model/connectors/external_connector.dart → lib/data/external_connector.dart b/lib/model/connectors/external_connector.dart → lib/data/external_connector.dart
diff --git a/lib/model/connectors/local/generic.dart → lib/data/local/generic.dart b/lib/model/connectors/local/generic.dart → lib/data/local/generic.dart
diff --git a/lib/model/connectors/local/instance.dart → lib/data/local/instance.dart b/lib/model/connectors/local/instance.dart → lib/data/local/instance.dart
@@ -1,7 +1,7 @@
 import 'package:sqflite/sqflite.dart';
 
-import '../../app_data.dart';
-import '../../instance.dart';
+import '../../models/app_data.dart';
+import '../../models/instance.dart';
 
 const String tableInstances = 'instances';
 

diff --git a/lib/model/connectors/local/item.dart → lib/data/local/item.dart b/lib/model/connectors/local/item.dart → lib/data/local/item.dart
@@ -1,9 +1,9 @@
-import 'package:splitr/model/connectors/local/generic.dart';
+import 'package:splitr/data/local/generic.dart';
 import 'package:sqflite/sqlite_api.dart';
 
-import '../../app_data.dart';
-import '../../item.dart';
-import '../../item_part.dart';
+import '../../models/app_data.dart';
+import '../../models/item.dart';
+import '../../models/item_part.dart';
 import 'item_part.dart';
 
 const String tableItems = 'items';

diff --git a/lib/model/connectors/local/item_part.dart → lib/data/local/item_part.dart b/lib/model/connectors/local/item_part.dart → lib/data/local/item_part.dart
@@ -1,8 +1,8 @@
-import 'package:splitr/model/connectors/local/generic.dart';
+import 'package:splitr/data/local/generic.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../../app_data.dart';
-import '../../item_part.dart';
+import '../../models/app_data.dart';
+import '../../models/item_part.dart';
 
 const String tableItemParts = 'itemParts';
 

diff --git a/lib/model/connectors/local/participant.dart → lib/data/local/participant.dart b/lib/model/connectors/local/participant.dart → lib/data/local/participant.dart
@@ -1,8 +1,8 @@
-import 'package:splitr/model/connectors/local/generic.dart';
+import 'package:splitr/data/local/generic.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../../app_data.dart';
-import '../../participant.dart';
+import '../../models/app_data.dart';
+import '../../models/participant.dart';
 
 const String tableParticipants = 'participants';
 

diff --git a/lib/model/connectors/local/project.dart → lib/data/local/project.dart b/lib/model/connectors/local/project.dart → lib/data/local/project.dart
@@ -1,10 +1,10 @@
-import 'package:splitr/model/connectors/local/generic.dart';
+import 'package:splitr/data/local/generic.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../../app_data.dart';
-import '../../item.dart';
-import '../../participant.dart';
-import '../../project.dart';
+import '../../models/app_data.dart';
+import '../../models/item.dart';
+import '../../models/participant.dart';
+import '../../models/project.dart';
 import 'item.dart';
 import 'participant.dart';
 

diff --git a/lib/model/connectors/local/provider.dart → lib/data/local/provider.dart b/lib/model/connectors/local/provider.dart → lib/data/local/provider.dart
@@ -1,5 +1,5 @@
-import '../../instance.dart';
-import '../../project.dart';
+import '../../models/instance.dart';
+import '../../models/project.dart';
 import '../provider.dart';
 
 class LocalProvider extends Provider {

diff --git a/lib/model/connectors/pocketbase/item.dart → lib/data/pocketbase/item.dart b/lib/model/connectors/pocketbase/item.dart → lib/data/pocketbase/item.dart
@@ -1,12 +1,12 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:splitr/model/participant.dart';
-import 'package:splitr/utils/extenders/datetime.dart';
-import 'package:splitr/utils/extenders/collections.dart';
-import 'package:splitr/utils/extenders/pocketbase.dart';
+import 'package:splitr/models/participant.dart';
+import 'package:splitr/utils/ext/datetime.dart';
+import 'package:splitr/utils/ext/list.dart';
+import 'package:splitr/utils/ext/record_service.dart';
 import 'package:tuple/tuple.dart';
 
-import '../../item.dart';
-import '../../project.dart';
+import '../../models/item.dart';
+import '../../models/project.dart';
 import 'item_part.dart';
 
 class PocketBaseItemsFields {

diff --git a/...odel/connectors/pocketbase/item_part.dart → lib/data/pocketbase/item_part.dart b/...odel/connectors/pocketbase/item_part.dart → lib/data/pocketbase/item_part.dart
@@ -1,13 +1,12 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:splitr/utils/extenders/datetime.dart';
-import 'package:splitr/utils/extenders/collections.dart';
-import 'package:splitr/utils/extenders/pocketbase.dart';
+import 'package:splitr/utils/ext/datetime.dart';
+import 'package:splitr/utils/ext/record_model.dart';
+import 'package:splitr/utils/ext/record_service.dart';
 import 'package:tuple/tuple.dart';
 
-import '../../item.dart';
-import '../../item_part.dart';
-import '../../participant.dart';
-import '../../project.dart';
+import '../../models/item.dart';
+import '../../models/item_part.dart';
+import '../../models/participant.dart';
 
 class PocketBaseItemPartsFields {
   static const String id = "id";

diff --git a/...el/connectors/pocketbase/participant.dart → lib/data/pocketbase/participant.dart b/...el/connectors/pocketbase/participant.dart → lib/data/pocketbase/participant.dart
@@ -1,11 +1,11 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:splitr/utils/extenders/datetime.dart';
-import 'package:splitr/utils/extenders/collections.dart';
-import 'package:splitr/utils/extenders/pocketbase.dart';
+import 'package:splitr/utils/ext/datetime.dart';
+import 'package:splitr/utils/ext/list.dart';
+import 'package:splitr/utils/ext/record_service.dart';
 import 'package:tuple/tuple.dart';
 
-import '../../participant.dart';
-import '../../project.dart';
+import '../../models/participant.dart';
+import '../../models/project.dart';
 
 class PocketBaseParticipantFields {
   static const String id = "id";

diff --git a/lib/model/connectors/pocketbase/project.dart → lib/data/pocketbase/project.dart b/lib/model/connectors/pocketbase/project.dart → lib/data/pocketbase/project.dart
@@ -1,8 +1,8 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:splitr/utils/extenders/datetime.dart';
-import 'package:splitr/utils/extenders/pocketbase.dart';
+import 'package:splitr/utils/ext/datetime.dart';
+import 'package:splitr/utils/ext/record_service.dart';
 
-import '../../project.dart';
+import '../../models/project.dart';
 
 class PocketBaseProjectFields {
   static const String name = "name";

diff --git a/...model/connectors/pocketbase/provider.dart → lib/data/pocketbase/provider.dart b/...model/connectors/pocketbase/provider.dart → lib/data/pocketbase/provider.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:pocketbase/pocketbase.dart';
 
-import '../../instance.dart';
-import '../../item.dart';
-import '../../item_part.dart';
-import '../../project.dart';
+import '../../models/instance.dart';
+import '../../models/item.dart';
+import '../../models/item_part.dart';
+import '../../models/project.dart';
 import '../provider.dart';
 import 'item.dart';
 import 'item_part.dart';

diff --git a/lib/model/connectors/provider.dart → lib/data/provider.dart b/lib/model/connectors/provider.dart → lib/data/provider.dart
@@ -1,5 +1,5 @@
-import '../instance.dart';
-import '../project.dart';
+import '../models/instance.dart';
+import '../models/project.dart';
 import 'local/provider.dart';
 import 'pocketbase/provider.dart';
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,10 @@
+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'model/app_data.dart';
-import 'screens/main_screen.dart';
-import 'screens/setup_screen.dart';
-import 'screens/splash_screen.dart';
+import 'screens/project/project_page.dart';
+import 'screens/projects_list/projects_list_page.dart';
+import 'models/app_data.dart';
+import 'screens/project/new_project.dart';
+import 'utils/helper/theme.dart';
 
 void main() async {
   runApp(const SplashScreen());
@@ -13,3 +15,58 @@ void main() async {
     runApp(const MainScreen());
   }
 }
+
+class SplashScreen extends StatelessWidget {
+  const SplashScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
+      return MaterialApp(
+        theme: defaultTheme,
+        darkTheme: defaultDarkTheme,
+        home: const Scaffold(
+          body: Center(
+            child: Text("Starting up Splitr ..."),
+          ),
+        ),
+      );
+    });
+  }
+}
+
+class MainScreen extends StatelessWidget {
+  const MainScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
+      return MaterialApp(
+        title: 'Splitr',
+        theme: defaultTheme,
+        darkTheme: defaultDarkTheme,
+        themeMode: ThemeMode.system,
+        home: AppData.current == null
+            ? const ProjectsListPage()
+            : ProjectPage(AppData.current!),
+      );
+    });
+  }
+}
+
+class SetupScreen extends StatelessWidget {
+  const SetupScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
+      return MaterialApp(
+        title: 'Splitr',
+        theme: defaultTheme,
+        darkTheme: defaultDarkTheme,
+        themeMode: ThemeMode.system,
+        home: NewProjectScreen(first: true),
+      );
+    });
+  }
+}
diff --git a/lib/model/app_data.dart → lib/models/app_data.dart b/lib/model/app_data.dart → lib/models/app_data.dart
@@ -2,13 +2,13 @@ import 'package:app_links/app_links.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:splitr/model/connectors/local/project.dart';
-import 'package:splitr/utils/extenders/collections.dart';
+import 'package:splitr/data/local/project.dart';
+import 'package:splitr/utils/ext/set.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../db/splitr_database.dart';
-import '../screens/main_screen.dart';
-import '../screens/new_project_screen.dart';
+import '../screens/project/new_project.dart';
+import '../services/database.dart';
+import '../utils/helper/theme.dart';
 import 'instance.dart';
 import 'project.dart';
 

diff --git a/lib/model/bill_data.dart → lib/models/bill_data.dart b/lib/model/bill_data.dart → lib/models/bill_data.dart
@@ -1,4 +1,4 @@
-import 'package:splitr/utils/extenders/collections.dart';
+import 'package:splitr/utils/ext/list.dart';
 
 import 'item_part.dart';
 import 'participant.dart';

diff --git a/lib/model/data.dart → lib/models/data.dart b/lib/model/data.dart → lib/models/data.dart
@@ -1,4 +1,4 @@
-import 'package:splitr/model/connectors/local/generic.dart';
+import 'package:splitr/data/local/generic.dart';
 
 abstract class Data {
   Data({

diff --git a/lib/model/instance.dart → lib/models/instance.dart b/lib/model/instance.dart → lib/models/instance.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'app_data.dart';
-import 'connectors/local/instance.dart';
+import '../data/local/instance.dart';
 
 class InstanceFields {
   static const values = [

diff --git a/lib/model/item.dart → lib/models/item.dart b/lib/model/item.dart → lib/models/item.dart
@@ -1,11 +1,11 @@
-import 'package:splitr/model/data.dart';
-import 'package:splitr/utils/extenders/collections.dart';
+import 'package:splitr/models/data.dart';
+import 'package:splitr/utils/ext/list.dart';
 
 import 'item_part.dart';
 import 'participant.dart';
 import 'project.dart';
 
-import 'connectors/local/item.dart';
+import '../data/local/item.dart';
 
 class ItemFields {
   static const values = [

diff --git a/lib/model/item_part.dart → lib/models/item_part.dart b/lib/model/item_part.dart → lib/models/item_part.dart
@@ -2,7 +2,7 @@ import 'data.dart';
 import 'participant.dart';
 import 'item.dart';
 
-import 'connectors/local/item_part.dart';
+import '../data/local/item_part.dart';
 
 class ItemPartFields {
   static const values = [

diff --git a/lib/model/participant.dart → lib/models/participant.dart b/lib/model/participant.dart → lib/models/participant.dart
@@ -1,6 +1,6 @@
-import 'package:splitr/model/data.dart';
+import 'package:splitr/models/data.dart';
 
-import 'connectors/local/participant.dart';
+import '../data/local/participant.dart';
 import 'project.dart';
 
 class ParticipantFields {

diff --git a/lib/model/project.dart → lib/models/project.dart b/lib/model/project.dart → lib/models/project.dart
@@ -1,11 +1,11 @@
-import 'package:splitr/model/data.dart';
-import 'package:splitr/utils/extenders/collections.dart';
+import 'package:splitr/models/data.dart';
+import 'package:splitr/utils/ext/set.dart';
 import 'package:tuple/tuple.dart';
 
-import '../screens/new_project_screen.dart';
+import '../utils/helper/random.dart';
 import 'app_data.dart';
-import 'connectors/local/project.dart';
-import 'connectors/provider.dart';
+import '../data/local/project.dart';
+import '../data/provider.dart';
 import 'instance.dart';
 import 'item.dart';
 import 'item_part.dart';

diff --git a/lib/model/project_data.dart → lib/models/project_data.dart b/lib/model/project_data.dart → lib/models/project_data.dart
diff --git a/...onents/pages/instances/instance_tile.dart → lib/screens/instances/instance_tile.dart b/...onents/pages/instances/instance_tile.dart → lib/screens/instances/instance_tile.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:splitr/model/connectors/local/instance.dart';
+import 'package:splitr/data/local/instance.dart';
 
-import '../../../model/app_data.dart';
-import '../../../model/instance.dart';
-import '../../../utils/dialogs/confirm_box.dart';
-import '../../../utils/navigator/navigator.dart';
+import '../../models/app_data.dart';
+import '../../models/instance.dart';
+import '../../utils/helper/confirm_box.dart';
+import '../../utils/helper/navigator.dart';
 import '../new_instance/new_instance_page.dart';
 
 class InstanceTile extends StatefulWidget {

diff --git a/.../pages/instances/instances_list_page.dart → ...creens/instances/instances_list_page.dart b/.../pages/instances/instances_list_page.dart → ...creens/instances/instances_list_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import '../../../model/app_data.dart';
-import '../../../model/instance.dart';
-import '../../../utils/navigator/navigator.dart';
+import '../../models/app_data.dart';
+import '../../models/instance.dart';
+import '../../utils/helper/navigator.dart';
 import '../new_instance/new_instance_page.dart';
 import 'instance_tile.dart';