update migration

ios/Runner.xcodeproj/project.pbxproj

@@ -546,4 +546,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

lib/bottom_nav_bar.dart

@@ -1,5 +1,5 @@
 import 'package:doxbox/providers/navBarProvider.dart';
-import 'package:doxbox/utilities/colors.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:doxbox/views/migrate/settings_screen.dart';
 import 'package:doxbox/views/upload/upload_screen.dart';
 

lib/components/documentCard.dart

@@ -2,8 +2,7 @@ import 'package:clipboard/clipboard.dart';
 import 'package:doxbox/models/document.dart';
 import 'package:doxbox/services/database.dart';
 import 'package:doxbox/utilities/assets.dart';
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 

lib/components/textField.dart

@@ -1,5 +1,4 @@
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 
 class CustomTextField extends StatelessWidget {

lib/main.dart

@@ -5,8 +5,7 @@ import 'package:doxbox/config/multi_provider.dart';
 import 'package:doxbox/config/size_config.dart';
 import 'package:doxbox/models/detail.dart';
 import 'package:doxbox/models/document.dart';
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
@@ -51,23 +50,20 @@ class _MyAppState extends State<MyApp> {
         ),
         builder: (BuildContext context, AsyncSnapshot snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            if (snapshot.hasError)
+            if (snapshot.hasError) {
               return const Center(
                 child: Text('Something Went Wrong'),
               );
-            else
+            } else {
               return const BottomNavBarScreen();
+            }
           }
 
           return MaterialApp(
             debugShowCheckedModeBanner: false,
             home: Scaffold(
-              body: Center(
-                child: Text(
-                  'Loading...',
-                  style: TextStyles.t32.apply(color: Colors.white),
-                ),
-              ),
+              body: const Center(
+                  child: CircularProgressIndicator(color: Colors.white)),
               backgroundColor: Nord.bg,
             ),
           );

lib/providers/fieldsProvider.dart

@@ -1,5 +1,3 @@
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 
@@ -26,6 +24,8 @@ class FieldsProvider extends ChangeNotifier {
 
     controllers.add([nameDetailController, contentDetailController]);
     detailFields.add(detailField);
+    print('hi');
+    print(detailFields.length);
     notifyListeners();
   }
 
@@ -39,7 +39,7 @@ class FieldsProvider extends ChangeNotifier {
       details: [],
       isFavorite: false,
     );
-    for (int i = 0; i < detailFields.length - 3; ++i) {
+    for (int i = 0; i < detailFields.length; ++i) {
       newDocument.details.add(Detail(
           name: controllers[i][0].text, content: controllers[i][1].text));
     }

lib/services/migrate.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:doxbox/models/detail.dart';
 import 'package:doxbox/models/document.dart';
 import 'package:doxbox/services/csv.dart';
+import 'package:doxbox/services/database.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -68,7 +69,10 @@ class Migrate {
 
   static void generateCSV() async {
     var fileName = DateTime.now().day.toString() +
+        DateTime.now().month.toString() +
+        DateTime.now().year.toString() +
         DateTime.now().hour.toString() +
+        DateTime.now().minute.toString() +
         DateTime.now().second.toString();
 
     var res = await exportFile(CSV.generate(), "$fileName.csv");
@@ -85,17 +89,20 @@ class Migrate {
 
     var _listData = await CSV.parse(file);
 
-    for (var i = 1; i <= _listData.length; i++) {
+    print(_listData.length);
+
+    for (var i = 1; i < _listData.length; i++) {
       List<dynamic> doc = _listData[i];
       var title = doc[1];
-      var isFavorite = doc[2] == 'false' ? false : true;
-      Detail primaryDetail = Detail(name: doc[3], content: doc[4]);
+      var isFavorite = (doc[2] == 'FALSE' || doc[2] == 'false') ? false : true;
+
+      Detail primaryDetail =
+          Detail(name: doc[3].toString(), content: doc[4].toString());
       List<Detail> details = [];
-      print(doc.length);
       if (doc.length > 4) {
         for (int j = 5; j < doc.length - 1; j += 2) {
-          print(j);
-          Detail anotherDetail = Detail(name: doc[j], content: doc[j + 1]);
+          Detail anotherDetail =
+              Detail(name: doc[j].toString(), content: doc[j + 1].toString());
           details.add(anotherDetail);
         }
       }
@@ -106,8 +113,7 @@ class Migrate {
         primaryDetail: primaryDetail,
         details: details,
       );
-
-      // AppDatabase.addDocument(document);
+      AppDatabase.addDocument(document);
     }
   }
 }

lib/utilities/styles.dart

@@ -1,5 +1,5 @@
 import 'package:doxbox/config/size_config.dart';
-import 'package:doxbox/utilities/colors.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 
 class Converts {

lib/views/details/details_screen.dart

@@ -3,8 +3,7 @@ import 'package:doxbox/models/detail.dart';
 import 'package:doxbox/models/document.dart';
 import 'package:doxbox/services/database.dart';
 import 'package:doxbox/utilities/assets.dart';
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
@@ -77,34 +76,32 @@ class DetailWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return Padding(
       padding: EdgeInsets.symmetric(vertical: Converts.c12),
-      child: Container(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(detail.name, style: TextStyles.t12),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(detail.content, style: TextStyles.t20),
-                IconButton(
-                  onPressed: () {
-                    FlutterClipboard.copy(detail.content).then(
-                      (value) => Fluttertoast.showToast(
-                          msg: "Copied to Clipboard",
-                          toastLength: Toast.LENGTH_LONG,
-                          gravity: ToastGravity.BOTTOM,
-                          timeInSecForIosWeb: 1,
-                          backgroundColor: Nord.nord1,
-                          textColor: Colors.white,
-                          fontSize: 16.0),
-                    );
-                  },
-                  icon: AppAssets.copy,
-                ),
-              ],
-            ),
-          ],
-        ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(detail.name, style: TextStyles.t12),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(detail.content, style: TextStyles.t20),
+              IconButton(
+                onPressed: () {
+                  FlutterClipboard.copy(detail.content).then(
+                    (value) => Fluttertoast.showToast(
+                        msg: "Copied to Clipboard",
+                        toastLength: Toast.LENGTH_LONG,
+                        gravity: ToastGravity.BOTTOM,
+                        timeInSecForIosWeb: 1,
+                        backgroundColor: Nord.nord1,
+                        textColor: Colors.white,
+                        fontSize: 16.0),
+                  );
+                },
+                icon: AppAssets.copy,
+              ),
+            ],
+          ),
+        ],
       ),
     );
   }

