lib/providers/user_provider.dart

@@ -5,7 +5,7 @@ class UserProvider with ChangeNotifier {
   User _user = User.noUser;
   int _selectedTabIndex = 0;
 
-  List<String> _categories = ["Workplace", "Equipment", "Home", "Other"];
+  List<String> _categories = ["All", "Workplace", "Equipment", "Home", "Other"];
 
   List<String> get categories => _categories;
 

lib/screens/history/history.dart

@@ -57,24 +57,19 @@ class _HistoryScreenState extends State<HistoryScreen> {
                     children: [
                       DropdownButton<String>(
                         isExpanded: true,
-                        items: [
-                          DropdownMenuItem<String>(
-                              value: null,
-                              child: Text('All'),
-                          ),
-                          ...Provider.of<UserProvider>(context, listen: true)
-                              .categories
-                              .map((String value) {
-                            return DropdownMenuItem<String>(
-                              value: value,
-                              child: Text(value),
-                            );
-                          })
-                        ],
+                        items: Provider.of<UserProvider>(context, listen: true)
+                            .categories
+                            .map((String value) {
+                          return DropdownMenuItem<String>(
+                            value: value,
+                            child: Text(value),
+                          );
+                        }).toList(),
                         hint: new Text("Select Category"),
                         value: Provider.of<TransactionProvider>(context,
                                     listen: true)
-                                .selectedCategory,
+                                .selectedCategory ??
+                            'All',
                         onChanged: (String? newValue) {
                           Provider.of<TransactionProvider>(context,
                                   listen: false)

lib/screens/home/home.dart

@@ -247,7 +247,7 @@ class _HomeScreenState extends State<HomeScreen> {
                           SizedBox(
                             height: 20.0,
                           ),
-                          Container(height: 200, width: 200, child: ExpensesChart())
+                          ExpensesChart()
                         ],
                       )
                     ],

lib/screens/home/local_widgets/expenses_chart.dart

@@ -12,14 +12,6 @@ class ExpensesChart extends StatefulWidget {
 class ExpensesChartState extends State {
   int? touchedIndex;
 
-  bool disposed = false;
-
-  @override
-  void dispose() {
-    disposed = true;
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     List<String> categories =
@@ -32,7 +24,6 @@ class ExpensesChartState extends State {
                 pieTouchData:
                     PieTouchData(touchCallback: (event, pieTouchResponse) {
                   if (pieTouchResponse == null) return;
-                  if (disposed) return;
 
                   setState(() {
                     if (event is FlLongPressEnd || event is FlPanEndEvent) {

lib/screens/login.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
 import 'package:robo_advisory/utils/constants.dart';
 import 'package:robo_advisory/config/Routes.dart';
-import 'package:robo_advisory/widgets/buttons.dart';
 
 class LoginScreen extends StatelessWidget {
   bool rememberSwitch = false;
@@ -22,7 +21,9 @@ class LoginScreen extends StatelessWidget {
             Expanded(
               child: Container(
                 child: Center(
-                  child: ElevatedButton(
+                  child: FlatButton(
+                    splashColor: Colors.transparent,
+                    highlightColor: Colors.transparent,
                     onPressed: () {
                       Navigator.pushNamed(context, Routes.register);
                     },
@@ -109,7 +110,9 @@ class LoginScreen extends StatelessWidget {
                               // activeTrackColor: Colors.white,
                               // activeColor: Colors.white,
                             ),
-                            TextButton(
+                            FlatButton(
+                              splashColor: Colors.transparent,
+                              highlightColor: Colors.transparent,
                               onPressed: () {
                                 Navigator.pushNamed(
                                     context, Routes.splashScreen);
@@ -123,12 +126,17 @@ class LoginScreen extends StatelessWidget {
                         ),
                         SizedBox(
                           width: double.infinity,
-                          child: ElevatedButton(
-                            style: mainButtonStyle(),
+                          child: RaisedButton(
+                            color: Color(0xFF495057),
+                            textColor: Colors.white,
                             onPressed: () {
                               Navigator.pushNamed(context, Routes.dashboard);
                             },
                             child: Text('Log In'),
+                            padding: EdgeInsets.all(18.0),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(18.0),
+                            ),
                           ),
                         )
                       ],

lib/screens/register/register_step_1.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
 import 'package:robo_advisory/utils/constants.dart';
 import 'package:robo_advisory/screens/register/register_step_2.dart';
-import 'package:robo_advisory/widgets/buttons.dart';
 
 class RegisterFirstScreen extends StatelessWidget {
   @override
@@ -90,8 +89,9 @@ class RegisterFirstScreen extends StatelessWidget {
                   ),
                   SizedBox(
                     width: double.infinity,
-                    child: ElevatedButton(
-                      style: mainButtonStyle(),
+                    child: RaisedButton(
+                      color: Color(0xFF495057),
+                      textColor: Colors.white,
                       onPressed: () {
                         Navigator.push(
                           context,
@@ -103,6 +103,10 @@ class RegisterFirstScreen extends StatelessWidget {
                         );
                       },
                       child: Text('Continue'),
+                      padding: EdgeInsets.all(18.0),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(18.0),
+                      ),
                     ),
                   )
                 ],

lib/screens/register/register_step_2.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:robo_advisory/utils/constants.dart';
 import 'package:robo_advisory/config/Routes.dart';
-import 'package:robo_advisory/widgets/buttons.dart';
 
 class RegisterSecondScreen extends StatelessWidget {
   @override
@@ -57,13 +56,18 @@ class RegisterSecondScreen extends StatelessWidget {
                   ),
                   SizedBox(
                     width: double.infinity,
-                    child: ElevatedButton(
-                      style: mainButtonStyle(),
+                    child: RaisedButton(
+                      color: Color(0xFF495057),
+                      textColor: Colors.white,
                       onPressed: () {
                         Navigator.pushNamed(context, Routes.dashboard);
                         print('Next Step');
                       },
                       child: Text('Register'),
+                      padding: EdgeInsets.all(18.0),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(18.0),
+                      ),
                     ),
                   )
                 ],

lib/widgets/buttons.dart

@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-
-mainButtonStyle() {
-  return ElevatedButton.styleFrom(
-      backgroundColor: Color(0xFF495057),
-      foregroundColor: Colors.white,
-      padding: EdgeInsets.all(18.0),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(18.0),
-      ));
-}

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.0"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,21 +21,28 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   crypto:
     dependency: transitive
     description:
@@ -63,7 +70,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -110,7 +117,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "1.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -148,28 +155,28 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
@@ -183,7 +190,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
@@ -253,7 +260,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "4.4.0"
   pin_code_fields:
     dependency: "direct main"
     description:
@@ -356,7 +363,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -377,21 +384,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -405,7 +412,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
@@ -426,7 +433,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.0"
+    version: "5.3.1"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=2.11.0-0.1.pre"
+  dart: ">=2.16.2 <3.0.0"
+  flutter: ">=2.10.0"

pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   shared_preferences: ^2.0.15
   flutter_spinkit: ^5.1.0
   pin_code_fields: ^7.4.0
-  flutter_svg: ^1.1.5
+  flutter_svg: ^1.0.3
   google_fonts: ^3.0.1
   fl_chart: ^0.55.1
   flutter_custom_dialog: ^1.3.0