resolve merge conflicts

saiankit · Sep 21, 2022 · c858d1d · c858d1d
1 parent ae715a0
commit c858d1d
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 199 deletions.
diff --git a/lib/bottom_nav_bar.dart b/lib/bottom_nav_bar.dart
@@ -1,9 +1,5 @@
 import 'package:doxbox/providers/navBarProvider.dart';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:doxbox/views/migrate/settings_screen.dart';
 import 'package:doxbox/views/upload/upload_screen.dart';
 

diff --git a/lib/components/documentCard.dart b/lib/components/documentCard.dart
@@ -2,12 +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';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -5,12 +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';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
@@ -55,22 +50,13 @@ class _MyAppState extends State<MyApp> {
         ),
         builder: (BuildContext context, AsyncSnapshot snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-<<<<<<< HEAD
             if (snapshot.hasError) {
               return const Center(
                 child: Text('Something Went Wrong'),
               );
             } else {
               return const BottomNavBarScreen();
             }
-=======
-            if (snapshot.hasError)
-              return const Center(
-                child: Text('Something Went Wrong'),
-              );
-            else
-              return const BottomNavBarScreen();
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
           }
 
           return MaterialApp(

diff --git a/lib/providers/fieldsProvider.dart b/lib/providers/fieldsProvider.dart
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 
@@ -29,8 +24,6 @@ class FieldsProvider extends ChangeNotifier {
 
     controllers.add([nameDetailController, contentDetailController]);
     detailFields.add(detailField);
-    print('hi');
-    print(detailFields.length);
     notifyListeners();
   }
 
@@ -44,7 +37,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));
     }

diff --git a/lib/services/migrate.dart b/lib/services/migrate.dart
@@ -2,10 +2,7 @@ import 'dart:io';
 import 'package:doxbox/models/detail.dart';
 import 'package:doxbox/models/document.dart';
 import 'package:doxbox/services/csv.dart';
-<<<<<<< HEAD
 import 'package:doxbox/services/database.dart';
-=======
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:file_picker/file_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -72,14 +69,10 @@ class Migrate {
 
   static void generateCSV() async {
     var fileName = DateTime.now().day.toString() +
-<<<<<<< HEAD
         DateTime.now().month.toString() +
         DateTime.now().year.toString() +
         DateTime.now().hour.toString() +
         DateTime.now().minute.toString() +
-=======
-        DateTime.now().hour.toString() +
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
         DateTime.now().second.toString();
 
     var res = await exportFile(CSV.generate(), "$fileName.csv");
@@ -96,7 +89,6 @@ class Migrate {
 
     var _listData = await CSV.parse(file);
 
-<<<<<<< HEAD
     print(_listData.length);
 
     for (var i = 1; i < _listData.length; i++) {
@@ -111,19 +103,6 @@ class Migrate {
         for (int j = 5; j < doc.length - 1; j += 2) {
           Detail anotherDetail =
               Detail(name: doc[j].toString(), content: doc[j + 1].toString());
-=======
-    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]);
-      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]);
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
           details.add(anotherDetail);
         }
       }
@@ -134,12 +113,7 @@ class Migrate {
         primaryDetail: primaryDetail,
         details: details,
       );
-<<<<<<< HEAD
       AppDatabase.addDocument(document);
-=======
-
-      // AppDatabase.addDocument(document);
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
     }
   }
 }
diff --git a/lib/views/details/details_screen.dart b/lib/views/details/details_screen.dart
@@ -3,12 +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';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
@@ -81,7 +76,6 @@ class DetailWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return Padding(
       padding: EdgeInsets.symmetric(vertical: Converts.c12),
-<<<<<<< HEAD
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -108,36 +102,6 @@ class DetailWidget extends StatelessWidget {
             ],
           ),
         ],
-=======
-      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,
-                ),
-              ],
-            ),
-          ],
-        ),
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
       ),
     );
   }

diff --git a/lib/views/home/empty_screen.dart b/lib/views/home/empty_screen.dart
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 

diff --git a/lib/views/home/home_screen.dart b/lib/views/home/home_screen.dart
@@ -1,12 +1,7 @@
 import 'package:doxbox/components/documentCard.dart';
 import 'package:doxbox/services/database.dart';
 import 'package:doxbox/utilities/assets.dart';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:doxbox/views/details/details_screen.dart';
 import 'package:doxbox/views/home/empty_screen.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/views/migrate/export_data.dart b/lib/views/migrate/export_data.dart