lib/views/home/empty_screen.dart

@@ -1,4 +1,4 @@
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 

lib/views/home/home_screen.dart

@@ -1,8 +1,7 @@
 import 'package:doxbox/components/documentCard.dart';
 import 'package:doxbox/services/database.dart';
 import 'package:doxbox/utilities/assets.dart';
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
+import 'package:doxbox/utilities/theme.dart';
 import 'package:doxbox/views/details/details_screen.dart';
 import 'package:doxbox/views/home/empty_screen.dart';
 import 'package:flutter/material.dart';

lib/views/migrate/export_data.dart

@@ -55,14 +55,14 @@ class ExportDataScreen extends StatelessWidget {
                       fontSize: 16.0);
                   Navigator.of(context).pop();
                 },
-                child: Text(
-                  'SAVE',
-                  style: TextStyles.t20.apply(color: Colors.white),
-                ),
                 style: ElevatedButton.styleFrom(
                   primary: Nord.orange,
                   minimumSize: Size.fromHeight(Converts.c48),
                 ),
+                child: Text(
+                  'SAVE',
+                  style: TextStyles.t20.apply(color: Colors.white),
+                ),
               ),
             ),
           ],

lib/views/migrate/import_data.dart

@@ -55,14 +55,14 @@ class ImportDataScreen extends StatelessWidget {
                       fontSize: 16.0);
                   Navigator.of(context).pop();
                 },
-                child: Text(
-                  'SAVE',
-                  style: TextStyles.t20.apply(color: Colors.white),
-                ),
                 style: ElevatedButton.styleFrom(
                   primary: Nord.orange,
                   minimumSize: Size.fromHeight(Converts.c48),
                 ),
+                child: Text(
+                  'SAVE',
+                  style: TextStyles.t20.apply(color: Colors.white),
+                ),
               ),
             ),
           ],