From 432b0b85d5beed86d18e1c83965439d92e5f14c6 Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Sun, 13 Aug 2023 13:44:21 +0530
Subject: [PATCH 1/6] Fix all dart analysis errors

---
 .gradle/5.6.2/fileChanges/last-build.bin      | Bin 1 -> 0 bytes
 .gradle/5.6.2/fileHashes/fileHashes.lock      | Bin 17 -> 0 bytes
 .gradle/5.6.2/gc.properties                   |   0
 android/app/build.gradle                      |  14 +-
 android/app/src/main/AndroidManifest.xml      |   4 +-
 .../kotlin/com/example/folio/MainActivity.kt  |   6 -
 android/build.gradle                          |   6 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   3 +-
 lib/assets/app_theme.dart                     | 155 +++---
 lib/helpers/database_actions.dart             |  69 +--
 lib/helpers/stock_repository.dart             |   8 +-
 lib/models/database/portfolio.dart            |  12 +-
 lib/models/database/tracked.dart              |   8 +-
 lib/models/database/trade_log.dart            |  14 +-
 lib/models/stock/latest.dart                  |  10 +-
 lib/models/stock/stock.dart                   |  41 +-
 lib/models/trade/summary.dart                 |   6 +-
 lib/services/database/database.dart           |  22 +-
 lib/services/query/query_api.dart             |  23 +-
 lib/services/query/query_bse_api.dart         |  34 +-
 lib/services/query/query_nse_api.dart         |  22 +-
 lib/services/search.dart                      |   4 +-
 lib/state/app_state.dart                      |   2 +-
 lib/views/common/bottom_navbar.dart           |   2 +-
 lib/views/common/drawer.dart                  |   6 +-
 lib/views/common/text_loading_indicator.dart  |   6 +-
 lib/views/logs/log_tile.dart                  |  14 +-
 lib/views/logs/logs.dart                      |  19 +-
 lib/views/portfolio/portfolio.dart            |  22 +-
 lib/views/portfolio/portfolio_tile.dart       |  46 +-
 lib/views/settings/data/add_file.dart         |   4 +-
 .../settings/data/add_portfolio_dialog.dart   |  49 +-
 lib/views/settings/data/add_trade_log.dart    |  75 +--
 lib/views/settings/data/data.dart             |  78 +--
 .../settings/data/track_stock_dialog.dart     |  54 +-
 lib/views/settings/drive/drive.dart           |  98 ++--
 lib/views/tracked/details/cycle_tile.dart     |  36 +-
 lib/views/tracked/details/details.dart        | 168 ++++---
 lib/views/tracked/tracked.dart                |  20 +-
 lib/views/tracked/tracked_bottom_sheet.dart   |  50 +-
 lib/views/tracked/tracked_list.dart           |  10 +-
 lib/views/tracked/tracked_tile.dart           |  66 +--
 pubspec.lock                                  | 466 ++++++++++++------
 pubspec.yaml                                  |  30 +-
 44 files changed, 982 insertions(+), 800 deletions(-)
 delete mode 100644 .gradle/5.6.2/fileChanges/last-build.bin
 delete mode 100644 .gradle/5.6.2/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/5.6.2/gc.properties
 delete mode 100644 android/app/src/main/kotlin/com/example/folio/MainActivity.kt

diff --git a/.gradle/5.6.2/fileChanges/last-build.bin b/.gradle/5.6.2/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/5.6.2/fileHashes/fileHashes.lock b/.gradle/5.6.2/fileHashes/fileHashes.lock
deleted file mode 100644
index 2effef765720e532ad735f4e87b98c065396b12d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
ScmZRMvUY#t!CUCb00jUfAp+X~

diff --git a/.gradle/5.6.2/gc.properties b/.gradle/5.6.2/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5f94bfd..6fe047a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new RuntimeException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -31,14 +31,14 @@ def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 } else {
-    keystoreProperties.setProperty('storePassword', System.getenv('STORE_PASSWORD'));
-    keystoreProperties.setProperty('keyPassword', System.getenv('KEY_PASSWORD'));
-    keystoreProperties.setProperty('keyAlias', System.getenv('KEY_ALIAS'));
-    keystoreProperties.setProperty('storeFile', System.getenv('KEY_PATH'));
+    keystoreProperties.setProperty('storePassword', System.getenv('STORE_PASSWORD'))
+    keystoreProperties.setProperty('keyPassword', System.getenv('KEY_PASSWORD'))
+    keystoreProperties.setProperty('keyAlias', System.getenv('KEY_ALIAS'))
+    keystoreProperties.setProperty('storeFile', System.getenv('KEY_PATH'))
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -52,7 +52,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.sudopanda.folio"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5d5bdb8..0633539 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,8 +7,8 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <application android:name="io.flutter.app.FlutterApplication" android:label="folio" android:icon="@mipmap/launcher_icon">
-    <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+  <application android:name="${applicationName}" android:label="folio" android:icon="@mipmap/launcher_icon">
+    <activity android:name="io.flutter.embedding.android.FlutterActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:exported="true">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/android/app/src/main/kotlin/com/example/folio/MainActivity.kt b/android/app/src/main/kotlin/com/example/folio/MainActivity.kt
deleted file mode 100644
index 9f46c73..0000000
--- a/android/app/src/main/kotlin/com/example/folio/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.sudopanda.folio
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/build.gradle b/android/build.gradle
index 9319192..e5e37ab 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.4'
     }
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 296b146..ffed3a2 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/lib/assets/app_theme.dart b/lib/assets/app_theme.dart
index 186348e..6dd25dc 100644
--- a/lib/assets/app_theme.dart
+++ b/lib/assets/app_theme.dart
@@ -21,134 +21,129 @@ class AppTheme {
 
   static final ThemeData lightTheme = ThemeData.light().copyWith(
     scaffoldBackgroundColor: _lightScaffoldBackgroundColor,
-    backgroundColor: _lightBackgroundColor,
     appBarTheme: AppBarTheme(
       color: _lightScaffoldBackgroundColor,
       iconTheme: IconThemeData(color: _lightOnPrimaryColor),
-      textTheme: _lightTextTheme,
+      toolbarTextStyle: _lightTextTheme.bodyMedium,
+      titleTextStyle: _lightTextTheme.titleLarge,
     ),
     primaryColor: Colors.lightGreen,
-    colorScheme: ColorScheme.light(
-      primary: _lightPrimaryColor,
-      primaryVariant: _lightPrimaryVariantColor,
-      secondary: _lightSecondaryColor,
-      onPrimary: _lightOnPrimaryColor,
-    ),
     iconTheme: IconThemeData(
       color: _iconColor,
     ),
-    accentColor: _iconColor,
     textTheme: _lightTextTheme,
     canvasColor: Colors.transparent,
-    buttonColor: _lightSecondaryColor,
     unselectedWidgetColor: _lightPrimaryVariantColor,
     inputDecorationTheme: InputDecorationTheme(
       border: OutlineInputBorder(),
     ),
+    colorScheme: ColorScheme.light(
+      primary: _lightPrimaryColor,
+      background: _lightBackgroundColor,
+      secondary: _iconColor,
+      onPrimary: _lightOnPrimaryColor,
+    ),
   );
 
   static final ThemeData darkTheme = ThemeData.dark().copyWith(
     scaffoldBackgroundColor: _darkScaffoldBackgroundColor,
-    backgroundColor: _darkBackgroundColor,
     appBarTheme: AppBarTheme(
       color: _darkScaffoldBackgroundColor,
       iconTheme: IconThemeData(color: _darkOnPrimaryColor),
-      textTheme: _darkTextTheme,
+      toolbarTextStyle: _darkTextTheme.bodyMedium,
+      titleTextStyle: _darkTextTheme.titleLarge,
     ),
     primaryColor: Colors.lightGreen,
-    colorScheme: ColorScheme.light(
-      primary: _darkPrimaryColor,
-      primaryVariant: _darkPrimaryVariantColor,
-      secondary: _darkSecondaryColor,
-      onPrimary: _darkOnPrimaryColor,
-    ),
     iconTheme: IconThemeData(
       color: _iconColor,
     ),
-    accentColor: _iconColor,
     textTheme: _darkTextTheme,
     canvasColor: Colors.transparent,
-    buttonColor: _darkSecondaryColor,
     unselectedWidgetColor: _darkPrimaryVariantColor,
     inputDecorationTheme: InputDecorationTheme(
       border: OutlineInputBorder(),
       enabledBorder: OutlineInputBorder(
         borderSide: BorderSide(color: _darkPrimaryVariantColor),
       ),
+    ), colorScheme: ColorScheme.light(
+      primary: _darkPrimaryColor,
+      secondary: _iconColor,
+      background: _darkBackgroundColor,
+      onPrimary: _darkOnPrimaryColor,
     ),
   );
 
   static final TextTheme _lightTextTheme = TextTheme(
-    headline1: _lightHeadline1TextStyle,
-    headline2: _lightHeadline2TextStyle,
-    headline3: _lightHeadline3TextStyle,
-    headline4: _lightHeadline4TextStyle,
-    headline5: _lightHeadline5TextStyle,
-    headline6: _lightHeadline6TextStyle,
-    bodyText1: _lightBodyText1TextStyle,
-    bodyText2: _lightBodyText2TextStyle,
-    button: _lightButtonTextStyle,
-    subtitle1: _lightSubtitle1TextStyle,
+    displayLarge: _lightHeadline1TextStyle,
+    displayMedium: _lightHeadline2TextStyle,
+    displaySmall: _lightHeadline3TextStyle,
+    headlineMedium: _lightHeadline4TextStyle,
+    headlineSmall: _lightHeadline5TextStyle,
+    titleLarge: _lightHeadline6TextStyle,
+    bodyLarge: _lightBodyText1TextStyle,
+    bodyMedium: _lightBodyText2TextStyle,
+    labelLarge: _lightButtonTextStyle,
+    titleMedium: _lightSubtitle1TextStyle,
   );
 
   static final TextTheme _darkTextTheme = TextTheme(
-    headline1: _darkHeadline1TextStyle,
-    headline2: _darkHeadline2TextStyle,
-    headline3: _darkHeadline3TextStyle,
-    headline4: _darkHeadline4TextStyle,
-    headline5: _darkHeadline5TextStyle,
-    headline6: _darkHeadline6TextStyle,
-    bodyText1: _darkBodyText1TextStyle,
-    bodyText2: _darkBodyText2TextStyle,
-    button: _darkButtonTextStyle,
-    subtitle1: _darkSubtitle1TextStyle,
+    displayLarge: _darkHeadline1TextStyle,
+    displayMedium: _darkHeadline2TextStyle,
+    displaySmall: _darkHeadline3TextStyle,
+    headlineMedium: _darkHeadline4TextStyle,
+    headlineSmall: _darkHeadline5TextStyle,
+    titleLarge: _darkHeadline6TextStyle,
+    bodyLarge: _darkBodyText1TextStyle,
+    bodyMedium: _darkBodyText2TextStyle,
+    labelLarge: _darkButtonTextStyle,
+    titleMedium: _darkSubtitle1TextStyle,
   );
 
-  static final TextStyle _lightHeadline1TextStyle =
-      ThemeData.light().textTheme.headline1.copyWith(fontSize: 48);
-  static final TextStyle _lightHeadline2TextStyle =
-      ThemeData.light().textTheme.headline2;
-  static final TextStyle _lightHeadline3TextStyle =
-      ThemeData.light().textTheme.headline3;
-  static final TextStyle _lightHeadline4TextStyle =
-      ThemeData.light().textTheme.headline4.copyWith(fontSize: 25);
-  static final TextStyle _lightHeadline5TextStyle =
-      ThemeData.light().textTheme.headline5;
-  static final TextStyle _lightHeadline6TextStyle =
-      ThemeData.light().textTheme.headline6.copyWith(
+  static final TextStyle? _lightHeadline1TextStyle =
+      ThemeData.light().textTheme.displayLarge?.copyWith(fontSize: 48);
+  static final TextStyle? _lightHeadline2TextStyle =
+      ThemeData.light().textTheme.displayMedium;
+  static final TextStyle? _lightHeadline3TextStyle =
+      ThemeData.light().textTheme.displaySmall;
+  static final TextStyle? _lightHeadline4TextStyle =
+      ThemeData.light().textTheme.headlineMedium?.copyWith(fontSize: 25);
+  static final TextStyle? _lightHeadline5TextStyle =
+      ThemeData.light().textTheme.headlineSmall;
+  static final TextStyle? _lightHeadline6TextStyle =
+      ThemeData.light().textTheme.titleLarge?.copyWith(
             fontSize: 20,
             fontWeight: FontWeight.bold,
           );
-  static final TextStyle _lightBodyText1TextStyle =
-      ThemeData.light().textTheme.bodyText1;
-  static final TextStyle _lightBodyText2TextStyle =
-      ThemeData.light().textTheme.bodyText2;
-  static final TextStyle _lightSubtitle1TextStyle =
-      ThemeData.light().textTheme.subtitle1;
-  static final TextStyle _lightButtonTextStyle =
-      ThemeData.light().textTheme.button.copyWith(color: _lightSecondaryColor);
+  static final TextStyle? _lightBodyText1TextStyle =
+      ThemeData.light().textTheme.bodyLarge;
+  static final TextStyle? _lightBodyText2TextStyle =
+      ThemeData.light().textTheme.bodyMedium;
+  static final TextStyle? _lightSubtitle1TextStyle =
+      ThemeData.light().textTheme.titleMedium;
+  static final TextStyle? _lightButtonTextStyle =
+      ThemeData.light().textTheme.labelLarge?.copyWith(color: _lightSecondaryColor);
 
-  static final TextStyle _darkHeadline1TextStyle =
-      ThemeData.dark().textTheme.headline1.copyWith(fontSize: 48);
-  static final TextStyle _darkHeadline2TextStyle =
-      ThemeData.dark().textTheme.headline2;
-  static final TextStyle _darkHeadline3TextStyle =
-      ThemeData.dark().textTheme.headline3;
-  static final TextStyle _darkHeadline4TextStyle =
-      ThemeData.dark().textTheme.headline4.copyWith(fontSize: 25);
-  static final TextStyle _darkHeadline5TextStyle =
-      ThemeData.dark().textTheme.headline5;
-  static final TextStyle _darkHeadline6TextStyle =
-      ThemeData.dark().textTheme.headline6.copyWith(
+  static final TextStyle? _darkHeadline1TextStyle =
+      ThemeData.dark().textTheme.displayLarge?.copyWith(fontSize: 48);
+  static final TextStyle? _darkHeadline2TextStyle =
+      ThemeData.dark().textTheme.displayMedium;
+  static final TextStyle? _darkHeadline3TextStyle =
+      ThemeData.dark().textTheme.displaySmall;
+  static final TextStyle? _darkHeadline4TextStyle =
+      ThemeData.dark().textTheme.headlineMedium?.copyWith(fontSize: 25);
+  static final TextStyle? _darkHeadline5TextStyle =
+      ThemeData.dark().textTheme.headlineSmall;
+  static final TextStyle? _darkHeadline6TextStyle =
+      ThemeData.dark().textTheme.titleLarge?.copyWith(
             fontSize: 20,
             fontWeight: FontWeight.bold,
           );
-  static final TextStyle _darkBodyText1TextStyle =
-      ThemeData.dark().textTheme.bodyText1;
-  static final TextStyle _darkBodyText2TextStyle =
-      ThemeData.dark().textTheme.bodyText2;
-  static final TextStyle _darkSubtitle1TextStyle =
-      ThemeData.dark().textTheme.subtitle1;
-  static final TextStyle _darkButtonTextStyle =
-      ThemeData.dark().textTheme.button.copyWith(color: _darkSecondaryColor);
+  static final TextStyle? _darkBodyText1TextStyle =
+      ThemeData.dark().textTheme.bodyLarge;
+  static final TextStyle? _darkBodyText2TextStyle =
+      ThemeData.dark().textTheme.bodyMedium;
+  static final TextStyle? _darkSubtitle1TextStyle =
+      ThemeData.dark().textTheme.titleMedium;
+  static final TextStyle? _darkButtonTextStyle =
+      ThemeData.dark().textTheme.labelLarge?.copyWith(color: _darkSecondaryColor);
 }
diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index c0951e2..26e86ad 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -14,7 +14,7 @@ import 'package:csv/csv.dart';
 
 class DatabaseActions {
   static Future<List<TradeLog>> getAllLogs() async {
-    List<Map> tuples = await Db()
+    List<Map<String, dynamic>> tuples = await Db()
         .getOrdered(Db.tblTradeLog, '${Db.colDate} DESC, ${Db.colCode} ASC');
 
     List<TradeLog> logs = [];
@@ -23,7 +23,7 @@ class DatabaseActions {
   }
 
   static Future<List<Portfolio>> getAllPortfolios() async {
-    List<Map> tuples = await Db().getOrdered(
+    List<Map<String, dynamic>> tuples = await Db().getOrdered(
         Db.tblPortfolio, '${Db.colNSECode} DESC, ${Db.colBSECode} DESC');
 
     List<Portfolio> portfolio = [];
@@ -31,8 +31,8 @@ class DatabaseActions {
     return portfolio;
   }
 
-  static Future<DateTime> getRecentDate() async {
-    List<Map> tuples = await Db().getLimitedOrdered(
+  static Future<DateTime?> getRecentDate() async {
+    List<Map<String, dynamic>> tuples = await Db().getLimitedOrdered(
       Db.tblTradeLog,
       1,
       '${Db.colDate} DESC',
@@ -49,7 +49,7 @@ class DatabaseActions {
     int qty,
     double rate,
   ) async {
-    String where, codeCol;
+    String where = "", codeCol = "";
     if (exchange == "BSE") {
       where = "${Db.colBSECode} = ?";
       codeCol = Db.colBSECode;
@@ -103,9 +103,9 @@ class DatabaseActions {
     var buyLogs = await DatabaseActions.getBuyLogs(rowID);
     var sellLogs = await DatabaseActions.getSellLogs(rowID);
 
-    int qty;
-    double msr;
-    double esr;
+    int qty = 0;
+    double? msr;
+    double? esr;
 
     int b = 0, s = 0;
     double totalNet = 0, totalProfitDifference = 0;
@@ -235,7 +235,7 @@ class DatabaseActions {
   }
 
   static Future<List<TradeLog>> getBuyLogs(int stockID) async {
-    List<Map> tuples = await Db().getOrderedQuery(
+    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
       Db.tblTradeLog,
       '${Db.colBought} = ? and ${Db.colStockID} = ?',
       [1, stockID],
@@ -250,7 +250,7 @@ class DatabaseActions {
   }
 
   static Future<List<TradeLog>> getSellLogs(int stockID) async {
-    List<Map> tuples = await Db().getOrderedQuery(
+    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
       Db.tblTradeLog,
       '${Db.colBought} = ? and ${Db.colStockID} = ?',
       [0, stockID],
@@ -264,7 +264,7 @@ class DatabaseActions {
     return sellLogs;
   }
 
-  static Future<int> getRowIDAfterSettingCodes(String bseCode, nseCode) async {
+  static Future<int> getRowIDAfterSettingCodes(String? bseCode, String? nseCode) async {
     List<Map> tuples = await Db().getQuery(Db.tblPortfolio,
         '${Db.colBSECode} = ? or ${Db.colNSECode} = ?', [bseCode, nseCode]);
     if (tuples.length == 0) {
@@ -307,7 +307,7 @@ class DatabaseActions {
   }
 
   static Future<bool> linkCodes(Map<String, String> codes) async {
-    int id = await getRowIDAfterSettingCodes(codes["BSE"], codes["NSE"]);
+    int id = await getRowIDAfterSettingCodes(codes["BSE"]!, codes["NSE"]);
 
     bool res = await Db().updateConditionally(
       Db.tblTradeLog,
@@ -326,14 +326,14 @@ class DatabaseActions {
     return await updatePortfolioFigures(id);
   }
 
-  static Future<List<TradeLog>> parseSBIFile(String file) async {
+  static Future<List<TradeLog>?> parseSBIFile(String file) async {
     int mode = 0;
     Document parsedHTML = html.parse(file);
     List<String> headers = [];
 
     // dev.log(parsedHTML.outerHtml);
 
-    Element table = parsedHTML.querySelector("#grdViewTradeDetail");
+    Element? table = parsedHTML.querySelector("#grdViewTradeDetail");
 
     if (table == null) {
       table = parsedHTML.querySelector("#grdViewTradeDetail_old");
@@ -350,8 +350,9 @@ class DatabaseActions {
     List<TradeLog> logs = [];
 
     for (var row in table.querySelectorAll("tr").skip(1)) {
-      DateTime date;
-      String exchange, code, scripCode, scripName;
+      late DateTime date;
+      String exchange = "";
+      String? scripCode, scripName, code;
       int buyQty = 0, sellQty = 0;
       double buyRate = 0, sellRate = 0;
 
@@ -377,9 +378,9 @@ class DatabaseActions {
             break;
           case "Scrip Name":
             scripName = html
-                .parse(html.parse(cell.innerHtml).body.text)
+                .parse(html.parse(cell.innerHtml).body?.text)
                 .documentElement
-                .text
+                !.text
                 .trim();
             break;
           case "Buy Qty":
@@ -433,11 +434,12 @@ class DatabaseActions {
     List<TradeLog> logs = [];
 
     for (var row in trades.skip(1)) {
-      DateTime date;
-      String exchange, code, bseCode, nseCode;
+      late DateTime date;
+      String exchange = "";
+      String? code, bseCode, nseCode;
       int qty = 0;
       double rate = 0;
-      bool bought;
+      bool bought = false;
 
       int i = 0;
       for (var element in row) {
@@ -465,10 +467,10 @@ class DatabaseActions {
             exchange = element;
             break;
           case "BSE Code":
-            bseCode = element.toString() == "null" ? null : element.toString();
+            bseCode = element.toString();
             break;
           case "NSE Code":
-            nseCode = element.toString() == "null" ? null : element.toString();
+            nseCode = element.toString();
             break;
           case "Quantity":
             qty = int.parse(element.toString());
@@ -499,9 +501,8 @@ class DatabaseActions {
           code = nseCode;
           break;
       }
-      print(bseCode);
-      print(nseCode);
-      print("");
+      print("Codes:- BSE: $bseCode \t NSE: $nseCode \t Exch: $exchange \n");
+      if (code == null) continue;
 
       try {
         int id =
@@ -517,7 +518,7 @@ class DatabaseActions {
     return logs;
   }
 
-  static Future<T> addTradeLogs<T>(List<TradeLog> logs) async {
+  static Future<Object?> addTradeLogs(List<TradeLog> logs) async {
     Set updateLater = Set();
 
     return await Db().transact((txn) async {
@@ -599,7 +600,7 @@ class DatabaseActions {
   }
 
   static Future<List<TradeLog>> getStockLogs(int stockId) async {
-    List<Map> tuples = await Db().getOrderedQuery(
+    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
         Db.tblTradeLog,
         '${Db.colStockID} = ?',
         [stockId],
@@ -610,9 +611,9 @@ class DatabaseActions {
     return logs;
   }
 
-  static Future<List<Stock>> getPinnedStocks() async {
+  static Future<List<Stock>?> getPinnedStocks() async {
     try {
-      List<Map> tuples = await Db().getRawQuery("SELECT * "
+      List<Map<String, dynamic>> tuples = await Db().getRawQuery("SELECT * "
           "FROM ${Db.tblTracked} T "
           "LEFT JOIN ${Db.tblPortfolio} P "
           "ON T.${Db.colCode} = P.${Db.colBSECode} "
@@ -638,9 +639,9 @@ class DatabaseActions {
     }
   }
 
-  static Future<List<Stock>> getUnpinnedStocks() async {
+  static Future<List<Stock>?> getUnpinnedStocks() async {
     try {
-      List<Map> tuples = await Db().getRawQuery("SELECT * "
+      List<Map<String, dynamic>> tuples = await Db().getRawQuery("SELECT * "
           "FROM ${Db.tblTracked} T "
           "LEFT JOIN ${Db.tblPortfolio} P "
           "ON T.${Db.colCode} = P.${Db.colBSECode} "
@@ -694,9 +695,9 @@ class DatabaseActions {
     });
   }
 
-  static Future<T> updateCode<T>(
+  static Future<Object?> updateCode(
       String oldCode, String exch, String newCode) async {
-    String codeCol;
+    String codeCol = "";
     switch (exch) {
       case "BSE":
         codeCol = Db.colBSECode;
diff --git a/lib/helpers/stock_repository.dart b/lib/helpers/stock_repository.dart
index f1ea6d6..a582862 100644
--- a/lib/helpers/stock_repository.dart
+++ b/lib/helpers/stock_repository.dart
@@ -3,7 +3,7 @@ import 'package:folio/models/stock/latest.dart';
 import 'package:folio/services/query/query_api.dart';
 
 class StockRepository {
-  static Stream<Latest> getPeriodicLatest(String code, String exchange) async* {
+  static Stream<Latest?> getPeriodicLatest(String code, String exchange) async* {
     yield await QueryAPI.getCurrentData(exchange: exchange, code: code);
 
     yield* Stream.periodic(Duration(seconds: 30), (_) {
@@ -13,8 +13,8 @@ class StockRepository {
     );
   }
 
-  static Future<String> getName(String code, String exchange) async {
-    String name = await QueryAPI.getName(exchange: exchange, code: code);
+  static Future<String?> getName(String code, String exchange) async {
+    String? name = await QueryAPI.getName(exchange: exchange, code: code);
     await Db().updateConditionally(
         Db.tblTracked,
         {Db.colName: name?.toUpperCase()},
@@ -23,7 +23,7 @@ class StockRepository {
     return name?.toUpperCase();
   }
 
-  static Future<Latest> getOnceLatest(String code, String exchange) async {
+  static Future<Latest?> getOnceLatest(String code, String exchange) async {
     return await QueryAPI.getCurrentData(exchange: exchange, code: code);
   }
 
diff --git a/lib/models/database/portfolio.dart b/lib/models/database/portfolio.dart
index 992b44e..25d4e41 100644
--- a/lib/models/database/portfolio.dart
+++ b/lib/models/database/portfolio.dart
@@ -1,12 +1,12 @@
 import 'package:folio/services/database/database.dart';
 
 class Portfolio {
-  int rowid;
-  String bseCode;
-  String nseCode;
-  int qty;
-  double msr;
-  double esr;
+  late int rowid;
+  late String bseCode;
+  late String nseCode;
+  late int qty;
+  late double msr;
+  late double esr;
 
   Portfolio.fromDbTuple(Map<String, dynamic> tuple) {
     rowid = tuple["rowid"];
diff --git a/lib/models/database/tracked.dart b/lib/models/database/tracked.dart
index 72f336c..b8be663 100644
--- a/lib/models/database/tracked.dart
+++ b/lib/models/database/tracked.dart
@@ -1,10 +1,10 @@
 import 'package:folio/services/database/database.dart';
 
 class Tracked {
-  String code;
-  String exchange;
-  String name;
-  bool pinned;
+  late String code;
+  late String exchange;
+  late String? name;
+  late bool pinned;
 
   Tracked.fromDbTuple(Map<String, dynamic> tuple) {
     code = tuple[Db.colCode];
diff --git a/lib/models/database/trade_log.dart b/lib/models/database/trade_log.dart
index f831a32..ac427df 100644
--- a/lib/models/database/trade_log.dart
+++ b/lib/models/database/trade_log.dart
@@ -1,13 +1,13 @@
 import 'package:folio/services/database/database.dart';
 
 class TradeLog {
-  DateTime date;
-  int id;
-  String code;
-  String exchange;
-  bool bought;
-  int qty;
-  double rate;
+  late DateTime date;
+  late int id;
+  late String code;
+  late String exchange;
+  late bool bought;
+  late int qty;
+  late double rate;
 
   TradeLog(this.date, this.id, this.code, this.exchange, this.bought, this.qty,
       this.rate);
diff --git a/lib/models/stock/latest.dart b/lib/models/stock/latest.dart
index 5e48107..f845ad1 100644
--- a/lib/models/stock/latest.dart
+++ b/lib/models/stock/latest.dart
@@ -1,9 +1,9 @@
 class Latest {
-  double value;
-  String change;
-  String percentageChange;
-  int sign;
-  String updated;
+  double value = 0.0;
+  String change = "";
+  String percentageChange = "";
+  int sign = 0;
+  String updated = "";
 
   Latest();
 
diff --git a/lib/models/stock/stock.dart b/lib/models/stock/stock.dart
index fb22707..b86ddca 100644
--- a/lib/models/stock/stock.dart
+++ b/lib/models/stock/stock.dart
@@ -11,46 +11,45 @@ class Stock {
   bool isVisible = true;
 
   Stock.fromDbTuple(Map<String, dynamic> tuple)
-      : assert(tuple != null),
-        _portfolio = Portfolio.fromDbTuple(tuple),
+      : _portfolio = Portfolio.fromDbTuple(tuple),
         _tracked = Tracked.fromDbTuple(tuple),
         _latest = Latest();
 
   int get id => _portfolio.rowid;
 
-  String get name => _tracked?.name;
+  String? get name => _tracked?.name;
 
-  String get exchange => _tracked?.exchange;
+  String? get exchange => _tracked?.exchange;
 
-  String get code => _tracked?.code;
+  String? get code => _tracked?.code;
 
-  int get qty => _portfolio?.qty;
+  int? get qty => _portfolio?.qty;
 
-  double get msr => _portfolio?.msr;
+  double? get msr => _portfolio?.msr;
 
-  double get esr => _portfolio?.esr;
+  double? get esr => _portfolio?.esr;
 
-  double get lastValue => _latest?.value;
+  double? get lastValue => _latest?.value;
 
-  String get change => _latest?.change;
+  String? get change => _latest?.change;
 
-  String get percentChange => _latest?.percentageChange;
+  String? get percentChange => _latest?.percentageChange;
 
-  String get lastUpdated => _latest?.updated;
+  String? get lastUpdated => _latest?.updated;
 
   int get changeSign => _latest?.sign ?? 0;
 
-  double get netAmount => netPerStock == null || qty == null || qty == 0
+  double? get netAmount => (netPerStock == null || qty == null || qty == 0)
       ? null
-      : (netPerStock * qty).abs();
+      : (netPerStock! * qty!).abs();
 
-  double get netPerStock => lastValue == null || msr == null
+  double? get netPerStock => (lastValue == null || msr == null)
       ? null
-      : ((lastValue - msr) * (1 - Globals.brokerage));
+      : ((lastValue! - msr!) * (1 - Globals.brokerage));
 
-  String get percentNet => msr == null || msr == 0 || netPerStock == null
+  String? get percentNet => (msr == null || msr == 0 || netPerStock == null)
       ? null
-      : (netPerStock / msr).toStringAsFixed(2);
+      : (netPerStock! / msr!).toStringAsFixed(2);
 
   bool get pinned => _tracked.pinned;
 
@@ -62,7 +61,7 @@ class Stock {
     _tracked.pinned = pin;
   }
 
-  set name(String name) {
+  set name(String? name) {
     _tracked.name = name;
   }
 
@@ -87,7 +86,7 @@ class Stock {
     _latest.percentageChange =
         data?.percentageChange ?? _latest.percentageChange;
     _latest.sign = data?.sign ?? 0;
-    _latest.updated = data?.updated;
-    _latest.value = data?.value;
+    _latest.updated = data!.updated;
+    _latest.value = data!.value;
   }
 }
diff --git a/lib/models/trade/summary.dart b/lib/models/trade/summary.dart
index f62f05e..3cf8ac7 100644
--- a/lib/models/trade/summary.dart
+++ b/lib/models/trade/summary.dart
@@ -3,8 +3,8 @@ import 'package:folio/models/trade/cycle.dart';
 import 'package:folio/models/database/trade_log.dart';
 
 class TradeSummary {
-  List<TradeLog> portfolio;
-  List<TradeCycle> cycles;
+  List<TradeLog> portfolio = [];
+  List<TradeCycle> cycles = [];
   bool incorrect;
 
   Future<List<TradeLog>> _buyLogsFuture;
@@ -12,7 +12,7 @@ class TradeSummary {
 
   TradeSummary(this._buyLogsFuture, this._sellLogsFuture) : incorrect = false;
 
-  TradeCycle computeCycle(int sellQty, double sellRate) {
+  TradeCycle? computeCycle(int sellQty, double sellRate) {
     int b = 0;
     var cycle = TradeCycle(DateTime.now(), sellQty, sellRate);
 
diff --git a/lib/services/database/database.dart b/lib/services/database/database.dart
index 2100bdb..db5f81e 100644
--- a/lib/services/database/database.dart
+++ b/lib/services/database/database.dart
@@ -8,7 +8,7 @@ import 'package:sqflite/sqflite.dart';
 class Db {
   static final Db _instance = new Db.internal();
   factory Db() => _instance;
-  static Database _db;
+  static Database? _db;
 
   static String tblTracked = 'Tracked';
   static String tblPortfolio = 'Portfolio';
@@ -31,9 +31,7 @@ class Db {
   static String colDate = 'date';
 
   Future<Database> get db async {
-    if (_db != null) return _db;
-    _db = await initDb();
-    return _db;
+    return _db ?? (_db = await initDb());
   }
 
   Db.internal();
@@ -95,26 +93,26 @@ class Db {
     return res;
   }
 
-  Future<int> getTotalCount(String table) async {
+  Future<int?> getTotalCount(String table) async {
     var dbClient = await db;
-    int count = Sqflite.firstIntValue(
+    int? count = Sqflite.firstIntValue(
         await dbClient.rawQuery('SELECT COUNT(*) FROM $table'));
     return count;
   }
 
   Future<List<Map>> getAllTuples(String table) async {
     var dbClient = await db;
-    List<Map> result = await dbClient.query(table);
+    List<Map<String, dynamic>> result = await dbClient.query(table);
 
     return result;
   }
 
-  Future<List<Map>> getRawQuery(String query) async {
+  Future<List<Map<String, dynamic>>> getRawQuery(String query) async {
     var dbClient = await db;
     return await dbClient.rawQuery(query);
   }
 
-  Future<List<Map>> getQuery(
+  Future<List<Map<String, dynamic>>> getQuery(
       String table, String where, List<dynamic> whereArgs) async {
     var dbClient = await db;
     return await dbClient.query(table, where: where, whereArgs: whereArgs);
@@ -127,20 +125,20 @@ class Db {
         .length;
   }
 
-  Future<List<Map>> getLimitedOrdered(
+  Future<List<Map<String, dynamic>>> getLimitedOrdered(
       String table, int limit, String orderBy) async {
     var dbClient = await db;
     return await dbClient.query(table, limit: limit, orderBy: orderBy);
   }
 
-  Future<List<Map>> getOrderedQuery(String table, String where,
+  Future<List<Map<String, dynamic>>> getOrderedQuery(String table, String where,
       List<dynamic> whereArgs, String orderBy) async {
     var dbClient = await db;
     return await dbClient.query(table,
         where: where, whereArgs: whereArgs, orderBy: orderBy);
   }
 
-  Future<List<Map>> getOrdered(String table, String orderBy) async {
+  Future<List<Map<String, dynamic>>> getOrdered(String table, String orderBy) async {
     var dbClient = await db;
     return await dbClient.query(table, orderBy: orderBy);
   }
diff --git a/lib/services/query/query_api.dart b/lib/services/query/query_api.dart
index 2a97950..f403b0e 100644
--- a/lib/services/query/query_api.dart
+++ b/lib/services/query/query_api.dart
@@ -4,14 +4,12 @@ import 'dart:developer';
 import 'package:dio/dio.dart';
 import 'package:folio/models/stock/latest.dart';
 import 'package:folio/services/query/query_bse_api.dart';
-import 'package:flutter/foundation.dart';
 import 'package:folio/services/query/query_nse_api.dart';
 import 'package:folio/services/search.dart';
 
 class QueryAPI {
-  static Future<Latest> getCurrentData(
-      {@required String exchange, @required String code, String key}) async {
-    assert(exchange != null && code != null);
+  static Future<Latest?> getCurrentData(
+      {required String exchange, required String code, String? key}) async {
     switch (exchange) {
       case "BSE":
         return QueryBSEAPI.getCurrentData(code);
@@ -20,6 +18,8 @@ class QueryAPI {
     }
     if (key == null) {
       key = await searchAPIKey(code, exchange);
+      if (key == null)
+        return null;
     }
 
     var dio = Dio()
@@ -37,7 +37,7 @@ class QueryAPI {
       );
 
       if (r.statusCode == 200) {
-        var data = jsonDecode(r.data.substring(4))['PriceUpdate']['entities']
+        var data = jsonDecode(r.data!.substring(4))['PriceUpdate']['entities']
             .first['financial_entity']['common_entity_data'];
 
         var ret = Latest.fromData(
@@ -57,7 +57,7 @@ class QueryAPI {
         log("query_api.getCurrentData($code, $exchange, $key) => \n " +
             r.statusCode.toString() +
             ": " +
-            r.statusMessage);
+            (r.statusMessage ?? ""));
         return null;
       }
     } catch (e) {
@@ -66,9 +66,8 @@ class QueryAPI {
     }
   }
 
-  static Future<String> getName(
-      {@required String exchange, @required String code, String key}) async {
-    assert(exchange != null && code != null);
+  static Future<String?> getName(
+      {required String exchange, required String code, String? key}) async {
     switch (exchange) {
       case "BSE":
         return QueryBSEAPI.getName(code);
@@ -77,6 +76,8 @@ class QueryAPI {
     }
     if (key == null) {
       key = await searchAPIKey(code, exchange);
+      if (key == null)
+        return null;
     }
 
     var dio = Dio()
@@ -94,7 +95,7 @@ class QueryAPI {
       );
 
       if (r.statusCode == 200) {
-        var ret = jsonDecode(r.data.substring(4))['PriceUpdate']['entities']
+        var ret = jsonDecode(r.data!.substring(4))['PriceUpdate']['entities']
             .first['financial_entity']['common_entity_data']['name']
             .toString();
         return ret;
@@ -102,7 +103,7 @@ class QueryAPI {
         log("query_api.getName($code, $exchange, $key) => \n " +
             r.statusCode.toString() +
             ": " +
-            r.statusMessage);
+            (r.statusMessage ?? ""));
         return null;
       }
     } catch (e) {
diff --git a/lib/services/query/query_bse_api.dart b/lib/services/query/query_bse_api.dart
index ec2e167..945d50e 100644
--- a/lib/services/query/query_bse_api.dart
+++ b/lib/services/query/query_bse_api.dart
@@ -5,7 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:folio/models/stock/latest.dart';
 
 class QueryBSEAPI {
-  static Future<Latest> getCurrentData(String code) async {
+  static Future<Latest?> getCurrentData(String code) async {
     var dio = Dio()
       ..options.headers = {
         'User-Agent'.toLowerCase():
@@ -26,30 +26,24 @@ class QueryBSEAPI {
         },
       );
       if (r.statusCode == 200) {
-        var data = jsonDecode(r.data);
+        var data = jsonDecode(r.data!);
+        double currVal = double.parse(data['CurrVal']);
+        double prevClose = double.parse(data['PrevClose']);
+        double change = (currVal - prevClose);
+        double? percentChange = (prevClose == 0) ? null : ((change * 100.0) / prevClose);
+        var sign = change.sign.round();
         var ret = Latest.fromData(
             double.parse(data['CurrVal']),
-            (double.parse(data['CurrVal']) - double.parse(data['PrevClose']))
-                .abs()
-                .toStringAsFixed(2),
-            double.parse(data['PrevClose']) == 0
-                ? null
-                : (((double.parse(data['CurrVal']) -
-                                double.parse(data['PrevClose'])) *
-                            100.0) /
-                        double.parse(data['PrevClose']))
-                    .abs()
-                    .toStringAsFixed(2),
-            (double.parse(data['CurrVal']) - double.parse(data['PrevClose']))
-                .sign
-                .round(),
+            change.abs().toStringAsFixed(2),
+            percentChange?.abs().toStringAsFixed(2) ?? "-",
+            sign,
             data['CurrDate']);
         return ret;
       } else {
         log("query_bse_api.getCurrentData($code) => \n " +
             r.statusCode.toString() +
             ": " +
-            r.statusMessage);
+            (r.statusMessage ?? ""));
         return null;
       }
     } catch (e) {
@@ -58,7 +52,7 @@ class QueryBSEAPI {
     }
   }
 
-  static Future<String> getName(String code) async {
+  static Future<String?> getName(String code) async {
     var dio = Dio()
       ..options.headers = {
         'User-Agent'.toLowerCase():
@@ -77,12 +71,12 @@ class QueryBSEAPI {
         },
       );
       if (r.statusCode == 200) {
-        return jsonDecode(r.data)['Cmpname']['FullN'].toString();
+        return jsonDecode(r.data!)['Cmpname']['FullN'].toString();
       } else {
         log("query_bse_api.getName($code) => \n " +
             r.statusCode.toString() +
             ": " +
-            r.statusMessage);
+            (r.statusMessage ?? ""));
         return null;
       }
     } catch (e) {
diff --git a/lib/services/query/query_nse_api.dart b/lib/services/query/query_nse_api.dart
index a853e2f..97a9d66 100644
--- a/lib/services/query/query_nse_api.dart
+++ b/lib/services/query/query_nse_api.dart
@@ -8,7 +8,7 @@ class NetworkService {
   Map<String, String> cookies = {};
 
   void _updateCookie(http.Response response) {
-    String allSetCookie = response.headers['set-cookie'];
+    String? allSetCookie = response.headers['set-cookie'];
 
     if (allSetCookie != null) {
       var setCookies = allSetCookie.split(',');
@@ -49,16 +49,16 @@ class NetworkService {
 
     for (var key in cookies.keys) {
       if (cookie.length > 0) cookie += "; ";
-      cookie += key + "=" + cookies[key];
+      cookie += key + "=" + cookies[key]!;
     }
 
     return cookie;
   }
 
-  Future<String> get(String url, Map<String, String> headers) async {
+  Future<String> get(Uri uri, Map<String, String> headers) async {
     headers['cookie'] = _generateCookieHeader();
 
-    http.Response response = await http.get(url, headers: headers);
+    http.Response response = await http.get(uri, headers: headers);
     final String res = response.body;
     final int statusCode = response.statusCode;
 
@@ -68,7 +68,7 @@ class NetworkService {
       throw new Exception("Error while fetching data: " +
           statusCode.toString() +
           "\n\n" +
-          response.request.headers.toString());
+          response.request!.headers.toString());
     }
     return res;
   }
@@ -86,7 +86,7 @@ class QueryNSEAPI {
     'Upgrade-Insecure-Requests'.toLowerCase(): '1',
   };
 
-  static Future<Latest> getCurrentData(String code) async {
+  static Future<Latest?> getCurrentData(String code) async {
     var session = NetworkService();
     var uri = Uri.https(
       'www.nseindia.com',
@@ -97,7 +97,7 @@ class QueryNSEAPI {
     );
 
     try {
-      await session.get(uri.toString(), headers);
+      await session.get(uri, headers);
     } catch (e) {
       dev.log("query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " + e.toString());
     }
@@ -113,7 +113,7 @@ class QueryNSEAPI {
     String r;
 
     try {
-      r = await session.get(uri.toString(), headers);
+      r = await session.get(uri, headers);
     } catch (e) {
       dev.log("query_nse_api.getCurrentData($code) try 1 => \n" + e.toString());
       return null;
@@ -138,7 +138,7 @@ class QueryNSEAPI {
     }
   }
 
-  static Future<String> getName(String code) async {
+  static Future<String?> getName(String code) async {
     var session = NetworkService();
     var uri = Uri.https(
       'www.nseindia.com',
@@ -149,7 +149,7 @@ class QueryNSEAPI {
     );
 
     try {
-      await session.get(uri.toString(), headers);
+      await session.get(uri, headers);
     } catch (e) {
       dev.log("query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " + e.toString());
     }
@@ -165,7 +165,7 @@ class QueryNSEAPI {
     String r;
 
     try {
-      r = await session.get(uri.toString(), headers);
+      r = await session.get(uri, headers);
     } catch (e) {
       dev.log("query_nse_api.getName($code) => try 1 \n" + e.toString());
       return null;
diff --git a/lib/services/search.dart b/lib/services/search.dart
index 6585ee7..054d87d 100644
--- a/lib/services/search.dart
+++ b/lib/services/search.dart
@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 
-Future<String> searchAPIKey(String code, String exchange) async {
+Future<String?> searchAPIKey(String code, String exchange) async {
   var dio = Dio()
     ..options.headers = {
       'User-Agent'.toLowerCase():
@@ -28,7 +28,7 @@ Future<String> searchAPIKey(String code, String exchange) async {
 
     if (r.statusCode == 200) {
       var match =
-          RegExp(r'data-mid="([a-zA-Z0-9\/]*)"').firstMatch(r.data).group(1);
+          RegExp(r'data-mid="([a-zA-Z0-9\/]*)"').firstMatch(r.data!)?.group(1);
 
       return match;
     } else {
diff --git a/lib/state/app_state.dart b/lib/state/app_state.dart
index eefd5ea..9416b37 100644
--- a/lib/state/app_state.dart
+++ b/lib/state/app_state.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class AppState extends ChangeNotifier {
-  bool isDarkModeOn;
+  late bool isDarkModeOn;
   final SharedPreferences _prefs;
 
   AppState(this._prefs) {
diff --git a/lib/views/common/bottom_navbar.dart b/lib/views/common/bottom_navbar.dart
index 7736dc8..629344f 100644
--- a/lib/views/common/bottom_navbar.dart
+++ b/lib/views/common/bottom_navbar.dart
@@ -30,7 +30,7 @@ class _BottomNavbarState extends State<BottomNavbar> {
         ),
       ],
       currentIndex: widget.index,
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
       selectedItemColor: Theme.of(context).colorScheme.secondary,
       unselectedItemColor: Theme.of(context).colorScheme.onPrimary,
       onTap: (index) {
diff --git a/lib/views/common/drawer.dart b/lib/views/common/drawer.dart
index b81ee8b..481de97 100644
--- a/lib/views/common/drawer.dart
+++ b/lib/views/common/drawer.dart
@@ -12,7 +12,7 @@ class FolioDrawer extends StatelessWidget {
       child: Drawer(
         semanticLabel: "Settings",
         child: Container(
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).colorScheme.background,
           child: Column(
             children: [
               ListView(
@@ -48,14 +48,14 @@ class FolioDrawer extends StatelessWidget {
                                           ),
                                 onPressed: () {
                                   Provider.of<AppState>(context).updateTheme(
-                                      !Provider.of<AppState>(context)
+                                      !Provider.of<AppState>(context, listen: false)
                                           .isDarkModeOn);
                                 }),
                           ),
                           Spacer(),
                           Text(
                             "folio",
-                            style: Theme.of(context).textTheme.headline2,
+                            style: Theme.of(context).textTheme.displayMedium,
                           ),
                         ],
                       ),
diff --git a/lib/views/common/text_loading_indicator.dart b/lib/views/common/text_loading_indicator.dart
index c39da5e..7c98bf4 100644
--- a/lib/views/common/text_loading_indicator.dart
+++ b/lib/views/common/text_loading_indicator.dart
@@ -5,8 +5,8 @@ class TextLoadingIndicator extends StatelessWidget {
   final double height;
 
   const TextLoadingIndicator({
-    @required this.width,
-    @required this.height,
+    required this.width,
+    required this.height,
   });
 
   @override
@@ -19,7 +19,7 @@ class TextLoadingIndicator extends StatelessWidget {
           backgroundColor: Theme.of(context).scaffoldBackgroundColor,
           minHeight: height,
           valueColor:
-              AlwaysStoppedAnimation<Color>(Theme.of(context).backgroundColor),
+              AlwaysStoppedAnimation<Color>(Theme.of(context).colorScheme.background),
         ),
       ),
     );
diff --git a/lib/views/logs/log_tile.dart b/lib/views/logs/log_tile.dart
index e5aaaf7..993800f 100644
--- a/lib/views/logs/log_tile.dart
+++ b/lib/views/logs/log_tile.dart
@@ -12,7 +12,7 @@ class LogTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
-      color: Theme.of(context).backgroundColor,
+      color: Theme.of(context).colorScheme.background,
       elevation: 2,
       margin: const EdgeInsets.symmetric(
         horizontal: 15,
@@ -57,13 +57,13 @@ class LogTile extends StatelessWidget {
                       children: [
                         Text(
                           (_tradeLog?.exchange ?? "-"),
-                          style: Theme.of(context).textTheme.bodyText1,
+                          style: Theme.of(context).textTheme.bodyLarge,
                         ),
                         Text(
                           _tradeLog?.date == null
                               ? "-"
                               : _dateFormatter.format(_tradeLog.date),
-                          style: Theme.of(context).textTheme.bodyText1,
+                          style: Theme.of(context).textTheme.bodyLarge,
                         ),
                       ],
                     ),
@@ -77,8 +77,8 @@ class LogTile extends StatelessWidget {
                             (_tradeLog?.code ?? "-"),
                             style: Theme.of(context)
                                 .textTheme
-                                .headline6
-                                .copyWith(fontWeight: FontWeight.normal),
+                                .titleLarge
+                                ?.copyWith(fontWeight: FontWeight.normal),
                           ),
                         ),
                         Expanded(
@@ -87,7 +87,7 @@ class LogTile extends StatelessWidget {
                             _tradeLog?.qty?.toString() ?? "-",
                             style: Theme.of(context)
                                 .textTheme
-                                .headline6,
+                                .titleLarge,
                           ),
                         ),
                         Expanded(
@@ -96,7 +96,7 @@ class LogTile extends StatelessWidget {
                             _tradeLog?.rate?.toStringAsFixed(2) ?? "-",
                             style: Theme.of(context)
                                 .textTheme
-                                .headline6,
+                                .titleLarge,
                           ),
                         ),
                       ],
diff --git a/lib/views/logs/logs.dart b/lib/views/logs/logs.dart
index eaa757f..839f67d 100644
--- a/lib/views/logs/logs.dart
+++ b/lib/views/logs/logs.dart
@@ -12,7 +12,7 @@ class LogsView extends StatefulWidget {
 }
 
 class _LogsViewState extends State<LogsView> {
-  Future<List<TradeLog>> _getLogsFuture;
+  late Future<List<TradeLog>> _getLogsFuture;
 
   @override
   void initState() {
@@ -50,13 +50,16 @@ class _LogsViewState extends State<LogsView> {
                     children: <Widget>[
                       Text(
                         "Logs",
-                        style: Theme.of(context).textTheme.headline1,
+                        style: Theme.of(context).textTheme.displayLarge,
                       ),
-                      RaisedButton(
-                        shape: CircleBorder(),
+                      ElevatedButton(
+                        style: ElevatedButton.styleFrom(
+                            foregroundColor: Theme.of(context).colorScheme.background,
+                            backgroundColor: Theme.of(context).colorScheme.secondary,
+                            minimumSize: Size(88, 36),
+                            padding: EdgeInsets.symmetric(horizontal: 16),
+                            shape: const CircleBorder()),
                         child: Icon(Icons.add),
-                        color: Theme.of(context).accentColor,
-                        textColor: Theme.of(context).backgroundColor,
                         onPressed: () {
                           Navigator.push(
                             context,
@@ -76,7 +79,7 @@ class _LogsViewState extends State<LogsView> {
           ),
           FutureBuilder(
             future: _getLogsFuture,
-            builder: (context, snapshot) {
+            builder: (context, AsyncSnapshot snapshot) {
               if (snapshot.connectionState != ConnectionState.done ||
                   snapshot.hasError) {
                 return SliverToBoxAdapter(
@@ -89,7 +92,7 @@ class _LogsViewState extends State<LogsView> {
                   child: Center(
                     child: Text(
                       "No logs imported",
-                      style: Theme.of(context).textTheme.headline4,
+                      style: Theme.of(context).textTheme.headlineMedium,
                     ),
                   ),
                 );
diff --git a/lib/views/portfolio/portfolio.dart b/lib/views/portfolio/portfolio.dart
index b8cc44e..00d2052 100644
--- a/lib/views/portfolio/portfolio.dart
+++ b/lib/views/portfolio/portfolio.dart
@@ -12,7 +12,7 @@ class PortfolioView extends StatefulWidget {
 }
 
 class _PortfolioViewState extends State<PortfolioView> {
-  Future<List<Portfolio>> _getPortfolioFuture;
+  late Future<List<Portfolio>> _getPortfolioFuture;
 
   @override
   void initState() {
@@ -50,13 +50,17 @@ class _PortfolioViewState extends State<PortfolioView> {
                     children: <Widget>[
                       Text(
                         "Portfolio",
-                        style: Theme.of(context).textTheme.headline1,
+                        style: Theme.of(context).textTheme.displayLarge,
                       ),
-                      RaisedButton(
-                        shape: CircleBorder(),
+                      ElevatedButton(
+                        style: ElevatedButton.styleFrom(
+                          foregroundColor: Theme.of(context).colorScheme.background,
+                          backgroundColor: Theme.of(context).colorScheme.secondary,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const CircleBorder(),
+                        ),
                         child: Icon(Icons.add),
-                        color: Theme.of(context).accentColor,
-                        textColor: Theme.of(context).backgroundColor,
                         onPressed: () {
                           showDialog(
                             context: context,
@@ -72,7 +76,7 @@ class _PortfolioViewState extends State<PortfolioView> {
           ),
           FutureBuilder(
             future: _getPortfolioFuture,
-            builder: (context, snapshot) {
+            builder: (context, AsyncSnapshot snapshot) {
               if (snapshot.connectionState != ConnectionState.done) {
                 return SliverToBoxAdapter(
                   child: Container(),
@@ -84,7 +88,7 @@ class _PortfolioViewState extends State<PortfolioView> {
                   child: Center(
                     child: Text(
                       "Some error occurred",
-                      style: Theme.of(context).textTheme.headline4,
+                      style: Theme.of(context).textTheme.headlineMedium,
                     ),
                   ),
                 );
@@ -95,7 +99,7 @@ class _PortfolioViewState extends State<PortfolioView> {
                   child: Center(
                     child: Text(
                       "No stocks in your portfolio",
-                      style: Theme.of(context).textTheme.headline4,
+                      style: Theme.of(context).textTheme.headlineMedium,
                     ),
                   ),
                 );
diff --git a/lib/views/portfolio/portfolio_tile.dart b/lib/views/portfolio/portfolio_tile.dart
index bcf607a..d09a021 100644
--- a/lib/views/portfolio/portfolio_tile.dart
+++ b/lib/views/portfolio/portfolio_tile.dart
@@ -11,7 +11,7 @@ class PortfolioTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
-      color: Theme.of(context).backgroundColor,
+      color: Theme.of(context).colorScheme.background,
       elevation: 2,
       margin: const EdgeInsets.symmetric(
         horizontal: 15,
@@ -39,8 +39,8 @@ class PortfolioTile extends StatelessWidget {
                             mainAxisSize: MainAxisSize.min,
                             children: [
                               Text(
-                                "BSE - " + _portfolio?.bseCode,
-                                style: Theme.of(context).textTheme.bodyText1,
+                                "BSE - " + (_portfolio?.bseCode)!,
+                                style: Theme.of(context).textTheme.bodyLarge,
                               ),
                               SizedBox(
                                 width: 5,
@@ -50,15 +50,15 @@ class PortfolioTile extends StatelessWidget {
                                   Icons.edit,
                                   size: Theme.of(context)
                                           .textTheme
-                                          .bodyText1
-                                          .fontSize +
+                                          .bodyLarge
+                                          !.fontSize! +
                                       3,
                                 ),
                                 onTap: () async {
                                   await showDialog(
                                     context: context,
                                     builder: (context) => EditCodeDialog(
-                                        _portfolio?.bseCode,
+                                        _portfolio!.bseCode!,
                                         "BSE",
                                         updateBSECode),
                                   );
@@ -77,8 +77,8 @@ class PortfolioTile extends StatelessWidget {
                             mainAxisSize: MainAxisSize.min,
                             children: [
                               Text(
-                                "NSE - " + _portfolio?.nseCode,
-                                style: Theme.of(context).textTheme.bodyText1,
+                                "NSE - " + _portfolio!.nseCode,
+                                style: Theme.of(context).textTheme.bodyLarge,
                               ),
                               SizedBox(
                                 width: 5,
@@ -88,15 +88,15 @@ class PortfolioTile extends StatelessWidget {
                                   Icons.edit,
                                   size: Theme.of(context)
                                           .textTheme
-                                          .bodyText1
-                                          .fontSize +
+                                          .bodyLarge
+                                          !.fontSize! +
                                       3,
                                 ),
                                 onTap: () {
                                   showDialog(
                                     context: context,
                                     builder: (context) => EditCodeDialog(
-                                        _portfolio?.nseCode,
+                                        _portfolio!.nseCode!,
                                         "NSE",
                                         updateNSECode),
                                   );
@@ -122,8 +122,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .headline6
-                        .copyWith(fontWeight: FontWeight.normal),
+                        .titleLarge
+                        ?.copyWith(fontWeight: FontWeight.normal),
                   ),
                 ),
                 Expanded(
@@ -133,8 +133,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .headline6
-                        .copyWith(fontWeight: FontWeight.normal),
+                        .titleLarge
+                        ?.copyWith(fontWeight: FontWeight.normal),
                   ),
                 ),
                 Expanded(
@@ -144,8 +144,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .headline6
-                        .copyWith(fontWeight: FontWeight.normal),
+                        .titleLarge
+                        ?.copyWith(fontWeight: FontWeight.normal),
                   ),
                 ),
               ],
@@ -161,8 +161,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText1
-                        .copyWith(fontWeight: FontWeight.bold),
+                        .bodyLarge
+                        ?.copyWith(fontWeight: FontWeight.bold),
                   ),
                 ),
                 Expanded(
@@ -172,8 +172,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText1
-                        .copyWith(fontWeight: FontWeight.bold),
+                        .bodyLarge
+                        ?.copyWith(fontWeight: FontWeight.bold),
                   ),
                 ),
                 Expanded(
@@ -183,8 +183,8 @@ class PortfolioTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText1
-                        .copyWith(fontWeight: FontWeight.bold),
+                        .bodyLarge
+                        ?.copyWith(fontWeight: FontWeight.bold),
                   ),
                 ),
               ],
diff --git a/lib/views/settings/data/add_file.dart b/lib/views/settings/data/add_file.dart
index 913b8f8..01f61fb 100644
--- a/lib/views/settings/data/add_file.dart
+++ b/lib/views/settings/data/add_file.dart
@@ -59,7 +59,7 @@ class _AddFileState extends State<AddFile> {
               },
               itemCount: widget.logs.length,
             )
-          : Center(child: Text("Sorry couldn't parse the file.", style: Theme.of(context).textTheme.subtitle1),),
+          : Center(child: Text("Sorry couldn't parse the file.", style: Theme.of(context).textTheme.titleMedium),),
       bottomNavigationBar: widget.logs != null
           ? BottomAppBar(
               child: Padding(
@@ -67,7 +67,7 @@ class _AddFileState extends State<AddFile> {
                 child: Text(
                   "Total: ${widget.logs?.length}",
                   textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
             )
diff --git a/lib/views/settings/data/add_portfolio_dialog.dart b/lib/views/settings/data/add_portfolio_dialog.dart
index 1adc630..e869600 100644
--- a/lib/views/settings/data/add_portfolio_dialog.dart
+++ b/lib/views/settings/data/add_portfolio_dialog.dart
@@ -7,8 +7,8 @@ class AddPortfolioDialog extends StatefulWidget {
 }
 
 class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
-  TextEditingController _nseCodeCtl;
-  TextEditingController _bseCodeCtl;
+  late TextEditingController _nseCodeCtl;
+  late TextEditingController _bseCodeCtl;
   final _formKey = GlobalKey<FormState>();
 
   @override
@@ -28,7 +28,7 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
   @override
   Widget build(BuildContext context) {
     return Dialog(
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(10),
       ),
@@ -43,7 +43,7 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Text(
                   "Codes",
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
               Padding(
@@ -56,12 +56,12 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                     ),
                     helperText: "NSE Code",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.text,
                   controller: _nseCodeCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -78,12 +78,12 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                     ),
                     helperText: "BSE Code",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.text,
                   controller: _bseCodeCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -94,27 +94,30 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Row(
                   children: [
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Cancel"),
                       onPressed: () {
                         Navigator.pop(context);
                       },
                     ),
                     Spacer(),
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                        foregroundColor: Colors.black87,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Add"),
                       onPressed: () {
-                        if (_formKey.currentState.validate()) {
+                        if (_formKey.currentState!.validate()) {
                           DatabaseActions.linkCodes({
                             'NSE': _nseCodeCtl.text,
                             'BSE': _bseCodeCtl.text,
diff --git a/lib/views/settings/data/add_trade_log.dart b/lib/views/settings/data/add_trade_log.dart
index 3d34b8c..cbaffda 100644
--- a/lib/views/settings/data/add_trade_log.dart
+++ b/lib/views/settings/data/add_trade_log.dart
@@ -7,13 +7,13 @@ class AddTradeLogRoute extends StatefulWidget {
 }
 
 class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
-  TextEditingController _dateCtl;
-  TextEditingController _codeCtl;
-  TextEditingController _rateCtl;
-  TextEditingController _qtyCtl;
+  late TextEditingController _dateCtl;
+  late TextEditingController _codeCtl;
+  late TextEditingController _rateCtl;
+  late TextEditingController _qtyCtl;
   final _formKey = GlobalKey<FormState>();
 
-  List<bool> _isSelected;
+  late List<bool> _isSelected;
   var _exchanges = ["BSE", "NSE"];
   String _selectedExch = 'BSE';
 
@@ -43,12 +43,12 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
         centerTitle: true,
         title: Text("Add Trade Log"),
         elevation: 0,
-        backgroundColor: Theme.of(context).backgroundColor,
+        backgroundColor: Theme.of(context).colorScheme.background,
         actions: [
           IconButton(
             icon: Icon(Icons.check),
             onPressed: () async {
-                        if (_formKey.currentState.validate()) {
+                        if (_formKey.currentState!.validate()) {
                           var res = await DatabaseActions.setTradeLog(
                             _codeCtl.text.trim(),
                             _selectedExch,
@@ -68,7 +68,14 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                                 return AlertDialog(
                                   title: Text("Couldn't add!"),
                                   actions: [
-                                    FlatButton(
+                                    TextButton(
+                                      style: TextButton.styleFrom(
+                                          foregroundColor: Colors.black87,
+                                          minimumSize: Size(88, 36),
+                                          padding: EdgeInsets.symmetric(horizontal: 16),
+                                          shape: const RoundedRectangleBorder(
+                                            borderRadius: BorderRadius.all(Radius.circular(2)),
+                                          )),
                                       child: Text("OK"),
                                       onPressed: () {
                                         Navigator.pop(context);
@@ -100,9 +107,9 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                       child: Text(
                         "BUY",
                         textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.subtitle2.copyWith(
+                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
                               color: _isSelected[0]
-                                  ? Theme.of(context).backgroundColor
+                                  ? Theme.of(context).colorScheme.background
                                   : Theme.of(context).colorScheme.onPrimary,
                             ),
                       ),
@@ -112,9 +119,9 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                       child: Text(
                         "SELL",
                         textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.subtitle2.copyWith(
+                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
                               color: _isSelected[1]
-                                  ? Theme.of(context).backgroundColor
+                                  ? Theme.of(context).colorScheme.background
                                   : Theme.of(context).colorScheme.onPrimary,
                             ),
                       ),
@@ -149,12 +156,12 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                     ),
                     helperText: "Code",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.text,
                   controller: _codeCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -167,7 +174,7 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                   builder: (FormFieldState<String> state) {
                     return InputDecorator(
                       decoration: InputDecoration(
-                        labelStyle: Theme.of(context).textTheme.bodyText2,
+                        labelStyle: Theme.of(context).textTheme.bodyMedium,
                         errorStyle: TextStyle(
                           color: Colors.redAccent,
                           fontSize: 16.0,
@@ -178,13 +185,13 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                       isEmpty: false,
                       child: DropdownButtonHideUnderline(
                         child: DropdownButton<String>(
-                          style: Theme.of(context).textTheme.bodyText2,
-                          dropdownColor: Theme.of(context).backgroundColor,
+                          style: Theme.of(context).textTheme.bodyMedium,
+                          dropdownColor: Theme.of(context).colorScheme.background,
                           value: _selectedExch,
                           isDense: true,
                           onChanged: (newValue) {
                             setState(() {
-                              _selectedExch = newValue;
+                              _selectedExch = newValue!;
                               state.didChange(newValue);
                             });
                           },
@@ -210,25 +217,25 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                     contentPadding: EdgeInsets.symmetric(horizontal: 15),
                     helperText: "Date",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.datetime,
                   onTap: () async {
                     DateTime date = DateTime(1900);
                     FocusScope.of(context).requestFocus(new FocusNode());
 
-                    date = await showDatePicker(
+                    date = (await showDatePicker(
                       context: context,
                       initialDate: DateTime.now(),
                       firstDate: DateTime(1900),
                       lastDate: DateTime(2100),
-                    );
+                    ))!;
 
-                    _dateCtl.text = date?.toIso8601String()?.substring(0, 10);
+                    _dateCtl.text = (date?.toIso8601String()!.substring(0, 10))!;
                   },
                   controller: _dateCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -243,15 +250,15 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                     contentPadding: EdgeInsets.symmetric(horizontal: 15),
                     helperText: "Quantity",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.number,
                   controller: _qtyCtl,
                   validator: (value) {
-                    if (value.trim() == "") {
+                    if (value?.trim() == "") {
                       return "Required";
                     }
-                    if (RegExp(r"^[0-9]*?$").hasMatch(value.trim())) {
+                    if (RegExp(r"^[0-9]*?$").hasMatch(value!.trim())) {
                       return null;
                     }
                     return "Enter valid rate";
@@ -266,15 +273,15 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                     contentPadding: EdgeInsets.symmetric(horizontal: 15),
                     helperText: "Rate",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.numberWithOptions(decimal: true),
                   validator: (value) {
-                    if (value.trim() == "") {
+                    if (value?.trim() == "") {
                       return "Required";
                     }
                     if (RegExp(r"^[0-9]*(\.[0-9][0-9]?)?$")
-                        .hasMatch(value.trim())) {
+                        .hasMatch(value!.trim())) {
                       return null;
                     }
                     return "Enter valid rate";
@@ -286,7 +293,7 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
           ),
         ),
       ),
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
     );
   }
 }
diff --git a/lib/views/settings/data/data.dart b/lib/views/settings/data/data.dart
index 60a4889..5fe72a0 100644
--- a/lib/views/settings/data/data.dart
+++ b/lib/views/settings/data/data.dart
@@ -22,7 +22,7 @@ class ImportRoute extends StatelessWidget {
         title: Text("Manage Data"),
         centerTitle: true,
         elevation: 0,
-        backgroundColor: Theme.of(context).backgroundColor,
+        backgroundColor: Theme.of(context).colorScheme.background,
         actions: [
           SizedBox(
             width: 50.0,
@@ -30,10 +30,10 @@ class ImportRoute extends StatelessWidget {
           ),
         ],
       ),
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
       body: SafeArea(
         child: Padding(
-          padding: EdgeInsets.fromWindowPadding(WindowPadding.zero, 1),
+          padding: EdgeInsets.fromViewPadding(ViewPadding.zero, 1),
           child: ImportArea(),
         ),
       ),
@@ -47,9 +47,9 @@ class ImportArea extends StatefulWidget {
 }
 
 class _ImportAreaState extends State<ImportArea> {
-  bool _isButtonEnabled;
-  bool _isImporting;
-  bool _isExporting;
+  late bool _isButtonEnabled;
+  late bool _isImporting;
+  late bool _isExporting;
   final DateFormat _fileFormatter = DateFormat('folio-yyyy-MMM-dd-HH-mm-ss');
 
   @override
@@ -76,8 +76,8 @@ class _ImportAreaState extends State<ImportArea> {
                   "Import",
                   style: Theme.of(context)
                       .textTheme
-                      .bodyText1
-                      .copyWith(fontWeight: FontWeight.bold),
+                      .bodyLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
                 ),
                 ListTile(
                   title: Text("Import File"),
@@ -147,8 +147,8 @@ class _ImportAreaState extends State<ImportArea> {
                   "Export",
                   style: Theme.of(context)
                       .textTheme
-                      .bodyText1
-                      .copyWith(fontWeight: FontWeight.bold),
+                      .bodyLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
                 ),
                 ListTile(
                   title: Text("Export to CSV"),
@@ -171,8 +171,8 @@ class _ImportAreaState extends State<ImportArea> {
                   "Delete",
                   style: Theme.of(context)
                       .textTheme
-                      .bodyText1
-                      .copyWith(fontWeight: FontWeight.bold),
+                      .bodyLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
                 ),
                 ListTile(
                   trailing: Icon(
@@ -187,15 +187,18 @@ class _ImportAreaState extends State<ImportArea> {
                         title: Text("Careful!"),
                         content: Text(
                           "This will delete the database. Proceed only if you know what you are doing.",
-                          style: Theme.of(context).textTheme.bodyText1,
+                          style: Theme.of(context).textTheme.bodyLarge,
                         ),
                         actions: [
-                          FlatButton(
-                            shape: RoundedRectangleBorder(
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(5)),
-                            ),
-                            color: Theme.of(context).buttonColor,
+                          TextButton(
+                            style: TextButton.styleFrom(
+                                foregroundColor: Theme.of(context).colorScheme.background,
+                                minimumSize: Size(88, 36),
+                                padding: EdgeInsets.symmetric(horizontal: 16),
+                                shape: const RoundedRectangleBorder(
+                                  borderRadius:
+                                      BorderRadius.all(Radius.circular(5)),
+                                )),
                             onPressed: () {
                               Navigator.pop(context, "");
                             },
@@ -204,12 +207,15 @@ class _ImportAreaState extends State<ImportArea> {
                           SizedBox(
                             width: 5,
                           ),
-                          FlatButton(
-                            shape: RoundedRectangleBorder(
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(5)),
+                          ElevatedButton(
+                            style: TextButton.styleFrom(
+                              foregroundColor: Theme.of(context).colorScheme.background,
+                              minimumSize: Size(88, 36),
+                              padding: EdgeInsets.symmetric(horizontal: 16),
+                              shape: const RoundedRectangleBorder(
+                                borderRadius: BorderRadius.all(Radius.circular(5)),
+                              ),
                             ),
-                            color: Theme.of(context).buttonColor,
                             onPressed: () {
                               Navigator.pop(context, null);
                             },
@@ -230,7 +236,7 @@ class _ImportAreaState extends State<ImportArea> {
           Spacer(),
           FutureBuilder(
             future: DatabaseActions.getRecentDate(),
-            builder: (context, snapshot) {
+            builder: (context, AsyncSnapshot snapshot) {
               if (snapshot.hasData && snapshot.data != null) {
                 return Container(
                   margin: EdgeInsets.symmetric(vertical: 10, horizontal: 30),
@@ -248,13 +254,13 @@ class _ImportAreaState extends State<ImportArea> {
                       Expanded(
                         child: Text(
                           "Most recent entry is on: "
-                          "${snapshot.data.day.toString()}-"
-                          "${snapshot.data.month.toString()}-"
-                          "${snapshot.data.year.toString()}",
+                          "${snapshot.data?.day.toString()}-"
+                          "${snapshot.data?.month.toString()}-"
+                          "${snapshot.data?.year.toString()}",
                           textAlign: TextAlign.center,
                           style: TextStyle(
                               fontSize: 18,
-                              color: Theme.of(context).accentColor),
+                              color: Theme.of(context).colorScheme.secondary),
                         ),
                       ),
                     ],
@@ -284,26 +290,26 @@ class _ImportAreaState extends State<ImportArea> {
       _isButtonEnabled = false;
     });
 
-    FilePickerResult result =
+    FilePickerResult? result =
         await FilePicker.platform.pickFiles(type: FileType.any);
 
     if (result != null) {
-      String file;
+      String file = "";
       try {
-        file = File(result.files.first.path).readAsStringSync();
+        file = File(result.files.first.path!).readAsStringSync();
       } catch (e) {
         log("data.importLogs() => Error in reading file\n " + e.toString());
       }
 
-      List<TradeLog> logs;
-      
+      List<TradeLog> logs = [];
+
       try {
         switch (result.files.first.extension) {
           case "csv":
             logs = await DatabaseActions.parseCSVFile(file);
             break;
           case "xls":
-            logs = await DatabaseActions.parseSBIFile(file);
+            logs = await DatabaseActions.parseSBIFile(file) ?? [];
             break;
           default:
             setState(() {
@@ -338,7 +344,7 @@ class _ImportAreaState extends State<ImportArea> {
       await Permission.storage.request();
     }
 
-    String dir = await FilePicker.platform.getDirectoryPath();
+    String? dir = await FilePicker.platform.getDirectoryPath();
     if (dir != null) {
       String csv = await DatabaseActions.getTradesCSV();
 
diff --git a/lib/views/settings/data/track_stock_dialog.dart b/lib/views/settings/data/track_stock_dialog.dart
index ee424d9..83082be 100644
--- a/lib/views/settings/data/track_stock_dialog.dart
+++ b/lib/views/settings/data/track_stock_dialog.dart
@@ -8,7 +8,7 @@ class TrackStockDialog extends StatefulWidget {
 }
 
 class _TrackStockDialogState extends State<TrackStockDialog> {
-  TextEditingController _codeCtl;
+  late TextEditingController _codeCtl;
   var _exchanges = ["BSE", "NSE"];
   String _selectedExch = 'BSE';
   final _formKey = GlobalKey<FormState>();
@@ -22,13 +22,13 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
   @override
   void dispose() {
     super.dispose();
-    _codeCtl?.dispose();
+    _codeCtl.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return Dialog(
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(10),
       ),
@@ -43,7 +43,7 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Text(
                   "Add stock to tracker",
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
               Padding(
@@ -56,12 +56,12 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                     ),
                     helperText: "Code",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.text,
                   controller: _codeCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -74,7 +74,7 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                   builder: (FormFieldState<String> state) {
                     return InputDecorator(
                       decoration: InputDecoration(
-                        labelStyle: Theme.of(context).textTheme.bodyText2,
+                        labelStyle: Theme.of(context).textTheme.bodyMedium,
                         errorStyle: TextStyle(
                           color: Colors.redAccent,
                           fontSize: 16.0,
@@ -85,13 +85,13 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                       isEmpty: false,
                       child: DropdownButtonHideUnderline(
                         child: DropdownButton<String>(
-                          style: Theme.of(context).textTheme.bodyText2,
-                          dropdownColor: Theme.of(context).backgroundColor,
+                          style: Theme.of(context).textTheme.bodyMedium,
+                          dropdownColor: Theme.of(context).colorScheme.background,
                           value: _selectedExch,
                           isDense: true,
                           onChanged: (newValue) {
                             setState(() {
-                              _selectedExch = newValue;
+                              _selectedExch = newValue!;
                               state.didChange(newValue);
                             });
                           },
@@ -113,29 +113,33 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Row(
                   children: [
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                          foregroundColor: Colors.black87,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Cancel"),
                       onPressed: () {
                         Navigator.pop(context);
                       },
                     ),
                     Spacer(),
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                          foregroundColor: Colors.black87,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Add"),
                       onPressed: () {
-                        if (_formKey.currentState.validate()) {
+                        if (_formKey.currentState!.validate()) {
                           DatabaseActions.addTracked(
-                                  _codeCtl.text, _selectedExch, null, false)
+                                  _codeCtl.text, _selectedExch, "", false)
                               .then(
                             (value) {
                               if (value) {
diff --git a/lib/views/settings/drive/drive.dart b/lib/views/settings/drive/drive.dart
index 0230f79..d70d9b0 100644
--- a/lib/views/settings/drive/drive.dart
+++ b/lib/views/settings/drive/drive.dart
@@ -26,7 +26,7 @@ class DriveRoute extends StatelessWidget {
       ),
       body: SafeArea(
         child: Padding(
-          padding: EdgeInsets.fromWindowPadding(WindowPadding.zero, 1),
+          padding: EdgeInsets.fromViewPadding(ViewPadding.zero, 1),
           child: DriveArea(),
         ),
       ),
@@ -40,13 +40,13 @@ class DriveArea extends StatefulWidget {
 }
 
 class _DriveAreaState extends State<DriveArea> {
-  bool _isProcessing;
-  bool _isBackingUp;
-  bool _isRestoring;
-  bool _isDeleting;
-  signIn.GoogleSignInAccount account;
+  bool _isProcessing = true;
+  bool _isBackingUp = false;
+  bool _isRestoring = false;
+  bool _isDeleting = false;
+  late signIn.GoogleSignInAccount? account;
   final DateFormat _fileFormatter = DateFormat('folio-yyyy-MMM-dd-HH-mm-ss');
-  signIn.GoogleSignIn googleSignIn;
+  late signIn.GoogleSignIn googleSignIn;
 
   @override
   void initState() {
@@ -61,7 +61,7 @@ class _DriveAreaState extends State<DriveArea> {
   void login() async {
     try {
       googleSignIn = signIn.GoogleSignIn.standard(
-          scopes: [drive.DriveApi.DriveAppdataScope]);
+          scopes: [drive.DriveApi.driveAppdataScope]);
       account = await googleSignIn.signIn();
       if (account == null) throw Exception();
       setState(() {
@@ -142,8 +142,8 @@ class _DriveAreaState extends State<DriveArea> {
                       )
                     : Center(
                         child: ListTile(
-                          title: Text("Logged in as: ${account.displayName}"),
-                          subtitle: Text("${account.email}"),
+                          title: Text("Logged in as: ${account?.displayName}"),
+                          subtitle: Text("${account?.email}"),
                           trailing: IconButton(
                               icon: Icon(Icons.logout),
                               onPressed: () {
@@ -167,8 +167,8 @@ class _DriveAreaState extends State<DriveArea> {
       _isProcessing = true;
     });
 
-    final authHeaders = await account.authHeaders;
-    final authenticateClient = GoogleAuthClient(authHeaders);
+    final authHeaders = await account?.authHeaders;
+    final authenticateClient = GoogleAuthClient(authHeaders!);
     final driveApi = drive.DriveApi(authenticateClient);
 
     final path = await Db().getDbPath();
@@ -209,15 +209,15 @@ class _DriveAreaState extends State<DriveArea> {
                   border: Border.all(color: Theme.of(context).dividerColor)),
               child: FutureBuilder(
                 future: getBackups(),
-                builder: (context, snapshot) {
+                builder: (context, AsyncSnapshot snapshot) {
                   if (snapshot.hasData) {
                     return ListView.builder(
                       shrinkWrap: true,
-                      itemCount: snapshot.data.files.length,
+                      itemCount: snapshot.data?.files.length,
                       itemBuilder: (context, index) {
                         return ListTile(
                           leading: Icon(Icons.storage_outlined),
-                          title: Text("${snapshot.data.files[index].name}"),
+                          title: Text("${snapshot.data?.files[index].name}"),
                           onTap: () {
                             Navigator.pop(
                                 context, "${snapshot.data.files[index].id}");
@@ -241,11 +241,14 @@ class _DriveAreaState extends State<DriveArea> {
           Row(
             mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              FlatButton(
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(5)),
-                ),
-                color: Theme.of(context).buttonColor,
+              TextButton(
+                style: TextButton.styleFrom(
+                    foregroundColor: Theme.of(context).colorScheme.background,
+                    minimumSize: Size(88, 36),
+                    padding: EdgeInsets.symmetric(horizontal: 16),
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(5)),
+                    )),
                 onPressed: () {
                   Navigator.pop(context, null);
                 },
@@ -265,27 +268,29 @@ class _DriveAreaState extends State<DriveArea> {
         _isRestoring = true;
       });
 
-      final authHeaders = await account.authHeaders;
-      final authenticateClient = GoogleAuthClient(authHeaders);
+      final authHeaders = await account?.authHeaders;
+      final authenticateClient = GoogleAuthClient(authHeaders!);
       final driveApi = drive.DriveApi(authenticateClient);
 
-      drive.Media file = await driveApi.files
-          .get(id, downloadOptions: drive.DownloadOptions.FullMedia);
+      Object file = await driveApi.files
+          .get(id, downloadOptions: drive.DownloadOptions.fullMedia);
 
       final saveFile = File(await Db().getDbPath());
       List<int> dataStore = [];
-      file.stream.listen((data) {
-        dataStore.insertAll(dataStore.length, data);
-      }, onDone: () async {
-        log("Download Done");
-        saveFile.writeAsBytes(dataStore, flush: true).then((res) async {
-          log("Written to File");
-        });
-      }, onError: (e) {
-        log("drive.showRestoreDialog() => \n " + e.toString());
-      });
+      print(file.toString());
+      // FIXME:
+      // file.stream.listen((data) {
+      //   dataStore.insertAll(dataStore.length, data);
+      // }, onDone: () async {
+      //   log("Download Done");
+      //   saveFile.writeAsBytes(dataStore, flush: true).then((res) async {
+      //     log("Written to File");
+      //   });
+      // }, onError: (e) {
+      //   log("drive.showRestoreDialog() => \n " + e.toString());
+      // });
     }
-    
+
     setState(() {
       _isRestoring = false;
       _isProcessing = false;
@@ -314,7 +319,7 @@ class _DriveAreaState extends State<DriveArea> {
                   border: Border.all(color: Theme.of(context).dividerColor)),
               child: FutureBuilder(
                 future: getBackups(),
-                builder: (context, snapshot) {
+                builder: (context, AsyncSnapshot snapshot) {
                   if (snapshot.hasData) {
                     return ListView.builder(
                       shrinkWrap: true,
@@ -346,11 +351,14 @@ class _DriveAreaState extends State<DriveArea> {
           Row(
             mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              FlatButton(
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(5)),
-                ),
-                color: Theme.of(context).buttonColor,
+              TextButton(
+                style: TextButton.styleFrom(
+                    foregroundColor: Theme.of(context).colorScheme.background,
+                    minimumSize: Size(88, 36),
+                    padding: EdgeInsets.symmetric(horizontal: 16),
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(5)),
+                    )),
                 onPressed: () {
                   Navigator.pop(context, null);
                 },
@@ -370,8 +378,8 @@ class _DriveAreaState extends State<DriveArea> {
         _isDeleting = true;
       });
 
-      final authHeaders = await account.authHeaders;
-      final authenticateClient = GoogleAuthClient(authHeaders);
+      final authHeaders = await account?.authHeaders;
+      final authenticateClient = GoogleAuthClient(authHeaders!);
       final driveApi = drive.DriveApi(authenticateClient);
 
       driveApi.files.delete(id);
@@ -384,8 +392,8 @@ class _DriveAreaState extends State<DriveArea> {
   }
 
   Future<dynamic> getBackups() async {
-    final authHeaders = await account.authHeaders;
-    final authenticateClient = GoogleAuthClient(authHeaders);
+    final authHeaders = await account?.authHeaders;
+    final authenticateClient = GoogleAuthClient(authHeaders!);
     final driveApi = drive.DriveApi(authenticateClient);
     return await driveApi.files.list(spaces: 'appDataFolder');
   }
diff --git a/lib/views/tracked/details/cycle_tile.dart b/lib/views/tracked/details/cycle_tile.dart
index 2f9ac69..efafbb0 100644
--- a/lib/views/tracked/details/cycle_tile.dart
+++ b/lib/views/tracked/details/cycle_tile.dart
@@ -17,7 +17,7 @@ class CycleTile extends StatelessWidget {
         borderRadius: BorderRadius.circular(10),
       ),
       elevation: 2,
-      color: Theme.of(context).backgroundColor,
+      color: Theme.of(context).colorScheme.background,
       margin: EdgeInsets.all(10),
       child: Padding(
         padding: const EdgeInsets.all(15.0),
@@ -32,13 +32,13 @@ class CycleTile extends StatelessWidget {
                   textAlign: TextAlign.left,
                   style: Theme.of(context)
                       .textTheme
-                      .bodyText2
-                      .copyWith(fontWeight: FontWeight.bold),
+                      .bodyMedium
+                      ?.copyWith(fontWeight: FontWeight.bold),
                 ),
                 Text(
                   dateFormatter.format(cycle.date),
                   textAlign: TextAlign.left,
-                  style: Theme.of(context).textTheme.bodyText2,
+                  style: Theme.of(context).textTheme.bodyMedium,
                 ),
               ],
             ),
@@ -53,8 +53,8 @@ class CycleTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText2
-                        .copyWith(fontWeight: FontWeight.w900),
+                        .bodyMedium
+                        ?.copyWith(fontWeight: FontWeight.w900),
                   ),
                 ),
                 SizedBox(
@@ -71,8 +71,8 @@ class CycleTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText2
-                        .copyWith(fontWeight: FontWeight.w900),
+                        .bodyMedium
+                        ?.copyWith(fontWeight: FontWeight.w900),
                   ),
                 ),
                 SizedBox(
@@ -89,8 +89,8 @@ class CycleTile extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText2
-                        .copyWith(fontWeight: FontWeight.w900),
+                        .bodyMedium
+                        ?.copyWith(fontWeight: FontWeight.w900),
                   ),
                 ),
               ],
@@ -107,19 +107,19 @@ class CycleTile extends StatelessWidget {
                           Text(
                             cycle.sellQty.toString(),
                             textAlign: TextAlign.left,
-                            style: Theme.of(context).textTheme.bodyText1,
+                            style: Theme.of(context).textTheme.bodyLarge,
                           ),
                           Text(
                             " x",
                             textAlign: TextAlign.left,
-                            style: Theme.of(context).textTheme.bodyText2,
+                            style: Theme.of(context).textTheme.bodyMedium,
                           ),
                         ],
                       ),
                       Text(
                         cycle.sellRate.toStringAsFixed(2),
                         textAlign: TextAlign.left,
-                        style: Theme.of(context).textTheme.bodyText1,
+                        style: Theme.of(context).textTheme.bodyLarge,
                       ),
                     ],
                   ),
@@ -146,7 +146,7 @@ class CycleTile extends StatelessWidget {
                                 Text(
                                   element.qty.toString(),
                                   textAlign: TextAlign.left,
-                                  style: Theme.of(context).textTheme.bodyText1,
+                                  style: Theme.of(context).textTheme.bodyLarge,
                                 ),
                                 Text(
                                   " x",
@@ -157,7 +157,7 @@ class CycleTile extends StatelessWidget {
                             ),
                             Text(element.rate.toStringAsFixed(2),
                                 textAlign: TextAlign.left,
-                                style: Theme.of(context).textTheme.bodyText1)
+                                style: Theme.of(context).textTheme.bodyLarge)
                           ],
                         ),
                       ),
@@ -176,7 +176,7 @@ class CycleTile extends StatelessWidget {
                   child: Text(
                     cycle.brokerage.toStringAsFixed(2),
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.bodyText1,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
                 ),
               ],
@@ -193,7 +193,7 @@ class CycleTile extends StatelessWidget {
                 Text(
                   "Net:",
                   textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
                 Expanded(
                   child: Row(
@@ -214,7 +214,7 @@ class CycleTile extends StatelessWidget {
                         child: Text(
                           cycle.net.abs().toStringAsFixed(2),
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headline6,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
                     ],
diff --git a/lib/views/tracked/details/details.dart b/lib/views/tracked/details/details.dart
index 32f3329..264860a 100644
--- a/lib/views/tracked/details/details.dart
+++ b/lib/views/tracked/details/details.dart
@@ -26,17 +26,17 @@ class DetailsView extends StatefulWidget {
 
 class _DetailsViewState extends State<DetailsView>
     with TickerProviderStateMixin {
-  Stock _stock;
-  Latest _bseLatest;
-  Latest _nseLatest;
-  TradeCycle _computedCycle;
-  TradeSummary _summary;
-  Future<TradeSummary> _futureSummary;
-  Future<List<TradeLog>> _futureLogs;
+  late Stock _stock;
+  late Latest _bseLatest;
+  late Latest _nseLatest;
+  late TradeCycle _computedCycle;
+  late TradeSummary _summary;
+  late Future<TradeSummary> _futureSummary;
+  late Future<List<TradeLog>> _futureLogs;
 
-  StreamSubscription<Latest> _latestBSEStreamSub;
-  StreamSubscription<Latest> _latestNSEStreamSub;
-  TabController _tabController;
+  late StreamSubscription<Latest?> _latestBSEStreamSub;
+  late StreamSubscription<Latest?> _latestNSEStreamSub;
+  late TabController _tabController;
 
   final _formKey = GlobalKey<FormState>();
   final _qtyController = TextEditingController();
@@ -50,20 +50,20 @@ class _DetailsViewState extends State<DetailsView>
 
     if (_stock?.bseCode != null) {
       _latestBSEStreamSub =
-          StockRepository.getPeriodicLatest(_stock?.bseCode, "BSE")
+          StockRepository.getPeriodicLatest(_stock!.bseCode, "BSE")
               .listen((value) {
         setState(() {
-          _bseLatest = value;
+          _bseLatest = value!;
         });
       });
     }
 
     if (_stock?.nseCode != null) {
       _latestNSEStreamSub =
-          StockRepository.getPeriodicLatest(_stock?.nseCode, "NSE")
+          StockRepository.getPeriodicLatest(_stock!.nseCode, "NSE")
               .listen((value) {
         setState(() {
-          _nseLatest = value;
+          _nseLatest = value!;
         });
       });
     }
@@ -94,12 +94,12 @@ class _DetailsViewState extends State<DetailsView>
         centerTitle: true,
         title: Text("Details"),
         elevation: 0,
-        backgroundColor: Theme.of(context).backgroundColor,
+        backgroundColor: Theme.of(context).colorScheme.background,
       ),
       body: Column(
         children: [
           Container(
-            color: Theme.of(context).backgroundColor,
+            color: Theme.of(context).colorScheme.background,
             child: Column(
               children: [
                 Padding(
@@ -112,13 +112,13 @@ class _DetailsViewState extends State<DetailsView>
                               width: 200,
                               height: Theme.of(context)
                                   .textTheme
-                                  .headline6
-                                  .fontSize)
+                                  .titleLarge
+                                  !.fontSize!)
                           : Flexible(
                               child: Text(
-                                _stock?.name,
+                                _stock!.name!,
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline6,
+                                style: Theme.of(context).textTheme.titleLarge,
                               ),
                             ),
                     ],
@@ -136,8 +136,8 @@ class _DetailsViewState extends State<DetailsView>
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  "BSE - " + _stock?.bseCode,
-                                  style: Theme.of(context).textTheme.bodyText1,
+                                  "BSE - " + _stock!.bseCode,
+                                  style: Theme.of(context).textTheme.bodyLarge,
                                 ),
                                 SizedBox(
                                   width: 5,
@@ -147,15 +147,15 @@ class _DetailsViewState extends State<DetailsView>
                                     Icons.edit,
                                     size: Theme.of(context)
                                             .textTheme
-                                            .bodyText1
-                                            .fontSize +
+                                            .bodyLarge
+                                            !.fontSize! +
                                         3,
                                   ),
                                   onTap: () async {
                                     await showDialog(
                                       context: context,
                                       builder: (context) => EditCodeDialog(
-                                          _stock?.bseCode,
+                                          _stock!.bseCode,
                                           "BSE",
                                           updateBSECode),
                                     );
@@ -175,8 +175,8 @@ class _DetailsViewState extends State<DetailsView>
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  "NSE - " + _stock?.nseCode,
-                                  style: Theme.of(context).textTheme.bodyText1,
+                                  "NSE - " + _stock!.nseCode,
+                                  style: Theme.of(context).textTheme.bodyLarge,
                                 ),
                                 SizedBox(
                                   width: 5,
@@ -186,15 +186,15 @@ class _DetailsViewState extends State<DetailsView>
                                     Icons.edit,
                                     size: Theme.of(context)
                                             .textTheme
-                                            .bodyText1
-                                            .fontSize +
+                                            .bodyLarge
+                                            !.fontSize! +
                                         3,
                                   ),
                                   onTap: () async {
                                     await showDialog(
                                       context: context,
                                       builder: (context) => EditCodeDialog(
-                                          _stock?.nseCode,
+                                          _stock!.nseCode,
                                           "NSE",
                                           updateNSECode),
                                     );
@@ -254,7 +254,7 @@ class _DetailsViewState extends State<DetailsView>
             children: [
               Expanded(
                 child: Container(
-                  color: Theme.of(context).backgroundColor,
+                  color: Theme.of(context).colorScheme.background,
                   child: Center(
                     child: TabBar(
                       controller: _tabController,
@@ -273,8 +273,8 @@ class _DetailsViewState extends State<DetailsView>
                           child: Text("LOGS"),
                         ),
                       ],
-                      indicatorColor: Theme.of(context).accentColor,
-                      labelColor: Theme.of(context).accentColor,
+                      indicatorColor: Theme.of(context).colorScheme.secondary,
+                      labelColor: Theme.of(context).colorScheme.secondary,
                     ),
                   ),
                 ),
@@ -283,7 +283,7 @@ class _DetailsViewState extends State<DetailsView>
           ),
           Container(
             height: 1,
-            color: Theme.of(context).accentColor,
+            color: Theme.of(context).colorScheme.secondary,
           ),
           Expanded(
             child: TabBarView(
@@ -291,7 +291,7 @@ class _DetailsViewState extends State<DetailsView>
               children: [
                 FutureBuilder(
                   future: _futureSummary,
-                  builder: (context, snapshot) {
+                  builder: (context, AsyncSnapshot snapshot) {
                     if (snapshot.connectionState != ConnectionState.done) {
                       return Column(
                         mainAxisSize: MainAxisSize.max,
@@ -318,7 +318,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -332,7 +332,7 @@ class _DetailsViewState extends State<DetailsView>
                           Form(
                             key: _formKey,
                             child: Card(
-                              color: Theme.of(context).backgroundColor,
+                              color: Theme.of(context).colorScheme.background,
                               shape: RoundedRectangleBorder(
                                 borderRadius: BorderRadius.circular(10),
                               ),
@@ -354,10 +354,10 @@ class _DetailsViewState extends State<DetailsView>
                                             RegExp(r'[0-9]')),
                                       ],
                                       validator: (value) {
-                                        if (value.isEmpty) {
+                                        if (value!.isEmpty) {
                                           return 'Required';
                                         } else if (int.parse(value) >
-                                            _stock.qty) {
+                                            _stock.qty!) {
                                           return 'Too High!';
                                         }
                                         return null;
@@ -377,7 +377,7 @@ class _DetailsViewState extends State<DetailsView>
                                           TextInputType.numberWithOptions(
                                               decimal: true),
                                       validator: (value) {
-                                        if (value.isEmpty ||
+                                        if (value!.isEmpty ||
                                             RegExp(r"^[0-9]*(\.[0-9][0-9]?)?$")
                                                 .hasMatch(value)) {
                                           return null;
@@ -389,23 +389,33 @@ class _DetailsViewState extends State<DetailsView>
                                     Row(
                                       children: [
                                         Spacer(),
-                                        FlatButton(
+                                        TextButton(
+                                          style: TextButton.styleFrom(
+                                              foregroundColor: Colors.black87,
+                                              minimumSize: Size(88, 36),
+                                              padding: EdgeInsets.symmetric(horizontal: 16),
+                                              shape: const RoundedRectangleBorder(
+                                                borderRadius:
+                                                BorderRadius.all(Radius.circular(2)),
+                                              )),
                                           child: Text("Calculate"),
                                           onPressed: () {
-                                            if (_formKey.currentState
-                                                .validate()) {
+                                            if (_formKey.currentState!.validate()) {
                                               int qty = int.parse(
                                                   _qtyController.text);
+                                              // FIXME check rate is valid (!= 0  or null)
                                               double rate =
-                                                  _rateController.text.isEmpty
+                                                  (_rateController.text.isEmpty
                                                       ? _stock?.lastValue
                                                       : double.parse(
-                                                          _rateController.text);
+                                                          _rateController.text)) ?? 0;
                                               var cycle = _summary.computeCycle(
                                                   qty, rate);
-                                              setState(() {
-                                                _computedCycle = cycle;
-                                              });
+                                              if (cycle != null) {
+                                                setState(() {
+                                                  _computedCycle = cycle;
+                                                });
+                                              }
                                             }
                                           },
                                         ),
@@ -426,7 +436,7 @@ class _DetailsViewState extends State<DetailsView>
                 ),
                 FutureBuilder(
                   future: _futureSummary,
-                  builder: (context, snapshot) {
+                  builder: (context, AsyncSnapshot snapshot) {
                     if (snapshot.connectionState != ConnectionState.done) {
                       return Column(
                         mainAxisSize: MainAxisSize.max,
@@ -454,7 +464,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -472,7 +482,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No stocks remaining",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -490,7 +500,7 @@ class _DetailsViewState extends State<DetailsView>
                 ),
                 FutureBuilder(
                   future: _futureSummary,
-                  builder: (context, snapshot) {
+                  builder: (context, AsyncSnapshot snapshot) {
                     if (snapshot.connectionState != ConnectionState.done) {
                       return Column(
                         mainAxisSize: MainAxisSize.max,
@@ -518,7 +528,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -535,7 +545,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No stocks sold",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -553,7 +563,7 @@ class _DetailsViewState extends State<DetailsView>
                 ),
                 FutureBuilder(
                   future: _futureLogs,
-                  builder: (context, snapshot) {
+                  builder: (context, AsyncSnapshot snapshot) {
                     if (snapshot.connectionState != ConnectionState.done) {
                       return Column(
                         mainAxisSize: MainAxisSize.max,
@@ -581,7 +591,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "An error occurred",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -598,7 +608,7 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No logs imported",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -643,7 +653,7 @@ class EditCodeDialog extends StatefulWidget {
 }
 
 class _EditCodeDialogState extends State<EditCodeDialog> {
-  TextEditingController _codeCtl;
+  late TextEditingController _codeCtl;
   final _formKey = GlobalKey<FormState>();
 
   @override
@@ -661,7 +671,7 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
   @override
   Widget build(BuildContext context) {
     return Dialog(
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(10),
       ),
@@ -676,7 +686,7 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Text(
                   "Edit Code",
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
               Padding(
@@ -689,12 +699,12 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
                     ),
                     helperText: widget.exchange + " code",
                   ),
-                  cursorColor: Theme.of(context).accentColor,
-                  style: Theme.of(context).textTheme.bodyText1,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
+                  style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.text,
                   controller: _codeCtl,
                   validator: (value) {
-                    if (value.isEmpty) {
+                    if (value!.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -705,27 +715,33 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
                 padding: const EdgeInsets.all(8.0),
                 child: Row(
                   children: [
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                          foregroundColor: Colors.black87,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius:
+                            BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Cancel"),
                       onPressed: () {
                         Navigator.pop(context);
                       },
                     ),
                     Spacer(),
-                    FlatButton(
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(
-                          Radius.circular(5),
-                        ),
-                      ),
+                    TextButton(
+                      style: TextButton.styleFrom(
+                          foregroundColor: Colors.black87,
+                          minimumSize: Size(88, 36),
+                          padding: EdgeInsets.symmetric(horizontal: 16),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius:
+                            BorderRadius.all(Radius.circular(5)),
+                          )),
                       child: Text("Apply"),
                       onPressed: () async {
-                        if (_formKey.currentState.validate()) {
+                        if (_formKey.currentState!.validate()) {
                           if (widget.code != _codeCtl.text) {
                             await DatabaseActions.updateCode(
                               widget.code,
diff --git a/lib/views/tracked/tracked.dart b/lib/views/tracked/tracked.dart
index c2c11ea..00561e2 100644
--- a/lib/views/tracked/tracked.dart
+++ b/lib/views/tracked/tracked.dart
@@ -12,8 +12,8 @@ class TrackedView extends StatefulWidget {
 }
 
 class _TrackedViewState extends State<TrackedView> {
-  Future<List<Stock>> _pinnedStockFuture;
-  Future<List<Stock>> _unpinnedStockFuture;
+  late Future<List<Stock>?> _pinnedStockFuture;
+  late Future<List<Stock>?> _unpinnedStockFuture;
 
   Future<bool> hasData() async {
     if (((await _pinnedStockFuture)?.length ?? 0) == 0 &&
@@ -54,13 +54,15 @@ class _TrackedViewState extends State<TrackedView> {
                     children: <Widget>[
                       Text(
                         "Tracked",
-                        style: Theme.of(context).textTheme.headline1,
+                        style: Theme.of(context).textTheme.displayLarge,
                       ),
-                      RaisedButton(
-                        shape: CircleBorder(),
+                      ElevatedButton(
+                        style: ElevatedButton.styleFrom(
+                            backgroundColor: Theme.of(context).colorScheme.secondary,
+                            foregroundColor: Theme.of(context).colorScheme.background,
+                            shape: const CircleBorder(),
+                        ),
                         child: Icon(Icons.add),
-                        color: Theme.of(context).accentColor,
-                        textColor: Theme.of(context).backgroundColor,
                         onPressed: () {
                           showDialog(
                             context: context,
@@ -93,13 +95,13 @@ class _TrackedViewState extends State<TrackedView> {
                     ),
                   ),
                 );
-              } else if (!snapshot.data) {
+              } else if (!snapshot.hasData) {
                 return SliverFillRemaining(
                   hasScrollBody: false,
                   child: Center(
                     child: Text(
                       "No stocks tracked",
-                      style: Theme.of(context).textTheme.headline4,
+                      style: Theme.of(context).textTheme.headlineMedium,
                     ),
                   ),
                 );
diff --git a/lib/views/tracked/tracked_bottom_sheet.dart b/lib/views/tracked/tracked_bottom_sheet.dart
index 2a80839..149c4ab 100644
--- a/lib/views/tracked/tracked_bottom_sheet.dart
+++ b/lib/views/tracked/tracked_bottom_sheet.dart
@@ -16,7 +16,7 @@ class TrackedBottomSheet extends StatefulWidget {
 }
 
 class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
-  Stock _stock;
+  late Stock _stock;
   bool _isRefreshing = true;
 
   @override
@@ -30,7 +30,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         borderRadius: BorderRadius.only(
           topLeft: const Radius.circular(20.0),
           topRight: const Radius.circular(20.0),
@@ -85,10 +85,10 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                             });
 
                             StockRepository.getOnceLatest(
-                                    _stock.code, _stock.exchange)
+                                    _stock.code!, _stock.exchange!)
                                 .then((value) {
                               setState(() {
-                                _stock.latest = value;
+                                _stock.latest = value!;
                                 _isRefreshing = false;
                               });
                             });
@@ -107,8 +107,8 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                     splashRadius: 25.0,
                     onPressed: () {
                       DatabaseActions.updatePinned(
-                        _stock.code,
-                        _stock.exchange,
+                        _stock.code!,
+                        _stock.exchange!,
                         !_stock.pinned,
                       ).then((value) {
                         if (value) {
@@ -134,12 +134,12 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                     onPressed: () {
                       if (_stock.isVisible) {
                         DatabaseActions.deleteTracked(
-                            _stock.code, _stock.exchange);
+                            _stock.code!, _stock.exchange!);
                       } else {
                         DatabaseActions.addTracked(
-                          _stock.code,
-                          _stock.exchange,
-                          _stock.name,
+                          _stock.code!,
+                          _stock.exchange!,
+                          _stock.name!,
                           _stock.pinned,
                         );
                       }
@@ -216,12 +216,12 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                 _stock?.name == null
                     ? TextLoadingIndicator(
                         width: 200,
-                        height: Theme.of(context).textTheme.headline6.fontSize)
+                        height: Theme.of(context).textTheme.titleLarge!.fontSize!)
                     : Flexible(
                         child: Text(
-                          _stock?.name,
+                          _stock.name!,
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headline6,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
               ],
@@ -235,18 +235,18 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                 _stock?.exchange == null || _stock?.code == null
                     ? TextLoadingIndicator(
                         width: 100,
-                        height: Theme.of(context).textTheme.bodyText1.fontSize)
+                        height: Theme.of(context).textTheme.bodyLarge!.fontSize!)
                     : Text(
                         (_stock?.exchange ?? "") + "-" + (_stock.code ?? ""),
-                        style: Theme.of(context).textTheme.bodyText1,
+                        style: Theme.of(context).textTheme.bodyLarge,
                       ),
                 _stock?.lastUpdated == null
                     ? TextLoadingIndicator(
                         width: 150,
-                        height: Theme.of(context).textTheme.bodyText1.fontSize)
+                        height: Theme.of(context).textTheme.bodyLarge!.fontSize!)
                     : Text(
-                        _stock?.lastUpdated,
-                        style: Theme.of(context).textTheme.bodyText1,
+                        _stock!.lastUpdated!,
+                        style: Theme.of(context).textTheme.bodyLarge,
                       ),
               ],
             ),
@@ -259,12 +259,10 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
 
 class MapTile extends StatelessWidget {
   const MapTile({
-    Key key,
-    @required String name,
-    @required String value,
+    required String name,
+    required String value,
   })  : _name = name,
-        _value = value,
-        super(key: key);
+        _value = value;
 
   final String _name;
   final String _value;
@@ -272,7 +270,7 @@ class MapTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
-      color: Theme.of(context).colorScheme.primaryVariant,
+      color: Theme.of(context).colorScheme.primaryContainer,
       elevation: 0,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(20),
@@ -288,11 +286,11 @@ class MapTile extends StatelessWidget {
             children: [
               Text(
                 _value,
-                style: Theme.of(context).textTheme.headline4,
+                style: Theme.of(context).textTheme.headlineMedium,
               ),
               Text(
                 _name,
-                style: Theme.of(context).textTheme.bodyText1,
+                style: Theme.of(context).textTheme.bodyLarge,
               )
             ],
           ),
diff --git a/lib/views/tracked/tracked_list.dart b/lib/views/tracked/tracked_list.dart
index 70e6e89..de7eca5 100644
--- a/lib/views/tracked/tracked_list.dart
+++ b/lib/views/tracked/tracked_list.dart
@@ -3,9 +3,9 @@ import 'package:folio/models/stock/stock.dart';
 import 'package:folio/views/tracked/tracked_tile.dart';
 
 class TrackedList extends StatefulWidget {
-  TrackedList({Key key, @required this.future}) : super(key: key);
+  TrackedList({required this.future});
 
-  final Future<List<Stock>> future;
+  final Future<List<Stock>?> future;
 
   @override
   _TrackedListState createState() => _TrackedListState();
@@ -16,7 +16,7 @@ class _TrackedListState extends State<TrackedList> {
   Widget build(BuildContext context) {
     return FutureBuilder(
       future: widget.future,
-      builder: (context, snapshot) {
+      builder: (context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState != ConnectionState.done || snapshot.hasError ||
             (snapshot.data?.length ?? 0) == 0 ) {
           return SliverToBoxAdapter(
@@ -26,9 +26,9 @@ class _TrackedListState extends State<TrackedList> {
         return SliverList(
           delegate: SliverChildBuilderDelegate(
             (BuildContext context, int index) {
-              return TrackedTile(snapshot.data[index]);
+              return TrackedTile(snapshot.data?[index]);
             },
-            childCount: snapshot.data.length,
+            childCount: (snapshot.data?.length ?? 0),
           ),
         );
       },
diff --git a/lib/views/tracked/tracked_tile.dart b/lib/views/tracked/tracked_tile.dart
index 7969000..7abfa2d 100644
--- a/lib/views/tracked/tracked_tile.dart
+++ b/lib/views/tracked/tracked_tile.dart
@@ -17,8 +17,8 @@ class TrackedTile extends StatefulWidget {
 }
 
 class _TrackedTileState extends State<TrackedTile> {
-  Stock _stock;
-  StreamSubscription<Latest> _latestStreamSub;
+  late Stock _stock;
+  late StreamSubscription<Latest?> _latestStreamSub;
   GlobalKey _scaffold = GlobalKey();
 
   @override
@@ -26,15 +26,15 @@ class _TrackedTileState extends State<TrackedTile> {
     super.initState();
     _stock = widget.stock;
     _latestStreamSub =
-        StockRepository.getPeriodicLatest(_stock.code, _stock.exchange)
+        StockRepository.getPeriodicLatest(_stock.code!, _stock.exchange!)
             .listen((value) {
       setState(() {
-        _stock.latest = value;
+        _stock.latest = value!;
       });
     });
     if (_stock.name == null) {
-      StockRepository.getName(_stock.code, _stock.exchange).then((value) {
-        if (this.mounted) {
+      StockRepository.getName(_stock.code!, _stock.exchange!).then((value) {
+        if (this.mounted && value != null) {
           setState(() {
             _stock.name = value;
           });
@@ -56,7 +56,7 @@ class _TrackedTileState extends State<TrackedTile> {
       color: (_stock?.lastValue ?? double.negativeInfinity) >
               (_stock?.esr ?? double.infinity)
           ? Colors.lightGreen[600]
-          : Theme.of(context).backgroundColor,
+          : Theme.of(context).colorScheme.background,
       elevation: 2,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(20),
@@ -99,15 +99,15 @@ class _TrackedTileState extends State<TrackedTile> {
                         _stock == null
                             ? TextLoadingIndicator(
                                 width: 100,
-                                height: Theme.of(context)
+                                height: (Theme.of(context)
                                     .textTheme
-                                    .bodyText2
-                                    .fontSize)
+                                    .bodyMedium
+                                    ?.fontSize)!)
                             : Text(
                                 (_stock?.exchange ?? "") +
                                     " - " +
                                     (_stock?.code ?? ""),
-                                style: Theme.of(context).textTheme.bodyText2,
+                                style: Theme.of(context).textTheme.bodyMedium,
                               ),
                         SizedBox(
                           height: 5,
@@ -115,13 +115,13 @@ class _TrackedTileState extends State<TrackedTile> {
                         _stock?.name == null
                             ? TextLoadingIndicator(
                                 width: 200,
-                                height: Theme.of(context)
+                                height: (Theme.of(context)
                                     .textTheme
-                                    .headline6
-                                    .fontSize)
+                                    .titleLarge
+                                    ?.fontSize)!)
                             : Text(
-                                (_stock?.name == "NULL" ? "-" : _stock?.name),
-                                style: Theme.of(context).textTheme.headline6,
+                                (_stock?.name == "NULL" ? "-" : (_stock?.name)!),
+                                style: Theme.of(context).textTheme.titleLarge,
                               ),
                       ],
                     ),
@@ -136,7 +136,7 @@ class _TrackedTileState extends State<TrackedTile> {
                     vertical: 20,
                   ),
                   decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.primaryVariant,
+                    color: Theme.of(context).colorScheme.primaryContainer,
                     borderRadius: BorderRadius.only(
                       topRight: Radius.circular(20),
                       bottomRight: Radius.circular(20),
@@ -151,13 +151,13 @@ class _TrackedTileState extends State<TrackedTile> {
                                 width: 70,
                                 height: Theme.of(context)
                                         .textTheme
-                                        .headline4
-                                        .fontSize +
+                                        .headlineMedium
+                                        !.fontSize! +
                                     5,
                               )
                             : Text(
                                 _stock?.lastValue?.toStringAsFixed(2) ?? "",
-                                style: Theme.of(context).textTheme.headline4,
+                                style: Theme.of(context).textTheme.headlineMedium,
                               ),
                         SizedBox(
                           height: 5,
@@ -169,34 +169,34 @@ class _TrackedTileState extends State<TrackedTile> {
                             _stock?.percentChange == null
                                 ? TextLoadingIndicator(
                                     width: 30,
-                                    height: Theme.of(context)
+                                    height: (Theme.of(context)
                                         .textTheme
-                                        .bodyText1
-                                        .fontSize,
+                                        .bodyLarge
+                                        ?.fontSize)!,
                                   )
                                 : Text(
                                     "${_stock?.percentChange}%",
                                     style:
-                                        Theme.of(context).textTheme.bodyText1,
+                                        Theme.of(context).textTheme.bodyLarge,
                                   ),
                             SizedBox(width: 10),
                             _stock?.change == null
                                 ? TextLoadingIndicator(
                                     width: 40,
-                                    height: Theme.of(context)
+                                    height: (Theme.of(context)
                                         .textTheme
-                                        .bodyText1
-                                        .fontSize,
+                                        .bodyLarge
+                                        ?.fontSize)!,
                                   )
                                 : Text(
-                                    _stock?.change,
+                                    _stock!.change!,
                                     style: Theme.of(context)
                                         .textTheme
-                                        .bodyText1
-                                        .copyWith(
-                                          color: _stock?.changeSign == 1
+                                        .bodyLarge
+                                        ?.copyWith(
+                                          color: _stock.changeSign == 1
                                               ? Colors.green
-                                              : (_stock?.changeSign == -1
+                                              : (_stock.changeSign == -1
                                                   ? Colors.red
                                                   : Theme.of(context)
                                                       .colorScheme
@@ -219,7 +219,7 @@ class _TrackedTileState extends State<TrackedTile> {
 
   void _modalBottomSheetMenu() {
     showModalBottomSheet(
-        context: _scaffold.currentContext,
+        context: (_scaffold.currentContext)!,
         builder: (builder) {
           return TrackedBottomSheet(_stock);
         });
diff --git a/pubspec.lock b/pubspec.lock
index fea409b..4eeaae0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,135 +5,162 @@ packages:
     dependency: transitive
     description:
       name: _discoveryapis_commons
-      url: "https://pub.dartlang.org"
+      sha256: f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "1.0.6"
   archive:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.13"
+    version: "3.3.7"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      url: "https://pub.dev"
     source: hosted
-    version: "1.6.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  charcode:
+    version: "1.3.0"
+  checked_yaml:
     dependency: transitive
     description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.1"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "3.0.3"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      url: "https://pub.dartlang.org"
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.16.2"
+    version: "1.0.0"
   csv:
     dependency: "direct main"
     description:
       name: csv
-      url: "https://pub.dartlang.org"
+      sha256: "016b31a51a913744a0a1655c74ff13c9379e1200e246a03d96c81c5d9ed297b5"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "5.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "1.0.5"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.10"
+    version: "5.3.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.2.1"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.4"
   file_picker:
     dependency: "direct main"
     description:
       name: file_picker
-      url: "https://pub.dartlang.org"
+      sha256: "704259669b5e9cb24e15c11cfcf02caf5f20d30901b3916d60b6d1c2d647035f"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "4.6.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -143,16 +170,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      url: "https://pub.dartlang.org"
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.8.1"
+    version: "0.13.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.11"
+    version: "2.0.15"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -163,244 +192,350 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  google_identity_services_web:
+    dependency: transitive
+    description:
+      name: google_identity_services_web
+      sha256: "7940fdc3b1035db4d65d387c1bdd6f9574deaa6777411569c05ecc25672efacd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   google_sign_in:
     dependency: "direct main"
     description:
       name: google_sign_in
-      url: "https://pub.dartlang.org"
+      sha256: aab6fdc41374014494f9e9026b9859e7309639d50a0bf4a2a412467a5ae4abc6
+      url: "https://pub.dev"
     source: hosted
-    version: "4.5.6"
+    version: "6.1.4"
+  google_sign_in_android:
+    dependency: transitive
+    description:
+      name: google_sign_in_android
+      sha256: "8d60a787b29cb7d2bcf29230865f4a91f17323c6ac5b6b9027a6418e48d9ffc3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.18"
+  google_sign_in_ios:
+    dependency: transitive
+    description:
+      name: google_sign_in_ios
+      sha256: "6ec0e13a4c5c646471b9f6a25ceb3ae76d339889d4c0f79b729bf0714215a63e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.6.2"
   google_sign_in_platform_interface:
     dependency: transitive
     description:
       name: google_sign_in_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: e69553c0fc6a76216e9d06a8c3767e291ad9be42171f879aab7ab708569d4393
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "2.4.1"
   google_sign_in_web:
     dependency: transitive
     description:
       name: google_sign_in_web
-      url: "https://pub.dartlang.org"
+      sha256: "69b9ce0e760945ff52337921a8b5871592b74c92f85e7632293310701eea68cc"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.12.0+2"
   googleapis:
     dependency: "direct main"
     description:
       name: googleapis
-      url: "https://pub.dartlang.org"
+      sha256: c2f311bcd1b3e4052234162edc6b626a9013a7e1385d6aad37e9e6a6c5f89908
+      url: "https://pub.dev"
     source: hosted
-    version: "0.56.1"
+    version: "11.4.0"
   html:
     dependency: "direct main"
     description:
       name: html
-      url: "https://pub.dartlang.org"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.14.0+4"
+    version: "0.15.4"
   http:
     dependency: "direct main"
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.2"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "4.0.2"
   image:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.dartlang.org"
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.18"
+    version: "4.0.17"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.1"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.3"
+    version: "4.8.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.15"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.9.1"
   nested:
     dependency: transitive
     description:
       name: nested
-      url: "https://pub.dartlang.org"
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
-  path_provider_linux:
+    version: "2.0.15"
+  path_provider_android:
     dependency: transitive
     description:
-      name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      name: path_provider_android
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  path_provider_macos:
+    version: "2.3.0"
+  path_provider_linux:
     dependency: transitive
     description:
-      name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      name: path_provider_linux
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      sha256: a34ecd7fb548f8e57321fd8e50d865d266941b54e6c3b7758cf8f37c24116905
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.9.2"
+    version: "2.0.7"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.dartlang.org"
+      sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.4.3"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.1+1"
+    version: "10.3.3"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.1.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.11.3"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "0.1.3"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "5.4.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
-  process:
+    version: "2.1.5"
+  pointycastle:
     dependency: transitive
     description:
-      name: process
-      url: "https://pub.dartlang.org"
+      name: pointycastle
+      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.2.1"
+    version: "3.7.3"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      url: "https://pub.dartlang.org"
+      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.5"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "3.2.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.dartlang.org"
+      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
-  shared_preferences_linux:
+    version: "2.2.0"
+  shared_preferences_android:
     dependency: transitive
     description:
-      name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
+      name: shared_preferences_android
+      sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  shared_preferences_macos:
+    version: "2.3.2"
+  shared_preferences_linux:
     dependency: transitive
     description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      name: shared_preferences_linux
+      sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
+      sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -410,107 +545,122 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
-      url: "https://pub.dartlang.org"
+      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.1+1"
+    version: "2.3.0"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      url: "https://pub.dartlang.org"
+      sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2+1"
+    version: "2.5.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      url: "https://pub.dartlang.org"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.0+2"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.19"
+    version: "0.5.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.2"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      sha256: c0e3a4f7be7dae51d8f152230b86627e3397c1ba8c3fa58e63d44a9f3edc9cef
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.6.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "1.0.2"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.5.1"
+    version: "6.3.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "3.1.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.3.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 8f35e5b..6976675 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 3.1.4
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -28,20 +28,20 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   shared_preferences: ^2.0.5
-  permission_handler: ^5.0.1+1
-  cupertino_icons: ^0.1.3
-  google_sign_in: ^4.5.6
+  permission_handler: ^10.4.3
+  cupertino_icons: ^1.0.5
+  google_sign_in: ^6.1.4
   path_provider: ^2.0.1
-  file_picker: ^2.0.6
-  collection: ^1.15.0
-  googleapis: ^0.56.1
-  provider: ^5.0.0
-  sqflite: ^1.3.1+1
-  html: ^0.14.0+4
-  http: ^0.12.2
-  intl: ^0.17.0
-  dio: ^3.0.10
-  csv: ^4.1.0
+  file_picker: ^4.0.1
+  collection: ^1.17.1
+  googleapis: ^11.4.0
+  provider: ^6.0.5
+  sqflite: ^2.3.0
+  html: ^0.15.4
+  http: ^1.1.0
+  intl: ^0.18.1
+  dio: ^5.3.2
+  csv: ^5.0.2
 
 flutter_icons:
   android: "launcher_icon"
@@ -51,7 +51,7 @@ flutter_icons:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: "^0.8.0"
+  flutter_launcher_icons: "^0.13.1"
 
 
 

From 6e01a0171b0afc6ab70f2c10e72dd727eb2debb6 Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Sun, 13 Aug 2023 19:59:48 +0530
Subject: [PATCH 2/6] Fix some runtime errors

---
 lib/assets/app_theme.dart                     |   3 +-
 lib/helpers/database_actions.dart             |   2 +-
 lib/models/database/portfolio.dart            |  12 +-
 lib/models/stock/latest.dart                  |  16 +--
 lib/models/stock/stock.dart                   |  32 +++--
 lib/services/query/query_api.dart             |   4 +-
 lib/services/query/query_bse_api.dart         |   4 +-
 lib/services/query/query_nse_api.dart         |  11 +-
 lib/views/portfolio/portfolio_tile.dart       |  18 +--
 .../settings/data/add_portfolio_dialog.dart   |   6 +-
 lib/views/settings/data/add_trade_log.dart    | 112 ++++++++-------
 lib/views/settings/data/data.dart             |  22 +--
 .../settings/data/track_stock_dialog.dart     |  14 +-
 lib/views/settings/drive/drive.dart           |  28 +++-
 lib/views/tracked/details/details.dart        | 129 ++++++++++--------
 lib/views/tracked/tracked_bottom_sheet.dart   |  48 +++----
 lib/views/tracked/tracked_tile.dart           |  36 +++--
 17 files changed, 278 insertions(+), 219 deletions(-)

diff --git a/lib/assets/app_theme.dart b/lib/assets/app_theme.dart
index 6dd25dc..990d816 100644
--- a/lib/assets/app_theme.dart
+++ b/lib/assets/app_theme.dart
@@ -65,7 +65,8 @@ class AppTheme {
       enabledBorder: OutlineInputBorder(
         borderSide: BorderSide(color: _darkPrimaryVariantColor),
       ),
-    ), colorScheme: ColorScheme.light(
+    ),
+    colorScheme: ColorScheme.dark(
       primary: _darkPrimaryColor,
       secondary: _iconColor,
       background: _darkBackgroundColor,
diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index 26e86ad..ee54cef 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -686,7 +686,7 @@ class DatabaseActions {
   }
 
   static Future<bool> addTracked(
-      String code, String exchange, String name, bool pinned) async {
+      String code, String exchange, String? name, bool pinned) async {
     return await Db().insert(Db.tblTracked, {
       Db.colCode: code,
       Db.colExch: exchange,
diff --git a/lib/models/database/portfolio.dart b/lib/models/database/portfolio.dart
index 25d4e41..2d60835 100644
--- a/lib/models/database/portfolio.dart
+++ b/lib/models/database/portfolio.dart
@@ -1,12 +1,12 @@
 import 'package:folio/services/database/database.dart';
 
 class Portfolio {
-  late int rowid;
-  late String bseCode;
-  late String nseCode;
-  late int qty;
-  late double msr;
-  late double esr;
+  late int? rowid;
+  late String? bseCode;
+  late String? nseCode;
+  late int? qty;
+  late double? msr;
+  late double? esr;
 
   Portfolio.fromDbTuple(Map<String, dynamic> tuple) {
     rowid = tuple["rowid"];
diff --git a/lib/models/stock/latest.dart b/lib/models/stock/latest.dart
index f845ad1..2e6918b 100644
--- a/lib/models/stock/latest.dart
+++ b/lib/models/stock/latest.dart
@@ -1,9 +1,9 @@
 class Latest {
-  double value = 0.0;
-  String change = "";
-  String percentageChange = "";
+  double? value;
+  String? change;
+  String? percentageChange;
   int sign = 0;
-  String updated = "";
+  String? updated;
 
   Latest();
 
@@ -13,14 +13,14 @@ class Latest {
   @override
   String toString() {
     return 'value: ' +
-        value.toStringAsFixed(2) +
+        (value?.toStringAsFixed(2) ?? "NULL") +
         '\nchange: ' +
-        change +
+        (change ?? "NULL") +
         '\npercentageChange: ' +
-        percentageChange +
+        (percentageChange ?? "NULL") +
         '\nsign: ' +
         sign.toString() +
         '\ntime: ' +
-        updated;
+        (updated ?? "NULL");
   }
 }
diff --git a/lib/models/stock/stock.dart b/lib/models/stock/stock.dart
index b86ddca..6f76f2e 100644
--- a/lib/models/stock/stock.dart
+++ b/lib/models/stock/stock.dart
@@ -15,13 +15,13 @@ class Stock {
         _tracked = Tracked.fromDbTuple(tuple),
         _latest = Latest();
 
-  int get id => _portfolio.rowid;
+  int? get id => _portfolio.rowid;
 
-  String? get name => _tracked?.name;
+  String? get name => _tracked.name;
 
-  String? get exchange => _tracked?.exchange;
+  String get exchange => _tracked.exchange;
 
-  String? get code => _tracked?.code;
+  String get code => _tracked.code;
 
   int? get qty => _portfolio?.qty;
 
@@ -53,9 +53,9 @@ class Stock {
 
   bool get pinned => _tracked.pinned;
 
-  String get bseCode => _portfolio.bseCode;
+  String? get bseCode => _portfolio.bseCode;
 
-  String get nseCode => _portfolio.nseCode;
+  String? get nseCode => _portfolio.nseCode;
 
   set pinned(bool pin) {
     _tracked.pinned = pin;
@@ -65,7 +65,8 @@ class Stock {
     _tracked.name = name;
   }
 
-  set bseCode(String code) {
+  set bseCode(String? code) {
+    if (code == null) return;
     _portfolio.bseCode = code;
 
     if (_tracked.exchange == "BSE") {
@@ -73,7 +74,8 @@ class Stock {
     }
   }
 
-  set nseCode(String code) {
+  set nseCode(String? code) {
+    if (code == null) return;
     _portfolio.nseCode = code;
 
     if (_tracked.exchange == "NSE") {
@@ -81,12 +83,12 @@ class Stock {
     }
   }
 
-  set latest(Latest data) {
-    _latest.change = data?.change ?? _latest.change;
-    _latest.percentageChange =
-        data?.percentageChange ?? _latest.percentageChange;
-    _latest.sign = data?.sign ?? 0;
-    _latest.updated = data!.updated;
-    _latest.value = data!.value;
+  set latest(Latest? data) {
+    if (data == null) return;
+    _latest.change = data.change;
+    _latest.percentageChange = data.percentageChange;
+    _latest.sign = data.sign;
+    _latest.updated = data.updated;
+    _latest.value = data.value;
   }
 }
diff --git a/lib/services/query/query_api.dart b/lib/services/query/query_api.dart
index f403b0e..ae85251 100644
--- a/lib/services/query/query_api.dart
+++ b/lib/services/query/query_api.dart
@@ -36,7 +36,7 @@ class QueryAPI {
         },
       );
 
-      if (r.statusCode == 200) {
+      if (r.statusCode == 200 && r.data != null) {
         var data = jsonDecode(r.data!.substring(4))['PriceUpdate']['entities']
             .first['financial_entity']['common_entity_data'];
 
@@ -94,7 +94,7 @@ class QueryAPI {
         },
       );
 
-      if (r.statusCode == 200) {
+      if (r.statusCode == 200 && r.data != null) {
         var ret = jsonDecode(r.data!.substring(4))['PriceUpdate']['entities']
             .first['financial_entity']['common_entity_data']['name']
             .toString();
diff --git a/lib/services/query/query_bse_api.dart b/lib/services/query/query_bse_api.dart
index 945d50e..0a3d1e7 100644
--- a/lib/services/query/query_bse_api.dart
+++ b/lib/services/query/query_bse_api.dart
@@ -25,7 +25,7 @@ class QueryBSEAPI {
           "seriesid": "",
         },
       );
-      if (r.statusCode == 200) {
+      if (r.statusCode == 200 && r.data != null) {
         var data = jsonDecode(r.data!);
         double currVal = double.parse(data['CurrVal']);
         double prevClose = double.parse(data['PrevClose']);
@@ -70,7 +70,7 @@ class QueryBSEAPI {
           "seriesid": "",
         },
       );
-      if (r.statusCode == 200) {
+      if (r.statusCode == 200 && r.data != null) {
         return jsonDecode(r.data!)['Cmpname']['FullN'].toString();
       } else {
         log("query_bse_api.getName($code) => \n " +
diff --git a/lib/services/query/query_nse_api.dart b/lib/services/query/query_nse_api.dart
index 97a9d66..b865a0b 100644
--- a/lib/services/query/query_nse_api.dart
+++ b/lib/services/query/query_nse_api.dart
@@ -68,7 +68,8 @@ class NetworkService {
       throw new Exception("Error while fetching data: " +
           statusCode.toString() +
           "\n\n" +
-          response.request!.headers.toString());
+          (response.request?.headers?.toString() ??
+              "<<< Headers  are NULL >>>"));
     }
     return res;
   }
@@ -99,7 +100,9 @@ class QueryNSEAPI {
     try {
       await session.get(uri, headers);
     } catch (e) {
-      dev.log("query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " + e.toString());
+      dev.log(
+          "query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " +
+              e.toString());
     }
 
     uri = Uri.https(
@@ -151,7 +154,9 @@ class QueryNSEAPI {
     try {
       await session.get(uri, headers);
     } catch (e) {
-      dev.log("query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " + e.toString());
+      dev.log(
+          "query_nse_api.getCurrentData($code) => \nNSE: Error getting cookies : " +
+              e.toString());
     }
 
     uri = Uri.https(
diff --git a/lib/views/portfolio/portfolio_tile.dart b/lib/views/portfolio/portfolio_tile.dart
index d09a021..cf0a7b3 100644
--- a/lib/views/portfolio/portfolio_tile.dart
+++ b/lib/views/portfolio/portfolio_tile.dart
@@ -32,14 +32,14 @@ class PortfolioTile extends StatelessWidget {
                 alignment: WrapAlignment.center,
                 runAlignment: WrapAlignment.center,
                 children: [
-                  _portfolio?.bseCode != null
+                  _portfolio.bseCode != null
                       ? Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 10.0),
                           child: Row(
                             mainAxisSize: MainAxisSize.min,
                             children: [
                               Text(
-                                "BSE - " + (_portfolio?.bseCode)!,
+                                "BSE - " + _portfolio.bseCode!,
                                 style: Theme.of(context).textTheme.bodyLarge,
                               ),
                               SizedBox(
@@ -58,7 +58,7 @@ class PortfolioTile extends StatelessWidget {
                                   await showDialog(
                                     context: context,
                                     builder: (context) => EditCodeDialog(
-                                        _portfolio!.bseCode!,
+                                        _portfolio.bseCode!,
                                         "BSE",
                                         updateBSECode),
                                   );
@@ -70,14 +70,14 @@ class PortfolioTile extends StatelessWidget {
                       : Container(
                           width: 0,
                         ),
-                  _portfolio?.nseCode != null
+                  _portfolio.nseCode != null
                       ? Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 5.0),
                           child: Row(
                             mainAxisSize: MainAxisSize.min,
                             children: [
                               Text(
-                                "NSE - " + _portfolio!.nseCode,
+                                "NSE - " + _portfolio.nseCode!,
                                 style: Theme.of(context).textTheme.bodyLarge,
                               ),
                               SizedBox(
@@ -96,7 +96,7 @@ class PortfolioTile extends StatelessWidget {
                                   showDialog(
                                     context: context,
                                     builder: (context) => EditCodeDialog(
-                                        _portfolio!.nseCode!,
+                                        _portfolio.nseCode!,
                                         "NSE",
                                         updateNSECode),
                                   );
@@ -118,7 +118,7 @@ class PortfolioTile extends StatelessWidget {
                 Expanded(
                   flex: 2,
                   child: Text(
-                    _portfolio?.qty?.toString() ?? "N/A",
+                    _portfolio.qty?.toString() ?? "—",
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
@@ -129,7 +129,7 @@ class PortfolioTile extends StatelessWidget {
                 Expanded(
                   flex: 3,
                   child: Text(
-                    _portfolio?.msr?.toStringAsFixed(2) ?? "N/A",
+                    _portfolio.msr?.toStringAsFixed(2) ?? "—",
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
@@ -140,7 +140,7 @@ class PortfolioTile extends StatelessWidget {
                 Expanded(
                   flex: 3,
                   child: Text(
-                    _portfolio?.esr?.toStringAsFixed(2) ?? "N/A",
+                    _portfolio?.esr?.toStringAsFixed(2) ?? "—",
                     textAlign: TextAlign.center,
                     style: Theme.of(context)
                         .textTheme
diff --git a/lib/views/settings/data/add_portfolio_dialog.dart b/lib/views/settings/data/add_portfolio_dialog.dart
index e869600..7ee48ba 100644
--- a/lib/views/settings/data/add_portfolio_dialog.dart
+++ b/lib/views/settings/data/add_portfolio_dialog.dart
@@ -61,7 +61,7 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                   keyboardType: TextInputType.text,
                   controller: _nseCodeCtl,
                   validator: (value) {
-                    if (value!.isEmpty) {
+                    if (value == null || value.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -83,7 +83,7 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                   keyboardType: TextInputType.text,
                   controller: _bseCodeCtl,
                   validator: (value) {
-                    if (value!.isEmpty) {
+                    if (value == null || value.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -117,7 +117,7 @@ class _AddPortfolioDialogState extends State<AddPortfolioDialog> {
                           )),
                       child: Text("Add"),
                       onPressed: () {
-                        if (_formKey.currentState!.validate()) {
+                        if (_formKey.currentState != null && _formKey.currentState!.validate()) {
                           DatabaseActions.linkCodes({
                             'NSE': _nseCodeCtl.text,
                             'BSE': _bseCodeCtl.text,
diff --git a/lib/views/settings/data/add_trade_log.dart b/lib/views/settings/data/add_trade_log.dart
index cbaffda..175a49c 100644
--- a/lib/views/settings/data/add_trade_log.dart
+++ b/lib/views/settings/data/add_trade_log.dart
@@ -48,46 +48,48 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
           IconButton(
             icon: Icon(Icons.check),
             onPressed: () async {
-                        if (_formKey.currentState!.validate()) {
-                          var res = await DatabaseActions.setTradeLog(
-                            _codeCtl.text.trim(),
-                            _selectedExch,
-                            _dateCtl.text.trim(),
-                            _isSelected[0],
-                            int.parse(_qtyCtl.text.trim()),
-                            double.parse(
-                              _rateCtl.text.trim(),
-                            ),
-                          );
-                          if (res) {
-                            Navigator.pop(context);
-                          } else {
-                            await showDialog(
-                              context: context,
-                              builder: (context) {
-                                return AlertDialog(
-                                  title: Text("Couldn't add!"),
-                                  actions: [
-                                    TextButton(
-                                      style: TextButton.styleFrom(
-                                          foregroundColor: Colors.black87,
-                                          minimumSize: Size(88, 36),
-                                          padding: EdgeInsets.symmetric(horizontal: 16),
-                                          shape: const RoundedRectangleBorder(
-                                            borderRadius: BorderRadius.all(Radius.circular(2)),
-                                          )),
-                                      child: Text("OK"),
-                                      onPressed: () {
-                                        Navigator.pop(context);
-                                      },
-                                    )
-                                  ],
-                                );
-                              },
-                            );
-                          }
-                        }
-                      },
+              if (_formKey.currentState != null &&
+                  _formKey.currentState!.validate()) {
+                var res = await DatabaseActions.setTradeLog(
+                  _codeCtl.text.trim(),
+                  _selectedExch,
+                  _dateCtl.text.trim(),
+                  _isSelected[0],
+                  int.parse(_qtyCtl.text.trim()),
+                  double.parse(
+                    _rateCtl.text.trim(),
+                  ),
+                );
+                if (res) {
+                  Navigator.pop(context);
+                } else {
+                  await showDialog(
+                    context: context,
+                    builder: (context) {
+                      return AlertDialog(
+                        title: Text("Couldn't add!"),
+                        actions: [
+                          TextButton(
+                            style: TextButton.styleFrom(
+                                foregroundColor: Colors.black87,
+                                minimumSize: Size(88, 36),
+                                padding: EdgeInsets.symmetric(horizontal: 16),
+                                shape: const RoundedRectangleBorder(
+                                  borderRadius:
+                                      BorderRadius.all(Radius.circular(2)),
+                                )),
+                            child: Text("OK"),
+                            onPressed: () {
+                              Navigator.pop(context);
+                            },
+                          )
+                        ],
+                      );
+                    },
+                  );
+                }
+              }
+            },
           )
         ],
       ),
@@ -141,8 +143,12 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                     });
                   },
                   isSelected: _isSelected,
-                  selectedColor: _isSelected[0] ? Colors.lightGreen[600] : Colors.redAccent,
-                  fillColor: _isSelected[0] ? Colors.lightGreen[600] : Colors.redAccent,
+                  selectedColor: _isSelected[0]
+                      ? Colors.lightGreen[600]
+                      : Colors.redAccent,
+                  fillColor: _isSelected[0]
+                      ? Colors.lightGreen[600]
+                      : Colors.redAccent,
                   borderRadius: BorderRadius.circular(40),
                 ),
               ),
@@ -186,7 +192,8 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                       child: DropdownButtonHideUnderline(
                         child: DropdownButton<String>(
                           style: Theme.of(context).textTheme.bodyMedium,
-                          dropdownColor: Theme.of(context).colorScheme.background,
+                          dropdownColor:
+                              Theme.of(context).colorScheme.background,
                           value: _selectedExch,
                           isDense: true,
                           onChanged: (newValue) {
@@ -231,7 +238,8 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                       lastDate: DateTime(2100),
                     ))!;
 
-                    _dateCtl.text = (date?.toIso8601String()!.substring(0, 10))!;
+                    _dateCtl.text =
+                        (date?.toIso8601String()!.substring(0, 10))!;
                   },
                   controller: _dateCtl,
                   validator: (value) {
@@ -255,13 +263,13 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                   keyboardType: TextInputType.number,
                   controller: _qtyCtl,
                   validator: (value) {
-                    if (value?.trim() == "") {
-                      return "Required";
+                    if (value == null || value.trim() == "") {
+                      return "Quantity required!";
                     }
-                    if (RegExp(r"^[0-9]*?$").hasMatch(value!.trim())) {
+                    if (RegExp(r"^[0-9]*?$").hasMatch(value.trim())) {
                       return null;
                     }
-                    return "Enter valid rate";
+                    return "Enter valid quantity!";
                   },
                 ),
               ),
@@ -277,14 +285,14 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                   style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.numberWithOptions(decimal: true),
                   validator: (value) {
-                    if (value?.trim() == "") {
-                      return "Required";
+                    if (value == null || value.trim() == "") {
+                      return "Rate required!";
                     }
                     if (RegExp(r"^[0-9]*(\.[0-9][0-9]?)?$")
-                        .hasMatch(value!.trim())) {
+                        .hasMatch(value.trim())) {
                       return null;
                     }
-                    return "Enter valid rate";
+                    return "Enter valid rate!";
                   },
                   controller: _rateCtl,
                 ),
diff --git a/lib/views/settings/data/data.dart b/lib/views/settings/data/data.dart
index 5fe72a0..79f3340 100644
--- a/lib/views/settings/data/data.dart
+++ b/lib/views/settings/data/data.dart
@@ -181,18 +181,18 @@ class _ImportAreaState extends State<ImportArea> {
                   ),
                   title: Text("Delete Database"),
                   onTap: () async {
-                    String result = await showDialog(
+                    String? result = await showDialog(
                       context: context,
                       builder: (_) => AlertDialog(
-                        title: Text("Careful!"),
+                        title: Center(child: Text("WARNING")),
                         content: Text(
                           "This will delete the database. Proceed only if you know what you are doing.",
                           style: Theme.of(context).textTheme.bodyLarge,
+                          textAlign: TextAlign.justify,
                         ),
                         actions: [
                           TextButton(
                             style: TextButton.styleFrom(
-                                foregroundColor: Theme.of(context).colorScheme.background,
                                 minimumSize: Size(88, 36),
                                 padding: EdgeInsets.symmetric(horizontal: 16),
                                 shape: const RoundedRectangleBorder(
@@ -200,7 +200,7 @@ class _ImportAreaState extends State<ImportArea> {
                                       BorderRadius.all(Radius.circular(5)),
                                 )),
                             onPressed: () {
-                              Navigator.pop(context, "");
+                              Navigator.pop(context, "Delete");
                             },
                             child: Text("Delete"),
                           ),
@@ -217,15 +217,15 @@ class _ImportAreaState extends State<ImportArea> {
                               ),
                             ),
                             onPressed: () {
-                              Navigator.pop(context, null);
+                              Navigator.pop(context, "Cancel");
                             },
                             child: Text("Cancel"),
                           ),
                         ],
-                        actionsPadding: EdgeInsets.symmetric(horizontal: 10),
+                        actionsPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
                       ),
                     );
-                    if (result == "") {
+                    if (result == "Delete") {
                       DatabaseActions.deleteDbThenInit();
                     }
                   },
@@ -296,9 +296,15 @@ class _ImportAreaState extends State<ImportArea> {
     if (result != null) {
       String file = "";
       try {
-        file = File(result.files.first.path!).readAsStringSync();
+        if (result.files.first.path != null)
+          file = File(result.files.first.path!).readAsStringSync();
+        else {
+          log("data.importLogs() => Path is null\n ");
+          return;
+        }
       } catch (e) {
         log("data.importLogs() => Error in reading file\n " + e.toString());
+        return;
       }
 
       List<TradeLog> logs = [];
diff --git a/lib/views/settings/data/track_stock_dialog.dart b/lib/views/settings/data/track_stock_dialog.dart
index 83082be..83474ec 100644
--- a/lib/views/settings/data/track_stock_dialog.dart
+++ b/lib/views/settings/data/track_stock_dialog.dart
@@ -61,7 +61,7 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                   keyboardType: TextInputType.text,
                   controller: _codeCtl,
                   validator: (value) {
-                    if (value!.isEmpty) {
+                    if (value == null || value.isEmpty) {
                       return 'Required';
                     }
                     return null;
@@ -90,10 +90,12 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                           value: _selectedExch,
                           isDense: true,
                           onChanged: (newValue) {
-                            setState(() {
-                              _selectedExch = newValue!;
-                              state.didChange(newValue);
-                            });
+                            if (newValue != null) {
+                              setState(() {
+                                _selectedExch = newValue;
+                                state.didChange(newValue);
+                              });
+                            }
                           },
                           items: _exchanges.map(
                             (value) {
@@ -137,7 +139,7 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                           )),
                       child: Text("Add"),
                       onPressed: () {
-                        if (_formKey.currentState!.validate()) {
+                        if (_formKey.currentState != null && _formKey.currentState!.validate()) {
                           DatabaseActions.addTracked(
                                   _codeCtl.text, _selectedExch, "", false)
                               .then(
diff --git a/lib/views/settings/drive/drive.dart b/lib/views/settings/drive/drive.dart
index d70d9b0..8c29394 100644
--- a/lib/views/settings/drive/drive.dart
+++ b/lib/views/settings/drive/drive.dart
@@ -168,7 +168,11 @@ class _DriveAreaState extends State<DriveArea> {
     });
 
     final authHeaders = await account?.authHeaders;
-    final authenticateClient = GoogleAuthClient(authHeaders!);
+    if (authHeaders == null) {
+      log("drive.showRestoreDialog() => Auth Headers was null");
+      return;
+    }
+    final authenticateClient = GoogleAuthClient(authHeaders);
     final driveApi = drive.DriveApi(authenticateClient);
 
     final path = await Db().getDbPath();
@@ -192,7 +196,7 @@ class _DriveAreaState extends State<DriveArea> {
     setState(() {
       _isProcessing = true;
     });
-    String id = await showDialog(
+    String? id = await showDialog(
       context: context,
       builder: (_) => SimpleDialog(
         shape: RoundedRectangleBorder(
@@ -269,7 +273,11 @@ class _DriveAreaState extends State<DriveArea> {
       });
 
       final authHeaders = await account?.authHeaders;
-      final authenticateClient = GoogleAuthClient(authHeaders!);
+      if (authHeaders == null) {
+        log("drive.showRestoreDialog() => Auth Headers was null");
+        return;
+      }
+      final authenticateClient = GoogleAuthClient(authHeaders);
       final driveApi = drive.DriveApi(authenticateClient);
 
       Object file = await driveApi.files
@@ -302,7 +310,7 @@ class _DriveAreaState extends State<DriveArea> {
       _isProcessing = true;
     });
 
-    String id = await showDialog(
+    String? id = await showDialog(
       context: context,
       builder: (_) => SimpleDialog(
         shape: RoundedRectangleBorder(
@@ -379,7 +387,11 @@ class _DriveAreaState extends State<DriveArea> {
       });
 
       final authHeaders = await account?.authHeaders;
-      final authenticateClient = GoogleAuthClient(authHeaders!);
+      if (authHeaders == null) {
+        log("drive.showDeleteDialog() => Auth Headers was null");
+        return;
+      }
+      final authenticateClient = GoogleAuthClient(authHeaders);
       final driveApi = drive.DriveApi(authenticateClient);
 
       driveApi.files.delete(id);
@@ -393,7 +405,11 @@ class _DriveAreaState extends State<DriveArea> {
 
   Future<dynamic> getBackups() async {
     final authHeaders = await account?.authHeaders;
-    final authenticateClient = GoogleAuthClient(authHeaders!);
+    if (authHeaders == null) {
+      log("getBackups() => Auth Headers was null");
+      return;
+    }
+    final authenticateClient = GoogleAuthClient(authHeaders);
     final driveApi = drive.DriveApi(authenticateClient);
     return await driveApi.files.list(spaces: 'appDataFolder');
   }
diff --git a/lib/views/tracked/details/details.dart b/lib/views/tracked/details/details.dart
index 264860a..db378fa 100644
--- a/lib/views/tracked/details/details.dart
+++ b/lib/views/tracked/details/details.dart
@@ -27,9 +27,9 @@ class DetailsView extends StatefulWidget {
 class _DetailsViewState extends State<DetailsView>
     with TickerProviderStateMixin {
   late Stock _stock;
-  late Latest _bseLatest;
-  late Latest _nseLatest;
-  late TradeCycle _computedCycle;
+  late Latest? _bseLatest;
+  late Latest? _nseLatest;
+  late TradeCycle? _computedCycle;
   late TradeSummary _summary;
   late Future<TradeSummary> _futureSummary;
   late Future<List<TradeLog>> _futureLogs;
@@ -48,31 +48,33 @@ class _DetailsViewState extends State<DetailsView>
 
     _stock = widget.stock;
 
-    if (_stock?.bseCode != null) {
+    if (_stock.bseCode != null) {
       _latestBSEStreamSub =
-          StockRepository.getPeriodicLatest(_stock!.bseCode, "BSE")
+          StockRepository.getPeriodicLatest(_stock.bseCode!, "BSE")
               .listen((value) {
         setState(() {
-          _bseLatest = value!;
+          _bseLatest = value;
         });
       });
     }
 
-    if (_stock?.nseCode != null) {
+    if (_stock.nseCode != null) {
       _latestNSEStreamSub =
-          StockRepository.getPeriodicLatest(_stock!.nseCode, "NSE")
+          StockRepository.getPeriodicLatest(_stock.nseCode!, "NSE")
               .listen((value) {
         setState(() {
-          _nseLatest = value!;
+          _nseLatest = value;
         });
       });
     }
 
-    _summary = TradeSummary(DatabaseActions.getBuyLogs(_stock.id),
-        DatabaseActions.getSellLogs(_stock.id));
+    if (_stock.id != null) {
+      _summary = TradeSummary(DatabaseActions.getBuyLogs(_stock.id!),
+          DatabaseActions.getSellLogs(_stock.id!));
 
-    _futureSummary = _summary.calculateSummary(0);
-    _futureLogs = DatabaseActions.getStockLogs(_stock.id);
+      _futureSummary = _summary.calculateSummary(0);
+      _futureLogs = DatabaseActions.getStockLogs(_stock.id!);
+    }
 
     _tabController = new TabController(vsync: this, length: 4);
   }
@@ -107,16 +109,16 @@ class _DetailsViewState extends State<DetailsView>
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      _stock?.name == null
+                      _stock.name == null
                           ? TextLoadingIndicator(
                               width: 200,
                               height: Theme.of(context)
                                   .textTheme
-                                  .titleLarge
-                                  !.fontSize!)
+                                  .titleLarge!
+                                  .fontSize!)
                           : Flexible(
                               child: Text(
-                                _stock!.name!,
+                                _stock.name!,
                                 textAlign: TextAlign.center,
                                 style: Theme.of(context).textTheme.titleLarge,
                               ),
@@ -128,7 +130,7 @@ class _DetailsViewState extends State<DetailsView>
                   alignment: WrapAlignment.center,
                   runAlignment: WrapAlignment.center,
                   children: [
-                    _stock?.bseCode != null
+                    _stock.bseCode != null
                         ? Padding(
                             padding: const EdgeInsets.all(10.0),
                             child: Row(
@@ -136,7 +138,7 @@ class _DetailsViewState extends State<DetailsView>
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  "BSE - " + _stock!.bseCode,
+                                  "BSE - " + _stock.bseCode!,
                                   style: Theme.of(context).textTheme.bodyLarge,
                                 ),
                                 SizedBox(
@@ -147,15 +149,15 @@ class _DetailsViewState extends State<DetailsView>
                                     Icons.edit,
                                     size: Theme.of(context)
                                             .textTheme
-                                            .bodyLarge
-                                            !.fontSize! +
+                                            .bodyLarge!
+                                            .fontSize! +
                                         3,
                                   ),
                                   onTap: () async {
                                     await showDialog(
                                       context: context,
                                       builder: (context) => EditCodeDialog(
-                                          _stock!.bseCode,
+                                          _stock.bseCode!,
                                           "BSE",
                                           updateBSECode),
                                     );
@@ -167,7 +169,7 @@ class _DetailsViewState extends State<DetailsView>
                         : Container(
                             width: 0,
                           ),
-                    _stock?.nseCode != null
+                    _stock.nseCode != null
                         ? Padding(
                             padding: const EdgeInsets.all(10.0),
                             child: Row(
@@ -175,7 +177,7 @@ class _DetailsViewState extends State<DetailsView>
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  "NSE - " + _stock!.nseCode,
+                                  "NSE - " + _stock.nseCode!,
                                   style: Theme.of(context).textTheme.bodyLarge,
                                 ),
                                 SizedBox(
@@ -186,15 +188,15 @@ class _DetailsViewState extends State<DetailsView>
                                     Icons.edit,
                                     size: Theme.of(context)
                                             .textTheme
-                                            .bodyLarge
-                                            !.fontSize! +
+                                            .bodyLarge!
+                                            .fontSize! +
                                         3,
                                   ),
                                   onTap: () async {
                                     await showDialog(
                                       context: context,
                                       builder: (context) => EditCodeDialog(
-                                          _stock!.nseCode,
+                                          _stock.nseCode!,
                                           "NSE",
                                           updateNSECode),
                                     );
@@ -212,7 +214,7 @@ class _DetailsViewState extends State<DetailsView>
                   alignment: WrapAlignment.center,
                   runAlignment: WrapAlignment.center,
                   children: [
-                    _stock?.bseCode != null
+                    _stock.bseCode != null
                         ? MapTile(
                             name: "BSE PRICE",
                             value:
@@ -221,7 +223,7 @@ class _DetailsViewState extends State<DetailsView>
                         : Container(
                             width: 0,
                           ),
-                    _stock?.nseCode != null
+                    _stock.nseCode != null
                         ? MapTile(
                             name: "NSE PRICE",
                             value:
@@ -232,15 +234,15 @@ class _DetailsViewState extends State<DetailsView>
                           ),
                     MapTile(
                       name: "QTY",
-                      value: _stock?.qty?.toString() ?? "N/A",
+                      value: _stock.qty?.toString() ?? "N/A",
                     ),
                     MapTile(
                       name: "ESR",
-                      value: _stock?.esr?.toStringAsFixed(2) ?? "N/A",
+                      value: _stock.esr?.toStringAsFixed(2) ?? "N/A",
                     ),
                     MapTile(
                       name: "MSR",
-                      value: _stock?.msr?.toStringAsFixed(2) ?? "N/A",
+                      value: _stock.msr?.toStringAsFixed(2) ?? "N/A",
                     ),
                   ],
                 ),
@@ -318,7 +320,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -337,7 +340,8 @@ class _DetailsViewState extends State<DetailsView>
                                 borderRadius: BorderRadius.circular(10),
                               ),
                               elevation: 2,
-                              margin: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                              margin: EdgeInsets.symmetric(
+                                  horizontal: 20, vertical: 10),
                               child: Padding(
                                 padding: EdgeInsets.fromLTRB(20, 30, 20, 10),
                                 child: Column(
@@ -354,11 +358,11 @@ class _DetailsViewState extends State<DetailsView>
                                             RegExp(r'[0-9]')),
                                       ],
                                       validator: (value) {
-                                        if (value!.isEmpty) {
+                                        if (value == null || value.isEmpty) {
                                           return 'Required';
                                         } else if (int.parse(value) >
-                                            _stock.qty!) {
-                                          return 'Too High!';
+                                            (_stock.qty ?? 0)) {
+                                          return 'Sell qty entered is too high!';
                                         }
                                         return null;
                                       },
@@ -393,22 +397,28 @@ class _DetailsViewState extends State<DetailsView>
                                           style: TextButton.styleFrom(
                                               foregroundColor: Colors.black87,
                                               minimumSize: Size(88, 36),
-                                              padding: EdgeInsets.symmetric(horizontal: 16),
-                                              shape: const RoundedRectangleBorder(
-                                                borderRadius:
-                                                BorderRadius.all(Radius.circular(2)),
+                                              padding: EdgeInsets.symmetric(
+                                                  horizontal: 16),
+                                              shape:
+                                                  const RoundedRectangleBorder(
+                                                borderRadius: BorderRadius.all(
+                                                    Radius.circular(2)),
                                               )),
                                           child: Text("Calculate"),
                                           onPressed: () {
-                                            if (_formKey.currentState!.validate()) {
+                                            if (_formKey.currentState != null &&
+                                                _formKey.currentState!
+                                                    .validate()) {
                                               int qty = int.parse(
                                                   _qtyController.text);
                                               // FIXME check rate is valid (!= 0  or null)
                                               double rate =
                                                   (_rateController.text.isEmpty
-                                                      ? _stock?.lastValue
-                                                      : double.parse(
-                                                          _rateController.text)) ?? 0;
+                                                          ? _stock.lastValue
+                                                          : double.parse(
+                                                              _rateController
+                                                                  .text)) ??
+                                                      0;
                                               var cycle = _summary.computeCycle(
                                                   qty, rate);
                                               if (cycle != null) {
@@ -428,7 +438,7 @@ class _DetailsViewState extends State<DetailsView>
                           ),
                           _computedCycle == null
                               ? Container()
-                              : CycleTile(_computedCycle),
+                              : CycleTile(_computedCycle!),
                         ],
                       ),
                     );
@@ -464,7 +474,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -482,7 +493,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No stocks remaining",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -528,7 +540,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "Sorry there is some inconsistency in the logs",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -545,7 +558,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No stocks sold",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -591,7 +605,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "An error occurred",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -608,7 +623,8 @@ class _DetailsViewState extends State<DetailsView>
                               child: Text(
                                 "No logs imported",
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style:
+                                    Theme.of(context).textTheme.headlineMedium,
                               ),
                             ),
                           ),
@@ -721,8 +737,7 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
                           minimumSize: Size(88, 36),
                           padding: EdgeInsets.symmetric(horizontal: 16),
                           shape: const RoundedRectangleBorder(
-                            borderRadius:
-                            BorderRadius.all(Radius.circular(5)),
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
                           )),
                       child: Text("Cancel"),
                       onPressed: () {
@@ -736,12 +751,12 @@ class _EditCodeDialogState extends State<EditCodeDialog> {
                           minimumSize: Size(88, 36),
                           padding: EdgeInsets.symmetric(horizontal: 16),
                           shape: const RoundedRectangleBorder(
-                            borderRadius:
-                            BorderRadius.all(Radius.circular(5)),
+                            borderRadius: BorderRadius.all(Radius.circular(5)),
                           )),
                       child: Text("Apply"),
                       onPressed: () async {
-                        if (_formKey.currentState!.validate()) {
+                        if (_formKey.currentState != null &&
+                            _formKey.currentState!.validate()) {
                           if (widget.code != _codeCtl.text) {
                             await DatabaseActions.updateCode(
                               widget.code,
diff --git a/lib/views/tracked/tracked_bottom_sheet.dart b/lib/views/tracked/tracked_bottom_sheet.dart
index 149c4ab..6f57fb8 100644
--- a/lib/views/tracked/tracked_bottom_sheet.dart
+++ b/lib/views/tracked/tracked_bottom_sheet.dart
@@ -85,10 +85,10 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                             });
 
                             StockRepository.getOnceLatest(
-                                    _stock.code!, _stock.exchange!)
+                                    _stock.code, _stock.exchange)
                                 .then((value) {
                               setState(() {
-                                _stock.latest = value!;
+                                _stock.latest = value;
                                 _isRefreshing = false;
                               });
                             });
@@ -102,13 +102,13 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                   child: IconButton(
                     padding: EdgeInsets.all(0.0),
                     icon:
-                        Icon(_stock?.pinned ?? false ? Folio.unpin : Folio.pin),
+                        Icon(_stock.pinned ?? false ? Folio.unpin : Folio.pin),
                     iconSize: 25.0,
                     splashRadius: 25.0,
                     onPressed: () {
                       DatabaseActions.updatePinned(
-                        _stock.code!,
-                        _stock.exchange!,
+                        _stock.code,
+                        _stock.exchange,
                         !_stock.pinned,
                       ).then((value) {
                         if (value) {
@@ -118,7 +118,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                         }
                       });
                     },
-                    tooltip: _stock?.pinned ?? false ? "Unpin" : "Pin",
+                    tooltip: _stock.pinned ?? false ? "Unpin" : "Pin",
                   ),
                 ),
                 SizedBox(
@@ -134,12 +134,12 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                     onPressed: () {
                       if (_stock.isVisible) {
                         DatabaseActions.deleteTracked(
-                            _stock.code!, _stock.exchange!);
+                            _stock.code, _stock.exchange);
                       } else {
                         DatabaseActions.addTracked(
-                          _stock.code!,
-                          _stock.exchange!,
-                          _stock.name!,
+                          _stock.code,
+                          _stock.exchange,
+                          _stock.name,
                           _stock.pinned,
                         );
                       }
@@ -182,27 +182,27 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                 children: [
                   MapTile(
                     name: "PRICE",
-                    value: _stock?.lastValue?.toStringAsFixed(2) ?? "N/A",
+                    value: _stock.lastValue?.toStringAsFixed(2) ?? "—",
                   ),
                   MapTile(
                     name: "QTY",
-                    value: _stock?.qty?.toString() ?? "N/A",
+                    value: _stock.qty?.toString() ?? "—",
                   ),
                   MapTile(
                     name: "ESR",
-                    value: _stock?.esr?.toStringAsFixed(2) ?? "N/A",
+                    value: _stock.esr?.toStringAsFixed(2) ?? "—",
                   ),
                   MapTile(
                     name: "MSR",
-                    value: _stock?.msr?.toStringAsFixed(2) ?? "N/A",
+                    value: _stock.msr?.toStringAsFixed(2) ?? "—",
                   ),
                   MapTile(
                     name: "NET",
-                    value: _stock?.netAmount?.toStringAsFixed(2) ?? "N/A",
+                    value: _stock.netAmount?.toStringAsFixed(2) ?? "—",
                   ),
                   MapTile(
                     name: "NET/STK",
-                    value: _stock?.netPerStock?.toStringAsFixed(2) ?? "N/A",
+                    value: _stock?.netPerStock?.toStringAsFixed(2) ?? "—",
                   ),
                 ],
               ),
@@ -213,7 +213,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                _stock?.name == null
+                _stock.name == null
                     ? TextLoadingIndicator(
                         width: 200,
                         height: Theme.of(context).textTheme.titleLarge!.fontSize!)
@@ -232,20 +232,16 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                _stock?.exchange == null || _stock?.code == null
-                    ? TextLoadingIndicator(
-                        width: 100,
-                        height: Theme.of(context).textTheme.bodyLarge!.fontSize!)
-                    : Text(
-                        (_stock?.exchange ?? "") + "-" + (_stock.code ?? ""),
+                Text(
+                        _stock.exchange + "-" + _stock.code,
                         style: Theme.of(context).textTheme.bodyLarge,
-                      ),
-                _stock?.lastUpdated == null
+                ),
+                _stock.lastUpdated == null
                     ? TextLoadingIndicator(
                         width: 150,
                         height: Theme.of(context).textTheme.bodyLarge!.fontSize!)
                     : Text(
-                        _stock!.lastUpdated!,
+                        _stock.lastUpdated!,
                         style: Theme.of(context).textTheme.bodyLarge,
                       ),
               ],
diff --git a/lib/views/tracked/tracked_tile.dart b/lib/views/tracked/tracked_tile.dart
index 7abfa2d..9e4f745 100644
--- a/lib/views/tracked/tracked_tile.dart
+++ b/lib/views/tracked/tracked_tile.dart
@@ -26,14 +26,14 @@ class _TrackedTileState extends State<TrackedTile> {
     super.initState();
     _stock = widget.stock;
     _latestStreamSub =
-        StockRepository.getPeriodicLatest(_stock.code!, _stock.exchange!)
+        StockRepository.getPeriodicLatest(_stock.code, _stock.exchange)
             .listen((value) {
       setState(() {
-        _stock.latest = value!;
+        _stock.latest = value;
       });
     });
-    if (_stock.name == null) {
-      StockRepository.getName(_stock.code!, _stock.exchange!).then((value) {
+    if (_stock.name == null || _stock.name == "") {
+      StockRepository.getName(_stock.code, _stock.exchange).then((value) {
         if (this.mounted && value != null) {
           setState(() {
             _stock.name = value;
@@ -59,7 +59,7 @@ class _TrackedTileState extends State<TrackedTile> {
           : Theme.of(context).colorScheme.background,
       elevation: 2,
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: BorderRadius.circular(10),
       ),
       margin: const EdgeInsets.symmetric(horizontal: 15, vertical: 10),
       child: InkWell(
@@ -112,7 +112,7 @@ class _TrackedTileState extends State<TrackedTile> {
                         SizedBox(
                           height: 5,
                         ),
-                        _stock?.name == null
+                        _stock.name == null
                             ? TextLoadingIndicator(
                                 width: 200,
                                 height: (Theme.of(context)
@@ -120,7 +120,9 @@ class _TrackedTileState extends State<TrackedTile> {
                                     .titleLarge
                                     ?.fontSize)!)
                             : Text(
-                                (_stock?.name == "NULL" ? "-" : (_stock?.name)!),
+                                (_stock.name == "NULL"
+                                    ? "-"
+                                    : _stock.name ?? "-"),
                                 style: Theme.of(context).textTheme.titleLarge,
                               ),
                       ],
@@ -138,8 +140,8 @@ class _TrackedTileState extends State<TrackedTile> {
                   decoration: BoxDecoration(
                     color: Theme.of(context).colorScheme.primaryContainer,
                     borderRadius: BorderRadius.only(
-                      topRight: Radius.circular(20),
-                      bottomRight: Radius.circular(20),
+                      topRight: Radius.circular(10),
+                      bottomRight: Radius.circular(10),
                     ),
                   ),
                   child: Center(
@@ -151,13 +153,19 @@ class _TrackedTileState extends State<TrackedTile> {
                                 width: 70,
                                 height: Theme.of(context)
                                         .textTheme
-                                        .headlineMedium
-                                        !.fontSize! +
+                                        .headlineMedium!
+                                        .fontSize! +
                                     5,
                               )
                             : Text(
                                 _stock?.lastValue?.toStringAsFixed(2) ?? "",
-                                style: Theme.of(context).textTheme.headlineMedium,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .headlineMedium
+                                    ?.copyWith(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .background),
                               ),
                         SizedBox(
                           height: 5,
@@ -180,7 +188,7 @@ class _TrackedTileState extends State<TrackedTile> {
                                         Theme.of(context).textTheme.bodyLarge,
                                   ),
                             SizedBox(width: 10),
-                            _stock?.change == null
+                            _stock.change == null
                                 ? TextLoadingIndicator(
                                     width: 40,
                                     height: (Theme.of(context)
@@ -189,7 +197,7 @@ class _TrackedTileState extends State<TrackedTile> {
                                         ?.fontSize)!,
                                   )
                                 : Text(
-                                    _stock!.change!,
+                                    _stock.change!,
                                     style: Theme.of(context)
                                         .textTheme
                                         .bodyLarge

From f8863778f87ee70eed5893fcc8f177f80c219748 Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Fri, 18 Aug 2023 12:28:44 +0530
Subject: [PATCH 3/6] Fix some more runtime errors and chnage app theme

---
 android/app/build.gradle                     |   2 +-
 lib/assets/app_theme.dart                    | 183 ++++++++++++-------
 lib/folio_app.dart                           |  43 +++++
 lib/helpers/database_actions.dart            |  41 +++--
 lib/main.dart                                |  23 +--
 lib/models/stock/stock.dart                  |   2 +-
 lib/services/query/query_nse_api.dart        |   2 +-
 lib/views/common/drawer.dart                 |  35 ++--
 lib/views/common/text_loading_indicator.dart |   8 +-
 lib/views/logs/logs.dart                     |   2 -
 lib/views/portfolio/portfolio.dart           |   4 +-
 lib/views/settings/data/data.dart            |  26 ++-
 lib/views/settings/drive/drive.dart          |  18 +-
 lib/views/tracked/details/details.dart       |  10 +-
 lib/views/tracked/tracked_bottom_sheet.dart  |   4 +-
 lib/views/tracked/tracked_tile.dart          |  70 +++++--
 pubspec.lock                                 |  52 ++++--
 pubspec.yaml                                 |   5 +-
 test/widget_test.dart                        |   5 +-
 19 files changed, 341 insertions(+), 194 deletions(-)
 create mode 100644 lib/folio_app.dart

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6fe047a..de49ba5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -51,7 +51,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.sudopanda.folio"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/lib/assets/app_theme.dart b/lib/assets/app_theme.dart
index 990d816..57ae3f0 100644
--- a/lib/assets/app_theme.dart
+++ b/lib/assets/app_theme.dart
@@ -1,78 +1,131 @@
 import 'package:flutter/material.dart';
 
+@immutable
+class MyColors extends ThemeExtension<MyColors> {
+  const MyColors({
+    required this.negativeColor,
+    required this.positiveColor,
+  });
+
+  final Color? negativeColor;
+  final Color? positiveColor;
+
+  @override
+  MyColors copyWith({Color? negativeColor, Color? positiveColor}) {
+    return MyColors(
+      negativeColor: negativeColor ?? this.negativeColor,
+      positiveColor: positiveColor ?? this.positiveColor,
+    );
+  }
+
+  @override
+  MyColors lerp(MyColors? other, double t) {
+    if (other is! MyColors) {
+      return this;
+    }
+    return MyColors(
+      negativeColor: Color.lerp(negativeColor, other.negativeColor, t),
+      positiveColor: Color.lerp(positiveColor, other.positiveColor, t),
+    );
+  }
+
+  // Optional
+  @override
+  String toString() =>
+      'MyColors(negativeColor: $negativeColor, positiveColor: $positiveColor)';
+}
+
 class AppTheme {
   AppTheme._();
 
-  static Color _iconColor = Colors.blueAccent.shade200;
+  static Color _iconColor = Colors.green;
 
-  static const Color _lightPrimaryColor = Colors.lightGreen;
-  static const Color _lightScaffoldBackgroundColor = Color(0XFFc8e6c9);
+  static const Color _lightPrimaryColor = Color(0XFF454d66);
+  static const Color _lightScaffoldBackgroundColor = Color(0XFFefeeb4);
   static const Color _lightBackgroundColor = Colors.white;
+  static const Color _lightOnBackgroundColor = Color(0XFFCCCCCC);
   static const Color _lightPrimaryVariantColor = Color(0XFFE0E0E0);
-  static const Color _lightSecondaryColor = Colors.green;
-  static const Color _lightOnPrimaryColor = Colors.black;
+  static const Color _lightSecondaryColor = Colors.lightGreen;
+  static const Color _lightOnPrimaryColor = Color(0XFF6a7591);
+  static const Color _lightPositiveColor = Colors.greenAccent;
+  static const Color _lightNegativeColor = Colors.redAccent;
 
-  static const Color _darkPrimaryColor = Color(0XFF0F0F0F);
+  static const Color _darkPrimaryColor = Color(0XFFF0CAA3);
   static const Color _darkScaffoldBackgroundColor = Colors.black;
   static const Color _darkBackgroundColor = Color(0XFF0F0F0F);
+  static const Color _darkOnBackgroundColor = Color(0XFFDDDDDD);
   static const Color _darkPrimaryVariantColor = Color(0XFF1F1F1F);
   static const Color _darkSecondaryColor = Colors.lightGreen;
   static const Color _darkOnPrimaryColor = Colors.white;
+  static const Color _darkPositiveColor = Colors.green;
+  static const Color _darkNegativeColor = Colors.red;
 
   static final ThemeData lightTheme = ThemeData.light().copyWith(
-    scaffoldBackgroundColor: _lightScaffoldBackgroundColor,
-    appBarTheme: AppBarTheme(
-      color: _lightScaffoldBackgroundColor,
-      iconTheme: IconThemeData(color: _lightOnPrimaryColor),
-      toolbarTextStyle: _lightTextTheme.bodyMedium,
-      titleTextStyle: _lightTextTheme.titleLarge,
-    ),
-    primaryColor: Colors.lightGreen,
-    iconTheme: IconThemeData(
-      color: _iconColor,
-    ),
-    textTheme: _lightTextTheme,
-    canvasColor: Colors.transparent,
-    unselectedWidgetColor: _lightPrimaryVariantColor,
-    inputDecorationTheme: InputDecorationTheme(
-      border: OutlineInputBorder(),
-    ),
-    colorScheme: ColorScheme.light(
-      primary: _lightPrimaryColor,
-      background: _lightBackgroundColor,
-      secondary: _iconColor,
-      onPrimary: _lightOnPrimaryColor,
-    ),
-  );
+      scaffoldBackgroundColor: _lightScaffoldBackgroundColor,
+      appBarTheme: AppBarTheme(
+        color: _lightScaffoldBackgroundColor,
+        iconTheme: IconThemeData(color: _lightOnPrimaryColor),
+        toolbarTextStyle: _lightTextTheme.bodyMedium,
+        titleTextStyle: _lightTextTheme.titleLarge,
+      ),
+      primaryColor: _lightPrimaryColor,
+      iconTheme: IconThemeData(
+        color: _iconColor,
+      ),
+      textTheme: _lightTextTheme,
+      canvasColor: Colors.transparent,
+      unselectedWidgetColor: _lightPrimaryVariantColor,
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(),
+      ),
+      colorScheme: ColorScheme.light(
+        primary: _lightPrimaryColor,
+        background: _lightBackgroundColor,
+        secondary: _iconColor,
+        onPrimary: _lightOnPrimaryColor,
+        onBackground: _lightOnBackgroundColor,
+      ),
+      extensions: <ThemeExtension<dynamic>>[
+        const MyColors(
+          negativeColor: _lightNegativeColor,
+          positiveColor: _lightPositiveColor,
+        )
+      ]);
 
   static final ThemeData darkTheme = ThemeData.dark().copyWith(
-    scaffoldBackgroundColor: _darkScaffoldBackgroundColor,
-    appBarTheme: AppBarTheme(
-      color: _darkScaffoldBackgroundColor,
-      iconTheme: IconThemeData(color: _darkOnPrimaryColor),
-      toolbarTextStyle: _darkTextTheme.bodyMedium,
-      titleTextStyle: _darkTextTheme.titleLarge,
-    ),
-    primaryColor: Colors.lightGreen,
-    iconTheme: IconThemeData(
-      color: _iconColor,
-    ),
-    textTheme: _darkTextTheme,
-    canvasColor: Colors.transparent,
-    unselectedWidgetColor: _darkPrimaryVariantColor,
-    inputDecorationTheme: InputDecorationTheme(
-      border: OutlineInputBorder(),
-      enabledBorder: OutlineInputBorder(
-        borderSide: BorderSide(color: _darkPrimaryVariantColor),
+      scaffoldBackgroundColor: _darkScaffoldBackgroundColor,
+      appBarTheme: AppBarTheme(
+        color: _darkScaffoldBackgroundColor,
+        iconTheme: IconThemeData(color: _darkOnPrimaryColor),
+        toolbarTextStyle: _darkTextTheme.bodyMedium,
+        titleTextStyle: _darkTextTheme.titleLarge,
       ),
-    ),
-    colorScheme: ColorScheme.dark(
-      primary: _darkPrimaryColor,
-      secondary: _iconColor,
-      background: _darkBackgroundColor,
-      onPrimary: _darkOnPrimaryColor,
-    ),
-  );
+      primaryColor: _darkPrimaryColor,
+      iconTheme: IconThemeData(
+        color: _iconColor,
+      ),
+      textTheme: _darkTextTheme,
+      canvasColor: Colors.transparent,
+      unselectedWidgetColor: _darkPrimaryVariantColor,
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(),
+        enabledBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: _darkPrimaryVariantColor),
+        ),
+      ),
+      colorScheme: ColorScheme.dark(
+        primary: _darkPrimaryColor,
+        secondary: _iconColor,
+        background: _darkBackgroundColor,
+        onPrimary: _darkOnPrimaryColor,
+        onBackground: _darkOnBackgroundColor,
+      ),
+      extensions: <ThemeExtension<dynamic>>[
+        const MyColors(
+          negativeColor: _darkNegativeColor,
+          positiveColor: _darkPositiveColor,
+        )
+      ]);
 
   static final TextTheme _lightTextTheme = TextTheme(
     displayLarge: _lightHeadline1TextStyle,
@@ -100,8 +153,10 @@ class AppTheme {
     titleMedium: _darkSubtitle1TextStyle,
   );
 
-  static final TextStyle? _lightHeadline1TextStyle =
-      ThemeData.light().textTheme.displayLarge?.copyWith(fontSize: 48);
+  static final TextStyle? _lightHeadline1TextStyle = ThemeData.light()
+      .textTheme
+      .displayLarge
+      ?.copyWith(fontSize: 48, fontWeight: FontWeight.normal);
   static final TextStyle? _lightHeadline2TextStyle =
       ThemeData.light().textTheme.displayMedium;
   static final TextStyle? _lightHeadline3TextStyle =
@@ -121,8 +176,10 @@ class AppTheme {
       ThemeData.light().textTheme.bodyMedium;
   static final TextStyle? _lightSubtitle1TextStyle =
       ThemeData.light().textTheme.titleMedium;
-  static final TextStyle? _lightButtonTextStyle =
-      ThemeData.light().textTheme.labelLarge?.copyWith(color: _lightSecondaryColor);
+  static final TextStyle? _lightButtonTextStyle = ThemeData.light()
+      .textTheme
+      .labelLarge
+      ?.copyWith(color: _lightSecondaryColor);
 
   static final TextStyle? _darkHeadline1TextStyle =
       ThemeData.dark().textTheme.displayLarge?.copyWith(fontSize: 48);
@@ -145,6 +202,8 @@ class AppTheme {
       ThemeData.dark().textTheme.bodyMedium;
   static final TextStyle? _darkSubtitle1TextStyle =
       ThemeData.dark().textTheme.titleMedium;
-  static final TextStyle? _darkButtonTextStyle =
-      ThemeData.dark().textTheme.labelLarge?.copyWith(color: _darkSecondaryColor);
+  static final TextStyle? _darkButtonTextStyle = ThemeData.dark()
+      .textTheme
+      .labelLarge
+      ?.copyWith(color: _darkSecondaryColor);
 }
diff --git a/lib/folio_app.dart b/lib/folio_app.dart
new file mode 100644
index 0000000..243053d
--- /dev/null
+++ b/lib/folio_app.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:folio/assets/app_theme.dart';
+import 'package:folio/views/tracked/tracked.dart';
+
+class FolioApp extends StatefulWidget {
+  @override
+  _FolioAppState createState() => _FolioAppState();
+
+  /// InheritedWidget style accessor to our State object.
+  static _FolioAppState of(BuildContext context) =>
+      context.findAncestorStateOfType<_FolioAppState>()!;
+}
+
+class _FolioAppState extends State<FolioApp> {
+  ThemeMode _themeMode = ThemeMode.light;
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Folio',
+      theme: AppTheme.lightTheme,
+      darkTheme: AppTheme.darkTheme,
+      themeMode: _themeMode,
+      home: TrackedView(),
+    );
+  }
+
+  void changeTheme(ThemeMode themeMode) {
+    setState(() {
+      _themeMode = themeMode;
+    });
+  }
+
+  void invertTheme() {
+    setState(() {
+      _themeMode = _themeMode == ThemeMode.light ? ThemeMode.dark : ThemeMode.light;
+    });
+  }
+
+  bool isLightTheme() {
+    return _themeMode == ThemeMode.light;
+  }
+}
\ No newline at end of file
diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index ee54cef..f2dac64 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -435,8 +435,7 @@ class DatabaseActions {
 
     for (var row in trades.skip(1)) {
       late DateTime date;
-      String exchange = "";
-      String? code, bseCode, nseCode;
+      String? exchange, name, code, bseCode, nseCode;
       int qty = 0;
       double rate = 0;
       bool bought = false;
@@ -466,6 +465,9 @@ class DatabaseActions {
           case "Exchange":
             exchange = element;
             break;
+          case "Name":
+            name = element;
+            break;
           case "BSE Code":
             bseCode = element.toString();
             break;
@@ -502,7 +504,8 @@ class DatabaseActions {
           break;
       }
       print("Codes:- BSE: $bseCode \t NSE: $nseCode \t Exch: $exchange \n");
-      if (code == null) continue;
+
+      if (code == null || exchange == null) continue;
 
       try {
         int id =
@@ -553,28 +556,35 @@ class DatabaseActions {
 
   static Future<String> getTradesCSV() async {
     List<Map> tuples = await Db().getRawQuery(""
-        "SELECT ${Db.colDate}, ${Db.colBSECode}, ${Db.colNSECode}, "
-        "${Db.colExch}, ${Db.colBought}, T.${Db.colQty} AS ${Db.colQty}, "
-        "${Db.colRate} "
-        "FROM ${Db.tblTradeLog} T "
+        "SELECT ${Db.colDate}, T.${Db.colName} AS ${Db.colName}, "
+        "L.${Db.colCode} AS ${Db.colBSECode}, P.${Db.colNSECode} AS ${Db.colNSECode}, "
+        "L.${Db.colExch} AS ${Db.colExch}, ${Db.colBought}, "
+        "L.${Db.colQty} AS ${Db.colQty}, ${Db.colRate} "
+        "FROM ${Db.tblTradeLog} L "
         "LEFT JOIN ${Db.tblPortfolio} P "
-        "ON T.${Db.colCode} = P.${Db.colBSECode} "
+        "ON L.${Db.colCode} = P.${Db.colBSECode} "
+        "LEFT JOIN ${Db.tblTracked} T "
+        "ON L.${Db.colCode} = T.${Db.colCode} "
         "WHERE "
-        "T.${Db.colExch} = 'BSE' "
+        "L.${Db.colExch} = 'BSE' "
         "UNION "
-        "SELECT ${Db.colDate}, ${Db.colBSECode}, ${Db.colNSECode}, "
-        "${Db.colExch}, ${Db.colBought}, T.${Db.colQty} AS ${Db.colQty}, "
-        "${Db.colRate} "
-        "FROM ${Db.tblTradeLog} T "
+        "SELECT ${Db.colDate}, T.${Db.colName} AS ${Db.colName}, "
+        "P.${Db.colBSECode} AS ${Db.colBSECode}, L.${Db.colCode} AS ${Db.colNSECode}, "
+        "L.${Db.colExch} AS ${Db.colExch}, ${Db.colBought}, "
+        "L.${Db.colQty} AS ${Db.colQty}, ${Db.colRate} "
+        "FROM ${Db.tblTradeLog} L "
         "LEFT JOIN ${Db.tblPortfolio} P "
-        "ON T.${Db.colCode} = P.${Db.colNSECode} "
+        "ON L.${Db.colCode} = P.${Db.colNSECode} "
+        "LEFT JOIN ${Db.tblTracked} T "
+        "ON L.${Db.colCode} = T.${Db.colCode} "
         "WHERE "
-        "T.${Db.colExch} = 'NSE' "
+        "L.${Db.colExch} = 'NSE' "
         "ORDER BY ${Db.colDate} ASC");
 
     List<List> trades = [
       [
         "Date",
+        "Name",
         "BSE Code",
         "NSE Code",
         "Exchange",
@@ -587,6 +597,7 @@ class DatabaseActions {
     tuples.forEach((element) {
       trades.add([
         element[Db.colDate],
+        element[Db.colName],
         element[Db.colBSECode],
         element[Db.colNSECode],
         element[Db.colExch],
diff --git a/lib/main.dart b/lib/main.dart
index 21be107..9bf41e4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:folio/assets/app_theme.dart';
 import 'package:folio/state/app_state.dart';
-import 'package:folio/views/tracked/tracked.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+import 'folio_app.dart';
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -16,23 +16,8 @@ void main() async {
 
   runApp(ChangeNotifierProvider<AppState>(
     create: (context) => AppState(prefs),
-    child: MyApp(),
+    child: FolioApp(),
   ));
 }
 
-class MyApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<AppState>(
-      builder: (context, appState, child) {
-        return MaterialApp(
-          title: 'Folio',
-          theme: AppTheme.lightTheme,
-          darkTheme: AppTheme.darkTheme,
-          themeMode: appState.isDarkModeOn ? ThemeMode.dark : ThemeMode.light,
-          home: TrackedView(),
-        );
-      },
-    );
-  }
-}
+
diff --git a/lib/models/stock/stock.dart b/lib/models/stock/stock.dart
index 6f76f2e..bd82ef0 100644
--- a/lib/models/stock/stock.dart
+++ b/lib/models/stock/stock.dart
@@ -41,7 +41,7 @@ class Stock {
 
   double? get netAmount => (netPerStock == null || qty == null || qty == 0)
       ? null
-      : (netPerStock! * qty!).abs();
+      : (netPerStock! * qty!);
 
   double? get netPerStock => (lastValue == null || msr == null)
       ? null
diff --git a/lib/services/query/query_nse_api.dart b/lib/services/query/query_nse_api.dart
index b865a0b..1c3a329 100644
--- a/lib/services/query/query_nse_api.dart
+++ b/lib/services/query/query_nse_api.dart
@@ -64,7 +64,7 @@ class NetworkService {
 
     _updateCookie(response);
 
-    if (statusCode < 200 || statusCode > 400 || json == null) {
+    if (statusCode < 200 || statusCode > 400) {
       throw new Exception("Error while fetching data: " +
           statusCode.toString() +
           "\n\n" +
diff --git a/lib/views/common/drawer.dart b/lib/views/common/drawer.dart
index 481de97..bc4901b 100644
--- a/lib/views/common/drawer.dart
+++ b/lib/views/common/drawer.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:folio/state/app_state.dart';
+import 'package:folio/folio_app.dart';
 import 'package:folio/views/settings/drive/drive.dart';
 import 'package:folio/views/settings/data/data.dart';
-import 'package:provider/provider.dart';
 
 class FolioDrawer extends StatelessWidget {
   @override
@@ -32,24 +31,21 @@ class FolioDrawer extends StatelessWidget {
                             alignment: Alignment.topRight,
                             child: IconButton(
                                 iconSize: 30,
-                                icon:
-                                    Provider.of<AppState>(context).isDarkModeOn
-                                        ? Icon(
-                                            Icons.nights_stay_outlined,
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .onPrimary,
-                                          )
-                                        : Icon(
-                                            Icons.wb_sunny_outlined,
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .onPrimary,
-                                          ),
+                                icon: FolioApp.of(context).isLightTheme()
+                                    ? Icon(
+                                        Icons.wb_sunny_outlined,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .onPrimary,
+                                      )
+                                    : Icon(
+                                        Icons.nights_stay_outlined,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .onPrimary,
+                                      ),
                                 onPressed: () {
-                                  Provider.of<AppState>(context).updateTheme(
-                                      !Provider.of<AppState>(context, listen: false)
-                                          .isDarkModeOn);
+                                  FolioApp.of(context).invertTheme();
                                 }),
                           ),
                           Spacer(),
@@ -94,7 +90,6 @@ class FolioDrawer extends StatelessWidget {
                 ],
               ),
               Spacer(),
-              
             ],
           ),
         ),
diff --git a/lib/views/common/text_loading_indicator.dart b/lib/views/common/text_loading_indicator.dart
index 7c98bf4..ccea248 100644
--- a/lib/views/common/text_loading_indicator.dart
+++ b/lib/views/common/text_loading_indicator.dart
@@ -3,10 +3,14 @@ import 'package:flutter/material.dart';
 class TextLoadingIndicator extends StatelessWidget {
   final double width;
   final double height;
+  final Color? backgroundColor;
+  final Color? foregroundColor;
 
   const TextLoadingIndicator({
     required this.width,
     required this.height,
+    this.backgroundColor,
+    this.foregroundColor,
   });
 
   @override
@@ -16,10 +20,10 @@ class TextLoadingIndicator extends StatelessWidget {
       child: ClipRRect(
         borderRadius: BorderRadius.all(Radius.circular(2)),
               child: LinearProgressIndicator(
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+          backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
           minHeight: height,
           valueColor:
-              AlwaysStoppedAnimation<Color>(Theme.of(context).colorScheme.background),
+              AlwaysStoppedAnimation<Color>(foregroundColor ?? Theme.of(context).colorScheme.background),
         ),
       ),
     );
diff --git a/lib/views/logs/logs.dart b/lib/views/logs/logs.dart
index 839f67d..5b66873 100644
--- a/lib/views/logs/logs.dart
+++ b/lib/views/logs/logs.dart
@@ -56,8 +56,6 @@ class _LogsViewState extends State<LogsView> {
                         style: ElevatedButton.styleFrom(
                             foregroundColor: Theme.of(context).colorScheme.background,
                             backgroundColor: Theme.of(context).colorScheme.secondary,
-                            minimumSize: Size(88, 36),
-                            padding: EdgeInsets.symmetric(horizontal: 16),
                             shape: const CircleBorder()),
                         child: Icon(Icons.add),
                         onPressed: () {
diff --git a/lib/views/portfolio/portfolio.dart b/lib/views/portfolio/portfolio.dart
index 00d2052..15546ed 100644
--- a/lib/views/portfolio/portfolio.dart
+++ b/lib/views/portfolio/portfolio.dart
@@ -56,11 +56,9 @@ class _PortfolioViewState extends State<PortfolioView> {
                         style: ElevatedButton.styleFrom(
                           foregroundColor: Theme.of(context).colorScheme.background,
                           backgroundColor: Theme.of(context).colorScheme.secondary,
-                          minimumSize: Size(88, 36),
-                          padding: EdgeInsets.symmetric(horizontal: 16),
                           shape: const CircleBorder(),
                         ),
-                        child: Icon(Icons.add),
+                        child: Icon(Icons.link),
                         onPressed: () {
                           showDialog(
                             context: context,
diff --git a/lib/views/settings/data/data.dart b/lib/views/settings/data/data.dart
index 79f3340..9c385f1 100644
--- a/lib/views/settings/data/data.dart
+++ b/lib/views/settings/data/data.dart
@@ -4,15 +4,16 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:folio/models/database/trade_log.dart';
 import 'package:intl/intl.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 
 import 'package:folio/views/settings/data/add_file.dart';
 import 'package:folio/views/settings/data/add_portfolio_dialog.dart';
 import 'package:folio/views/settings/data/add_trade_log.dart';
-import 'package:folio/helpers/database_actions.dart';
 import 'package:folio/views/settings/data/track_stock_dialog.dart';
-import 'package:permission_handler/permission_handler.dart';
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/models/database/trade_log.dart';
 
 class ImportRoute extends StatelessWidget {
   @override
@@ -209,11 +210,13 @@ class _ImportAreaState extends State<ImportArea> {
                           ),
                           ElevatedButton(
                             style: TextButton.styleFrom(
-                              foregroundColor: Theme.of(context).colorScheme.background,
+                              foregroundColor:
+                                  Theme.of(context).colorScheme.background,
                               minimumSize: Size(88, 36),
                               padding: EdgeInsets.symmetric(horizontal: 16),
                               shape: const RoundedRectangleBorder(
-                                borderRadius: BorderRadius.all(Radius.circular(5)),
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(5)),
                               ),
                             ),
                             onPressed: () {
@@ -222,7 +225,8 @@ class _ImportAreaState extends State<ImportArea> {
                             child: Text("Cancel"),
                           ),
                         ],
-                        actionsPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
+                        actionsPadding:
+                            EdgeInsets.symmetric(horizontal: 10, vertical: 10),
                       ),
                     );
                     if (result == "Delete") {
@@ -345,9 +349,15 @@ class _ImportAreaState extends State<ImportArea> {
       _isButtonEnabled = false;
       _isExporting = true;
     });
+    final plugin = DeviceInfoPlugin();
+    final android = await plugin.androidInfo;
+
+    final storageStatus = android.version.sdkInt < 33
+        ? await Permission.storage.request()
+        : PermissionStatus.granted;
 
-    if (!await Permission.storage.status.isGranted) {
-      await Permission.storage.request();
+    if (!storageStatus.isGranted) {
+      await Permission.manageExternalStorage.request();
     }
 
     String? dir = await FilePicker.platform.getDirectoryPath();
diff --git a/lib/views/settings/drive/drive.dart b/lib/views/settings/drive/drive.dart
index 8c29394..de9f90e 100644
--- a/lib/views/settings/drive/drive.dart
+++ b/lib/views/settings/drive/drive.dart
@@ -44,7 +44,7 @@ class _DriveAreaState extends State<DriveArea> {
   bool _isBackingUp = false;
   bool _isRestoring = false;
   bool _isDeleting = false;
-  late signIn.GoogleSignInAccount? account;
+  signIn.GoogleSignInAccount? account;
   final DateFormat _fileFormatter = DateFormat('folio-yyyy-MMM-dd-HH-mm-ss');
   late signIn.GoogleSignIn googleSignIn;
 
@@ -280,23 +280,11 @@ class _DriveAreaState extends State<DriveArea> {
       final authenticateClient = GoogleAuthClient(authHeaders);
       final driveApi = drive.DriveApi(authenticateClient);
 
-      Object file = await driveApi.files
+      var file = await driveApi.files
           .get(id, downloadOptions: drive.DownloadOptions.fullMedia);
 
       final saveFile = File(await Db().getDbPath());
-      List<int> dataStore = [];
-      print(file.toString());
-      // FIXME:
-      // file.stream.listen((data) {
-      //   dataStore.insertAll(dataStore.length, data);
-      // }, onDone: () async {
-      //   log("Download Done");
-      //   saveFile.writeAsBytes(dataStore, flush: true).then((res) async {
-      //     log("Written to File");
-      //   });
-      // }, onError: (e) {
-      //   log("drive.showRestoreDialog() => \n " + e.toString());
-      // });
+      await saveFile.writeAsString(file.toString(), flush: true);
     }
 
     setState(() {
diff --git a/lib/views/tracked/details/details.dart b/lib/views/tracked/details/details.dart
index db378fa..161acf5 100644
--- a/lib/views/tracked/details/details.dart
+++ b/lib/views/tracked/details/details.dart
@@ -27,15 +27,15 @@ class DetailsView extends StatefulWidget {
 class _DetailsViewState extends State<DetailsView>
     with TickerProviderStateMixin {
   late Stock _stock;
-  late Latest? _bseLatest;
-  late Latest? _nseLatest;
-  late TradeCycle? _computedCycle;
+  Latest? _bseLatest;
+  Latest? _nseLatest;
+  TradeCycle? _computedCycle;
   late TradeSummary _summary;
   late Future<TradeSummary> _futureSummary;
   late Future<List<TradeLog>> _futureLogs;
 
-  late StreamSubscription<Latest?> _latestBSEStreamSub;
-  late StreamSubscription<Latest?> _latestNSEStreamSub;
+  StreamSubscription<Latest?>? _latestBSEStreamSub;
+  StreamSubscription<Latest?>? _latestNSEStreamSub;
   late TabController _tabController;
 
   final _formKey = GlobalKey<FormState>();
diff --git a/lib/views/tracked/tracked_bottom_sheet.dart b/lib/views/tracked/tracked_bottom_sheet.dart
index 6f57fb8..e4179fb 100644
--- a/lib/views/tracked/tracked_bottom_sheet.dart
+++ b/lib/views/tracked/tracked_bottom_sheet.dart
@@ -282,11 +282,11 @@ class MapTile extends StatelessWidget {
             children: [
               Text(
                 _value,
-                style: Theme.of(context).textTheme.headlineMedium,
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(color: Theme.of(context).colorScheme.background),
               ),
               Text(
                 _name,
-                style: Theme.of(context).textTheme.bodyLarge,
+                style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Theme.of(context).colorScheme.onBackground),
               )
             ],
           ),
diff --git a/lib/views/tracked/tracked_tile.dart b/lib/views/tracked/tracked_tile.dart
index 9e4f745..696b79f 100644
--- a/lib/views/tracked/tracked_tile.dart
+++ b/lib/views/tracked/tracked_tile.dart
@@ -7,6 +7,8 @@ import 'package:folio/models/stock/stock.dart';
 import 'package:folio/views/common/text_loading_indicator.dart';
 import 'package:folio/views/tracked/tracked_bottom_sheet.dart';
 
+import '../../assets/app_theme.dart';
+
 class TrackedTile extends StatefulWidget {
   final Stock stock;
 
@@ -51,11 +53,17 @@ class _TrackedTileState extends State<TrackedTile> {
 
   @override
   Widget build(BuildContext context) {
+    final MyColors myColors = Theme.of(context).extension<MyColors>()!;
+    bool hasReachedESR = (_stock?.lastValue ?? double.negativeInfinity) >
+        (_stock?.esr ?? double.infinity);
+    bool hasReachedMSR = (_stock?.lastValue ?? double.negativeInfinity) >
+        (_stock?.msr ?? double.infinity);
+    bool isLessThanMSR = (_stock?.lastValue ?? double.infinity) <
+        (_stock?.msr ?? double.negativeInfinity);
     return Card(
       key: _scaffold,
-      color: (_stock?.lastValue ?? double.negativeInfinity) >
-              (_stock?.esr ?? double.infinity)
-          ? Colors.lightGreen[600]
+      color: hasReachedESR
+          ? myColors.positiveColor
           : Theme.of(context).colorScheme.background,
       elevation: 2,
       shape: RoundedRectangleBorder(
@@ -72,16 +80,14 @@ class _TrackedTileState extends State<TrackedTile> {
               Container(
                 width: 20,
                 decoration: BoxDecoration(
-                  color: (_stock?.lastValue ?? double.negativeInfinity) >
-                          (_stock?.msr ?? double.infinity)
-                      ? Colors.lightGreen[600]
-                      : (_stock?.lastValue ?? double.infinity) <
-                              (_stock?.msr ?? double.negativeInfinity)
-                          ? Colors.redAccent
+                  color: hasReachedMSR
+                      ? myColors.positiveColor
+                      : isLessThanMSR
+                          ? myColors.negativeColor
                           : Colors.transparent,
                   borderRadius: BorderRadius.only(
-                    topLeft: Radius.circular(20),
-                    bottomLeft: Radius.circular(20),
+                    topLeft: Radius.circular(10),
+                    bottomLeft: Radius.circular(10),
                   ),
                 ),
               ),
@@ -102,11 +108,16 @@ class _TrackedTileState extends State<TrackedTile> {
                                 height: (Theme.of(context)
                                     .textTheme
                                     .bodyMedium
-                                    ?.fontSize)!)
+                                    ?.fontSize)!,
+                                backgroundColor:
+                                    Theme.of(context).colorScheme.background,
+                                foregroundColor:
+                                    Theme.of(context).colorScheme.onBackground,
+                              )
                             : Text(
-                                (_stock?.exchange ?? "") +
+                                (_stock.exchange ?? "") +
                                     " - " +
-                                    (_stock?.code ?? ""),
+                                    (_stock.code ?? ""),
                                 style: Theme.of(context).textTheme.bodyMedium,
                               ),
                         SizedBox(
@@ -118,7 +129,12 @@ class _TrackedTileState extends State<TrackedTile> {
                                 height: (Theme.of(context)
                                     .textTheme
                                     .titleLarge
-                                    ?.fontSize)!)
+                                    ?.fontSize)!,
+                                backgroundColor:
+                                    Theme.of(context).colorScheme.background,
+                                foregroundColor:
+                                    Theme.of(context).colorScheme.onBackground,
+                              )
                             : Text(
                                 (_stock.name == "NULL"
                                     ? "-"
@@ -156,6 +172,9 @@ class _TrackedTileState extends State<TrackedTile> {
                                         .headlineMedium!
                                         .fontSize! +
                                     5,
+                                backgroundColor: Theme.of(context).primaryColor,
+                                foregroundColor:
+                                    Theme.of(context).colorScheme.onPrimary,
                               )
                             : Text(
                                 _stock?.lastValue?.toStringAsFixed(2) ?? "",
@@ -181,11 +200,20 @@ class _TrackedTileState extends State<TrackedTile> {
                                         .textTheme
                                         .bodyLarge
                                         ?.fontSize)!,
+                                    backgroundColor:
+                                        Theme.of(context).primaryColor,
+                                    foregroundColor:
+                                        Theme.of(context).colorScheme.onPrimary,
                                   )
                                 : Text(
                                     "${_stock?.percentChange}%",
-                                    style:
-                                        Theme.of(context).textTheme.bodyLarge,
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .bodyLarge
+                                        ?.copyWith(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .background),
                                   ),
                             SizedBox(width: 10),
                             _stock.change == null
@@ -195,6 +223,10 @@ class _TrackedTileState extends State<TrackedTile> {
                                         .textTheme
                                         .bodyLarge
                                         ?.fontSize)!,
+                                    backgroundColor:
+                                        Theme.of(context).primaryColor,
+                                    foregroundColor:
+                                        Theme.of(context).colorScheme.onPrimary,
                                   )
                                 : Text(
                                     _stock.change!,
@@ -203,9 +235,9 @@ class _TrackedTileState extends State<TrackedTile> {
                                         .bodyLarge
                                         ?.copyWith(
                                           color: _stock.changeSign == 1
-                                              ? Colors.green
+                                              ? myColors.positiveColor
                                               : (_stock.changeSign == -1
-                                                  ? Colors.red
+                                                  ? myColors.negativeColor
                                                   : Theme.of(context)
                                                       .colorScheme
                                                       .onPrimary),
diff --git a/pubspec.lock b/pubspec.lock
index 4eeaae0..e8cb554 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -121,6 +121,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
+  device_info_plus:
+    dependency: "direct main"
+    description:
+      name: device_info_plus
+      sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.3"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   dio:
     dependency: "direct main"
     description:
@@ -141,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18"
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
@@ -157,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "704259669b5e9cb24e15c11cfcf02caf5f20d30901b3916d60b6d1c2d647035f"
+      sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.1"
+    version: "5.3.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -348,10 +364,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   path_provider_android:
     dependency: transitive
     description:
@@ -388,10 +404,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: a34ecd7fb548f8e57321fd8e50d865d266941b54e6c3b7758cf8f37c24116905
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.2.0"
   permission_handler:
     dependency: "direct main"
     description:
@@ -444,10 +460,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -500,10 +516,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
+      sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -633,10 +649,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: c0e3a4f7be7dae51d8f152230b86627e3397c1ba8c3fa58e63d44a9f3edc9cef
+      sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "5.0.6"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: e4506d60b7244251bc59df15656a3093501c37fb5af02105a944d73eb95be4c9
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6976675..e34bfc3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 3.1.4
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.15.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -29,10 +29,11 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   shared_preferences: ^2.0.5
   permission_handler: ^10.4.3
+  device_info_plus: ^9.0.3
   cupertino_icons: ^1.0.5
   google_sign_in: ^6.1.4
   path_provider: ^2.0.1
-  file_picker: ^4.0.1
+  file_picker: ^5.3.3
   collection: ^1.17.1
   googleapis: ^11.4.0
   provider: ^6.0.5
diff --git a/test/widget_test.dart b/test/widget_test.dart
index a1ab7bd..bb267f5 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -7,13 +7,12 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-
-import 'package:folio/main.dart';
+import 'package:folio/folio_app.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
+    await tester.pumpWidget(FolioApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);

From d19cfaa379558c80bdc2c7d834d66a7b8fa2b42f Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Sun, 27 Aug 2023 02:13:16 +0530
Subject: [PATCH 4/6] Improve import file process.

- Added a separate page to choose a file to import
- Added progress bars wherever large processing takes places
- Added a page to correct and view trades before importing
---
 lib/helpers/database_actions.dart             | 335 +++++++++---
 lib/helpers/progress_provider.dart            |  31 ++
 lib/models/database/portfolio.dart            |   1 +
 lib/models/port/statement.dart                |  12 -
 lib/models/trade/parsed_file_logs.dart        |  51 ++
 lib/services/database/database.dart           |  18 +-
 lib/views/common/bottom_navbar.dart           |  18 +-
 lib/views/settings/data/add_file.dart         |  40 +-
 lib/views/settings/data/add_trade_log.dart    |   7 +-
 lib/views/settings/data/data.dart             |  64 +--
 .../import_file/correct_invalid_logs.dart     | 104 ++++
 .../data/import_file/file_log_tile.dart       | 492 ++++++++++++++++++
 .../data/import_file/import_file.dart         | 259 +++++++++
 .../data/import_file/import_logs.dart         | 115 ++++
 .../data/import_file/show_valid_logs.dart     |  51 ++
 lib/views/tracked/details/details.dart        |   2 +-
 .../{logs/logs.dart => trades/trades.dart}    |  10 +-
 .../log_tile.dart => trades/trades_tile.dart} |  27 +-
 pubspec.lock                                  |  16 +
 pubspec.yaml                                  |   1 +
 20 files changed, 1445 insertions(+), 209 deletions(-)
 create mode 100644 lib/helpers/progress_provider.dart
 delete mode 100644 lib/models/port/statement.dart
 create mode 100644 lib/models/trade/parsed_file_logs.dart
 create mode 100644 lib/views/settings/data/import_file/correct_invalid_logs.dart
 create mode 100644 lib/views/settings/data/import_file/file_log_tile.dart
 create mode 100644 lib/views/settings/data/import_file/import_file.dart
 create mode 100644 lib/views/settings/data/import_file/import_logs.dart
 create mode 100644 lib/views/settings/data/import_file/show_valid_logs.dart
 rename lib/views/{logs/logs.dart => trades/trades.dart} (93%)
 rename lib/views/{logs/log_tile.dart => trades/trades_tile.dart} (83%)

diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index f2dac64..8c0a616 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -1,4 +1,5 @@
 import 'dart:developer' as dev;
+import 'dart:io';
 
 import 'package:csv/csv_settings_autodetection.dart';
 import 'package:folio/services/database/database.dart';
@@ -11,8 +12,13 @@ import 'package:html/parser.dart' as html;
 import 'package:sqflite/sqflite.dart';
 import 'package:html/dom.dart';
 import 'package:csv/csv.dart';
+import 'package:excel/excel.dart';
+
+import '../models/trade/parsed_file_logs.dart';
 
 class DatabaseActions {
+  static void dummyOnUpdate({int? current, String? message, int? total}) {}
+
   static Future<List<TradeLog>> getAllLogs() async {
     List<Map<String, dynamic>> tuples = await Db()
         .getOrdered(Db.tblTradeLog, '${Db.colDate} DESC, ${Db.colCode} ASC');
@@ -264,9 +270,23 @@ class DatabaseActions {
     return sellLogs;
   }
 
-  static Future<int> getRowIDAfterSettingCodes(String? bseCode, String? nseCode) async {
-    List<Map> tuples = await Db().getQuery(Db.tblPortfolio,
-        '${Db.colBSECode} = ? or ${Db.colNSECode} = ?', [bseCode, nseCode]);
+  static Future<int> getRowIDAfterSettingCodes(
+      String? bseCode, String? nseCode) async {
+    List<Map> tuples;
+
+    if (bseCode != null && nseCode != null) {
+      tuples = await Db().getQuery(Db.tblPortfolio,
+          '${Db.colBSECode} = ? or ${Db.colNSECode} = ?', [bseCode, nseCode]);
+    } else if (bseCode != null) {
+      tuples = await Db()
+          .getQuery(Db.tblPortfolio, '${Db.colBSECode} = ?', [bseCode]);
+    } else if (nseCode != null) {
+      tuples = await Db()
+          .getQuery(Db.tblPortfolio, '${Db.colNSECode} = ?', [nseCode]);
+    } else {
+      throw ArgumentError("Both BSE and NSE codes cannot be null!");
+    }
+
     if (tuples.length == 0) {
       Db().insert(
         Db.tblPortfolio,
@@ -275,30 +295,39 @@ class DatabaseActions {
           Db.colNSECode: nseCode,
         },
       );
-    } else if (tuples.length == 1) {
-      Db().updateConditionally(
-        Db.tblPortfolio,
-        {
-          Db.colBSECode: bseCode,
-          Db.colNSECode: nseCode,
-        },
-        '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
-        [bseCode, nseCode],
-      );
-      return tuples.first[Db.colRowID];
     } else {
-      Db().deleteQuery(
-        Db.tblPortfolio,
-        '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
-        [bseCode, nseCode],
-      );
-      Db().insert(
-        Db.tblPortfolio,
-        {
-          Db.colBSECode: bseCode,
-          Db.colNSECode: nseCode,
-        },
-      );
+      if (bseCode == null) {
+        bseCode = tuples[0][Db.colBSECode];
+      }
+      if (nseCode == null) {
+        nseCode = tuples[0][Db.colNSECode];
+      }
+
+      if (tuples.length == 1) {
+        Db().updateConditionally(
+          Db.tblPortfolio,
+          {
+            Db.colBSECode: bseCode,
+            Db.colNSECode: nseCode,
+          },
+          '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
+          [bseCode, nseCode],
+        );
+        return tuples.first[Db.colRowID];
+      } else {
+        Db().deleteQuery(
+          Db.tblPortfolio,
+          '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
+          [bseCode, nseCode],
+        );
+        Db().insert(
+          Db.tblPortfolio,
+          {
+            Db.colBSECode: bseCode,
+            Db.colNSECode: nseCode,
+          },
+        );
+      }
     }
 
     tuples = await Db().getQuery(Db.tblPortfolio,
@@ -307,7 +336,7 @@ class DatabaseActions {
   }
 
   static Future<bool> linkCodes(Map<String, String> codes) async {
-    int id = await getRowIDAfterSettingCodes(codes["BSE"]!, codes["NSE"]);
+    int id = await getRowIDAfterSettingCodes(codes["BSE"], codes["NSE"]);
 
     bool res = await Db().updateConditionally(
       Db.tblTradeLog,
@@ -326,7 +355,68 @@ class DatabaseActions {
     return await updatePortfolioFigures(id);
   }
 
-  static Future<List<TradeLog>?> parseSBIFile(String file) async {
+  static Future<ParsedFileLogs> parseSBIFile(String filepath,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    onUpdate(message: "Parsing SBI File");
+
+    var bytes = File(filepath).readAsBytesSync();
+    var excelFile = Excel.decodeBytes(bytes);
+
+    if (excelFile.sheets.isEmpty) {
+      throw ArgumentError("Excel file has no sheets");
+    }
+    Sheet excelSheet = excelFile.sheets.values.first;
+    var parsedLogs = ParsedFileLogs();
+    var data = excelSheet.rows;
+    int dateColID = 0,
+        exchangeColID = 3,
+        nameColID = 8,
+        boughtColID = 9,
+        qtyColID = 10,
+        rateColID = 11;
+    int startRow = 3;
+    onUpdate(
+        message: "Parsing SBI File",
+        current: 0,
+        total: excelSheet.maxRows - startRow);
+    for (int rowIndex = startRow; rowIndex < excelSheet.maxRows; rowIndex++) {
+      onUpdate(
+          message: "Parsing SBI File",
+          current: rowIndex - startRow + 1,
+          total: excelSheet.maxRows - startRow);
+      var row = excelSheet.row(rowIndex);
+      DateTime? date;
+      var dateString = row[dateColID]?.value.toString();
+      if (dateString != null) {
+        dateString = dateString.substring(0, dateString.lastIndexOf("T"));
+        int year = int.parse(dateString.substring(0, dateString.indexOf('-')));
+        int month = int.parse(dateString.substring(
+            dateString.indexOf('-') + 1, dateString.lastIndexOf('-')));
+        int day = int.parse(dateString.substring(dateString.lastIndexOf('-')));
+        date = DateTime.utc(year, month, day);
+      }
+      String? exchange = row[exchangeColID]?.value.toString().trim();
+      String? name = row[nameColID]?.value.toString();
+      bool? bought = row[boughtColID]?.value.toString() == "B";
+      int? qty = row[qtyColID] == null
+          ? null
+          : int.parse(row[qtyColID]!.value.toString());
+      double? rate = row[rateColID] == null
+          ? null
+          : double.parse(row[rateColID]!.value.toString());
+
+      parsedLogs.invalidLogs
+          .add(FileLog(date, name, null, null, exchange, bought, qty, rate));
+    }
+
+    return parsedLogs;
+  }
+
+  static Future<ParsedFileLogs> parseOldSBIFile(String file,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    onUpdate(message: "Parsing SBI File (old format)");
     int mode = 0;
     Document parsedHTML = html.parse(file);
     List<String> headers = [];
@@ -340,25 +430,37 @@ class DatabaseActions {
       mode = 1;
     }
 
-    if (table == null) return null;
+    if (table == null) throw FormatException("File format is not correct");
 
     for (var cell
         in table.querySelectorAll("tr").first.querySelectorAll("th")) {
       headers.add(cell.innerHtml);
     }
 
-    List<TradeLog> logs = [];
+    var parsedLogs = ParsedFileLogs();
+
+    int skipRows = 1;
+    int rowNum = 0;
 
-    for (var row in table.querySelectorAll("tr").skip(1)) {
-      late DateTime date;
-      String exchange = "";
-      String? scripCode, scripName, code;
+    onUpdate(
+        message: "Parsing SBI File (old format)",
+        current: rowNum,
+        total: table.querySelectorAll("tr").length - skipRows);
+
+    for (var row in table.querySelectorAll("tr").skip(skipRows)) {
+      onUpdate(
+          message: "Parsing SBI File (old format)",
+          current: ++rowNum,
+          total: table.querySelectorAll("tr").length - skipRows);
+
+      DateTime? date;
+      String? exchange, scripCode, scripName, code;
       int buyQty = 0, sellQty = 0;
-      double buyRate = 0, sellRate = 0;
+      double? buyRate, sellRate;
 
-      int i = 0;
+      int colNum = 0;
       for (var cell in row.querySelectorAll("td")) {
-        switch (headers[i]) {
+        switch (headers[colNum]) {
           case "Date":
             date = DateTime.utc(
                 int.parse(cell.innerHtml
@@ -379,8 +481,8 @@ class DatabaseActions {
           case "Scrip Name":
             scripName = html
                 .parse(html.parse(cell.innerHtml).body?.text)
-                .documentElement
-                !.text
+                .documentElement!
+                .text
                 .trim();
             break;
           case "Buy Qty":
@@ -398,7 +500,7 @@ class DatabaseActions {
           default:
             break;
         }
-        i++;
+        colNum++;
       }
 
       switch (exchange) {
@@ -412,38 +514,55 @@ class DatabaseActions {
           code = null;
       }
 
-      if (code == null) continue;
-
-      int id =
-          await DatabaseActions.getRowIDAfterSettingCodes(scripCode, scripName);
-      if (buyQty > 0)
-        logs.add(TradeLog(date, id, code, exchange, true, buyQty, buyRate));
+      if (buyQty > 0) {
+        var log = FileLog(
+            date, null, scripCode, scripName, exchange, true, buyQty, buyRate);
+        if (date == null || code == null || exchange == null || buyRate == null)
+          parsedLogs.invalidLogs.add(log);
+        else
+          parsedLogs.validLogs.add(log);
+      }
 
-      if (sellQty > 0)
-        logs.add(TradeLog(date, id, code, exchange, false, sellQty, sellRate));
+      if (sellQty > 0) {
+        var log = FileLog(date, null, scripCode, scripName, exchange, false,
+            sellQty, sellRate);
+        if (date == null ||
+            code == null ||
+            exchange == null ||
+            sellRate == null)
+          parsedLogs.invalidLogs.add(log);
+        else
+          parsedLogs.validLogs.add(log);
+      }
     }
 
-    return logs;
+    onUpdate(message: "Parsed SBI File (old format)");
+
+    return parsedLogs;
   }
 
-  static Future<List<TradeLog>> parseCSVFile(String file) async {
+  static Future<ParsedFileLogs> parseCSVFile(String file,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
     var detector = FirstOccurrenceSettingsDetector(eols: ['\r\n', '\n']);
     List<List<dynamic>> trades =
         const CsvToListConverter().convert(file, csvSettingsDetector: detector);
 
-    List<TradeLog> logs = [];
+    var parsedLogs = ParsedFileLogs();
 
     for (var row in trades.skip(1)) {
-      late DateTime date;
+      DateTime? date;
       String? exchange, name, code, bseCode, nseCode;
-      int qty = 0;
-      double rate = 0;
-      bool bought = false;
+      int? qty;
+      double? rate;
+      bool? bought;
 
       int i = 0;
       for (var element in row) {
         switch (trades.first[i]) {
           case "Date":
+            if (element == "null") break;
+
             date = DateTime.utc(
               int.parse(
                 element.substring(
@@ -463,24 +582,31 @@ class DatabaseActions {
             );
             break;
           case "Exchange":
+            if (element == "null") break;
             exchange = element;
             break;
           case "Name":
+            if (element == "null") break;
             name = element;
             break;
           case "BSE Code":
+            if (element == "null") break;
             bseCode = element.toString();
             break;
           case "NSE Code":
+            if (element == "null") break;
             nseCode = element.toString();
             break;
           case "Quantity":
+            if (element == "null") break;
             qty = int.parse(element.toString());
             break;
           case "Rate":
+            if (element == "null") break;
             rate = double.parse(element.toString());
             break;
           case "BUY/SELL":
+            if (element == "null") break;
             switch (element) {
               case "BUY":
                 bought = true;
@@ -505,31 +631,38 @@ class DatabaseActions {
       }
       print("Codes:- BSE: $bseCode \t NSE: $nseCode \t Exch: $exchange \n");
 
-      if (code == null || exchange == null) continue;
-
-      try {
-        int id =
-            await DatabaseActions.getRowIDAfterSettingCodes(bseCode, nseCode);
-
-        if (qty > 0)
-          logs.add(TradeLog(date, id, code, exchange, bought, qty, rate));
-      } catch (e) {
-        dev.log("parseCSVFile() => \n" + e.toString());
-      }
+      var log =
+          FileLog(date, name, bseCode, nseCode, exchange, bought, qty, rate);
+      if (date == null ||
+          code == null ||
+          exchange == null ||
+          bought == null ||
+          qty == null ||
+          rate == null)
+        parsedLogs.invalidLogs.add(log);
+      else
+        parsedLogs.validLogs.add(log);
     }
 
-    return logs;
+    return parsedLogs;
   }
 
-  static Future<Object?> addTradeLogs(List<TradeLog> logs) async {
+  static Future<Object?> addTradeLogs(List<TradeLog> logs,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
     Set updateLater = Set();
 
     return await Db().transact((txn) async {
       int i = 0;
+      onUpdate(message: "Adding trade logs...", current: i, total: logs.length);
+
       for (var log in logs) {
         if (++i % 10 == 0) {
-          dev.log("Processed " + i.toString() + " logs");
+          dev.log("Processed " + i.toString() + " trade logs");
         }
+        onUpdate(
+            message: "Adding trade logs...", current: i, total: logs.length);
+
         try {
           await txn.insert(Db.tblTradeLog, log.toDbTuple());
           updateLater.add(log.id);
@@ -540,20 +673,81 @@ class DatabaseActions {
           });
         } on DatabaseException catch (e) {
           if (e.isUniqueConstraintError()) {
+            dev.log("Unique constraint error on ${log.toString()}!");
             continue;
           } else {
+            onUpdate(
+                message: "Unknown Error Occurred ...",
+                current: i,
+                total: logs.length);
             throw e;
           }
         }
       }
     }).then((value) async {
+      int i = 0;
+      onUpdate(
+          message: "Updating Portfolio ...",
+          current: i,
+          total: updateLater.length);
       for (var id in updateLater) {
+        onUpdate(
+            message: "Updating Portfolio ...",
+            current: ++i,
+            total: updateLater.length);
         await updatePortfolioFigures(id);
       }
       return value;
     });
   }
 
+  static Future<List<TradeLog>> addFileLogs(List<FileLog> logs,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    // Creating Trade Logs...
+    List<TradeLog> trades = [];
+    int i = 0;
+    onUpdate(
+        message: "Creating trade logs ...", current: i, total: logs.length);
+    for (var fileLog in logs) {
+      if (++i % 10 == 0) {
+        dev.log("Created " + i.toString() + " trade logs");
+      }
+
+      onUpdate(
+          message: "Creating trade logs ...", current: i, total: logs.length);
+
+      if (fileLog.date == null ||
+          fileLog.code == null ||
+          fileLog.exchange == null ||
+          fileLog.bought == null ||
+          fileLog.qty == null ||
+          fileLog.rate == null) {
+        onUpdate(
+            message: "Invalid logs found!", current: i, total: logs.length);
+        throw Exception("Invalid logs found!");
+      }
+
+      try {
+        int id = await DatabaseActions.getRowIDAfterSettingCodes(
+            fileLog.bseCode, fileLog.nseCode);
+
+        trades.add(TradeLog(fileLog.date!, id, fileLog.code!, fileLog.exchange!,
+            fileLog.bought!, fileLog.qty!, fileLog.rate!));
+      } catch (e) {
+        onUpdate(
+            message: "Unknown Error Occurred!", current: i, total: logs.length);
+        throw e;
+      }
+
+      i++;
+    }
+
+    await addTradeLogs(trades, onUpdate: onUpdate);
+
+    return trades;
+  }
+
   static Future<String> getTradesCSV() async {
     List<Map> tuples = await Db().getRawQuery(""
         "SELECT ${Db.colDate}, T.${Db.colName} AS ${Db.colName}, "
@@ -607,7 +801,8 @@ class DatabaseActions {
       ]);
     });
 
-    return const ListToCsvConverter().convert(trades, delimitAllFields: true);
+    var converter = const ListToCsvConverter();
+    return converter.convert(trades, delimitAllFields: true);
   }
 
   static Future<List<TradeLog>> getStockLogs(int stockId) async {
diff --git a/lib/helpers/progress_provider.dart b/lib/helpers/progress_provider.dart
new file mode 100644
index 0000000..e93692f
--- /dev/null
+++ b/lib/helpers/progress_provider.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+
+class ProgressProvider extends ChangeNotifier {
+  String _message = "";
+  int? total;
+  int? _current;
+
+  String get message => _message;
+
+  set message(String message) {
+    _message = message;
+
+    notifyListeners();
+  }
+
+  int? get current => _current;
+
+  set current(int? current) {
+    _current = current;
+
+    notifyListeners();
+  }
+
+  void init(String message, int current, int total) {
+    _message = message;
+    _current = current;
+    total = total;
+
+    notifyListeners();
+  }
+}
\ No newline at end of file
diff --git a/lib/models/database/portfolio.dart b/lib/models/database/portfolio.dart
index 2d60835..f9a6cb6 100644
--- a/lib/models/database/portfolio.dart
+++ b/lib/models/database/portfolio.dart
@@ -2,6 +2,7 @@ import 'package:folio/services/database/database.dart';
 
 class Portfolio {
   late int? rowid;
+  late String? name;
   late String? bseCode;
   late String? nseCode;
   late int? qty;
diff --git a/lib/models/port/statement.dart b/lib/models/port/statement.dart
deleted file mode 100644
index 86042c6..0000000
--- a/lib/models/port/statement.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-class Statement {
-  DateTime date;
-  String bseCode;
-  String nseCode;
-  String exchange;
-  bool bought;
-  int qty;
-  double rate;
-
-  Statement(this.date, this.bseCode, this.nseCode, this.exchange, this.bought,
-      this.qty, this.rate);
-}
diff --git a/lib/models/trade/parsed_file_logs.dart b/lib/models/trade/parsed_file_logs.dart
new file mode 100644
index 0000000..6f80d08
--- /dev/null
+++ b/lib/models/trade/parsed_file_logs.dart
@@ -0,0 +1,51 @@
+class FileLog {
+  DateTime? date;
+  String? name;
+  String? bseCode;
+  String? nseCode;
+  String? exchange;
+  bool? bought;
+  int? qty;
+  double? rate;
+
+  FileLog(this.date, this.name, this.bseCode, this.nseCode, this.exchange, this.bought, this.qty,
+      this.rate);
+
+  String? get code {
+    switch (exchange) {
+      case "BSE":
+        return bseCode;
+      case "NSE":
+        return nseCode;
+      default:
+        return null;
+    }
+  }
+
+  bool get isNSECodeRequired {
+    switch (exchange) {
+      case "BSE":
+        return false;
+      case "NSE":
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  bool get isBSECodeRequired {
+    switch (exchange) {
+      case "BSE":
+        return true;
+      case "NSE":
+        return false;
+      default:
+        return false;
+    }
+  }
+}
+
+class ParsedFileLogs {
+  List<FileLog> validLogs = [];
+  List<FileLog> invalidLogs = [];
+}
\ No newline at end of file
diff --git a/lib/services/database/database.dart b/lib/services/database/database.dart
index db5f81e..81cc1ab 100644
--- a/lib/services/database/database.dart
+++ b/lib/services/database/database.dart
@@ -61,17 +61,17 @@ class Db {
         '$colNSECode TEXT UNIQUE, '
         '$colQty INTEGER, '
         '$colMSR REAL, '
-        '$colESR REAL '
+        '$colESR REAL'
         ')');
     await db.execute('CREATE TABLE $tblTradeLog ('
-        '$colStockID INTEGER,'
-        '$colDate TEXT,'
-        '$colCode TEXT,'
-        '$colExch TEXT,'
-        '$colBought INTEGER,'
-        '$colQty INTEGER,'
-        '$colRate REAL,'
-        'PRIMARY KEY ($colDate, $colCode, $colExch, $colBought, $colQty, $colRate)'
+        '$colRowID INTEGER PRIMARY KEY, '
+        '$colStockID INTEGER, '
+        '$colDate TEXT, '
+        '$colCode TEXT, '
+        '$colExch TEXT, '
+        '$colBought INTEGER, '
+        '$colQty INTEGER, '
+        '$colRate REAL'
         ')');
   }
 
diff --git a/lib/views/common/bottom_navbar.dart b/lib/views/common/bottom_navbar.dart
index 629344f..1cc540e 100644
--- a/lib/views/common/bottom_navbar.dart
+++ b/lib/views/common/bottom_navbar.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:folio/views/logs/logs.dart';
+import 'package:folio/views/trades/trades.dart';
 import 'package:folio/views/portfolio/portfolio.dart';
 import 'package:folio/views/tracked/tracked.dart';
 
@@ -15,6 +15,14 @@ class _BottomNavbarState extends State<BottomNavbar> {
   @override
   Widget build(BuildContext context) {
     return BottomNavigationBar(
+      elevation: 4,
+      iconSize: 30,
+      selectedFontSize: 18,
+      unselectedFontSize: 18,
+      backgroundColor: Theme.of(context).colorScheme.background,
+      selectedItemColor: Theme.of(context).colorScheme.secondary,
+      unselectedItemColor: Theme.of(context).colorScheme.onPrimary,
+      currentIndex: widget.index,
       items: const <BottomNavigationBarItem>[
         BottomNavigationBarItem(
           icon: Icon(Icons.trending_up),
@@ -22,17 +30,13 @@ class _BottomNavbarState extends State<BottomNavbar> {
         ),
         BottomNavigationBarItem(
           icon: Icon(Icons.history),
-          label: 'Logs',
+          label: 'Trades',
         ),
         BottomNavigationBarItem(
           icon: Icon(Icons.table_rows_outlined),
           label: 'Portfolio',
         ),
       ],
-      currentIndex: widget.index,
-      backgroundColor: Theme.of(context).colorScheme.background,
-      selectedItemColor: Theme.of(context).colorScheme.secondary,
-      unselectedItemColor: Theme.of(context).colorScheme.onPrimary,
       onTap: (index) {
         // if (index == widget.index) return;
         switch (index) {
@@ -45,7 +49,7 @@ class _BottomNavbarState extends State<BottomNavbar> {
           case 1:
             Navigator.pushReplacement(
               context,
-              MaterialPageRoute(builder: (context) => LogsView()),
+              MaterialPageRoute(builder: (context) => TradesView()),
             );
             break;
           case 2:
diff --git a/lib/views/settings/data/add_file.dart b/lib/views/settings/data/add_file.dart
index 01f61fb..07fa4ec 100644
--- a/lib/views/settings/data/add_file.dart
+++ b/lib/views/settings/data/add_file.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:folio/models/database/trade_log.dart';
-import 'package:folio/views/logs/log_tile.dart';
-import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/views/trades/trades_tile.dart';
 
 class AddFile extends StatefulWidget {
-  final List<TradeLog> logs;
+  final List<TradeLog>? logs;
 
   AddFile(this.logs);
 
@@ -18,35 +17,13 @@ class _AddFileState extends State<AddFile> {
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
-        title: Text("Add File"),
+        title: Text("Added Logs"),
         centerTitle: true,
         actions: [
           IconButton(
             icon: Icon(Icons.check),
             onPressed: () async {
-              try {
-                if (widget.logs != null) {
-                  await DatabaseActions.addTradeLogs(widget.logs);
-                }
-                Navigator.pop(context);
-              } catch (e) {
-                await showDialog(
-                  context: context,
-                  builder: (context) {
-                    return AlertDialog(
-                      title: Text("Couldn't import logs!"),
-                      actions: [
-                        TextButton(
-                          child: Text("OK"),
-                          onPressed: () {
-                            Navigator.pop(context);
-                          },
-                        )
-                      ],
-                    );
-                  },
-                );
-              }
+              Navigator.pop(context);
             },
           )
         ],
@@ -55,11 +32,14 @@ class _AddFileState extends State<AddFile> {
           ? ListView.builder(
               shrinkWrap: true,
               itemBuilder: (context, index) {
-                return LogTile(widget.logs[index]);
+                return LogTile(widget.logs![index]);
               },
-              itemCount: widget.logs.length,
+              itemCount: widget.logs?.length,
             )
-          : Center(child: Text("Sorry couldn't parse the file.", style: Theme.of(context).textTheme.titleMedium),),
+          : Center(
+              child: Text("Sorry couldn't parse the file.",
+                  style: Theme.of(context).textTheme.titleMedium),
+            ),
       bottomNavigationBar: widget.logs != null
           ? BottomAppBar(
               child: Padding(
diff --git a/lib/views/settings/data/add_trade_log.dart b/lib/views/settings/data/add_trade_log.dart
index 175a49c..9a23787 100644
--- a/lib/views/settings/data/add_trade_log.dart
+++ b/lib/views/settings/data/add_trade_log.dart
@@ -228,18 +228,17 @@ class _AddTradeLogRouteState extends State<AddTradeLogRoute> {
                   style: Theme.of(context).textTheme.bodyLarge,
                   keyboardType: TextInputType.datetime,
                   onTap: () async {
-                    DateTime date = DateTime(1900);
                     FocusScope.of(context).requestFocus(new FocusNode());
 
-                    date = (await showDatePicker(
+                    DateTime? date = await showDatePicker(
                       context: context,
                       initialDate: DateTime.now(),
                       firstDate: DateTime(1900),
                       lastDate: DateTime(2100),
-                    ))!;
+                    );
 
                     _dateCtl.text =
-                        (date?.toIso8601String()!.substring(0, 10))!;
+                        date?.toIso8601String().substring(0, 10) ?? "";
                   },
                   controller: _dateCtl,
                   validator: (value) {
diff --git a/lib/views/settings/data/data.dart b/lib/views/settings/data/data.dart
index 9c385f1..bc0a54a 100644
--- a/lib/views/settings/data/data.dart
+++ b/lib/views/settings/data/data.dart
@@ -1,4 +1,3 @@
-import 'dart:developer';
 import 'dart:ui';
 import 'dart:io';
 
@@ -8,12 +7,12 @@ import 'package:intl/intl.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
-import 'package:folio/views/settings/data/add_file.dart';
 import 'package:folio/views/settings/data/add_portfolio_dialog.dart';
 import 'package:folio/views/settings/data/add_trade_log.dart';
 import 'package:folio/views/settings/data/track_stock_dialog.dart';
 import 'package:folio/helpers/database_actions.dart';
-import 'package:folio/models/database/trade_log.dart';
+
+import 'import_file/import_file.dart';
 
 class ImportRoute extends StatelessWidget {
   @override
@@ -94,7 +93,11 @@ class _ImportAreaState extends State<ImportArea> {
                           Icons.folder_open_outlined,
                           color: Theme.of(context).colorScheme.onPrimary,
                         ),
-                  onTap: _isButtonEnabled ? importLogs : null,
+                  onTap: !_isButtonEnabled ? null : () {
+                    Navigator.push(context, MaterialPageRoute(builder: (context) {
+                      return ImportFileRoute();
+                    }));
+                  },
                 ),
                 ListTile(
                   title: Text("Track a stock"),
@@ -289,60 +292,7 @@ class _ImportAreaState extends State<ImportArea> {
     );
   }
 
-  void importLogs() async {
-    setState(() {
-      _isButtonEnabled = false;
-    });
-
-    FilePickerResult? result =
-        await FilePicker.platform.pickFiles(type: FileType.any);
-
-    if (result != null) {
-      String file = "";
-      try {
-        if (result.files.first.path != null)
-          file = File(result.files.first.path!).readAsStringSync();
-        else {
-          log("data.importLogs() => Path is null\n ");
-          return;
-        }
-      } catch (e) {
-        log("data.importLogs() => Error in reading file\n " + e.toString());
-        return;
-      }
-
-      List<TradeLog> logs = [];
 
-      try {
-        switch (result.files.first.extension) {
-          case "csv":
-            logs = await DatabaseActions.parseCSVFile(file);
-            break;
-          case "xls":
-            logs = await DatabaseActions.parseSBIFile(file) ?? [];
-            break;
-          default:
-            setState(() {
-              _isButtonEnabled = true;
-            });
-            return;
-        }
-      } catch (e) {
-        log(e.toString());
-      }
-
-      Navigator.push(
-        context,
-        MaterialPageRoute(builder: (context) {
-          return AddFile(logs);
-        }),
-      );
-    }
-
-    setState(() {
-      _isButtonEnabled = true;
-    });
-  }
 
   void exportLogs() async {
     setState(() {
diff --git a/lib/views/settings/data/import_file/correct_invalid_logs.dart b/lib/views/settings/data/import_file/correct_invalid_logs.dart
new file mode 100644
index 0000000..f7a2c8b
--- /dev/null
+++ b/lib/views/settings/data/import_file/correct_invalid_logs.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+import 'package:folio/models/trade/parsed_file_logs.dart';
+import 'package:folio/views/settings/data/import_file/show_valid_logs.dart';
+
+import 'file_log_tile.dart';
+
+class CorrectInvalidLogs extends StatefulWidget {
+  final ParsedFileLogs _logs;
+
+  CorrectInvalidLogs(this._logs);
+
+  @override
+  _CorrectInvalidLogsState createState() => _CorrectInvalidLogsState();
+}
+
+class _CorrectInvalidLogsState extends State<CorrectInvalidLogs> {
+  late List<FileLog> correctedLogs;
+  late List<bool> isCorrected;
+
+  @override
+  void initState() {
+    super.initState();
+    correctedLogs = widget._logs.invalidLogs;
+    isCorrected =
+        List.filled(widget._logs.invalidLogs.length, false, growable: false);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Theme.of(context).colorScheme.background,
+        title: Text("Correct Missing Fields"),
+        centerTitle: true,
+        actions: [
+          IconButton(
+            icon: Icon(Icons.check),
+            onPressed: () async {
+              if (isCorrected.contains(false)) {
+                await showDialog(
+                  context: context,
+                  builder: (context) {
+                    return AlertDialog(
+                      title: Text("Please correct all logs"),
+                      actions: [
+                        TextButton(
+                          child: Text("OK"),
+                          onPressed: () async => Navigator.pop(context),
+                        )
+                      ],
+                    );
+                  },
+                );
+                return;
+              } else {
+                widget._logs.validLogs.addAll(correctedLogs);
+                Navigator.pushReplacement(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => ShowValidLogs(widget._logs.validLogs),
+                  ),
+                );
+              }
+            },
+          )
+        ],
+      ),
+      body: ListView.builder(
+        shrinkWrap: true,
+        itemBuilder: (context, index) {
+          return FileLogTile(
+            widget._logs.invalidLogs[index],
+            index: index,
+            updateLog: updateLog,
+          );
+        },
+        itemCount: widget._logs.invalidLogs.length,
+      ),
+      bottomNavigationBar: BottomAppBar(
+        child: Padding(
+          padding: const EdgeInsets.all(10.0),
+          child: Text(
+            "Total: ${widget._logs.validLogs.length + widget._logs.invalidLogs.length}",
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ),
+      ),
+    );
+  }
+
+  void updateLog(int index, FileLog log) {
+    correctedLogs[index] = log;
+
+    if (log.exchange != null &&
+        log.bought != null &&
+        log.date != null &&
+        log.code != null)
+      isCorrected[index] = true;
+    else
+      isCorrected[index] = false;
+  }
+}
diff --git a/lib/views/settings/data/import_file/file_log_tile.dart b/lib/views/settings/data/import_file/file_log_tile.dart
new file mode 100644
index 0000000..a5d21fc
--- /dev/null
+++ b/lib/views/settings/data/import_file/file_log_tile.dart
@@ -0,0 +1,492 @@
+import 'package:flutter/material.dart';
+import 'package:folio/models/trade/parsed_file_logs.dart';
+
+class FileLogTile extends StatefulWidget {
+  final FileLog _log;
+  final int index;
+  final Function(int, FileLog)? updateLog;
+  final bool isLogValid;
+
+  FileLogTile(this._log,
+      {this.index = -1, this.updateLog, this.isLogValid = false});
+
+  @override
+  State<StatefulWidget> createState() => _InvalidFileLogTile();
+}
+
+class _InvalidFileLogTile extends State<FileLogTile>
+    with AutomaticKeepAliveClientMixin {
+  late TextEditingController _dateCtl;
+  late TextEditingController _bseCodeCtl;
+  late TextEditingController _nseCodeCtl;
+  late TextEditingController _rateCtl;
+  late TextEditingController _qtyCtl;
+  final _formKey = GlobalKey<FormState>();
+  late FileLog correctedLog;
+
+  final _exchanges = ["BSE", "NSE"];
+  final _buyStates = ["BUY", "SELL"];
+
+  @override
+  void initState() {
+    super.initState();
+    correctedLog = widget._log;
+    _dateCtl = TextEditingController(
+        text: correctedLog.date?.toIso8601String().substring(0, 10));
+    _bseCodeCtl = TextEditingController(text: correctedLog.bseCode);
+    _nseCodeCtl = TextEditingController(text: correctedLog.nseCode);
+    _rateCtl =
+        TextEditingController(text: correctedLog.rate?.toStringAsFixed(2));
+    _qtyCtl = TextEditingController(text: correctedLog.qty?.toStringAsFixed(2));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+
+    return Card(
+      color: Theme.of(context).colorScheme.background,
+      elevation: 1,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(10),
+      ),
+      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 3),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+        child: InkWell(
+          borderRadius: BorderRadius.circular(20),
+          child: Form(
+            key: _formKey,
+            autovalidateMode: AutovalidateMode.onUserInteraction,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                widget._log.name == null && widget.isLogValid
+                    ? SizedBox(height: 15)
+                    : Padding(
+                        padding: const EdgeInsets.symmetric(
+                            vertical: 10, horizontal: 5),
+                        child: Center(
+                          child: Text(
+                            widget._log.name ?? "UNKNOWN",
+                            textAlign: TextAlign.center,
+                            style: widget._log.name == null
+                                ? Theme.of(context)
+                                    .textTheme
+                                    .titleLarge
+                                    ?.copyWith(
+                                        fontWeight: FontWeight.w200,
+                                        fontStyle: FontStyle.italic)
+                                : Theme.of(context).textTheme.titleLarge,
+                          ),
+                        ),
+                      ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        flex: 5,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: "Date",
+                            contentPadding: EdgeInsets.symmetric(
+                              horizontal: 10,
+                              vertical: 0,
+                            ),
+                            disabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.transparent,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.red,
+                                width: 2,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.red,
+                                width: 2,
+                              ),
+                            ),
+                          ),
+                          enabled:
+                              widget._log.date == null && !widget.isLogValid,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.datetime,
+                          onTap: () async {
+                            DateTime? date = DateTime(1900);
+                            FocusScope.of(context)
+                                .requestFocus(new FocusNode());
+
+                            date = await showDatePicker(
+                              context: context,
+                              initialDate: DateTime.now(),
+                              firstDate: DateTime(1900),
+                              lastDate: DateTime(2100),
+                            );
+
+                            if (date != null) {
+                              _dateCtl.text =
+                                  date.toIso8601String().substring(0, 10);
+                              correctedLog.date = date;
+                              updateLog();
+                            }
+                          },
+                          controller: _dateCtl,
+                          validator: (value) {
+                            if (value == null || value.isEmpty) {
+                              return 'Required';
+                            }
+                            return null;
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        width: 10,
+                      ),
+                      Expanded(
+                        flex: 3,
+                        child: Container(
+                          decoration: ShapeDecoration(
+                            shape: RoundedRectangleBorder(
+                              side: widget._log.exchange == null
+                                  ? BorderSide(color: Colors.red, width: 2)
+                                  : BorderSide(
+                                      color: Colors.transparent, width: 2),
+                              borderRadius:
+                                  const BorderRadius.all(Radius.circular(4)),
+                            ),
+                          ),
+                          padding: const EdgeInsets.symmetric(
+                              vertical: 10, horizontal: 10),
+                          child: Theme(
+                            data: Theme.of(context).copyWith(
+                                disabledColor: Theme.of(context).primaryColor),
+                            child: DropdownButtonHideUnderline(
+                              child: DropdownButton<String>(
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium
+                                    ?.copyWith(fontWeight: FontWeight.bold),
+                                elevation: 2,
+                                dropdownColor:
+                                    Theme.of(context).colorScheme.background,
+                                iconDisabledColor: Colors.transparent,
+                                isDense: true,
+                                value: correctedLog.exchange,
+                                onChanged: widget._log.exchange == null &&
+                                        !widget.isLogValid
+                                    ? (newValue) {
+                                        setState(() {
+                                          correctedLog.exchange = newValue;
+                                        });
+                                      }
+                                    : null,
+                                hint: Text("Exch"),
+                                items: _exchanges.map(
+                                  (value) {
+                                    return DropdownMenuItem<String>(
+                                      value: value,
+                                      child: Text(value),
+                                    );
+                                  },
+                                ).toList(),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 10,
+                      ),
+                      Expanded(
+                        flex: 3,
+                        child: Container(
+                          decoration: ShapeDecoration(
+                            shape: RoundedRectangleBorder(
+                              side: widget._log.bought == null
+                                  ? BorderSide(color: Colors.red, width: 2)
+                                  : BorderSide(
+                                      color: Colors.transparent, width: 2),
+                              borderRadius:
+                                  const BorderRadius.all(Radius.circular(4)),
+                            ),
+                          ),
+                          padding: const EdgeInsets.symmetric(
+                              vertical: 10, horizontal: 10),
+                          child: Theme(
+                            data: Theme.of(context).copyWith(
+                                disabledColor: Theme.of(context).primaryColor),
+                            child: DropdownButtonHideUnderline(
+                              child: DropdownButton<String>(
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium
+                                    ?.copyWith(fontWeight: FontWeight.bold),
+                                elevation: 2,
+                                dropdownColor:
+                                    Theme.of(context).colorScheme.background,
+                                iconDisabledColor: Colors.transparent,
+                                isDense: true,
+                                value: correctedLog.bought == null
+                                    ? null
+                                    : correctedLog.bought!
+                                        ? _buyStates.first
+                                        : _buyStates.last,
+                                onChanged: widget._log.bought == null &&
+                                        !widget.isLogValid
+                                    ? (newValue) {
+                                        setState(() {
+                                          correctedLog.bought =
+                                              newValue == _buyStates.first;
+                                        });
+                                      }
+                                    : null,
+                                hint: Text("Type"),
+                                items: _buyStates.map(
+                                  (value) {
+                                    return DropdownMenuItem<String>(
+                                      value: value,
+                                      child: Text(value),
+                                    );
+                                  },
+                                ).toList(),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: "NSE Code",
+                            contentPadding: EdgeInsets.symmetric(
+                              horizontal: 15,
+                            ),
+                            disabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.transparent,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: correctedLog.isNSECodeRequired
+                                    ? Colors.red
+                                    : Colors.grey,
+                                width: correctedLog.isNSECodeRequired ? 2 : 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: correctedLog.isNSECodeRequired
+                                    ? Colors.red
+                                    : Colors.black,
+                                width: 2,
+                              ),
+                            ),
+                          ),
+                          enabled:
+                              widget._log.nseCode == null && !widget.isLogValid,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.text,
+                          controller: _nseCodeCtl,
+                          validator: (value) {
+                            if (value == null || value.isEmpty) {
+                              if (correctedLog.isNSECodeRequired)
+                                return 'Required';
+                              return null;
+                            }
+                            correctedLog.nseCode = value;
+                            updateLog();
+                            return null;
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        width: 10,
+                      ),
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: "BSE Code",
+                            contentPadding: EdgeInsets.symmetric(
+                              horizontal: 15,
+                              vertical: 0,
+                            ),
+                            disabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.transparent,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: correctedLog.isBSECodeRequired
+                                    ? Colors.red
+                                    : Colors.grey,
+                                width: correctedLog.isBSECodeRequired ? 2 : 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: correctedLog.isBSECodeRequired
+                                    ? Colors.red
+                                    : Colors.black,
+                                width: 2,
+                              ),
+                            ),
+                          ),
+                          enabled:
+                              widget._log.bseCode == null && !widget.isLogValid,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.text,
+                          controller: _bseCodeCtl,
+                          validator: (value) {
+                            if ((value == null || value.isEmpty) &&
+                                correctedLog.isBSECodeRequired) {
+                              return 'Required';
+                            }
+                            correctedLog.bseCode = value;
+                            updateLog();
+                            return null;
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                              labelText: "Quantity",
+                              contentPadding:
+                                  EdgeInsets.symmetric(horizontal: 15),
+                              disabledBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.transparent,
+                                  width: 2,
+                                ),
+                              ),
+                              enabledBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.red,
+                                  width: 2,
+                                ),
+                              ),
+                              focusedBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.red,
+                                  width: 2,
+                                ),
+                              )),
+                          enabled:
+                              widget._log.date == null && !widget.isLogValid,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.number,
+                          controller: _qtyCtl,
+                          validator: (value) {
+                            if (value == null || value.trim() == "") {
+                              return "Required!";
+                            }
+                            if (RegExp(r"^[0-9]*?$").hasMatch(value.trim())) {
+                              correctedLog.qty = int.parse(value.trim());
+                              updateLog();
+                              return null;
+                            }
+                            return "Invalid!";
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        width: 10,
+                      ),
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                              labelText: "Rate",
+                              contentPadding:
+                                  EdgeInsets.symmetric(horizontal: 15),
+                              disabledBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.transparent,
+                                  width: 2,
+                                ),
+                              ),
+                              enabledBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.red,
+                                  width: 2,
+                                ),
+                              ),
+                              focusedBorder: OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: Colors.red,
+                                  width: 2,
+                                ),
+                              )),
+                          enabled:
+                              widget._log.date == null && !widget.isLogValid,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType:
+                              TextInputType.numberWithOptions(decimal: true),
+                          validator: (value) {
+                            if (value == null || value.trim() == "") {
+                              return "Required!";
+                            }
+                            if (RegExp(r"^[0-9]*(\.[0-9][0-9]?)?$")
+                                .hasMatch(value.trim())) {
+                              correctedLog.rate = double.parse(value.trim());
+                              updateLog();
+                              return null;
+                            }
+                            return "Invalid!";
+                          },
+                          controller: _rateCtl,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  void updateLog() {
+    if (widget.updateLog != null) widget.updateLog!(widget.index, correctedLog);
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
diff --git a/lib/views/settings/data/import_file/import_file.dart b/lib/views/settings/data/import_file/import_file.dart
new file mode 100644
index 0000000..e9cfe00
--- /dev/null
+++ b/lib/views/settings/data/import_file/import_file.dart
@@ -0,0 +1,259 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/import_file/show_valid_logs.dart';
+
+import '../../../../helpers/database_actions.dart';
+import '../../../../models/trade/parsed_file_logs.dart';
+import 'correct_invalid_logs.dart';
+
+class ImportFileRoute extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _ImportFileRouteState();
+}
+
+class _ImportFileRouteState extends State<ImportFileRoute> {
+  PlatformFile? pickedFile;
+  bool _isButtonEnabled = true;
+  String? _message;
+  int? _current;
+  int? _total;
+
+  void updateProgress({String? message, int? current, int? total}) {
+    setState(() {
+      _message = message;
+      _current = current;
+      _total = total;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async => _isButtonEnabled,
+      child: Scaffold(
+        appBar: AppBar(
+          title: Center(child: Text("Select File")),
+          backgroundColor: Theme.of(context).colorScheme.background,
+          elevation: 0,
+          actions: [
+            IconButton(
+              icon: Icon(
+                Icons.circle_outlined,
+                color: Theme.of(context).colorScheme.background,
+              ),
+              onPressed: null,
+            ),
+          ],
+        ),
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Expanded(
+              flex: 1,
+              child: Center(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 20),
+                  child: Container(
+                    decoration: ShapeDecoration(
+                      shape: RoundedRectangleBorder(
+                        side: BorderSide(width: 1),
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      color: Theme.of(context).colorScheme.background,
+                    ),
+                    child: InkWell(
+                      onTap: _isButtonEnabled ? pickFile : null,
+                      child: Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 10),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Expanded(
+                              flex: 9,
+                              child: Text(
+                                pickedFile?.path == null
+                                    ? ""
+                                    : pickedFile!.path!.substring(
+                                        pickedFile!.path!.lastIndexOf("/") + 1),
+                                softWrap: true,
+                              ),
+                            ),
+                            Expanded(
+                              child: IconButton(
+                                icon: Icon(Icons.file_open),
+                                onPressed: _isButtonEnabled ? pickFile : null,
+                              ),
+                            )
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            ElevatedButton(
+              onPressed: _isButtonEnabled && pickedFile?.path != null
+                  ? importLogs
+                  : null,
+              child: Text(
+                "Import",
+                style: Theme.of(context)
+                    .textTheme
+                    .titleMedium
+                    ?.copyWith(color: Colors.white),
+              ),
+            ),
+            Expanded(
+              flex: 5,
+              child: Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(_message ?? ""),
+                    Text(_total == null ? "" : "${_current ?? "?"}/$_total"),
+                    Padding(
+                      padding:
+                          EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                      child: _message == null
+                          ? null
+                          : LinearProgressIndicator(
+                              value: _total != null &&
+                                      _current != null &&
+                                      _total != 0
+                                  ? _current! / _total!
+                                  : null,
+                            ),
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 2,
+              child: SizedBox(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void pickFile() async {
+    setState(() {
+      _isButtonEnabled = false;
+    });
+
+    FilePickerResult? result =
+        await FilePicker.platform.pickFiles(type: FileType.any);
+
+    if (result == null || result.files.first.path == null) {
+      setState(() {
+        pickedFile = null;
+        _isButtonEnabled = true;
+      });
+
+      return;
+    }
+
+    setState(() {
+      pickedFile = result.files.first;
+      _isButtonEnabled = true;
+    });
+
+    return;
+  }
+
+  void importLogs() async {
+    if (pickedFile == null || pickedFile?.path == null) {
+      return;
+    }
+
+    setState(() {
+      _isButtonEnabled = false;
+    });
+    updateProgress(message: "Importing File");
+
+    ParsedFileLogs logs;
+    String filePath = pickedFile!.path!;
+
+    try {
+      switch (pickedFile?.extension) {
+        case "csv":
+          String file = "";
+          try {
+            file = File(pickedFile!.path!).readAsStringSync();
+          } catch (e) {
+            log("data.importLogs() => Error in reading file\n " + e.toString());
+            updateProgress(
+                message: "Error in reading file", current: 0, total: 1);
+            setState(() {
+              _isButtonEnabled = true;
+            });
+            return;
+          }
+          updateProgress(message: "Parsing CSV File");
+          logs = await DatabaseActions.parseCSVFile(file,
+              onUpdate: updateProgress);
+          break;
+        case "xls":
+          String file = "";
+          try {
+            file = File(pickedFile!.path!).readAsStringSync();
+          } catch (e) {
+            log("data.importLogs() => Error in reading file\n " + e.toString());
+            setState(() {
+              _isButtonEnabled = true;
+            });
+            updateProgress(
+                message: "Error in reading file", current: 0, total: 1);
+            return;
+          }
+          updateProgress(message: "Parsing SBI File (old format)");
+          logs = await DatabaseActions.parseOldSBIFile(file,
+              onUpdate: updateProgress);
+          break;
+        case "xlsx":
+          logs = await DatabaseActions.parseSBIFile(filePath,
+              onUpdate: updateProgress);
+          break;
+        default:
+          setState(() {
+            _isButtonEnabled = true;
+          });
+          updateProgress();
+          return;
+      }
+    } catch (e) {
+      // FIXME: Send error to user
+      updateProgress(message: e.toString(), current: 0, total: 1);
+      setState(() {
+        _isButtonEnabled = true;
+      });
+      return;
+    }
+
+    if (logs.invalidLogs.length != 0) {
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (context) {
+          return CorrectInvalidLogs(logs);
+        }),
+      );
+    } else {
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (context) {
+          return ShowValidLogs(logs.validLogs);
+        }),
+      );
+    }
+
+    setState(() {
+      _isButtonEnabled = true;
+    });
+  }
+}
diff --git a/lib/views/settings/data/import_file/import_logs.dart b/lib/views/settings/data/import_file/import_logs.dart
new file mode 100644
index 0000000..05e803c
--- /dev/null
+++ b/lib/views/settings/data/import_file/import_logs.dart
@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/models/trade/parsed_file_logs.dart';
+
+import '../../../../models/database/trade_log.dart';
+import '../../../trades/trades_tile.dart';
+
+class ImportLogs extends StatefulWidget {
+  final List<FileLog> _logs;
+
+  ImportLogs(this._logs);
+
+  @override
+  _ImportLogsState createState() => _ImportLogsState();
+}
+
+class _ImportLogsState extends State<ImportLogs> {
+  late bool isImporting;
+  String? _message;
+  int? _current;
+  int? _total;
+  late Future<List<TradeLog>> tradesFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    isImporting = true;
+    tradesFuture = addFileLogs();
+  }
+
+  Future<List<TradeLog>> addFileLogs() async {
+    var trades = await DatabaseActions.addFileLogs(widget._logs,
+        onUpdate: updateProgress);
+
+    setState(() {
+      isImporting = false;
+    });
+
+    return trades;
+  }
+
+  void updateProgress({String? message, int? current, int? total}) {
+    setState(() {
+      _message = message;
+      _current = current;
+      _total = total;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async => !isImporting,
+      child: Scaffold(
+        appBar: AppBar(
+          elevation: 0,
+          backgroundColor: Theme.of(context).colorScheme.background,
+          title: isImporting ? Text("Importing") : Text("Imported"),
+          centerTitle: true,
+          automaticallyImplyLeading: !isImporting,
+        ),
+        body: FutureBuilder(
+          future: tradesFuture,
+          builder: (context, AsyncSnapshot snapshot) {
+            if (snapshot.connectionState != ConnectionState.done) {
+              return Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(_message ?? ""),
+                    Text(_total == null ? "" : "${_current ?? "?"}/$_total"),
+                    Padding(
+                      padding:
+                          EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                      child: _message == null
+                          ? null
+                          : LinearProgressIndicator(
+                              value: _total != null &&
+                                      _current != null &&
+                                      _total != 0
+                                  ? _current! / _total!
+                                  : null,
+                            ),
+                    )
+                  ],
+                ),
+              );
+            }
+            isImporting = false;
+            if (snapshot.hasError) {
+              return Center(
+                child: Text(_message ?? "Error occurred during import of logs"),
+              );
+            }
+            if (snapshot.hasData && (snapshot.data?.length ?? 0) == 0) {
+              return Center(
+                child: Text(
+                  "No logs imported",
+                  style: Theme.of(context).textTheme.headlineMedium,
+                ),
+              );
+            }
+            return ListView.builder(
+              shrinkWrap: true,
+              itemBuilder: (context, index) {
+                return LogTile(snapshot.data[index]);
+              },
+              itemCount: snapshot.data.length,
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/settings/data/import_file/show_valid_logs.dart b/lib/views/settings/data/import_file/show_valid_logs.dart
new file mode 100644
index 0000000..debbaf7
--- /dev/null
+++ b/lib/views/settings/data/import_file/show_valid_logs.dart
@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:folio/models/trade/parsed_file_logs.dart';
+
+import 'import_logs.dart';
+import 'file_log_tile.dart';
+
+class ShowValidLogs extends StatelessWidget {
+  final List<FileLog> _validLogs;
+
+  ShowValidLogs(this._validLogs);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Theme.of(context).colorScheme.background,
+        title: Text("Importing Fields"),
+        centerTitle: true,
+        actions: [
+          IconButton(
+            icon: Icon(Icons.check),
+            onPressed: () async {
+              Navigator.pushReplacement(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => ImportLogs(_validLogs)));
+            },
+          )
+        ],
+      ),
+      body: ListView.builder(
+        shrinkWrap: true,
+        itemBuilder: (context, index) {
+          return FileLogTile(_validLogs[index], isLogValid: true);
+        },
+        itemCount: _validLogs.length,
+      ),
+      bottomNavigationBar: BottomAppBar(
+        child: Padding(
+          padding: const EdgeInsets.all(10.0),
+          child: Text(
+            "Total: ${_validLogs.length}",
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/tracked/details/details.dart b/lib/views/tracked/details/details.dart
index 161acf5..febd5c9 100644
--- a/lib/views/tracked/details/details.dart
+++ b/lib/views/tracked/details/details.dart
@@ -10,7 +10,7 @@ import 'package:folio/models/trade/cycle.dart';
 import 'package:folio/models/trade/summary.dart';
 import 'package:folio/helpers/database_actions.dart';
 import 'package:folio/helpers/stock_repository.dart';
-import 'package:folio/views/logs/log_tile.dart';
+import 'package:folio/views/trades/trades_tile.dart';
 import 'package:folio/views/tracked/details/cycle_tile.dart';
 import 'package:folio/views/tracked/tracked_bottom_sheet.dart';
 import 'package:folio/views/common/text_loading_indicator.dart';
diff --git a/lib/views/logs/logs.dart b/lib/views/trades/trades.dart
similarity index 93%
rename from lib/views/logs/logs.dart
rename to lib/views/trades/trades.dart
index 5b66873..4329a4e 100644
--- a/lib/views/logs/logs.dart
+++ b/lib/views/trades/trades.dart
@@ -3,15 +3,15 @@ import 'package:folio/models/database/trade_log.dart';
 import 'package:folio/views/common/bottom_navbar.dart';
 import 'package:folio/views/common/drawer.dart';
 import 'package:folio/helpers/database_actions.dart';
-import 'package:folio/views/logs/log_tile.dart';
+import 'package:folio/views/trades/trades_tile.dart';
 import 'package:folio/views/settings/data/add_trade_log.dart';
 
-class LogsView extends StatefulWidget {
+class TradesView extends StatefulWidget {
   @override
-  _LogsViewState createState() => _LogsViewState();
+  _TradesViewState createState() => _TradesViewState();
 }
 
-class _LogsViewState extends State<LogsView> {
+class _TradesViewState extends State<TradesView> {
   late Future<List<TradeLog>> _getLogsFuture;
 
   @override
@@ -49,7 +49,7 @@ class _LogsViewState extends State<LogsView> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
                       Text(
-                        "Logs",
+                        "Trades",
                         style: Theme.of(context).textTheme.displayLarge,
                       ),
                       ElevatedButton(
diff --git a/lib/views/logs/log_tile.dart b/lib/views/trades/trades_tile.dart
similarity index 83%
rename from lib/views/logs/log_tile.dart
rename to lib/views/trades/trades_tile.dart
index 993800f..f97cbd9 100644
--- a/lib/views/logs/log_tile.dart
+++ b/lib/views/trades/trades_tile.dart
@@ -3,6 +3,8 @@ import 'package:intl/intl.dart';
 import 'package:flutter/material.dart';
 import 'package:folio/models/database/trade_log.dart';
 
+import '../../assets/app_theme.dart';
+
 class LogTile extends StatelessWidget {
   final TradeLog _tradeLog;
   final DateFormat _dateFormatter = DateFormat('dd MMM y');
@@ -11,6 +13,7 @@ class LogTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final MyColors myColors = Theme.of(context).extension<MyColors>()!;
     return Card(
       color: Theme.of(context).colorScheme.background,
       elevation: 2,
@@ -33,15 +36,11 @@ class LogTile extends StatelessWidget {
             Container(
               width: 20,
               height: 20,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(40),
-                color: _tradeLog?.bought == null
-                    ? Colors.transparent
-                    : _tradeLog.bought
-                        ? Colors.lightGreen[600]
-                        : Colors.redAccent,
-                
-              ),
+              child: _tradeLog.bought == null
+                  ? Icon(Icons.circle_outlined)
+                  : _tradeLog.bought
+                  ? Icon(Icons.add_circle, color: myColors.positiveColor,)
+                  : Icon(Icons.add_circle, color: myColors.negativeColor,),
             ),
             Expanded(
               child: Padding(
@@ -56,11 +55,11 @@ class LogTile extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         Text(
-                          (_tradeLog?.exchange ?? "-"),
+                          (_tradeLog.exchange ?? "-"),
                           style: Theme.of(context).textTheme.bodyLarge,
                         ),
                         Text(
-                          _tradeLog?.date == null
+                          _tradeLog.date == null
                               ? "-"
                               : _dateFormatter.format(_tradeLog.date),
                           style: Theme.of(context).textTheme.bodyLarge,
@@ -74,7 +73,7 @@ class LogTile extends StatelessWidget {
                         Expanded(
                           flex: 6,
                           child: Text(
-                            (_tradeLog?.code ?? "-"),
+                            (_tradeLog.code ?? "-"),
                             style: Theme.of(context)
                                 .textTheme
                                 .titleLarge
@@ -84,7 +83,7 @@ class LogTile extends StatelessWidget {
                         Expanded(
                           flex: 2,
                           child: Text(
-                            _tradeLog?.qty?.toString() ?? "-",
+                            _tradeLog.qty.toString() ?? "-",
                             style: Theme.of(context)
                                 .textTheme
                                 .titleLarge,
@@ -93,7 +92,7 @@ class LogTile extends StatelessWidget {
                         Expanded(
                           flex: 3,
                           child: Text(
-                            _tradeLog?.rate?.toStringAsFixed(2) ?? "-",
+                            _tradeLog.rate.toStringAsFixed(2) ?? "-",
                             style: Theme.of(context)
                                 .textTheme
                                 .titleLarge,
diff --git a/pubspec.lock b/pubspec.lock
index e8cb554..61aadbf 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -145,6 +145,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.3.2"
+  equatable:
+    dependency: transitive
+    description:
+      name: equatable
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.5"
+  excel:
+    dependency: "direct main"
+    description:
+      name: excel
+      sha256: f6a76fff6ac14f48fd44a6528e72705965e02cbc593e00427ab1d9a9f5d3bffa
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   fake_async:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index e34bfc3..1c923e8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,6 +38,7 @@ dependencies:
   googleapis: ^11.4.0
   provider: ^6.0.5
   sqflite: ^2.3.0
+  excel: 2.1.0
   html: ^0.15.4
   http: ^1.1.0
   intl: ^0.18.1

From a9b63b90d845bf800d771161af437e1e467755f9 Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Tue, 29 Aug 2023 14:30:25 +0530
Subject: [PATCH 5/6] Modify database structure to add a scrips table

---
 lib/helpers/database_actions.dart             | 422 ++++++++++--------
 lib/helpers/stock_repository.dart             |   9 +-
 lib/models/database/portfolio.dart            |   9 +-
 lib/models/stock/stock.dart                   |  18 +-
 lib/services/database/database.dart           |  47 +-
 lib/views/portfolio/portfolio.dart            |   2 +-
 .../settings/data/track_stock_dialog.dart     |   2 +-
 lib/views/settings/drive/drive.dart           |   7 +-
 lib/views/tracked/details/details.dart        |   6 +-
 lib/views/tracked/tracked_bottom_sheet.dart   |   9 +-
 lib/views/trades/trades.dart                  |   2 +-
 11 files changed, 304 insertions(+), 229 deletions(-)

diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index 8c0a616..f8c215c 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -19,32 +19,46 @@ import '../models/trade/parsed_file_logs.dart';
 class DatabaseActions {
   static void dummyOnUpdate({int? current, String? message, int? total}) {}
 
-  static Future<List<TradeLog>> getAllLogs() async {
-    List<Map<String, dynamic>> tuples = await Db()
+  static Future<String> getDbPath() async => await Db().getDbPath();
+
+  static Future<List<TradeLog>> getAllTrades() async {
+    List<Map<String, dynamic>> tradeLogs = await Db()
         .getOrdered(Db.tblTradeLog, '${Db.colDate} DESC, ${Db.colCode} ASC');
 
-    List<TradeLog> logs = [];
-    tuples.forEach((row) => logs.add(TradeLog.fromDbTuple(row)));
-    return logs;
+    List<TradeLog> trades = [];
+    tradeLogs.forEach((row) => trades.add(TradeLog.fromDbTuple(row)));
+    return trades;
   }
 
-  static Future<List<Portfolio>> getAllPortfolios() async {
-    List<Map<String, dynamic>> tuples = await Db().getOrdered(
-        Db.tblPortfolio, '${Db.colNSECode} DESC, ${Db.colBSECode} DESC');
+  static Future<List<Portfolio>> getAllPortfolioLogs() async {
+    List<Map<String, dynamic>> portfolioLogs = await Db().getRawQuery(""
+        "SELECT "
+        "P.${Db.colRowID} AS ${Db.colRowID}, "
+        "P.${Db.colStockID} AS ${Db.colStockID}, "
+        "S.${Db.colName} AS ${Db.colName}, "
+        "S.${Db.colNSECode} AS ${Db.colNSECode}, "
+        "S.${Db.colBSECode} AS ${Db.colBSECode}, "
+        "${Db.colGrossQty}, ${Db.colAvgRate}, ${Db.colMSR}, ${Db.colESR} "
+        ""
+        "FROM ${Db.tblPortfolio} P "
+        "LEFT JOIN ${Db.tblScrips} S "
+        "ON P.${Db.colStockID} = S.${Db.colRowID} ");
 
     List<Portfolio> portfolio = [];
-    tuples.forEach((row) => portfolio.add(Portfolio.fromDbTuple(row)));
+    portfolioLogs.forEach((row) => portfolio.add(Portfolio.fromDbTuple(row)));
     return portfolio;
   }
 
   static Future<DateTime?> getRecentDate() async {
-    List<Map<String, dynamic>> tuples = await Db().getLimitedOrdered(
+    List<Map<String, dynamic>> tradeLogs = await Db().getLimitedOrdered(
       Db.tblTradeLog,
       1,
       '${Db.colDate} DESC',
     );
 
-    return tuples.isEmpty ? null : TradeLog.fromDbTuple(tuples.first).date;
+    return tradeLogs.isEmpty
+        ? null
+        : TradeLog.fromDbTuple(tradeLogs.first).date;
   }
 
   static Future<bool> setTradeLog(
@@ -55,27 +69,26 @@ class DatabaseActions {
     int qty,
     double rate,
   ) async {
-    String where = "", codeCol = "";
+    String codeCol = "";
     if (exchange == "BSE") {
-      where = "${Db.colBSECode} = ?";
       codeCol = Db.colBSECode;
     } else if (exchange == "NSE") {
-      where = "${Db.colNSECode} = ?";
       codeCol = Db.colNSECode;
     }
-    List<Map> tuples = await Db().getQuery(Db.tblPortfolio, where, [code]);
-    if (tuples.length > 1) {
+    var scrips = await Db().getQuery(Db.tblScrips, "$codeCol = ?", [code]);
+
+    if (scrips.length > 1) {
       return false;
-    } else if (tuples.length == 0) {
-      bool res = await Db().insert(Db.tblPortfolio, {codeCol: code});
+    } else if (scrips.length == 0) {
+      bool res = await Db().insert(Db.tblScrips, {codeCol: code});
       if (!res) return res;
-      tuples = await Db().getQuery(Db.tblPortfolio, where, [code]);
+      scrips = await Db().getQuery(Db.tblScrips, "$codeCol = ?", [code]);
     }
 
     if (!(await Db().insert(
       Db.tblTradeLog,
       {
-        Db.colStockID: tuples.first[Db.colRowID],
+        Db.colStockID: scrips.first[Db.colRowID],
         Db.colCode: code,
         Db.colExch: exchange,
         Db.colQty: qty,
@@ -87,15 +100,16 @@ class DatabaseActions {
       return false;
     }
 
-    if (!(await updatePortfolioFigures(tuples.first[Db.colRowID]))) {
+    if (!(await updatePortfolioFigures(scrips.first[Db.colRowID]))) {
       return false;
     }
 
-    tuples = await Db().getQuery(Db.tblTracked,
+    var trackedStocks = await Db().getQuery(Db.tblTracked,
         '${Db.colCode} = ? and ${Db.colExch} = ?', [code, exchange]);
 
-    if (tuples.length == 0) {
+    if (trackedStocks.length == 0) {
       return await Db().insert(Db.tblTracked, {
+        Db.colStockID: scrips.first[Db.colRowID],
         Db.colCode: code,
         Db.colExch: exchange,
         Db.colPinned: 0,
@@ -105,9 +119,17 @@ class DatabaseActions {
     }
   }
 
-  static Future<bool> updatePortfolioFigures(int rowID) async {
-    var buyLogs = await DatabaseActions.getBuyLogs(rowID);
-    var sellLogs = await DatabaseActions.getSellLogs(rowID);
+  static Future<bool> updatePortfolioFigures(int stockID) async {
+    try {
+      await Db().insert(Db.tblPortfolio, {Db.colStockID: stockID});
+    } on DatabaseException catch (e) {
+      if (!e.isUniqueConstraintError()) {
+        throw e;
+      }
+    }
+
+    var buyLogs = await DatabaseActions.getBuyTrades(stockID);
+    var sellLogs = await DatabaseActions.getSellTrades(stockID);
 
     int qty = 0;
     double? msr;
@@ -123,31 +145,32 @@ class DatabaseActions {
       // calculate avgBuyRate for the sold stocks
       while (buyQty > 0) {
         if (b >= buyLogs.length || sellLogs[s].date.isBefore(buyLogs[b].date)) {
+          // FIXME: throw exception
           await Db().updateConditionally(
             Db.tblPortfolio,
             {
-              Db.colQty: qty,
+              Db.colGrossQty: qty,
               Db.colMSR: msr,
               Db.colESR: esr,
             },
-            '${Db.colRowID} = ?',
-            [rowID],
+            '${Db.colStockID} = ?',
+            [stockID],
           );
-          var portfolio = await Db().getQuery(
-            Db.tblPortfolio,
+          var scrips = await Db().getQuery(
+            Db.tblScrips,
             '${Db.colRowID} = ?',
-            [rowID],
+            [stockID],
           );
           await Db().deleteQuery(
             Db.tblTracked,
             '${Db.colCode} = ? and ${Db.colExch} = ?',
-            [portfolio.first[Db.colBSECode], "BSE"],
+            [scrips.first[Db.colBSECode], "BSE"],
           );
 
           await Db().deleteQuery(
             Db.tblTracked,
             '${Db.colCode} = ? and ${Db.colExch} = ?',
-            [portfolio.first[Db.colNSECode], "NSE"],
+            [scrips.first[Db.colNSECode], "NSE"],
           );
           return false;
         }
@@ -208,135 +231,145 @@ class DatabaseActions {
     } else {
       msr = null;
       esr = null;
-      var portfolio = await Db().getQuery(
-        Db.tblPortfolio,
+      var scrips = await Db().getQuery(
+        Db.tblScrips,
         '${Db.colRowID} = ?',
-        [rowID],
+        [stockID],
       );
       await Db().deleteQuery(
         Db.tblTracked,
         '${Db.colCode} = ? and ${Db.colExch} = ?',
-        [portfolio.first[Db.colBSECode], "BSE"],
+        [scrips.first[Db.colBSECode], "BSE"],
       );
 
       await Db().deleteQuery(
         Db.tblTracked,
         '${Db.colCode} = ? and ${Db.colExch} = ?',
-        [portfolio.first[Db.colNSECode], "NSE"],
+        [scrips.first[Db.colNSECode], "NSE"],
       );
     }
 
     bool res = await Db().updateConditionally(
       Db.tblPortfolio,
       {
-        Db.colQty: qty,
+        Db.colGrossQty: qty,
         Db.colMSR: msr,
         Db.colESR: esr,
       },
-      '${Db.colRowID} = ?',
-      [rowID],
+      '${Db.colStockID} = ?',
+      [stockID],
     );
 
     return res;
   }
 
-  static Future<List<TradeLog>> getBuyLogs(int stockID) async {
-    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
+  static Future<List<TradeLog>> getBuyTrades(int stockID) async {
+    List<Map<String, dynamic>> buyTradeLogs = await Db().getOrderedQuery(
       Db.tblTradeLog,
       '${Db.colBought} = ? and ${Db.colStockID} = ?',
       [1, stockID],
       '${Db.colDate} ASC, ${Db.colRate} ASC',
     );
 
-    List<TradeLog> buyLogs = [];
-    tuples.forEach((element) {
-      buyLogs.add(TradeLog.fromDbTuple(element));
+    List<TradeLog> buyTrades = [];
+    buyTradeLogs.forEach((element) {
+      buyTrades.add(TradeLog.fromDbTuple(element));
     });
-    return buyLogs;
+    return buyTrades;
   }
 
-  static Future<List<TradeLog>> getSellLogs(int stockID) async {
-    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
+  static Future<List<TradeLog>> getSellTrades(int stockID) async {
+    List<Map<String, dynamic>> sellTradeLogs = await Db().getOrderedQuery(
       Db.tblTradeLog,
       '${Db.colBought} = ? and ${Db.colStockID} = ?',
       [0, stockID],
       '${Db.colDate} ASC, ${Db.colRate} ASC',
     );
 
-    List<TradeLog> sellLogs = [];
-    tuples.forEach((element) {
-      sellLogs.add(TradeLog.fromDbTuple(element));
+    List<TradeLog> sellTrades = [];
+    sellTradeLogs.forEach((element) {
+      sellTrades.add(TradeLog.fromDbTuple(element));
     });
-    return sellLogs;
+    return sellTrades;
   }
 
-  static Future<int> getRowIDAfterSettingCodes(
-      String? bseCode, String? nseCode) async {
-    List<Map> tuples;
+  static Future<int> setCodesNGetStockID(String? bseCode, String? nseCode,
+      [String? name]) async {
+    List<Map> scrips;
 
     if (bseCode != null && nseCode != null) {
-      tuples = await Db().getQuery(Db.tblPortfolio,
+      scrips = await Db().getQuery(Db.tblScrips,
           '${Db.colBSECode} = ? or ${Db.colNSECode} = ?', [bseCode, nseCode]);
     } else if (bseCode != null) {
-      tuples = await Db()
-          .getQuery(Db.tblPortfolio, '${Db.colBSECode} = ?', [bseCode]);
+      scrips =
+          await Db().getQuery(Db.tblScrips, '${Db.colBSECode} = ?', [bseCode]);
     } else if (nseCode != null) {
-      tuples = await Db()
-          .getQuery(Db.tblPortfolio, '${Db.colNSECode} = ?', [nseCode]);
+      scrips =
+          await Db().getQuery(Db.tblScrips, '${Db.colNSECode} = ?', [nseCode]);
     } else {
       throw ArgumentError("Both BSE and NSE codes cannot be null!");
     }
 
-    if (tuples.length == 0) {
-      Db().insert(
-        Db.tblPortfolio,
+    if (scrips.length == 0) {
+      await Db().insert(
+        Db.tblScrips,
         {
           Db.colBSECode: bseCode,
           Db.colNSECode: nseCode,
+          Db.colName: name,
         },
       );
     } else {
       if (bseCode == null) {
-        bseCode = tuples[0][Db.colBSECode];
+        bseCode = scrips[0][Db.colBSECode];
       }
       if (nseCode == null) {
-        nseCode = tuples[0][Db.colNSECode];
+        nseCode = scrips[0][Db.colNSECode];
       }
 
-      if (tuples.length == 1) {
-        Db().updateConditionally(
-          Db.tblPortfolio,
-          {
-            Db.colBSECode: bseCode,
-            Db.colNSECode: nseCode,
-          },
+      if (scrips.length == 1) {
+        await Db().updateConditionally(
+          Db.tblScrips,
+          name == null
+              ? {
+                  Db.colBSECode: bseCode,
+                  Db.colNSECode: nseCode,
+                }
+              : {
+                  Db.colBSECode: bseCode,
+                  Db.colNSECode: nseCode,
+                  Db.colName: name,
+                },
           '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
           [bseCode, nseCode],
         );
-        return tuples.first[Db.colRowID];
+        return scrips.first[Db.colRowID];
       } else {
-        Db().deleteQuery(
-          Db.tblPortfolio,
-          '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
-          [bseCode, nseCode],
-        );
-        Db().insert(
-          Db.tblPortfolio,
-          {
-            Db.colBSECode: bseCode,
-            Db.colNSECode: nseCode,
-          },
-        );
+        await Db().transact((txn) async {
+          await txn.delete(
+            Db.tblScrips,
+            where: '${Db.colBSECode} = ? or ${Db.colNSECode} = ?',
+            whereArgs: [bseCode, nseCode],
+          );
+          await txn.insert(
+            Db.tblScrips,
+            {
+              Db.colBSECode: bseCode,
+              Db.colNSECode: nseCode,
+              Db.colName: name,
+            },
+          );
+        });
       }
     }
 
-    tuples = await Db().getQuery(Db.tblPortfolio,
+    var updatedScrips = await Db().getQuery(Db.tblScrips,
         '${Db.colBSECode} = ? or ${Db.colNSECode} = ?', [bseCode, nseCode]);
-    return tuples.first[Db.colRowID];
+    return updatedScrips.first[Db.colRowID];
   }
 
   static Future<bool> linkCodes(Map<String, String> codes) async {
-    int id = await getRowIDAfterSettingCodes(codes["BSE"], codes["NSE"]);
+    int id = await setCodesNGetStockID(codes["BSE"], codes["NSE"]);
 
     bool res = await Db().updateConditionally(
       Db.tblTradeLog,
@@ -368,7 +401,7 @@ class DatabaseActions {
     }
     Sheet excelSheet = excelFile.sheets.values.first;
     var parsedLogs = ParsedFileLogs();
-    var data = excelSheet.rows;
+
     int dateColID = 0,
         exchangeColID = 3,
         nameColID = 8,
@@ -417,7 +450,6 @@ class DatabaseActions {
       {void Function({int? current, String? message, int? total}) onUpdate =
           dummyOnUpdate}) async {
     onUpdate(message: "Parsing SBI File (old format)");
-    int mode = 0;
     Document parsedHTML = html.parse(file);
     List<String> headers = [];
 
@@ -427,7 +459,6 @@ class DatabaseActions {
 
     if (table == null) {
       table = parsedHTML.querySelector("#grdViewTradeDetail_old");
-      mode = 1;
     }
 
     if (table == null) throw FormatException("File format is not correct");
@@ -666,7 +697,18 @@ class DatabaseActions {
         try {
           await txn.insert(Db.tblTradeLog, log.toDbTuple());
           updateLater.add(log.id);
+        } on DatabaseException catch (e) {
+          onUpdate(
+              message:
+                  "Unknown Error Occurred ... \n${e.toString()}\n${log.toString()}",
+              current: i,
+              total: logs.length);
+          throw e;
+        }
+
+        try {
           await txn.insert(Db.tblTracked, {
+            Db.colStockID: log.id,
             Db.colCode: log.code,
             Db.colExch: log.exchange,
             Db.colPinned: 0,
@@ -729,8 +771,8 @@ class DatabaseActions {
       }
 
       try {
-        int id = await DatabaseActions.getRowIDAfterSettingCodes(
-            fileLog.bseCode, fileLog.nseCode);
+        int id = await DatabaseActions.setCodesNGetStockID(
+            fileLog.bseCode, fileLog.nseCode, fileLog.name);
 
         trades.add(TradeLog(fileLog.date!, id, fileLog.code!, fileLog.exchange!,
             fileLog.bought!, fileLog.qty!, fileLog.rate!));
@@ -749,30 +791,16 @@ class DatabaseActions {
   }
 
   static Future<String> getTradesCSV() async {
-    List<Map> tuples = await Db().getRawQuery(""
-        "SELECT ${Db.colDate}, T.${Db.colName} AS ${Db.colName}, "
-        "L.${Db.colCode} AS ${Db.colBSECode}, P.${Db.colNSECode} AS ${Db.colNSECode}, "
-        "L.${Db.colExch} AS ${Db.colExch}, ${Db.colBought}, "
-        "L.${Db.colQty} AS ${Db.colQty}, ${Db.colRate} "
-        "FROM ${Db.tblTradeLog} L "
-        "LEFT JOIN ${Db.tblPortfolio} P "
-        "ON L.${Db.colCode} = P.${Db.colBSECode} "
-        "LEFT JOIN ${Db.tblTracked} T "
-        "ON L.${Db.colCode} = T.${Db.colCode} "
-        "WHERE "
-        "L.${Db.colExch} = 'BSE' "
-        "UNION "
-        "SELECT ${Db.colDate}, T.${Db.colName} AS ${Db.colName}, "
-        "P.${Db.colBSECode} AS ${Db.colBSECode}, L.${Db.colCode} AS ${Db.colNSECode}, "
-        "L.${Db.colExch} AS ${Db.colExch}, ${Db.colBought}, "
-        "L.${Db.colQty} AS ${Db.colQty}, ${Db.colRate} "
+    List<Map> tradeLogs = await Db().getRawQuery(""
+        "SELECT "
+        "S.${Db.colName} AS ${Db.colName}, "
+        "S.${Db.colBSECode} AS ${Db.colBSECode}, "
+        "S.${Db.colNSECode} AS ${Db.colNSECode}, "
+        "${Db.colDate}, ${Db.colExch}, ${Db.colBought}, "
+        "${Db.colQty}, ${Db.colRate} "
         "FROM ${Db.tblTradeLog} L "
-        "LEFT JOIN ${Db.tblPortfolio} P "
-        "ON L.${Db.colCode} = P.${Db.colNSECode} "
-        "LEFT JOIN ${Db.tblTracked} T "
-        "ON L.${Db.colCode} = T.${Db.colCode} "
-        "WHERE "
-        "L.${Db.colExch} = 'NSE' "
+        "LEFT JOIN ${Db.tblScrips} S "
+        "ON L.${Db.colStockID} = S.${Db.colRowID} "
         "ORDER BY ${Db.colDate} ASC");
 
     List<List> trades = [
@@ -788,7 +816,7 @@ class DatabaseActions {
       ]
     ];
 
-    tuples.forEach((element) {
+    tradeLogs.forEach((element) {
       trades.add([
         element[Db.colDate],
         element[Db.colName],
@@ -805,39 +833,33 @@ class DatabaseActions {
     return converter.convert(trades, delimitAllFields: true);
   }
 
-  static Future<List<TradeLog>> getStockLogs(int stockId) async {
-    List<Map<String, dynamic>> tuples = await Db().getOrderedQuery(
+  static Future<List<TradeLog>> getStockTrades(int stockId) async {
+    List<Map<String, dynamic>> tradeLogs = await Db().getOrderedQuery(
         Db.tblTradeLog,
         '${Db.colStockID} = ?',
         [stockId],
-        '${Db.colDate} DESC, ${Db.colCode} ASC');
+        '${Db.colDate} DESC');
 
-    List<TradeLog> logs = [];
-    tuples.forEach((row) => logs.add(TradeLog.fromDbTuple(row)));
-    return logs;
+    List<TradeLog> trades = [];
+    tradeLogs.forEach((row) => trades.add(TradeLog.fromDbTuple(row)));
+    return trades;
   }
 
   static Future<List<Stock>?> getPinnedStocks() async {
     try {
-      List<Map<String, dynamic>> tuples = await Db().getRawQuery("SELECT * "
-          "FROM ${Db.tblTracked} T "
-          "LEFT JOIN ${Db.tblPortfolio} P "
-          "ON T.${Db.colCode} = P.${Db.colBSECode} "
-          "WHERE "
-          "T.${Db.colExch} = 'BSE' "
-          "AND ${Db.colPinned} = 1 "
-          "UNION "
-          "SELECT * "
-          "FROM ${Db.tblTracked} T "
-          "LEFT JOIN ${Db.tblPortfolio} P "
-          "ON T.${Db.colCode} = P.${Db.colNSECode} "
-          "WHERE "
-          "T.${Db.colExch} = 'NSE' "
-          "AND ${Db.colPinned} = 1 "
-          "ORDER BY ${Db.colName} ASC, ${Db.colCode} ASC");
+      List<Map<String, dynamic>> trackedPinned =
+          await Db().getRawQuery("SELECT * "
+              "FROM ${Db.tblTracked} T "
+              "LEFT JOIN ${Db.tblScrips} S "
+              "ON T.${Db.colStockID} = S.${Db.colRowID} "
+              "LEFT JOIN ${Db.tblPortfolio} P "
+              "ON T.${Db.colStockID} = P.${Db.colStockID} "
+              "WHERE "
+              "${Db.colPinned} = 1 "
+              "ORDER BY ${Db.colName} ASC");
 
       List<Stock> stocks = [];
-      tuples.forEach((row) => stocks.add(Stock.fromDbTuple(row)));
+      trackedPinned.forEach((row) => stocks.add(Stock.fromDbTuple(row)));
       return stocks;
     } catch (e) {
       dev.log(e.toString());
@@ -847,25 +869,19 @@ class DatabaseActions {
 
   static Future<List<Stock>?> getUnpinnedStocks() async {
     try {
-      List<Map<String, dynamic>> tuples = await Db().getRawQuery("SELECT * "
-          "FROM ${Db.tblTracked} T "
-          "LEFT JOIN ${Db.tblPortfolio} P "
-          "ON T.${Db.colCode} = P.${Db.colBSECode} "
-          "WHERE "
-          "T.${Db.colExch} = 'BSE' "
-          "AND ${Db.colPinned} = 0 "
-          "UNION "
-          "SELECT * "
-          "FROM ${Db.tblTracked} T "
-          "LEFT JOIN ${Db.tblPortfolio} P "
-          "ON T.${Db.colCode} = P.${Db.colNSECode} "
-          "WHERE "
-          "T.${Db.colExch} = 'NSE' "
-          "AND ${Db.colPinned} = 0 "
-          "ORDER BY ${Db.colName} ASC, ${Db.colCode} ASC");
+      List<Map<String, dynamic>> trackedUnpinned =
+          await Db().getRawQuery("SELECT * "
+              "FROM ${Db.tblTracked} T "
+              "LEFT JOIN ${Db.tblScrips} S "
+              "ON T.${Db.colStockID} = S.${Db.colRowID} "
+              "LEFT JOIN ${Db.tblPortfolio} P "
+              "ON T.${Db.colStockID} = P.${Db.colStockID} "
+              "WHERE "
+              "${Db.colPinned} = 0 "
+              "ORDER BY ${Db.colName} ASC");
 
       List<Stock> stocks = [];
-      tuples.forEach((row) => stocks.add(Stock.fromDbTuple(row)));
+      trackedUnpinned.forEach((row) => stocks.add(Stock.fromDbTuple(row)));
       return stocks;
     } catch (e) {
       dev.log(e.toString());
@@ -873,6 +889,19 @@ class DatabaseActions {
     }
   }
 
+  static Future<bool> setScripName(
+      String exchange, String? name, String code) async {
+    String codeCol = "";
+    if (exchange == "BSE") {
+      codeCol = Db.colBSECode;
+    } else if (exchange == "NSE") {
+      codeCol = Db.colNSECode;
+    }
+
+    return await Db().updateConditionally(Db.tblScrips,
+        {Db.colName: name?.toUpperCase()}, '$codeCol = ?', [code]);
+  }
+
   static Future<bool> updatePinned(
       String code, String exchange, bool pinned) async {
     return await Db().updateConditionally(
@@ -892,19 +921,42 @@ class DatabaseActions {
   }
 
   static Future<bool> addTracked(
-      String code, String exchange, String? name, bool pinned) async {
-    return await Db().insert(Db.tblTracked, {
-      Db.colCode: code,
-      Db.colExch: exchange,
-      Db.colPinned: pinned ? 1 : 0,
-      Db.colName: name,
-    });
+      String code, String exchange, bool pinned) async {
+    String codeCol = "";
+    switch (exchange) {
+      case "BSE":
+        codeCol = Db.colBSECode;
+        break;
+      case "NSE":
+        codeCol = Db.colNSECode;
+        break;
+    }
+
+    return await Db().transact((txn) async {
+      // Check if Scrips has the newCode already
+      List<Map> scrips = await txn
+          .query(Db.tblScrips, where: '$codeCol = ?', whereArgs: [code]);
+
+      // If not present then update the oldCode with newCode
+      if (scrips.length == 0) {
+        await txn.insert(Db.tblScrips, {codeCol: code});
+        scrips = await txn
+            .query(Db.tblScrips, where: '$codeCol = ?', whereArgs: [code]);
+      }
+
+      await txn.insert(Db.tblTracked, {
+        Db.colStockID: scrips.first[Db.colRowID],
+        Db.colCode: code,
+        Db.colExch: exchange,
+        Db.colPinned: pinned ? 1 : 0,
+      });
+    }).then((value) => true);
   }
 
   static Future<Object?> updateCode(
-      String oldCode, String exch, String newCode) async {
+      String oldCode, String exchange, String newCode) async {
     String codeCol = "";
-    switch (exch) {
+    switch (exchange) {
       case "BSE":
         codeCol = Db.colBSECode;
         break;
@@ -914,26 +966,32 @@ class DatabaseActions {
     }
 
     return await Db().transact((txn) async {
-      await txn.update(Db.tblTracked, {Db.colCode: newCode},
-          where: '${Db.colCode} = ? and ${Db.colExch} = ?',
-          whereArgs: [oldCode, exch]);
-      List<Map> tuples = await txn
-          .query(Db.tblPortfolio, where: '$codeCol = ?', whereArgs: [newCode]);
-      if (tuples.length == 0) {
-        await txn.update(Db.tblPortfolio, {codeCol: newCode},
+      // Check if Scrips has the newCode already
+      List<Map> scrips = await txn
+          .query(Db.tblScrips, where: '$codeCol = ?', whereArgs: [newCode]);
+
+      // If not present then update the oldCode with newCode
+      if (scrips.length == 0) {
+        await txn.update(Db.tblScrips, {codeCol: newCode},
             where: '$codeCol = ?', whereArgs: [oldCode]);
-        tuples = await txn.query(Db.tblPortfolio,
-            where: '$codeCol = ?', whereArgs: [newCode]);
+        scrips = await txn
+            .query(Db.tblScrips, where: '$codeCol = ?', whereArgs: [newCode]);
       }
+
+      // Update Tracked table replacing oldCode with newCode
+      await txn.update(Db.tblTracked,
+          {Db.colStockID: scrips.first[Db.colRowID], Db.colCode: newCode},
+          where: '${Db.colCode} = ? and ${Db.colExch} = ?',
+          whereArgs: [oldCode, exchange]);
       await txn.update(Db.tblTradeLog,
-          {Db.colStockID: tuples.first[Db.colRowID], Db.colCode: newCode},
+          {Db.colStockID: scrips.first[Db.colRowID], Db.colCode: newCode},
           where: '${Db.colCode} = ? and ${Db.colExch} = ?',
-          whereArgs: [oldCode, exch]);
+          whereArgs: [oldCode, exchange]);
       return;
     }).then((value) async {
-      List<Map> tuples =
-          await Db().getQuery(Db.tblPortfolio, '$codeCol = ?', [newCode]);
-      updatePortfolioFigures(tuples.first[Db.colRowID]);
+      List<Map> scrips =
+          await Db().getQuery(Db.tblScrips, '$codeCol = ?', [newCode]);
+      updatePortfolioFigures(scrips.first[Db.colRowID]);
       return value;
     });
   }
diff --git a/lib/helpers/stock_repository.dart b/lib/helpers/stock_repository.dart
index a582862..95563f3 100644
--- a/lib/helpers/stock_repository.dart
+++ b/lib/helpers/stock_repository.dart
@@ -1,4 +1,4 @@
-import 'package:folio/services/database/database.dart';
+import 'package:folio/helpers/database_actions.dart';
 import 'package:folio/models/stock/latest.dart';
 import 'package:folio/services/query/query_api.dart';
 
@@ -15,11 +15,8 @@ class StockRepository {
 
   static Future<String?> getName(String code, String exchange) async {
     String? name = await QueryAPI.getName(exchange: exchange, code: code);
-    await Db().updateConditionally(
-        Db.tblTracked,
-        {Db.colName: name?.toUpperCase()},
-        '${Db.colCode} = ? and ${Db.colExch} = ?',
-        [code, exchange]);
+    
+    DatabaseActions.setScripName(exchange, name, code);
     return name?.toUpperCase();
   }
 
diff --git a/lib/models/database/portfolio.dart b/lib/models/database/portfolio.dart
index f9a6cb6..53a19ff 100644
--- a/lib/models/database/portfolio.dart
+++ b/lib/models/database/portfolio.dart
@@ -1,7 +1,7 @@
 import 'package:folio/services/database/database.dart';
 
 class Portfolio {
-  late int? rowid;
+  late int? stockID;
   late String? name;
   late String? bseCode;
   late String? nseCode;
@@ -10,19 +10,20 @@ class Portfolio {
   late double? esr;
 
   Portfolio.fromDbTuple(Map<String, dynamic> tuple) {
-    rowid = tuple["rowid"];
+    stockID = tuple[Db.colStockID];
     bseCode = tuple[Db.colBSECode];
     nseCode = tuple[Db.colNSECode];
-    qty = tuple[Db.colQty];
+    qty = tuple[Db.colGrossQty];
     msr = tuple[Db.colMSR];
     esr = tuple[Db.colESR];
   }
 
   Map<String, dynamic> toDbTuple() {
     return {
+      Db.colStockID: stockID,
       Db.colBSECode: bseCode,
       Db.colNSECode: nseCode,
-      Db.colQty: qty,
+      Db.colGrossQty: qty,
       Db.colMSR: msr,
       Db.colESR: esr,
     };
diff --git a/lib/models/stock/stock.dart b/lib/models/stock/stock.dart
index bd82ef0..8738e62 100644
--- a/lib/models/stock/stock.dart
+++ b/lib/models/stock/stock.dart
@@ -15,7 +15,7 @@ class Stock {
         _tracked = Tracked.fromDbTuple(tuple),
         _latest = Latest();
 
-  int? get id => _portfolio.rowid;
+  int? get id => _portfolio.stockID;
 
   String? get name => _tracked.name;
 
@@ -23,21 +23,21 @@ class Stock {
 
   String get code => _tracked.code;
 
-  int? get qty => _portfolio?.qty;
+  int? get qty => _portfolio.qty;
 
-  double? get msr => _portfolio?.msr;
+  double? get msr => _portfolio.msr;
 
-  double? get esr => _portfolio?.esr;
+  double? get esr => _portfolio.esr;
 
-  double? get lastValue => _latest?.value;
+  double? get lastValue => _latest.value;
 
-  String? get change => _latest?.change;
+  String? get change => _latest.change;
 
-  String? get percentChange => _latest?.percentageChange;
+  String? get percentChange => _latest.percentageChange;
 
-  String? get lastUpdated => _latest?.updated;
+  String? get lastUpdated => _latest.updated;
 
-  int get changeSign => _latest?.sign ?? 0;
+  int get changeSign => _latest.sign;
 
   double? get netAmount => (netPerStock == null || qty == null || qty == 0)
       ? null
diff --git a/lib/services/database/database.dart b/lib/services/database/database.dart
index 81cc1ab..4350169 100644
--- a/lib/services/database/database.dart
+++ b/lib/services/database/database.dart
@@ -10,9 +10,10 @@ class Db {
   factory Db() => _instance;
   static Database? _db;
 
-  static String tblTracked = 'Tracked';
-  static String tblPortfolio = 'Portfolio';
-  static String tblTradeLog = 'TradeLog';
+  static String tblTracked = 'TrackedTBL';
+  static String tblPortfolio = 'PortfolioTBL';
+  static String tblTradeLog = 'TradeLogTBL';
+  static String tblScrips = 'ScripsTBL';
 
   static String colStockID = 'stock_id';
   static String colRowID = 'rowid';
@@ -23,7 +24,9 @@ class Db {
   static String colName = 'name';
   static String colKey = 'key';
   static String colQty = 'qty';
+  static String colGrossQty = 'gross_qty';
   static String colRate = 'rate';
+  static String colAvgRate = 'avg_rate';
   static String colMSR = 'min_sell_rate';
   static String colESR = 'est_sell_rate';
   static String colPinned = 'pinned';
@@ -49,17 +52,17 @@ class Db {
 
   void _onCreate(Database db, int version) async {
     await db.execute('CREATE TABLE $tblTracked ('
+        '$colStockID INTEGER,' // Not UNIQUE as one of BSE and one of NSE
         '$colCode TEXT,'
         '$colExch TEXT,'
-        '$colName TEXT,'
         '$colPinned INTEGER,'
         'PRIMARY KEY ($colCode, $colExch)'
         ')');
     await db.execute('CREATE TABLE $tblPortfolio ('
         '$colRowID INTEGER PRIMARY KEY, '
-        '$colBSECode TEXT UNIQUE, '
-        '$colNSECode TEXT UNIQUE, '
-        '$colQty INTEGER, '
+        '$colStockID INTEGER UNIQUE,'
+        '$colGrossQty INTEGER, '
+        '$colAvgRate REAL, '
         '$colMSR REAL, '
         '$colESR REAL'
         ')');
@@ -73,6 +76,12 @@ class Db {
         '$colQty INTEGER, '
         '$colRate REAL'
         ')');
+    await db.execute('CREATE TABLE $tblScrips ('
+        '$colRowID INTEGER PRIMARY KEY, '
+        '$colBSECode TEXT UNIQUE, '
+        '$colNSECode TEXT UNIQUE, '
+        '$colName TEXT'
+        ')');
   }
 
   void deleteDb() async {
@@ -87,12 +96,6 @@ class Db {
     _db = await initDb();
   }
 
-  Future<int> saveTuple(String table, Map<String, dynamic> tuple) async {
-    var dbClient = await db;
-    int res = await dbClient.insert(table, tuple);
-    return res;
-  }
-
   Future<int?> getTotalCount(String table) async {
     var dbClient = await db;
     int? count = Sqflite.firstIntValue(
@@ -138,7 +141,8 @@ class Db {
         where: where, whereArgs: whereArgs, orderBy: orderBy);
   }
 
-  Future<List<Map<String, dynamic>>> getOrdered(String table, String orderBy) async {
+  Future<List<Map<String, dynamic>>> getOrdered(
+      String table, String orderBy) async {
     var dbClient = await db;
     return await dbClient.query(table, orderBy: orderBy);
   }
@@ -178,4 +182,19 @@ class Db {
     var dbClient = await db;
     return await dbClient.transaction(transaction);
   }
+
+  Future<List<Map<String, dynamic>>> getPortfolioView() async {
+    return Db().getRawQuery(""
+        "SELECT "
+        "P.${Db.colRowID} AS ${Db.colRowID}, "
+        "P.${Db.colStockID} AS ${Db.colStockID}, "
+        "S.${Db.colName} AS ${Db.colName}, "
+        "S.${Db.colNSECode} AS ${Db.colNSECode}, "
+        "S.${Db.colBSECode} AS ${Db.colBSECode}, "
+        "${Db.colGrossQty}, ${Db.colAvgRate}, ${Db.colMSR}, ${Db.colESR}, "
+        ""
+        "FROM ${Db.tblPortfolio} P "
+        "LEFT JOIN ${Db.tblScrips} S "
+        "ON P.${Db.colStockID} = S.${Db.colRowID} ");
+  }
 }
diff --git a/lib/views/portfolio/portfolio.dart b/lib/views/portfolio/portfolio.dart
index 15546ed..0c0bafd 100644
--- a/lib/views/portfolio/portfolio.dart
+++ b/lib/views/portfolio/portfolio.dart
@@ -17,7 +17,7 @@ class _PortfolioViewState extends State<PortfolioView> {
   @override
   void initState() {
     super.initState();
-    _getPortfolioFuture = DatabaseActions.getAllPortfolios();
+    _getPortfolioFuture = DatabaseActions.getAllPortfolioLogs();
   }
 
   @override
diff --git a/lib/views/settings/data/track_stock_dialog.dart b/lib/views/settings/data/track_stock_dialog.dart
index 83474ec..33b4e26 100644
--- a/lib/views/settings/data/track_stock_dialog.dart
+++ b/lib/views/settings/data/track_stock_dialog.dart
@@ -141,7 +141,7 @@ class _TrackStockDialogState extends State<TrackStockDialog> {
                       onPressed: () {
                         if (_formKey.currentState != null && _formKey.currentState!.validate()) {
                           DatabaseActions.addTracked(
-                                  _codeCtl.text, _selectedExch, "", false)
+                                  _codeCtl.text, _selectedExch, false)
                               .then(
                             (value) {
                               if (value) {
diff --git a/lib/views/settings/drive/drive.dart b/lib/views/settings/drive/drive.dart
index de9f90e..098fbcd 100644
--- a/lib/views/settings/drive/drive.dart
+++ b/lib/views/settings/drive/drive.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:folio/services/database/database.dart';
+import 'package:folio/helpers/database_actions.dart';
 import 'package:folio/services/google_api/google_auth_client.dart';
 import 'package:intl/intl.dart';
 import 'package:googleapis/drive/v3.dart' as drive;
@@ -175,7 +175,7 @@ class _DriveAreaState extends State<DriveArea> {
     final authenticateClient = GoogleAuthClient(authHeaders);
     final driveApi = drive.DriveApi(authenticateClient);
 
-    final path = await Db().getDbPath();
+    final path = await DatabaseActions.getDbPath();
     final file = File(path);
 
     var media = drive.Media(file.openRead(), file.lengthSync());
@@ -283,7 +283,8 @@ class _DriveAreaState extends State<DriveArea> {
       var file = await driveApi.files
           .get(id, downloadOptions: drive.DownloadOptions.fullMedia);
 
-      final saveFile = File(await Db().getDbPath());
+      final path = await DatabaseActions.getDbPath();
+      final saveFile = File(path);
       await saveFile.writeAsString(file.toString(), flush: true);
     }
 
diff --git a/lib/views/tracked/details/details.dart b/lib/views/tracked/details/details.dart
index febd5c9..231df71 100644
--- a/lib/views/tracked/details/details.dart
+++ b/lib/views/tracked/details/details.dart
@@ -69,11 +69,11 @@ class _DetailsViewState extends State<DetailsView>
     }
 
     if (_stock.id != null) {
-      _summary = TradeSummary(DatabaseActions.getBuyLogs(_stock.id!),
-          DatabaseActions.getSellLogs(_stock.id!));
+      _summary = TradeSummary(DatabaseActions.getBuyTrades(_stock.id!),
+          DatabaseActions.getSellTrades(_stock.id!));
 
       _futureSummary = _summary.calculateSummary(0);
-      _futureLogs = DatabaseActions.getStockLogs(_stock.id!);
+      _futureLogs = DatabaseActions.getStockTrades(_stock.id!);
     }
 
     _tabController = new TabController(vsync: this, length: 4);
diff --git a/lib/views/tracked/tracked_bottom_sheet.dart b/lib/views/tracked/tracked_bottom_sheet.dart
index e4179fb..64f222d 100644
--- a/lib/views/tracked/tracked_bottom_sheet.dart
+++ b/lib/views/tracked/tracked_bottom_sheet.dart
@@ -23,7 +23,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
   void initState() {
     super.initState();
     _stock = widget.stock;
-    _isRefreshing = _stock?.lastValue == null;
+    _isRefreshing = _stock.lastValue == null;
   }
 
   @override
@@ -102,7 +102,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                   child: IconButton(
                     padding: EdgeInsets.all(0.0),
                     icon:
-                        Icon(_stock.pinned ?? false ? Folio.unpin : Folio.pin),
+                        Icon(_stock.pinned ? Folio.unpin : Folio.pin),
                     iconSize: 25.0,
                     splashRadius: 25.0,
                     onPressed: () {
@@ -118,7 +118,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                         }
                       });
                     },
-                    tooltip: _stock.pinned ?? false ? "Unpin" : "Pin",
+                    tooltip: _stock.pinned ? "Unpin" : "Pin",
                   ),
                 ),
                 SizedBox(
@@ -139,7 +139,6 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                         DatabaseActions.addTracked(
                           _stock.code,
                           _stock.exchange,
-                          _stock.name,
                           _stock.pinned,
                         );
                       }
@@ -202,7 +201,7 @@ class _TrackedBottomSheetState extends State<TrackedBottomSheet> {
                   ),
                   MapTile(
                     name: "NET/STK",
-                    value: _stock?.netPerStock?.toStringAsFixed(2) ?? "—",
+                    value: _stock.netPerStock?.toStringAsFixed(2) ?? "—",
                   ),
                 ],
               ),
diff --git a/lib/views/trades/trades.dart b/lib/views/trades/trades.dart
index 4329a4e..bb3ce03 100644
--- a/lib/views/trades/trades.dart
+++ b/lib/views/trades/trades.dart
@@ -17,7 +17,7 @@ class _TradesViewState extends State<TradesView> {
   @override
   void initState() {
     super.initState();
-    _getLogsFuture = DatabaseActions.getAllLogs();
+    _getLogsFuture = DatabaseActions.getAllTrades();
   }
 
   @override

From c0822d379f864cf185a98ae9302ea0b84962b9b9 Mon Sep 17 00:00:00 2001
From: Baidyanath Kundu <kundubaidya99@gmail.com>
Date: Thu, 7 Sep 2023 02:41:58 +0530
Subject: [PATCH 6/6] Add pages to see, import and delete scrips

---
 lib/helpers/database_actions.dart             | 485 +++++++++++++++---
 lib/helpers/stock_repository.dart             |   6 +-
 lib/models/database/scrip.dart                |  82 +++
 lib/models/trade/parsed_file_logs.dart        |   1 +
 lib/services/database/database.dart           |   8 +-
 lib/views/settings/data/data.dart             | 141 +++--
 .../data/import_file/file_log_tile.dart       |   4 +-
 .../data/import_file/get_missing_codes.dart   | 217 ++++++++
 .../data/import_file/import_file.dart         |   7 +-
 .../data/import_file/name_code_tile.dart      | 187 +++++++
 .../import_scrips_list/import_scrips.dart     | 101 ++++
 .../import_scrips_list/parsed_scrips.dart     | 164 ++++++
 .../select_scrips_file.dart                   | 321 ++++++++++++
 .../data/import_scrips_list/show_scrips.dart  |  52 ++
 lib/views/settings/data/scrip_tile.dart       | 290 +++++++++++
 lib/views/settings/data/scrips_list.dart      | 105 ++++
 lib/views/settings/drive/drive.dart           |   1 +
 17 files changed, 2031 insertions(+), 141 deletions(-)
 create mode 100644 lib/models/database/scrip.dart
 create mode 100644 lib/views/settings/data/import_file/get_missing_codes.dart
 create mode 100644 lib/views/settings/data/import_file/name_code_tile.dart
 create mode 100644 lib/views/settings/data/import_scrips_list/import_scrips.dart
 create mode 100644 lib/views/settings/data/import_scrips_list/parsed_scrips.dart
 create mode 100644 lib/views/settings/data/import_scrips_list/select_scrips_file.dart
 create mode 100644 lib/views/settings/data/import_scrips_list/show_scrips.dart
 create mode 100644 lib/views/settings/data/scrip_tile.dart
 create mode 100644 lib/views/settings/data/scrips_list.dart

diff --git a/lib/helpers/database_actions.dart b/lib/helpers/database_actions.dart
index f8c215c..4a95e66 100644
--- a/lib/helpers/database_actions.dart
+++ b/lib/helpers/database_actions.dart
@@ -2,11 +2,13 @@ import 'dart:developer' as dev;
 import 'dart:io';
 
 import 'package:csv/csv_settings_autodetection.dart';
+import 'package:folio/models/database/scrip.dart';
 import 'package:folio/services/database/database.dart';
 import 'package:folio/models/database/trade_log.dart';
 import 'package:folio/models/database/portfolio.dart';
 import 'package:folio/models/stock/stock.dart';
 import 'package:folio/state/globals.dart';
+import 'package:folio/views/settings/data/import_scrips_list/parsed_scrips.dart';
 
 import 'package:html/parser.dart' as html;
 import 'package:sqflite/sqflite.dart';
@@ -16,7 +18,19 @@ import 'package:excel/excel.dart';
 
 import '../models/trade/parsed_file_logs.dart';
 
+class DataException implements Exception {
+  final String message;
+
+  DataException(this.message); // Pass your message in constructor.
+
+  @override
+  String toString() {
+    return message;
+  }
+}
+
 class DatabaseActions {
+  static const String delimiter = "; ";
   static void dummyOnUpdate({int? current, String? message, int? total}) {}
 
   static Future<String> getDbPath() async => await Db().getDbPath();
@@ -69,12 +83,7 @@ class DatabaseActions {
     int qty,
     double rate,
   ) async {
-    String codeCol = "";
-    if (exchange == "BSE") {
-      codeCol = Db.colBSECode;
-    } else if (exchange == "NSE") {
-      codeCol = Db.colNSECode;
-    }
+    String codeCol = getCodeCol(exchange);
     var scrips = await Db().getQuery(Db.tblScrips, "$codeCol = ?", [code]);
 
     if (scrips.length > 1) {
@@ -293,6 +302,48 @@ class DatabaseActions {
     return sellTrades;
   }
 
+  static Future<List<Map<String, dynamic>>> getScripsFromOldCode(
+      String exchange, String code) async {
+    var res = await Db().getQuery(
+        Db.tblScrips, "${getOldCodesCol(exchange)} LIKE ?", ["%$code%"]);
+    return res;
+  }
+
+  static Future<List<Map<String, dynamic>>> getScripsFromCode(
+      String exchange, String code) async {
+    var res = await Db()
+        .getQuery(Db.tblScrips, "${getCodeCol(exchange)} = ?", [code]);
+    return res;
+  }
+
+  static Future<List<Map<String, dynamic>>> getScripsFromName(
+      String name) async {
+    var res = await Db().getQuery(
+        Db.tblScrips, "${Db.colName} LIKE ?", ["${getNormalizedName(name)}%"]);
+    return res;
+  }
+
+  static Future<bool> isOldCodePresent(String exchange, String code) async {
+    return (await getScripsFromOldCode(exchange, code)).length != 0;
+  }
+
+  static Future<bool> isCodePresent(String exchange, String code) async {
+    var tuples = await getScripsFromCode(exchange, code);
+    return tuples.length != 0;
+  }
+
+  static Future<bool> isScripNamePresent(String name) async {
+    var tuples = await getScripsFromName(name);
+    return tuples.length != 0;
+  }
+
+  static Future<List<Scrip>?> getAllScrips() async {
+    var scripsTuple = await Db().getOrdered(Db.tblScrips, "${Db.colName} ASC");
+    List<Scrip> scripsList = [];
+    scripsTuple.forEach((row) => scripsList.add(Scrip.fromDbTuple(row)));
+    return scripsList;
+  }
+
   static Future<int> setCodesNGetStockID(String? bseCode, String? nseCode,
       [String? name]) async {
     List<Map> scrips;
@@ -430,7 +481,7 @@ class DatabaseActions {
         date = DateTime.utc(year, month, day);
       }
       String? exchange = row[exchangeColID]?.value.toString().trim();
-      String? name = row[nameColID]?.value.toString();
+      String? name = getNormalizedName(row[nameColID]?.value.toString());
       bool? bought = row[boughtColID]?.value.toString() == "B";
       int? qty = row[qtyColID] == null
           ? null
@@ -493,14 +544,16 @@ class DatabaseActions {
       for (var cell in row.querySelectorAll("td")) {
         switch (headers[colNum]) {
           case "Date":
-            date = DateTime.utc(
-                int.parse(cell.innerHtml
-                    .substring(cell.innerHtml.lastIndexOf('/') + 1)),
-                int.parse(cell.innerHtml.substring(
-                    cell.innerHtml.indexOf('/') + 1,
-                    cell.innerHtml.lastIndexOf('/'))),
-                int.parse(
-                    cell.innerHtml.substring(0, cell.innerHtml.indexOf('/'))));
+            try {
+              date = DateTime.utc(
+                  int.parse(cell.innerHtml
+                      .substring(cell.innerHtml.lastIndexOf('/') + 1)),
+                  int.parse(cell.innerHtml.substring(
+                      cell.innerHtml.indexOf('/') + 1,
+                      cell.innerHtml.lastIndexOf('/'))),
+                  int.parse(cell.innerHtml
+                      .substring(0, cell.innerHtml.indexOf('/'))));
+            } catch (e) {}
             break;
           case "Exch":
             exchange = cell.innerHtml.trim();
@@ -517,16 +570,24 @@ class DatabaseActions {
                 .trim();
             break;
           case "Buy Qty":
-            buyQty = int.parse(cell.innerHtml.trim());
+            try {
+              buyQty = int.parse(cell.innerHtml.trim());
+            } catch (e) {}
             break;
           case "Sold Qty":
-            sellQty = int.parse(cell.innerHtml.trim());
+            try {
+              sellQty = int.parse(cell.innerHtml.trim());
+            } catch (e) {}
             break;
           case "Buy Rate":
-            buyRate = double.parse(cell.innerHtml.trim());
+            try {
+              buyRate = double.parse(cell.innerHtml.trim());
+            } catch (e) {}
             break;
           case "Sold Rate":
-            sellRate = double.parse(cell.innerHtml.trim());
+            try {
+              sellRate = double.parse(cell.innerHtml.trim());
+            } catch (e) {}
             break;
           default:
             break;
@@ -588,29 +649,31 @@ class DatabaseActions {
       double? rate;
       bool? bought;
 
-      int i = 0;
+      int colNum = 0;
       for (var element in row) {
-        switch (trades.first[i]) {
+        switch (trades.first[colNum]) {
           case "Date":
             if (element == "null") break;
 
-            date = DateTime.utc(
-              int.parse(
-                element.substring(
-                  0,
-                  element.indexOf('-'),
+            try {
+              date = DateTime.utc(
+                int.parse(
+                  element.substring(
+                    0,
+                    element.indexOf('-'),
+                  ),
                 ),
-              ),
-              int.parse(
-                element.substring(
-                  element.indexOf('-') + 1,
-                  element.lastIndexOf('-'),
+                int.parse(
+                  element.substring(
+                    element.indexOf('-') + 1,
+                    element.lastIndexOf('-'),
+                  ),
                 ),
-              ),
-              int.parse(
-                element.substring(element.lastIndexOf('-') + 1),
-              ),
-            );
+                int.parse(
+                  element.substring(element.lastIndexOf('-') + 1),
+                ),
+              );
+            } catch (e) {}
             break;
           case "Exchange":
             if (element == "null") break;
@@ -618,7 +681,7 @@ class DatabaseActions {
             break;
           case "Name":
             if (element == "null") break;
-            name = element;
+            name = getNormalizedName(element);
             break;
           case "BSE Code":
             if (element == "null") break;
@@ -630,11 +693,15 @@ class DatabaseActions {
             break;
           case "Quantity":
             if (element == "null") break;
-            qty = int.parse(element.toString());
+            try {
+              qty = int.parse(element.toString());
+            } catch (e) {}
             break;
           case "Rate":
             if (element == "null") break;
-            rate = double.parse(element.toString());
+            try {
+              rate = double.parse(element.toString());
+            } catch (e) {}
             break;
           case "BUY/SELL":
             if (element == "null") break;
@@ -650,7 +717,7 @@ class DatabaseActions {
           default:
             break;
         }
-        i++;
+        colNum++;
       }
       switch (exchange) {
         case "BSE":
@@ -767,21 +834,23 @@ class DatabaseActions {
           fileLog.rate == null) {
         onUpdate(
             message: "Invalid logs found!", current: i, total: logs.length);
-        throw Exception("Invalid logs found!");
+        throw DataException("Invalid logs found!");
       }
 
-      try {
-        int id = await DatabaseActions.setCodesNGetStockID(
-            fileLog.bseCode, fileLog.nseCode, fileLog.name);
+      if (fileLog.stockID == null) {
+        var res = await DatabaseActions.getScripsFromCode(
+            fileLog.exchange!, fileLog.code!);
 
-        trades.add(TradeLog(fileLog.date!, id, fileLog.code!, fileLog.exchange!,
-            fileLog.bought!, fileLog.qty!, fileLog.rate!));
-      } catch (e) {
-        onUpdate(
-            message: "Unknown Error Occurred!", current: i, total: logs.length);
-        throw e;
+        if (res.length == 0)
+          throw DataException(
+              "Stock of ${fileLog.name} not present in securities list");
+
+        fileLog.stockID = Scrip.fromDbTuple(res.first).stockID;
       }
 
+      trades.add(TradeLog(fileLog.date!, fileLog.stockID!, fileLog.code!,
+          fileLog.exchange!, fileLog.bought!, fileLog.qty!, fileLog.rate!));
+
       i++;
     }
 
@@ -790,6 +859,159 @@ class DatabaseActions {
     return trades;
   }
 
+  static Future<ParsedScripsList> parseCSVScripsFile(
+      String exchange, String file,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    onUpdate(message: "Parsing Scrips File");
+    var detector = FirstOccurrenceSettingsDetector(eols: ['\r\n', '\n']);
+    List<List<dynamic>> scrips =
+        const CsvToListConverter().convert(file, csvSettingsDetector: detector);
+
+    Map<String, ParsedScrip> scripsMap = {};
+
+    switch (exchange) {
+      case "BSE":
+        int i = 0;
+        onUpdate(
+            message: "Parsing BSE Scrips File",
+            current: i,
+            total: scrips.length - 1);
+        for (var row in scrips.skip(1)) {
+          onUpdate(
+              message: "Parsing BSE Scrips File",
+              current: ++i,
+              total: scrips.length - 1);
+
+          String code = row[0].toString();
+          String name = getNormalizedName(row[3].toString())!;
+          bool isActive = (row[4].toString() == "Active");
+          if (scripsMap[name] == null) {
+            if (isActive)
+              scripsMap[name] = ParsedScrip(name, code);
+            else
+              scripsMap[name] = ParsedScrip(name, null, [code]);
+          } else {
+            if (isActive) {
+              if (scripsMap[name]!.newCode == null)
+                scripsMap[name]!.newCode = code;
+              else {
+                scripsMap[name]!.oldCodes.add(code);
+                // onUpdate(
+                //     message: "Two codes ${scripsMap[name]!.newCode} & $code for"
+                //         " the same stock $name found!",
+                //     current: i,
+                //     total: null);
+                // throw DataException("Two codes ${scripsMap[name]!.newCode} & $code for"
+                //     " the same stock $name found!");
+              }
+            } else {
+              scripsMap[name]!.oldCodes.add(code);
+            }
+          }
+        }
+
+        break;
+      case "NSE":
+        int i = 0;
+        onUpdate(
+            message: "Parsing NSE Scrips File",
+            current: i,
+            total: scrips.length - 1);
+        for (var row in scrips.skip(1)) {
+          onUpdate(
+              message: "Parsing NSE Scrips File",
+              current: ++i,
+              total: scrips.length - 1);
+
+          String code = row[0].toString();
+          String name = getNormalizedName(row[1].toString())!;
+          scripsMap[name] = ParsedScrip(name, code);
+        }
+
+        break;
+    }
+
+    ParsedScripsList scripsList = ParsedScripsList(exchange);
+    int i = 0, total = scripsMap.values.length;
+    onUpdate(message: "Checking Parsed Scrips", current: i, total: total);
+
+    for (var scrip in scripsMap.values) {
+      onUpdate(message: "Checking Parsed Scrips", current: ++i, total: total);
+
+      ParsedScrip checkedScrip = ParsedScrip.from(scrip);
+
+      for (var oldCode in scrip.oldCodes) {
+        if (await isOldCodePresent(exchange, oldCode) ||
+            await isCodePresent(exchange, oldCode)) {
+          checkedScrip.oldCodes.remove(oldCode);
+        }
+      }
+
+      if (checkedScrip.oldCodes.length == 0) {
+        if (scrip.newCode == null ||
+            await isCodePresent(exchange, scrip.newCode!)) {
+          continue;
+        }
+      }
+
+      if (scrip.newCode != null) {
+        var newCodeScrip = await getScripsFromOldCode(exchange, scrip.newCode!);
+        if (newCodeScrip.length != 0) {
+          checkedScrip.newCode = newCodeScrip.first[getCodeCol(exchange)];
+        }
+      }
+
+      scripsList.addNew(checkedScrip);
+    }
+
+    onUpdate(message: "Done", current: total, total: total);
+
+    return scripsList;
+  }
+
+  static addScrips(ParsedScripsList scripsList,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    var exchange = scripsList.exchange, total = scripsList.newScrips.length;
+
+    int i = 0;
+    onUpdate(message: "Importing Scrips", current: i, total: total);
+
+    for (var scrip in scripsList.newScrips) {
+      onUpdate(message: "Importing Scrips", current: ++i, total: total);
+      var scripTuple = await getScripsFromName(scrip.name);
+      if (scripTuple.length == 0) {
+        Scrip newScrip = Scrip(getNormalizedName(scrip.name)!);
+        newScrip.setCode(exchange, scrip.newCode);
+        newScrip.setOldCodes(exchange, scrip.oldCodes);
+        Db().insert(Db.tblScrips, newScrip.toDbTuple());
+      } else {
+        Scrip existingScrip = Scrip.fromDbTuple(scripTuple.first);
+        String? existingCode = existingScrip.code(exchange);
+        List<String> existingOldCodes = existingScrip.oldCodes(exchange);
+        for (var oldCode in scrip.oldCodes) {
+          if (!existingOldCodes.contains(oldCode)) {
+            existingOldCodes.add(oldCode);
+          }
+        }
+
+        if (scrip.newCode == null && existingCode != null) {
+          existingOldCodes.add(existingCode);
+        }
+
+        Db().updateConditionally(
+            Db.tblScrips,
+            {
+              getCodeCol(exchange): scrip.newCode,
+              getOldCodesCol(exchange): existingOldCodes.join(delimiter)
+            },
+            "${Db.colName} = ?",
+            [getNormalizedName(scrip.name)]);
+      }
+    }
+  }
+
   static Future<String> getTradesCSV() async {
     List<Map> tradeLogs = await Db().getRawQuery(""
         "SELECT "
@@ -889,17 +1111,40 @@ class DatabaseActions {
     }
   }
 
-  static Future<bool> setScripName(
-      String exchange, String? name, String code) async {
-    String codeCol = "";
-    if (exchange == "BSE") {
-      codeCol = Db.colBSECode;
-    } else if (exchange == "NSE") {
-      codeCol = Db.colNSECode;
+  static Future<String> getScripCode(String name, String exchange) async {
+    var scrips = await Db()
+        .getQuery(Db.tblScrips, "${Db.colName} = ?", [getNormalizedName(name)]);
+    return scrips.first[getCodeCol(exchange)];
+  }
+
+  static String getCodeCol(String exchange) {
+    switch (exchange) {
+      case "BSE":
+        return Db.colBSECode;
+      case "NSE":
+        return Db.colNSECode;
     }
 
+    return "";
+  }
+
+  static String getOldCodesCol(String exchange) {
+    switch (exchange) {
+      case "BSE":
+        return Db.colOldBSECodes;
+      case "NSE":
+        return Db.colOldNSECodes;
+    }
+
+    return "";
+  }
+
+  static Future<bool> setScripName(
+      String exchange, String name, String code) async {
+    String codeCol = getCodeCol(exchange);
+
     return await Db().updateConditionally(Db.tblScrips,
-        {Db.colName: name?.toUpperCase()}, '$codeCol = ?', [code]);
+        {Db.colName: getNormalizedName(name)}, '$codeCol = ?', [code]);
   }
 
   static Future<bool> updatePinned(
@@ -922,15 +1167,7 @@ class DatabaseActions {
 
   static Future<bool> addTracked(
       String code, String exchange, bool pinned) async {
-    String codeCol = "";
-    switch (exchange) {
-      case "BSE":
-        codeCol = Db.colBSECode;
-        break;
-      case "NSE":
-        codeCol = Db.colNSECode;
-        break;
-    }
+    String codeCol = getCodeCol(exchange);
 
     return await Db().transact((txn) async {
       // Check if Scrips has the newCode already
@@ -955,15 +1192,7 @@ class DatabaseActions {
 
   static Future<Object?> updateCode(
       String oldCode, String exchange, String newCode) async {
-    String codeCol = "";
-    switch (exchange) {
-      case "BSE":
-        codeCol = Db.colBSECode;
-        break;
-      case "NSE":
-        codeCol = Db.colNSECode;
-        break;
-    }
+    String codeCol = getCodeCol(exchange);
 
     return await Db().transact((txn) async {
       // Check if Scrips has the newCode already
@@ -999,4 +1228,108 @@ class DatabaseActions {
   static void deleteDbThenInit() {
     Db().deleteDbThenInit();
   }
+
+  static Future<ParsedFileLogs> resolveInvalidLogs(ParsedFileLogs logs,
+      {void Function({int? current, String? message, int? total}) onUpdate =
+          dummyOnUpdate}) async {
+    int i = 0;
+    onUpdate(
+        message: "Trying to fix invalid logs",
+        current: i,
+        total: logs.invalidLogs.length);
+    List<int> removeIndexes = [];
+    for (var log in logs.invalidLogs) {
+      onUpdate(
+          message: "Trying to fix invalid logs",
+          current: i + 1,
+          total: logs.invalidLogs.length);
+      // Find code if not present
+      if (log.code == null && log.name != null && log.exchange != null) {
+        var scripsTuple = await getScripsFromName(log.name!);
+        if (scripsTuple.length != 0) {
+          var scrip = Scrip.fromDbTuple(scripsTuple.first);
+          log.bseCode = scrip.bseCode;
+          log.nseCode = scrip.nseCode;
+          log.stockID = scrip.stockID;
+        }
+      }
+
+      if (log.date != null &&
+          log.code != null &&
+          log.exchange != null &&
+          log.bought != null &&
+          log.qty != null &&
+          log.rate != null) {
+        logs.validLogs.add(log);
+        removeIndexes.add(i);
+      }
+
+      i++;
+    }
+
+    for (var index in removeIndexes.reversed) {
+      logs.invalidLogs.removeAt(index);
+    }
+
+    return logs;
+  }
+
+  /// Normalize stock names to prevent string matching problems
+  static String? getNormalizedName(String? name) {
+    if (name == null) return null;
+    name = name.toUpperCase().trim();
+
+    // BSE List of scrips contain these unnecessary characters at the end
+    if (name.endsWith("-\$")) {
+      name = name.substring(0, name.length - 2);
+    }
+
+    // Shorten words to common acronyms
+    name = " $name ";
+    name = name
+        .replaceAll(" CO.LTD. ", " CO. LTD. ")
+        .replaceAll(" ENGG.LTD. ", " ENGG. LTD. ")
+        .replaceAll(" ENGINEERING ", " ENGG. ")
+        .replaceAll(" LIMITED ", " LTD. ")
+        .replaceAll(" LTD ", " LTD. ")
+        .replaceAll(" COMPANY ", " CO. ")
+        .replaceAll(" ENTERPRISES ", " ENT. ")
+        .replaceAll(" ENT ", " ENT. ")
+        .replaceAll(" CORPORATION ", " CORP. ")
+        .replaceAll(" CORP ", " CORP. ");
+
+    return name.trim();
+  }
+
+  static void editScripName(int stockID, String name) async {
+    var tuples = await getScripsFromName(name);
+    if (tuples.length == 0) {
+      await Db().updateConditionally(
+          Db.tblScrips, {Db.colName: name}, "${Db.colRowID} = ?", [stockID]);
+    } else if (tuples.first[Db.colRowID] != stockID) {
+      throw DataException("Scrip name already present!");
+    }
+  }
+
+  static Future<void> deleteScrip(int stockID) async {
+    var portfolioLogs =
+        await Db().getQuery(Db.tblPortfolio, "${Db.colStockID} = ?", [stockID]);
+    if (portfolioLogs.isNotEmpty)
+      throw DataException(
+          "Can't delete security as it exists in your Portfolio");
+
+    var tradeLogs =
+        await Db().getQuery(Db.tblTradeLog, "${Db.colStockID} = ?", [stockID]);
+    if (tradeLogs.isNotEmpty)
+      throw DataException(
+          "Can't delete security as it exists in your TradeLogs");
+
+    var trackedTuple =
+        await Db().getQuery(Db.tblTracked, "${Db.colStockID} = ?", [stockID]);
+    if (trackedTuple.isNotEmpty)
+      throw DataException(
+          "Can't delete security as it exists in your Tracked list");
+
+    await Db().deleteQuery(Db.tblScrips, "${Db.colRowID} = ?", [stockID]);
+  }
 }
diff --git a/lib/helpers/stock_repository.dart b/lib/helpers/stock_repository.dart
index 95563f3..f6fe604 100644
--- a/lib/helpers/stock_repository.dart
+++ b/lib/helpers/stock_repository.dart
@@ -15,8 +15,10 @@ class StockRepository {
 
   static Future<String?> getName(String code, String exchange) async {
     String? name = await QueryAPI.getName(exchange: exchange, code: code);
-    
-    DatabaseActions.setScripName(exchange, name, code);
+
+    if (name != null)
+      DatabaseActions.setScripName(exchange, name, code);
+
     return name?.toUpperCase();
   }
 
diff --git a/lib/models/database/scrip.dart b/lib/models/database/scrip.dart
new file mode 100644
index 0000000..850ad78
--- /dev/null
+++ b/lib/models/database/scrip.dart
@@ -0,0 +1,82 @@
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/services/database/database.dart';
+
+class Scrip {
+  int stockID = -1;
+  late String name;
+  String? bseCode;
+  String? nseCode;
+  List<String> oldBSECodes = [];
+  List<String> oldNSECodes = [];
+
+  Scrip(this.name);
+
+  Scrip.fromDbTuple(Map<String, dynamic> tuple) {
+    stockID = tuple[Db.colRowID];
+    name = tuple[Db.colName];
+    bseCode = tuple[Db.colBSECode];
+    nseCode = tuple[Db.colNSECode];
+    oldBSECodes =
+        tuple[Db.colOldBSECodes]?.split(DatabaseActions.delimiter) ?? [];
+    oldNSECodes =
+        tuple[Db.colOldNSECodes]?.split(DatabaseActions.delimiter) ?? [];
+    oldBSECodes.remove("");
+    oldNSECodes.remove("");
+  }
+
+  Map<String, dynamic> toDbTuple() {
+    return {
+      Db.colName: name,
+      Db.colBSECode: bseCode,
+      Db.colNSECode: nseCode,
+      Db.colOldBSECodes: oldBSECodes.join(DatabaseActions.delimiter),
+      Db.colOldNSECodes: oldNSECodes.join(DatabaseActions.delimiter),
+    };
+  }
+
+  String? code(String exchange) {
+    switch (exchange) {
+      case "BSE":
+        return bseCode;
+      case "NSE":
+        return nseCode;
+    }
+    throw Exception("Wrong exchange passed to code() of ${this.toString()}");
+  }
+
+  List<String> oldCodes(String exchange) {
+    switch (exchange) {
+      case "BSE":
+        return oldBSECodes;
+      case "NSE":
+        return oldNSECodes;
+    }
+    throw Exception(
+        "Wrong exchange passed to oldCodes() of ${this.toString()}");
+  }
+
+  void setCode(String exchange, String? code) {
+    switch (exchange) {
+      case "BSE":
+        bseCode = code;
+        return;
+      case "NSE":
+        nseCode = code;
+        return;
+    }
+    throw Exception("Wrong exchange passed to setCode() of ${this.toString()}");
+  }
+
+  void setOldCodes(String exchange, List<String> oldCodes) {
+    switch (exchange) {
+      case "BSE":
+        oldBSECodes = oldCodes;
+        return;
+      case "NSE":
+        oldNSECodes = oldCodes;
+        return;
+    }
+    throw Exception(
+        "Wrong exchange passed to setOldCodes() of ${this.toString()}");
+  }
+}
diff --git a/lib/models/trade/parsed_file_logs.dart b/lib/models/trade/parsed_file_logs.dart
index 6f80d08..51eec44 100644
--- a/lib/models/trade/parsed_file_logs.dart
+++ b/lib/models/trade/parsed_file_logs.dart
@@ -1,5 +1,6 @@
 class FileLog {
   DateTime? date;
+  int? stockID;
   String? name;
   String? bseCode;
   String? nseCode;
diff --git a/lib/services/database/database.dart b/lib/services/database/database.dart
index 4350169..b3dc5a3 100644
--- a/lib/services/database/database.dart
+++ b/lib/services/database/database.dart
@@ -20,6 +20,8 @@ class Db {
   static String colCode = 'code';
   static String colBSECode = 'bse_code';
   static String colNSECode = 'nse_code';
+  static String colOldBSECodes = 'old_bse_codes';
+  static String colOldNSECodes = 'old_nse_codes';
   static String colExch = 'exchange';
   static String colName = 'name';
   static String colKey = 'key';
@@ -80,7 +82,9 @@ class Db {
         '$colRowID INTEGER PRIMARY KEY, '
         '$colBSECode TEXT UNIQUE, '
         '$colNSECode TEXT UNIQUE, '
-        '$colName TEXT'
+        '$colOldBSECodes TEXT, '
+        '$colOldNSECodes TEXT, '
+        '$colName TEXT UNIQUE'
         ')');
   }
 
@@ -103,7 +107,7 @@ class Db {
     return count;
   }
 
-  Future<List<Map>> getAllTuples(String table) async {
+  Future<List<Map<String, dynamic>>> getAllTuples(String table) async {
     var dbClient = await db;
     List<Map<String, dynamic>> result = await dbClient.query(table);
 
diff --git a/lib/views/settings/data/data.dart b/lib/views/settings/data/data.dart
index bc0a54a..d27f103 100644
--- a/lib/views/settings/data/data.dart
+++ b/lib/views/settings/data/data.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/scrips_list.dart';
 import 'package:intl/intl.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:device_info_plus/device_info_plus.dart';
@@ -93,11 +94,14 @@ class _ImportAreaState extends State<ImportArea> {
                           Icons.folder_open_outlined,
                           color: Theme.of(context).colorScheme.onPrimary,
                         ),
-                  onTap: !_isButtonEnabled ? null : () {
-                    Navigator.push(context, MaterialPageRoute(builder: (context) {
-                      return ImportFileRoute();
-                    }));
-                  },
+                  onTap: !_isButtonEnabled
+                      ? null
+                      : () {
+                          Navigator.push(context,
+                              MaterialPageRoute(builder: (context) {
+                            return ImportFileRoute();
+                          }));
+                        },
                 ),
                 ListTile(
                   title: Text("Track a stock"),
@@ -147,6 +151,29 @@ class _ImportAreaState extends State<ImportArea> {
                       : null,
                 ),
                 Divider(),
+                Text(
+                  "Securities",
+                  style: Theme.of(context)
+                      .textTheme
+                      .bodyLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                ListTile(
+                  title: Text("Show Securities"),
+                  trailing: Icon(
+                    Icons.view_list_outlined,
+                    color: Theme.of(context).colorScheme.onPrimary,
+                  ),
+                  onTap: !_isButtonEnabled
+                      ? null
+                      : () {
+                    Navigator.push(context,
+                        MaterialPageRoute(builder: (context) {
+                          return ShowSecuritiesRoute();
+                        }));
+                  },
+                ),
+                Divider(),
                 Text(
                   "Export",
                   style: Theme.of(context)
@@ -185,56 +212,7 @@ class _ImportAreaState extends State<ImportArea> {
                   ),
                   title: Text("Delete Database"),
                   onTap: () async {
-                    String? result = await showDialog(
-                      context: context,
-                      builder: (_) => AlertDialog(
-                        title: Center(child: Text("WARNING")),
-                        content: Text(
-                          "This will delete the database. Proceed only if you know what you are doing.",
-                          style: Theme.of(context).textTheme.bodyLarge,
-                          textAlign: TextAlign.justify,
-                        ),
-                        actions: [
-                          TextButton(
-                            style: TextButton.styleFrom(
-                                minimumSize: Size(88, 36),
-                                padding: EdgeInsets.symmetric(horizontal: 16),
-                                shape: const RoundedRectangleBorder(
-                                  borderRadius:
-                                      BorderRadius.all(Radius.circular(5)),
-                                )),
-                            onPressed: () {
-                              Navigator.pop(context, "Delete");
-                            },
-                            child: Text("Delete"),
-                          ),
-                          SizedBox(
-                            width: 5,
-                          ),
-                          ElevatedButton(
-                            style: TextButton.styleFrom(
-                              foregroundColor:
-                                  Theme.of(context).colorScheme.background,
-                              minimumSize: Size(88, 36),
-                              padding: EdgeInsets.symmetric(horizontal: 16),
-                              shape: const RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(5)),
-                              ),
-                            ),
-                            onPressed: () {
-                              Navigator.pop(context, "Cancel");
-                            },
-                            child: Text("Cancel"),
-                          ),
-                        ],
-                        actionsPadding:
-                            EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-                      ),
-                    );
-                    if (result == "Delete") {
-                      DatabaseActions.deleteDbThenInit();
-                    }
+                    await deleteDatabase(context);
                   },
                 )
               ],
@@ -292,7 +270,58 @@ class _ImportAreaState extends State<ImportArea> {
     );
   }
 
-
+  Future<void> deleteDatabase(BuildContext context) async {
+    String? result = await showDialog(
+      context: context,
+      builder: (_) => AlertDialog(
+        title: Center(child: Text("WARNING")),
+        content: Text(
+          "This will delete the database. Proceed only if you know what you are doing.",
+          style: Theme.of(context).textTheme.bodyLarge,
+          textAlign: TextAlign.justify,
+        ),
+        actions: [
+          TextButton(
+            style: TextButton.styleFrom(
+                minimumSize: Size(88, 36),
+                padding: EdgeInsets.symmetric(horizontal: 16),
+                shape: const RoundedRectangleBorder(
+                  borderRadius:
+                      BorderRadius.all(Radius.circular(5)),
+                )),
+            onPressed: () {
+              Navigator.pop(context, "Delete");
+            },
+            child: Text("Delete"),
+          ),
+          SizedBox(
+            width: 5,
+          ),
+          ElevatedButton(
+            style: TextButton.styleFrom(
+              foregroundColor:
+                  Theme.of(context).colorScheme.background,
+              minimumSize: Size(88, 36),
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              shape: const RoundedRectangleBorder(
+                borderRadius:
+                    BorderRadius.all(Radius.circular(5)),
+              ),
+            ),
+            onPressed: () {
+              Navigator.pop(context, "Cancel");
+            },
+            child: Text("Cancel"),
+          ),
+        ],
+        actionsPadding:
+            EdgeInsets.symmetric(horizontal: 10, vertical: 10),
+      ),
+    );
+    if (result == "Delete") {
+      DatabaseActions.deleteDbThenInit();
+    }
+  }
 
   void exportLogs() async {
     setState(() {
diff --git a/lib/views/settings/data/import_file/file_log_tile.dart b/lib/views/settings/data/import_file/file_log_tile.dart
index a5d21fc..5b1a0bf 100644
--- a/lib/views/settings/data/import_file/file_log_tile.dart
+++ b/lib/views/settings/data/import_file/file_log_tile.dart
@@ -405,7 +405,7 @@ class _InvalidFileLogTile extends State<FileLogTile>
                                 ),
                               )),
                           enabled:
-                              widget._log.date == null && !widget.isLogValid,
+                              widget._log.qty == null && !widget.isLogValid,
                           cursorColor: Theme.of(context).colorScheme.secondary,
                           style: Theme.of(context).textTheme.bodyLarge,
                           keyboardType: TextInputType.number,
@@ -452,7 +452,7 @@ class _InvalidFileLogTile extends State<FileLogTile>
                                 ),
                               )),
                           enabled:
-                              widget._log.date == null && !widget.isLogValid,
+                              widget._log.rate == null && !widget.isLogValid,
                           cursorColor: Theme.of(context).colorScheme.secondary,
                           style: Theme.of(context).textTheme.bodyLarge,
                           keyboardType:
diff --git a/lib/views/settings/data/import_file/get_missing_codes.dart b/lib/views/settings/data/import_file/get_missing_codes.dart
new file mode 100644
index 0000000..867f937
--- /dev/null
+++ b/lib/views/settings/data/import_file/get_missing_codes.dart
@@ -0,0 +1,217 @@
+import 'package:flutter/material.dart';
+import 'package:folio/models/trade/parsed_file_logs.dart';
+import 'package:folio/views/settings/data/import_file/correct_invalid_logs.dart';
+import 'package:folio/views/settings/data/import_file/name_code_tile.dart';
+
+class GetMissingCodes extends StatefulWidget {
+  final ParsedFileLogs _logs;
+
+  GetMissingCodes(this._logs);
+
+  @override
+  _GetMissingCodesState createState() => _GetMissingCodesState();
+}
+
+class _GetMissingCodesState extends State<GetMissingCodes> {
+  late List<NameCode> correctedCodes;
+  late Map<String, int> nameIndexMap;
+  late Future<List<NameCode>> codesFuture;
+  late List<bool> isCorrected;
+  late bool isLoading;
+
+  @override
+  void initState() {
+    super.initState();
+    isLoading = true;
+    correctedCodes = [];
+    nameIndexMap = {};
+    codesFuture = getStocksWithInvalidCodes(widget._logs.invalidLogs);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Theme.of(context).colorScheme.background,
+        title: Text("Correct Missing Fields"),
+        centerTitle: true,
+        actions: [
+          IconButton(
+            icon: Icon(correctedCodes.length == 0 ? Icons.arrow_forward : Icons.check),
+            onPressed: isLoading ? null : () async {
+              await nextPage(context);
+            },
+          )
+        ],
+      ),
+      body: CustomScrollView(
+        slivers: [
+          FutureBuilder(
+            future: codesFuture,
+            builder: (context, AsyncSnapshot<List<NameCode>> snapshot) {
+              if (snapshot.connectionState != ConnectionState.done) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                      child: LinearProgressIndicator(),
+                    ),
+                  ),
+                );
+              }
+              if (snapshot.hasError) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Text(
+                      "Error Occurred",
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
+                  ),
+                );
+              }
+              if ((snapshot.data?.length ?? 0) == 0) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Text(
+                      "All codes ok. Go to next page!",
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
+                  ),
+                );
+              } else {
+                return SliverList(
+                  delegate: SliverChildBuilderDelegate(
+                    (BuildContext context, int index) {
+                      return NameCodeTile(
+                        index: index,
+                        nameCode: snapshot.data![index],
+                        updateCode: updateCode,
+                      );
+                    },
+                    childCount: (snapshot.data?.length ?? 0),
+                  ),
+                );
+              }
+            },
+          ),
+        ],
+      ),
+      bottomNavigationBar: BottomAppBar(
+        child: Padding(
+          padding: const EdgeInsets.all(10.0),
+          child: Text(
+            "Total: ${correctedCodes.length}",
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Future<void> nextPage(BuildContext context) async {
+    if (isCorrected.contains(false)) {
+      await showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(
+            title: Text("Please provide all required codes"),
+            actions: [
+              TextButton(
+                child: Text("OK"),
+                onPressed: () async => Navigator.pop(context),
+              )
+            ],
+          );
+        },
+      );
+    } else {
+      validateLogs();
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(
+          builder: (context) => CorrectInvalidLogs(widget._logs),
+        ),
+      );
+    }
+  }
+
+  void validateLogs() {
+    List<int> removeIndices = [];
+    int i = 0;
+    for (var log in widget._logs.invalidLogs) {
+      i++;
+      var index = nameIndexMap[log.name];
+
+      if (index == null) continue;
+
+      log.bseCode = correctedCodes[index].bseCode;
+      log.nseCode = correctedCodes[index].nseCode;
+      if (log.exchange != null &&
+          log.bought != null &&
+          log.date != null &&
+          log.code != null) {
+        widget._logs.validLogs.add(log);
+        removeIndices.add(i - 1);
+      }
+    }
+
+    for (var index in removeIndices.reversed)
+      widget._logs.invalidLogs.removeAt(index);
+  }
+
+  void updateCode(int index, String? bseCode, String? nseCode) {
+    correctedCodes[index].bseCode = bseCode;
+    correctedCodes[index].nseCode = nseCode;
+
+    if (correctedCodes[index].isCorrect())
+      isCorrected[index] = true;
+    else
+      isCorrected[index] = false;
+  }
+
+  Future<List<NameCode>> getStocksWithInvalidCodes(
+      List<FileLog> invalidLogs) async {
+    for (var log in invalidLogs) {
+      if (log.code == null && log.name != null) {
+        var index = nameIndexMap[log.name];
+        if (index == null) {
+          nameIndexMap[log.name!] = correctedCodes.length;
+          correctedCodes.add(NameCode(log.name!));
+          correctedCodes.last.isBSECodeRequired = log.isBSECodeRequired;
+          correctedCodes.last.isNSECodeRequired = log.isNSECodeRequired;
+        } else {
+          correctedCodes[index].isBSECodeRequired =
+              correctedCodes[index].isBSECodeRequired || log.isBSECodeRequired;
+          correctedCodes[index].isNSECodeRequired =
+              correctedCodes[index].isNSECodeRequired || log.isNSECodeRequired;
+        }
+      }
+    }
+
+    isCorrected = List<bool>.filled(correctedCodes.length, false);
+
+    setState(() {
+      isLoading = false;
+    });
+    return correctedCodes;
+  }
+}
+
+class NameCode {
+  late String name;
+  String? bseCode;
+  String? nseCode;
+  bool isBSECodeRequired = false, isNSECodeRequired = false;
+
+  NameCode(this.name, {this.bseCode, this.nseCode});
+
+  bool isCorrect() {
+    if (isBSECodeRequired && isNSECodeRequired)
+      return bseCode != null && nseCode != null;
+    if (isBSECodeRequired) return bseCode != null;
+    if (isNSECodeRequired) return nseCode != null;
+    return true;
+  }
+}
diff --git a/lib/views/settings/data/import_file/import_file.dart b/lib/views/settings/data/import_file/import_file.dart
index e9cfe00..56e8570 100644
--- a/lib/views/settings/data/import_file/import_file.dart
+++ b/lib/views/settings/data/import_file/import_file.dart
@@ -3,11 +3,11 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/import_file/get_missing_codes.dart';
 import 'package:folio/views/settings/data/import_file/show_valid_logs.dart';
 
 import '../../../../helpers/database_actions.dart';
 import '../../../../models/trade/parsed_file_logs.dart';
-import 'correct_invalid_logs.dart';
 
 class ImportFileRoute extends StatefulWidget {
   @override
@@ -227,8 +227,9 @@ class _ImportFileRouteState extends State<ImportFileRoute> {
           updateProgress();
           return;
       }
+
+      logs = await DatabaseActions.resolveInvalidLogs(logs, onUpdate: updateProgress);
     } catch (e) {
-      // FIXME: Send error to user
       updateProgress(message: e.toString(), current: 0, total: 1);
       setState(() {
         _isButtonEnabled = true;
@@ -240,7 +241,7 @@ class _ImportFileRouteState extends State<ImportFileRoute> {
       Navigator.pushReplacement(
         context,
         MaterialPageRoute(builder: (context) {
-          return CorrectInvalidLogs(logs);
+          return GetMissingCodes(logs);
         }),
       );
     } else {
diff --git a/lib/views/settings/data/import_file/name_code_tile.dart b/lib/views/settings/data/import_file/name_code_tile.dart
new file mode 100644
index 0000000..f4baaa1
--- /dev/null
+++ b/lib/views/settings/data/import_file/name_code_tile.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/import_file/get_missing_codes.dart';
+
+class NameCodeTile extends StatefulWidget {
+  final int index;
+  final NameCode nameCode;
+  final void Function(int, String?, String?) updateCode;
+
+  NameCodeTile({
+    required this.index,
+    required this.nameCode,
+    required this.updateCode,
+  });
+
+  @override
+  State<StatefulWidget> createState() => _NameCodeTileState();
+}
+
+class _NameCodeTileState extends State<NameCodeTile>
+    with AutomaticKeepAliveClientMixin {
+  late TextEditingController _bseCodeCtl;
+  late TextEditingController _nseCodeCtl;
+  final _formKey = GlobalKey<FormState>();
+  String? bseCode, nseCode;
+
+  @override
+  void initState() {
+    super.initState();
+    bseCode = widget.nameCode.bseCode;
+    nseCode = widget.nameCode.nseCode;
+    _bseCodeCtl = TextEditingController(text: bseCode);
+    _nseCodeCtl = TextEditingController(text: nseCode);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+
+    return Card(
+      color: Theme.of(context).colorScheme.background,
+      elevation: 1,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(10),
+      ),
+      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 3),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+        child: InkWell(
+          borderRadius: BorderRadius.circular(20),
+          child: Form(
+            key: _formKey,
+            autovalidateMode: AutovalidateMode.onUserInteraction,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding:
+                      const EdgeInsets.symmetric(vertical: 10, horizontal: 5),
+                  child: Center(
+                    child: Text(
+                      widget.nameCode.name,
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.titleLarge,
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: "NSE Code",
+                            contentPadding: EdgeInsets.symmetric(
+                              horizontal: 15,
+                            ),
+                            disabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.transparent,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: widget.nameCode.isNSECodeRequired
+                                    ? Colors.red
+                                    : Colors.grey,
+                                width: widget.nameCode.isNSECodeRequired ? 2 : 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: widget.nameCode.isNSECodeRequired
+                                    ? Colors.red
+                                    : Colors.black,
+                                width: 2,
+                              ),
+                            ),
+                          ),
+                          enabled: widget.nameCode.nseCode == null,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.text,
+                          controller: _nseCodeCtl,
+                          validator: (value) {
+                            if (value == null || value.isEmpty) {
+                              if (widget.nameCode.isNSECodeRequired) return 'Required';
+                              return null;
+                            }
+                            nseCode = value;
+                            updateLog();
+                            return null;
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        width: 10,
+                      ),
+                      Expanded(
+                        flex: 1,
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: "BSE Code",
+                            contentPadding: EdgeInsets.symmetric(
+                              horizontal: 15,
+                              vertical: 0,
+                            ),
+                            disabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.transparent,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: widget.nameCode.isBSECodeRequired
+                                    ? Colors.red
+                                    : Colors.grey,
+                                width: widget.nameCode.isBSECodeRequired ? 2 : 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: widget.nameCode.isBSECodeRequired
+                                    ? Colors.red
+                                    : Colors.black,
+                                width: 2,
+                              ),
+                            ),
+                          ),
+                          enabled: widget.nameCode.bseCode == null,
+                          cursorColor: Theme.of(context).colorScheme.secondary,
+                          style: Theme.of(context).textTheme.bodyLarge,
+                          keyboardType: TextInputType.text,
+                          controller: _bseCodeCtl,
+                          validator: (value) {
+                            if ((value == null || value.isEmpty) &&
+                                widget.nameCode.isBSECodeRequired) {
+                              return 'Required';
+                            }
+                            bseCode = value;
+                            updateLog();
+                            return null;
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  void updateLog() {
+    widget.updateCode(widget.index, bseCode, nseCode);
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
diff --git a/lib/views/settings/data/import_scrips_list/import_scrips.dart b/lib/views/settings/data/import_scrips_list/import_scrips.dart
new file mode 100644
index 0000000..74dd974
--- /dev/null
+++ b/lib/views/settings/data/import_scrips_list/import_scrips.dart
@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/views/settings/data/import_scrips_list/parsed_scrips.dart';
+
+class ImportScrips extends StatefulWidget {
+  final ParsedScripsList _scripsList;
+
+  ImportScrips(this._scripsList);
+
+  @override
+  _ImportScripsState createState() => _ImportScripsState();
+}
+
+class _ImportScripsState extends State<ImportScrips> {
+  late bool isImporting;
+  String? _message;
+  int? _current;
+  int? _total;
+  late Future<void> tradesFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    isImporting = true;
+    tradesFuture = addScrips();
+  }
+
+  Future<void> addScrips() async {
+    await DatabaseActions.addScrips(widget._scripsList,
+        onUpdate: updateProgress);
+
+    setState(() {
+      isImporting = false;
+    });
+  }
+
+  void updateProgress({String? message, int? current, int? total}) {
+    setState(() {
+      _message = message;
+      _current = current;
+      _total = total;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async => !isImporting,
+      child: Scaffold(
+        appBar: AppBar(
+          elevation: 0,
+          backgroundColor: Theme.of(context).colorScheme.background,
+          title: isImporting ? Text("Importing") : Text("Imported"),
+          centerTitle: true,
+          automaticallyImplyLeading: !isImporting,
+        ),
+        body: FutureBuilder(
+          future: tradesFuture,
+          builder: (context, AsyncSnapshot snapshot) {
+            if (snapshot.connectionState != ConnectionState.done) {
+              return Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(_message ?? ""),
+                    Text(_total == null ? "" : "${_current ?? "?"}/$_total"),
+                    Padding(
+                      padding:
+                          EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                      child: _message == null
+                          ? null
+                          : LinearProgressIndicator(
+                              value: _total != null &&
+                                      _current != null &&
+                                      _total != 0
+                                  ? _current! / _total!
+                                  : null,
+                            ),
+                    )
+                  ],
+                ),
+              );
+            }
+            isImporting = false;
+            if (snapshot.hasError) {
+              return Center(
+                child: Text(_message ?? "Error occurred during import of logs"),
+              );
+            }
+            return Center(
+              child: Text(
+                "Scrips successfully imported",
+                style: Theme.of(context).textTheme.headlineMedium,
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/settings/data/import_scrips_list/parsed_scrips.dart b/lib/views/settings/data/import_scrips_list/parsed_scrips.dart
new file mode 100644
index 0000000..4bfc194
--- /dev/null
+++ b/lib/views/settings/data/import_scrips_list/parsed_scrips.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+
+class ParsedScrip {
+  String name;
+  String? newCode;
+  List<String> oldCodes;
+
+  ParsedScrip(this.name, this.newCode, [List<String>? oldCodes])
+      : oldCodes = oldCodes ?? [];
+
+  ParsedScrip.from(ParsedScrip scrip)
+      : name = scrip.name, newCode = scrip.newCode, oldCodes = [] {
+    for (var oldCode in scrip.oldCodes){
+      oldCodes.add(oldCode);
+    }
+  }
+}
+
+class ParsedScripsList {
+  final String exchange;
+  List<ParsedScrip> newScrips = [];
+
+  ParsedScripsList(this.exchange);
+
+  Future<void> addNew(ParsedScrip scrip) async {
+    newScrips.add(scrip);
+  }
+}
+
+class ParsedScripTile extends StatelessWidget {
+  final ParsedScrip _scrip;
+
+  ParsedScripTile(this._scrip);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      child: Card(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(10),
+        ),
+        margin: const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
+        elevation: 2,
+        child: Padding(
+          padding: const EdgeInsets.all(15.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Expanded(
+                    flex: 3,
+                    child: Center(child: Text("Name ")),
+                  ),
+                  SizedBox(
+                    width: 10,
+                  ),
+                  Expanded(
+                    flex: 2,
+                    child: Center(child: Text("Code ")),
+                  )
+                ],
+              ),
+              Row(
+                children: [
+                  Expanded(
+                    flex: 3,
+                    child: Center(
+                      child: Text(
+                        _scrip.name,
+                        textAlign: TextAlign.center,
+                        style: Theme.of(context)
+                            .textTheme
+                            .bodyMedium
+                            ?.copyWith(fontWeight: FontWeight.bold),
+                      ),
+                    ),
+                  ),
+                  SizedBox(
+                    width: 10,
+                  ),
+                  Expanded(
+                    flex: 2,
+                    child: Center(
+                      child: _scrip.newCode == null
+                          ? Text("INACTIVE",
+                        style: Theme.of(context)
+                            .textTheme
+                            .bodyMedium
+                            ?.copyWith(fontWeight: FontWeight.w100),)
+                          : CodeChip(
+                              code: _scrip.newCode!,
+                            ),
+                    ),
+                  ),
+                ],
+              ),
+              _scrip.oldCodes.length == 0
+                  ? SizedBox()
+                  : Column(
+                    children: [
+                      Divider(thickness: 2,),
+                      Padding(
+                          padding: const EdgeInsets.only(
+                              left: 8.0, top: 5, right: 8.0, bottom: 2),
+                          child: Row(
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              Text(_scrip.newCode == null ? "Old Codes: " : "Replaces: "),
+                              Expanded(
+                                child: Wrap(
+                                  spacing: 5,
+                                  alignment: WrapAlignment.end,
+                                  children: _scrip.oldCodes
+                                      .map((code) => CodeChip(code: code))
+                                      .toList(),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                    ],
+                  )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class CodeChip extends StatelessWidget {
+  const CodeChip({
+    required String code,
+  }) : _code = code;
+
+  final String _code;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: ShapeDecoration(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(40),
+        ),
+        color: Theme.of(context).primaryColor,
+      ),
+      child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 10, vertical: 2),
+        child: Text(
+          _code,
+          textAlign: TextAlign.center,
+          style: Theme.of(context)
+              .textTheme
+              .bodyMedium
+              ?.copyWith(color: Theme.of(context).cardColor),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/settings/data/import_scrips_list/select_scrips_file.dart b/lib/views/settings/data/import_scrips_list/select_scrips_file.dart
new file mode 100644
index 0000000..4742294
--- /dev/null
+++ b/lib/views/settings/data/import_scrips_list/select_scrips_file.dart
@@ -0,0 +1,321 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/import_scrips_list/parsed_scrips.dart';
+
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/views/settings/data/import_scrips_list/show_scrips.dart';
+
+class ImportScripsFileRoute extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _ImportScripsFileRouteState();
+}
+
+class _ImportScripsFileRouteState extends State<ImportScripsFileRoute> {
+  PlatformFile? pickedFile;
+  bool _isButtonEnabled = true;
+  String? _message;
+  int? _current;
+  int? _total;
+  List<bool> _isExchangeSelected = [true, false];
+  List<String> _exchanges = ["BSE", "NSE"];
+
+  void updateProgress({String? message, int? current, int? total}) {
+    setState(() {
+      _message = message;
+      _current = current;
+      _total = total;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async => _isButtonEnabled,
+      child: Scaffold(
+        appBar: AppBar(
+          title: Center(child: Text("Select File")),
+          backgroundColor: Theme.of(context).colorScheme.background,
+          elevation: 0,
+          actions: [
+            IconButton(
+              icon: Icon(
+                Icons.circle_outlined,
+                color: Theme.of(context).colorScheme.background,
+              ),
+              onPressed: null,
+            ),
+          ],
+        ),
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Center(
+              child: Card(
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.all(
+                    Radius.circular(10),
+                  ),
+                ),
+                color: Theme.of(context).colorScheme.background,
+                margin: EdgeInsets.all(10),
+                elevation: 2,
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 5.0),
+                  child: Column(
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 10),
+                        child: ToggleButtons(
+                          children: <Widget>[
+                            ConstrainedBox(
+                              constraints: BoxConstraints(minWidth: 100),
+                              child: Text(
+                                "BSE",
+                                textAlign: TextAlign.center,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleSmall
+                                    ?.copyWith(
+                                      color: _isExchangeSelected[0]
+                                          ? Theme.of(context)
+                                              .colorScheme
+                                              .background
+                                          : Theme.of(context)
+                                              .colorScheme
+                                              .onPrimary,
+                                    ),
+                              ),
+                            ),
+                            ConstrainedBox(
+                              constraints: BoxConstraints(minWidth: 100),
+                              child: Text(
+                                "NSE",
+                                textAlign: TextAlign.center,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleSmall
+                                    ?.copyWith(
+                                      color: _isExchangeSelected[1]
+                                          ? Theme.of(context)
+                                              .colorScheme
+                                              .background
+                                          : Theme.of(context)
+                                              .colorScheme
+                                              .onPrimary,
+                                    ),
+                              ),
+                            ),
+                          ],
+                          onPressed: (int index) {
+                            setState(() {
+                              for (int buttonIndex = 0;
+                                  buttonIndex < _isExchangeSelected.length;
+                                  buttonIndex++) {
+                                if (buttonIndex == index) {
+                                  _isExchangeSelected[buttonIndex] = true;
+                                } else {
+                                  _isExchangeSelected[buttonIndex] = false;
+                                }
+                              }
+                            });
+                          },
+                          isSelected: _isExchangeSelected,
+                          selectedColor: _isExchangeSelected[0]
+                              ? Colors.lightBlue
+                              : Colors.orange,
+                          fillColor: _isExchangeSelected[0]
+                              ? Colors.lightBlue
+                              : Colors.orange,
+                          borderRadius: BorderRadius.circular(40),
+                        ),
+                      ),
+                      Container(
+                        decoration: ShapeDecoration(
+                          shape: RoundedRectangleBorder(
+                            side: BorderSide(width: 1),
+                            borderRadius: BorderRadius.circular(4),
+                          ),
+                          color: Theme.of(context).colorScheme.background,
+                        ),
+                        child: InkWell(
+                          onTap: _isButtonEnabled ? pickFile : null,
+                          child: Padding(
+                            padding: EdgeInsets.symmetric(horizontal: 10),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Expanded(
+                                  flex: 9,
+                                  child: Text(
+                                    pickedFile?.path == null
+                                        ? ""
+                                        : pickedFile!.path!.substring(
+                                            pickedFile!.path!.lastIndexOf("/") +
+                                                1),
+                                    softWrap: true,
+                                  ),
+                                ),
+                                Expanded(
+                                  child: IconButton(
+                                    icon: Icon(Icons.file_open),
+                                    onPressed:
+                                        _isButtonEnabled ? pickFile : null,
+                                  ),
+                                )
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.all(10.0),
+                        child: ElevatedButton(
+                          onPressed:
+                              _isButtonEnabled && pickedFile?.path != null
+                                  ? importScrips
+                                  : null,
+                          child: Text(
+                            "Import",
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium
+                                ?.copyWith(color: Colors.white),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            Expanded(
+              child: Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(_message ?? ""),
+                    Text(_total == null ? "" : "${_current ?? "?"}/$_total"),
+                    Padding(
+                      padding:
+                          EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                      child: _message == null
+                          ? null
+                          : LinearProgressIndicator(
+                              value: _total != null &&
+                                      _current != null &&
+                                      _total != 0
+                                  ? _current! / _total!
+                                  : null,
+                            ),
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 2,
+              child: SizedBox(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void pickFile() async {
+    setState(() {
+      _isButtonEnabled = false;
+    });
+
+    FilePickerResult? result =
+        await FilePicker.platform.pickFiles(type: FileType.any);
+
+    if (result == null || result.files.first.path == null) {
+      setState(() {
+        pickedFile = null;
+        _isButtonEnabled = true;
+      });
+
+      return;
+    }
+
+    setState(() {
+      pickedFile = result.files.first;
+      _isButtonEnabled = true;
+    });
+
+    return;
+  }
+
+  String getSelectedExchange() {
+    for (int i = 0; i < _isExchangeSelected.length; i++) {
+      if (_isExchangeSelected[i]) {
+        return _exchanges[i];
+      }
+    }
+    return "";
+  }
+
+  void importScrips() async {
+    if (pickedFile == null || pickedFile?.path == null) {
+      return;
+    }
+
+    setState(() {
+      _isButtonEnabled = false;
+    });
+    updateProgress(message: "Importing File");
+
+    ParsedScripsList scripsList;
+    String filePath = pickedFile!.path!;
+
+    try {
+      switch (pickedFile?.extension) {
+        case "csv":
+          String file = "";
+          try {
+            file = File(filePath).readAsStringSync();
+          } catch (e) {
+            log("data.importLogs() => Error in reading file\n " + e.toString());
+            updateProgress(
+                message: "Error in reading file", current: 0, total: 1);
+            setState(() {
+              _isButtonEnabled = true;
+            });
+            return;
+          }
+          updateProgress(message: "Parsing CSV File");
+          scripsList = await DatabaseActions.parseCSVScripsFile(
+              getSelectedExchange(), file,
+              onUpdate: updateProgress);
+          break;
+        default:
+          setState(() {
+            _isButtonEnabled = true;
+          });
+          updateProgress();
+          return;
+      }
+    } catch (e) {
+      updateProgress(message: e.toString(), current: 0, total: 1);
+      setState(() {
+        _isButtonEnabled = true;
+      });
+      return;
+    }
+
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(builder: (context) {
+        return ShowScrips(scripsList);
+      }),
+    );
+
+    setState(() {
+      _isButtonEnabled = true;
+    });
+  }
+}
diff --git a/lib/views/settings/data/import_scrips_list/show_scrips.dart b/lib/views/settings/data/import_scrips_list/show_scrips.dart
new file mode 100644
index 0000000..4b83be1
--- /dev/null
+++ b/lib/views/settings/data/import_scrips_list/show_scrips.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:folio/views/settings/data/import_scrips_list/import_scrips.dart';
+import 'package:folio/views/settings/data/import_scrips_list/parsed_scrips.dart';
+
+class ShowScrips extends StatelessWidget {
+  final ParsedScripsList _scripsList;
+
+  ShowScrips(this._scripsList);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Theme.of(context).colorScheme.background,
+        title: Text("Importing Scrips for ${_scripsList.exchange}"),
+        centerTitle: true,
+        actions: [
+          IconButton(
+            icon: Icon(Icons.check),
+            onPressed: () async {
+              Navigator.pushReplacement(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => ImportScrips(_scripsList)));
+            },
+          )
+        ],
+      ),
+      body: CustomScrollView(
+        slivers: [
+          SliverList.builder(
+            itemBuilder: (context, index) {
+              return ParsedScripTile(_scripsList.newScrips[index]);
+            },
+            itemCount: _scripsList.newScrips.length,
+          ),
+        ],
+      ),
+      bottomNavigationBar: BottomAppBar(
+        child: Padding(
+          padding: const EdgeInsets.all(10.0),
+          child: Text(
+            "Total: ${_scripsList.newScrips.length}",
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/views/settings/data/scrip_tile.dart b/lib/views/settings/data/scrip_tile.dart
new file mode 100644
index 0000000..12ab8ac
--- /dev/null
+++ b/lib/views/settings/data/scrip_tile.dart
@@ -0,0 +1,290 @@
+import 'package:flutter/material.dart';
+
+import 'package:folio/models/database/scrip.dart';
+
+import 'package:folio/helpers/database_actions.dart';
+
+import 'import_scrips_list/parsed_scrips.dart';
+
+class ScripTile extends StatefulWidget {
+  final Scrip _scrip;
+  final Function _refreshParent;
+
+  ScripTile(Scrip scrip, {required void Function() refreshParent}) : this._scrip = scrip, this._refreshParent = refreshParent;
+
+  @override
+  State<ScripTile> createState() => _ScripTileState();
+}
+
+class _ScripTileState extends State<ScripTile> {
+  bool _showOptions = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      child: Card(
+        shape: RoundedRectangleBorder(
+          side: BorderSide(width: 1),
+          borderRadius: BorderRadius.circular(10),
+        ),
+        borderOnForeground: false,
+        margin: const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
+        elevation: 2,
+        child: Column(
+          children: [
+            Card(
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(10),
+              ),
+              margin: const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
+              elevation: 4,
+              child: InkWell(
+                onTap: () {
+                  setState(() {
+                    _showOptions = !_showOptions;
+                  });
+                },
+                child: Padding(
+                  padding: const EdgeInsets.all(15.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Center(
+                        child: Text(
+                          widget._scrip.name,
+                          textAlign: TextAlign.center,
+                          style: Theme.of(context)
+                              .textTheme
+                              .bodyMedium
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.only(top: 10.0, bottom: 5.0),
+                        child: Row(
+                          children: [
+                            Expanded(
+                              flex: 1,
+                              child: Center(
+                                child: Text(
+                                  "BSE",
+                                  textAlign: TextAlign.center,
+                                ),
+                              ),
+                            ),
+                            Expanded(
+                              flex: 1,
+                              child: Center(
+                                child: Text(
+                                  "NSE",
+                                  textAlign: TextAlign.center,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Row(
+                        children: [
+                          CodeWidget(code: widget._scrip.bseCode),
+                          SizedBox(width: 10),
+                          CodeWidget(code: widget._scrip.nseCode),
+                        ],
+                      ),
+                      widget._scrip.oldBSECodes.length == 0 &&
+                          widget._scrip.oldNSECodes.length == 0
+                          ? SizedBox()
+                          : Column(
+                        children: [
+                          Divider(
+                            thickness: 1,
+                          ),
+                          Center(child: Text("OLD CODES")),
+                          Row(
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              Expanded(
+                                flex: 1,
+                                child: Column(
+                                  children: [
+                                    Wrap(
+                                      spacing: 5,
+                                      children: widget._scrip.oldBSECodes
+                                          .map((code) =>
+                                          CodeChip(code: code))
+                                          .toList(),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              SizedBox(width: 10),
+                              Expanded(
+                                flex: 1,
+                                child: Column(
+                                  children: [
+                                    Wrap(
+                                      spacing: 5,
+                                      children: widget._scrip.oldNSECodes
+                                          .map((code) =>
+                                          CodeChip(code: code))
+                                          .toList(),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        ],
+                      )
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            _showOptions
+                ? Row(
+              children: [
+                Expanded(
+                  child: Center(
+                    child: IconButton(
+                      icon: Icon(
+                        Icons.edit,
+                        color: Colors.blueAccent,
+                      ),
+                      onPressed: editScrip,
+                    ),
+                  ),
+                ),
+                Expanded(
+                  child: Center(
+                    child: IconButton(
+                      icon: Icon(
+                        Icons.delete,
+                        color: Colors.redAccent,
+                      ),
+                      onPressed: deleteScrip,
+                    ),
+                  ),
+                )
+              ],
+            )
+                : SizedBox()
+          ],
+        ),
+      ),
+    );
+  }
+
+  editScrip() {}
+
+  deleteScrip() async {
+    String? result = await showDialog(
+      context: context,
+      builder: (_) => AlertDialog(
+        title: Center(child: Text("WARNING")),
+        content: Text(
+          "Are you sure you want to delete ${widget._scrip.name}?",
+          style: Theme.of(context).textTheme.titleMedium,
+          textAlign: TextAlign.justify,
+        ),
+        actions: [
+          TextButton(
+            style: TextButton.styleFrom(
+              minimumSize: Size(88, 36),
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(5)),
+              ),
+            ),
+            onPressed: () {
+              Navigator.pop(context, "Delete");
+            },
+            child: Text("Delete"),
+          ),
+          SizedBox(
+            width: 5,
+          ),
+          ElevatedButton(
+            style: TextButton.styleFrom(
+              foregroundColor: Theme.of(context).colorScheme.background,
+              minimumSize: Size(88, 36),
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(5)),
+              ),
+            ),
+            onPressed: () {
+              Navigator.pop(context, "Cancel");
+            },
+            child: Text("Cancel"),
+          ),
+        ],
+        actionsPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
+      ),
+    );
+    if (result == "Delete") {
+      try {
+        await DatabaseActions.deleteScrip(widget._scrip.stockID);
+        widget._refreshParent();
+      } catch (e) {
+        await showDialog(
+          context: context,
+          builder: (_) => AlertDialog(
+            title: Center(child: Text("Error")),
+            content: Text(
+              "Error Occurred: ${e.toString()}",
+              style: Theme.of(context).textTheme.titleMedium,
+              textAlign: TextAlign.justify,
+            ),
+            actions: [
+              ElevatedButton(
+                style: TextButton.styleFrom(
+                  foregroundColor: Theme.of(context).colorScheme.background,
+                  minimumSize: Size(88, 36),
+                  padding: EdgeInsets.symmetric(horizontal: 16),
+                  shape: const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
+                  ),
+                ),
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+                child: Text("Ok"),
+              ),
+            ],
+            actionsPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
+          ),
+        );
+      }
+    }
+  }
+}
+
+class CodeWidget extends StatelessWidget {
+  const CodeWidget({
+    Key? key,
+    required String? code,
+  })  : _code = code,
+        super(key: key);
+
+  final String? _code;
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      flex: 1,
+      child: Center(
+        child: _code == null
+            ? Text(
+          "INACTIVE",
+          style: Theme.of(context)
+              .textTheme
+              .bodyMedium
+              ?.copyWith(fontWeight: FontWeight.w100),
+        )
+            : CodeChip(code: _code!),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/views/settings/data/scrips_list.dart b/lib/views/settings/data/scrips_list.dart
new file mode 100644
index 0000000..8e6512b
--- /dev/null
+++ b/lib/views/settings/data/scrips_list.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import 'package:folio/helpers/database_actions.dart';
+import 'package:folio/models/database/scrip.dart';
+import 'package:folio/views/settings/data/import_scrips_list/select_scrips_file.dart';
+import 'package:folio/views/settings/data/scrip_tile.dart';
+
+class ShowSecuritiesRoute extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _ShowSecuritiesRouteState();
+}
+
+class _ShowSecuritiesRouteState extends State<ShowSecuritiesRoute> {
+  late Future<List<Scrip>?> _scripsListFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _scripsListFuture = DatabaseActions.getAllScrips();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Theme.of(context).colorScheme.background,
+        title: Text("Securities"),
+        actions: [
+          IconButton(
+            icon: Icon(Icons.plus_one),
+            onPressed: () async {
+              // Navigator.pushReplacement(
+              //     context,
+              //     MaterialPageRoute(
+              //         builder: (context) => ImportScrip),);
+            },
+          ),
+          IconButton(
+            icon: Icon(Icons.note_add_outlined),
+            onPressed: () async {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => ImportScripsFileRoute()),
+              );
+            },
+          )
+        ],
+      ),
+      body: CustomScrollView(
+        slivers: [
+          FutureBuilder(
+            future: _scripsListFuture,
+            builder: (context, AsyncSnapshot snapshot) {
+              if (snapshot.connectionState != ConnectionState.done) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                      child: LinearProgressIndicator(),
+                    ),
+                  ),
+                );
+              }
+              if (snapshot.hasError) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Text(
+                      "Error Occurred",
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
+                  ),
+                );
+              }
+              if ((snapshot.data?.length ?? 0) == 0) {
+                return SliverFillRemaining(
+                  child: Center(
+                    child: Text(
+                      "No Securities Found",
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
+                  ),
+                );
+              }
+              return SliverList(
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    return ScripTile(snapshot.data?[index], refreshParent: refreshList);
+                  },
+                  childCount: (snapshot.data?.length ?? 0),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  void refreshList() {
+    setState(() {
+      _scripsListFuture = DatabaseActions.getAllScrips();
+    });
+  }
+}
\ No newline at end of file
diff --git a/lib/views/settings/drive/drive.dart b/lib/views/settings/drive/drive.dart
index 098fbcd..dbca816 100644
--- a/lib/views/settings/drive/drive.dart
+++ b/lib/views/settings/drive/drive.dart
@@ -284,6 +284,7 @@ class _DriveAreaState extends State<DriveArea> {
           .get(id, downloadOptions: drive.DownloadOptions.fullMedia);
 
       final path = await DatabaseActions.getDbPath();
+      // TODO: Check if this works
       final saveFile = File(path);
       await saveFile.writeAsString(file.toString(), flush: true);
     }