@@ -55,24 +55,14 @@ class ExportDataScreen extends StatelessWidget {
                       fontSize: 16.0);
                   Navigator.of(context).pop();
                 },
-<<<<<<< HEAD
                 style: ElevatedButton.styleFrom(
                   primary: Nord.orange,
                   minimumSize: Size.fromHeight(Converts.c48),
                 ),
-=======
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
                 child: Text(
                   'SAVE',
                   style: TextStyles.t20.apply(color: Colors.white),
                 ),
-<<<<<<< HEAD
-=======
-                style: ElevatedButton.styleFrom(
-                  primary: Nord.orange,
-                  minimumSize: Size.fromHeight(Converts.c48),
-                ),
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
               ),
             ),
           ],

diff --git a/lib/views/migrate/import_data.dart b/lib/views/migrate/import_data.dart
@@ -55,24 +55,14 @@ class ImportDataScreen extends StatelessWidget {
                       fontSize: 16.0);
                   Navigator.of(context).pop();
                 },
-<<<<<<< HEAD
                 style: ElevatedButton.styleFrom(
                   primary: Nord.orange,
                   minimumSize: Size.fromHeight(Converts.c48),
                 ),
-=======
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
                 child: Text(
                   'SAVE',
                   style: TextStyles.t20.apply(color: Colors.white),
                 ),
-<<<<<<< HEAD
-=======
-                style: ElevatedButton.styleFrom(
-                  primary: Nord.orange,
-                  minimumSize: Size.fromHeight(Converts.c48),
-                ),
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
               ),
             ),
           ],

diff --git a/lib/views/migrate/settings_screen.dart b/lib/views/migrate/settings_screen.dart
@@ -1,11 +1,6 @@
 import 'package:doxbox/services/migrate.dart';
 import 'package:doxbox/utilities/assets.dart';
-<<<<<<< HEAD
 import 'package:doxbox/utilities/theme.dart';
-=======
-import 'package:doxbox/utilities/colors.dart';
-import 'package:doxbox/utilities/styles.dart';
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
 import 'package:doxbox/views/migrate/export_data.dart';
 import 'package:flutter/material.dart';
 import 'package:page_transition/page_transition.dart';
@@ -19,7 +14,6 @@ class SettingsScreen extends StatelessWidget {
       padding: EdgeInsets.all(Converts.c24),
       child: SafeArea(
         child: Column(
-<<<<<<< HEAD
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Column(
@@ -98,77 +92,6 @@ class SettingsScreen extends StatelessWidget {
             Text(
               'Developed by Sai Ankit 🚀',
               style: TextStyles.t16.apply(color: Colors.white),
-=======
-          children: [
-            Padding(
-              padding: EdgeInsets.symmetric(vertical: Converts.c16),
-              child: GestureDetector(
-                onTap: () {
-                  Migrate.loadCsvFromStorage();
-                },
-                child: Container(
-                  height: Converts.c80,
-                  decoration: BoxDecoration(
-                    color: Nord.nord3,
-                    borderRadius:
-                        BorderRadius.all(Radius.circular(Converts.c8)),
-                  ),
-                  child: Padding(
-                    padding: EdgeInsets.symmetric(horizontal: Converts.c16),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Text(
-                          'IMPORT DATA',
-                          style: TextStyles.t16.apply(
-                            color: Colors.white,
-                          ),
-                        ),
-                        AppAssets.import,
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ),
-            Padding(
-              padding: EdgeInsets.symmetric(vertical: Converts.c16),
-              child: GestureDetector(
-                onTap: () {
-                  Navigator.push(
-                    context,
-                    PageTransition(
-                      curve: Curves.easeInOutSine,
-                      type: PageTransitionType.fade,
-                      child: const ExportDataScreen(),
-                    ),
-                  );
-                },
-                child: Container(
-                  height: Converts.c80,
-                  decoration: BoxDecoration(
-                    color: Nord.nord3,
-                    borderRadius:
-                        BorderRadius.all(Radius.circular(Converts.c8)),
-                  ),
-                  child: Padding(
-                    padding: EdgeInsets.symmetric(horizontal: Converts.c16),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Text(
-                          'EXPORT DATA',
-                          style: TextStyles.t16.apply(
-                            color: Colors.white,
-                          ),
-                        ),
-                        AppAssets.export,
-                      ],
-                    ),
-                  ),
-                ),
-              ),
->>>>>>> 0c18ed551f9c8acdbc44ebf282f4139dcad2ef46
             ),
           ],
         ),