Merge pull request #43 from syedwajid01/ounotes/null-safety

Upload UI Improved and merge conflicts resolved.
buildwithmalik · Mar 30, 2022 · c59f357 · c59f357
2 parents d9af899 + 6cf25ae
commit c59f357
Show file tree

Hide file tree

Showing 57 changed files with 1,262 additions and 1,271 deletions.
diff --git a/lib/AppTheme/AppTheme.dart b/lib/AppTheme/AppTheme.dart
@@ -13,7 +13,7 @@ class AppTheme {
     ),
     scaffoldBackgroundColor: Colors.white,
     appBarTheme: AppBarTheme(
-      color: Color(0xff2A9D8F),
+      color: Colors.white,
       iconTheme: IconThemeData(
         color: Colors.black54,
       ),
@@ -65,7 +65,7 @@ class AppTheme {
             color: Color(0xff2A9D8F),
             fontFamily: 'Montserrat',
             fontWeight: FontWeight.w400,
-            fontSize: 15,
+            fontSize: 14,
           ),
           subtitle1: TextStyle(
             color: Colors.black,
@@ -144,7 +144,7 @@ class AppTheme {
             color: Colors.white,
             fontFamily: 'Montserrat',
             fontWeight: FontWeight.w400,
-            fontSize: 15,
+            fontSize: 14,
           ),
           subtitle1: TextStyle(
             color: Colors.white,

diff --git a/lib/app/app.router.dart b/lib/app/app.router.dart
diff --git a/lib/enums/constants.dart b/lib/enums/constants.dart
@@ -128,6 +128,8 @@ class Constants {
     "TextFieldHeadingLabel4": null,
   };
 
+
+
   static Map<int, String> semlist = {
     1: "Semester 1",
     2: "Semester 2",
@@ -162,12 +164,13 @@ class Constants {
       case Document.None:
       case Document.Drawer:
       case Document.Random:
+      case Document.GDRIVE:
         return "";
         break;
     }
   }
 
-  static getBoxNameAccToType(AbstractDocument note){
+  static getBoxNameAccToType(AbstractDocument note) {
     switch (note.type) {
       case Constants.notes:
         return Constants.notesDownloads;

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,13 +1,7 @@
 import 'dart:async';
-
 import 'package:FSOUNotes/AppTheme/AppStateNotifier.dart';
 import 'package:FSOUNotes/AppTheme/AppTheme.dart';
-import 'package:FSOUNotes/models/recently_open_notes.dart';
-import 'package:FSOUNotes/services/funtional_services/admob_service.dart';
-import 'package:FSOUNotes/services/funtional_services/crashlytics_service.dart';
 import 'package:FSOUNotes/services/funtional_services/document_service.dart';
-import 'package:FSOUNotes/services/funtional_services/google_in_app_payment_service.dart';
-import 'package:FSOUNotes/services/funtional_services/notification_service.dart';
 import 'package:FSOUNotes/services/funtional_services/push_notification_service.dart';
 import 'package:FSOUNotes/services/funtional_services/remote_config_service.dart';
 import 'package:FSOUNotes/ui/widgets/smart_widgets/bottom_sheet/bottom_sheet_ui_view.dart';
@@ -16,28 +10,18 @@ import 'package:feature_discovery/feature_discovery.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_analytics/observer.dart';
 import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:onesignal_flutter/onesignal_flutter.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-import 'package:stacked_services/stacked_services.dart';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:hive/hive.dart';
-// import 'package:purchases_flutter/purchases_flutter.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:logger/logger.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:stacked/stacked.dart';
+import 'package:stacked_services/stacked_services.dart';
 import 'package:wiredash/wiredash.dart';
 
 import 'app/app.locator.dart';
 import 'app/app.logger.dart';
 import 'app/app.router.dart';
-import 'enums/constants.dart';
-import 'models/download.dart';
 
 Logger log = getLogger("main");
 void main() async {

diff --git a/lib/misc/constants.dart b/lib/misc/constants.dart
@@ -1,6 +1,7 @@
 import 'package:FSOUNotes/enums/enums.dart';
 import 'package:flutter/material.dart';
 
+//TODO we have duplicate contants.dart files in misc and enums , need to merge them in to one file
 const Color primary = Color(0xff2A9D8F);
 const Color secondary = Color(0xffFFB800);
 const Color ternary = Color(0xffFF8282);
@@ -176,7 +177,32 @@ class Constants {
     8: "Semester 8"
   };
 
-  static getDocumentNameFromEnum(Document doc) {
+  static getTextFieldMapFromEnum(Document doc) {
+    switch (doc) {
+      case Document.Notes:
+        return Notes;
+        break;
+      case Document.QuestionPapers:
+        return QuestionPaper;
+        break;
+      case Document.Syllabus:
+        return Syllabus;
+        break;
+      case Document.Links:
+        return Links;
+        break;
+      case Document.UploadLog:
+      case Document.Report:
+      case Document.None:
+      case Document.Drawer:
+      case Document.Random:
+      case Document.GDRIVE:
+        return {};
+        break;
+    }
+  }
+
+  static String getDocumentNameFromEnum(Document doc) {
     switch (doc) {
       case Document.Notes:
         return notes;
@@ -200,6 +226,7 @@ class Constants {
         return "";
         break;
     }
+    return "";
   }
 }
 

diff --git a/lib/models/download.dart b/lib/models/download.dart
@@ -1,9 +1,9 @@
 import 'package:FSOUNotes/enums/constants.dart';
-import 'package:FSOUNotes/models/document.dart';
 import 'package:FSOUNotes/models/notes.dart';
 import 'package:FSOUNotes/models/question_paper.dart';
 import 'package:FSOUNotes/models/syllabus.dart';
 import 'package:hive/hive.dart';
+
 part 'download.g.dart';
 
 @HiveType(typeId: 0)

diff --git a/lib/services/funtional_services/admob_service.dart b/lib/services/funtional_services/admob_service.dart
@@ -1,14 +1,12 @@
 
+import 'package:FSOUNotes/app/app.locator.dart';
+import 'package:FSOUNotes/app/app.logger.dart';
 import 'package:FSOUNotes/app/app.router.dart';
-import 'package:FSOUNotes/models/user.dart';
 import 'package:FSOUNotes/services/funtional_services/authentication_service.dart';
-import 'package:FSOUNotes/services/funtional_services/remote_config_service.dart';
 import 'package:FSOUNotes/services/funtional_services/onboarding_service.dart';
-import 'package:FSOUNotes/app/app.locator.dart';
-import 'package:FSOUNotes/app/app.logger.dart';
+import 'package:FSOUNotes/services/funtional_services/remote_config_service.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:googleapis/dfareporting/v3_4.dart';
 import 'package:logger/logger.dart';
 import 'package:stacked_services/stacked_services.dart';
 

diff --git a/lib/services/funtional_services/cloud_storage_service.dart b/lib/services/funtional_services/cloud_storage_service.dart
@@ -240,6 +240,7 @@ class CloudStorageService {
       case Document.UploadLog:
       case Document.Drawer:
       case Document.Random:
+      case Document.GDRIVE:
         return null;
         break;
     }

diff --git a/lib/services/funtional_services/document_service.dart b/lib/services/funtional_services/document_service.dart
@@ -8,12 +8,9 @@ import 'package:FSOUNotes/enums/constants.dart';
 import 'package:FSOUNotes/enums/enums.dart';
 import 'package:FSOUNotes/misc/helper.dart';
 import 'package:FSOUNotes/models/UploadLog.dart';
-import 'package:FSOUNotes/models/download.dart';
-import 'package:FSOUNotes/models/link.dart' as linkModel;
 import 'package:FSOUNotes/models/document.dart';
-import 'package:FSOUNotes/models/notes.dart';
+import 'package:FSOUNotes/models/link.dart' as linkModel;
 import 'package:FSOUNotes/models/report.dart';
-import 'package:FSOUNotes/models/subject.dart';
 import 'package:FSOUNotes/models/user.dart';
 import 'package:FSOUNotes/models/verifier.dart';
 import 'package:FSOUNotes/services/funtional_services/authentication_service.dart';

diff --git a/...vices/funtional_services/firebase_firestore/firestore_extra.dart/firestore_functions.dart b/...vices/funtional_services/firebase_firestore/firestore_extra.dart/firestore_functions.dart
@@ -31,6 +31,7 @@ extension FirestoreFunctions on FirestoreService{
       case Document.UploadLog:
       case Document.Drawer:
       case Document.Random:
+      case Document.GDRIVE:
         break;
     }
   }
@@ -54,6 +55,7 @@ extension FirestoreFunctions on FirestoreService{
       case Document.UploadLog:
       case Document.Drawer:
       case Document.Random:
+      case Document.GDRIVE:
         break;
     }
   }

diff --git a/lib/services/funtional_services/pdf_service.dart b/lib/services/funtional_services/pdf_service.dart
@@ -1,7 +1,7 @@
 
 import 'dart:io';
-import 'dart:math' as math;
 import 'dart:ui' as ui;
+
 import 'package:FSOUNotes/app/app.logger.dart';
 import 'package:flutter/painting.dart';
 import 'package:logger/logger.dart';