lib/util/color_schemes.g.dart

@@ -20,9 +20,11 @@ const lightColorScheme = ColorScheme(
   errorContainer: Color(0xFFFFDAD6),
   onError: Color(0xFFFFFFFF),
   onErrorContainer: Color(0xFF410002),
+  background: Color(0xFFFBFDF8),
+  onBackground: Color(0xFF191C19),
   surface: Color(0xFFFBFDF8),
   onSurface: Color(0xFF191C19),
-  surfaceContainerHighest: Color(0xFFDCE5DB),
+  surfaceVariant: Color(0xFFDCE5DB),
   onSurfaceVariant: Color(0xFF414942),
   outline: Color(0xFF717971),
   onInverseSurface: Color(0xFFF0F1EC),
@@ -52,9 +54,11 @@ const darkColorScheme = ColorScheme(
   errorContainer: Color(0xFF93000A),
   onError: Color(0xFF690005),
   onErrorContainer: Color(0xFFFFDAD6),
+  background: Color(0xFF191C19),
+  onBackground: Color(0xFFE1E3DE),
   surface: Color(0xFF191C19),
   onSurface: Color(0xFFE1E3DE),
-  surfaceContainerHighest: Color(0xFF414942),
+  surfaceVariant: Color(0xFF414942),
   onSurfaceVariant: Color(0xFFC0C9BF),
   outline: Color(0xFF8B938A),
   onInverseSurface: Color(0xFF191C19),

lib/util/graphs.dart

@@ -71,8 +71,7 @@ class ExpensesLineChart extends StatelessWidget {
       LineChartData(
         lineTouchData: LineTouchData(
           touchTooltipData: LineTouchTooltipData(
-            getTooltipColor: (group) =>
+            tooltipBgColor: Theme.of(context).colorScheme.secondaryContainer,
-                Theme.of(context).colorScheme.secondaryContainer,
             getTooltipItems: (spots) => List<LineTooltipItem>.generate(
               spots.length,
               (index) => LineTooltipItem(

lib/views/create_entry.dart

@@ -16,8 +16,7 @@ class CreateSingleEntryView extends StatefulWidget {
   /// Used when user wants to add new entry
   const CreateSingleEntryView({
     required this.w,
-    required this.locale,
+    required this.locale, super.key,
-    super.key,
     this.editEntry,
   });
 
@@ -29,7 +28,6 @@ class CreateSingleEntryView extends StatefulWidget {
   /// Is null unless we are editing an existing entry
   final WalletSingleEntry? editEntry;
 
-  /// Locale as set on user's system
   final String locale;
 
   @override
@@ -38,9 +36,6 @@ class CreateSingleEntryView extends StatefulWidget {
 
 class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
   late WalletSingleEntry newEntry;
-  final _entryNameController = TextEditingController();
-  final _entryBalanceController = TextEditingController();
-  final _entryDescriptionController = TextEditingController();
   @override
   void initState() {
     super.initState();
@@ -55,9 +50,6 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
         category: widget.w.categories.first,
       );
     }
-    _entryNameController.text = newEntry.data.name;
-    _entryBalanceController.text = newEntry.data.amount.toString();
-    _entryDescriptionController.text = newEntry.data.description;
     setState(() {});
   }
 
@@ -79,7 +71,10 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).name,
-                    controller: _entryNameController,
+                    controller: TextEditingController(text: newEntry.data.name),
+                    onChanged: (v) {
+                      newEntry.data.name = v;
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -89,7 +84,9 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).amount,
-                    controller: _entryBalanceController,
+                    controller: TextEditingController(
+                      text: newEntry.data.amount.toString(),
+                    ),
                     keyboardType:
                         const TextInputType.numberWithOptions(decimal: true),
                     inputFormatters: [
@@ -97,6 +94,9 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                         RegExp(r'\d+[\.,]{0,1}\d{0,}'),
                       ),
                     ],
+                    onChanged: (v) {
+                      newEntry.data.amount = double.parse(v);
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -183,7 +183,12 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   child: PlatformField(
                     keyboardType: TextInputType.multiline,
                     maxLines: null,
-                    controller: _entryDescriptionController,
+                    controller: TextEditingController(
+                      text: newEntry.data.description,
+                    ),
+                    onChanged: (v) {
+                      newEntry.data.description = v;
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -192,10 +197,10 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                 Text(AppLocalizations.of(context).date),
                 PlatformButton(
                   style: ButtonStyle(
-                    backgroundColor: WidgetStateProperty.all(
+                    backgroundColor: MaterialStateProperty.all(
                       Theme.of(context).colorScheme.primary,
                     ),
-                    foregroundColor: WidgetStateProperty.all(
+                    foregroundColor: MaterialStateProperty.all(
                       Theme.of(context).colorScheme.onPrimary,
                     ),
                   ),
@@ -219,18 +224,13 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                 PlatformButton(
                   text: AppLocalizations.of(context).save,
                   onPressed: () {
-                    if (_entryNameController.text.isEmpty) {
+                    if (newEntry.data.name.isEmpty) {
                       showMessage(
                         AppLocalizations.of(context).errorEmptyName,
                         context,
                       );
                       return;
                     }
-                    newEntry.data.name = _entryNameController.text;
-                    newEntry.data.amount =
-                        double.parse(_entryBalanceController.text);
-                    newEntry.data.description =
-                        _entryDescriptionController.text;
                     if (widget.editEntry != null) {
                       Navigator.of(context).pop(newEntry);
                       return;

lib/views/create_recur_entry.dart

@@ -7,6 +7,7 @@ import 'package:prasule/api/entry_data.dart';
 import 'package:prasule/api/recurring_entry.dart';
 import 'package:prasule/api/wallet.dart';
 import 'package:prasule/api/wallet_manager.dart';
+import 'package:prasule/main.dart';
 import 'package:prasule/pw/platformbutton.dart';
 import 'package:prasule/pw/platformfield.dart';
 import 'package:prasule/util/show_message.dart';
@@ -38,10 +39,6 @@ class CreateRecurringEntryView extends StatefulWidget {
 
 class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
   late RecurringWalletEntry newEntry;
-  final _entryNameController = TextEditingController();
-  final _entryBalanceController = TextEditingController();
-  final _entryDescriptionController = TextEditingController();
-  final _repeatAfterController = TextEditingController();
   @override
   void initState() {
     super.initState();
@@ -58,10 +55,6 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
         recurType: RecurType.month,
       );
     }
-    _entryNameController.text = newEntry.data.name;
-    _entryBalanceController.text = newEntry.data.amount.toString();
-    _entryDescriptionController.text = newEntry.data.description;
-    _repeatAfterController.text = newEntry.repeatAfter.toString();
     setState(() {});
   }
 
@@ -83,7 +76,10 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).name,
-                    controller: _entryNameController,
+                    controller: TextEditingController(text: newEntry.data.name),
+                    onChanged: (v) {
+                      newEntry.data.name = v;
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -93,7 +89,9 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).amount,
-                    controller: _entryBalanceController,
+                    controller: TextEditingController(
+                      text: newEntry.data.amount.toString(),
+                    ),
                     keyboardType:
                         const TextInputType.numberWithOptions(decimal: true),
                     inputFormatters: [
@@ -101,6 +99,10 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                         RegExp(r'\d+[\.,]{0,1}\d{0,}'),
                       ),
                     ],
+                    onChanged: (v) {
+                      logger.i(v);
+                      newEntry.data.amount = double.parse(v);
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -187,7 +189,12 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   child: PlatformField(
                     keyboardType: TextInputType.multiline,
                     maxLines: null,
-                    controller: _entryDescriptionController,
+                    controller: TextEditingController(
+                      text: newEntry.data.description,
+                    ),
+                    onChanged: (v) {
+                      newEntry.data.description = v;
+                    },
                   ),
                 ),
                 const SizedBox(
@@ -208,7 +215,9 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                       SizedBox(
                         width: 50,
                         child: PlatformField(
-                          controller: _repeatAfterController,
+                          controller: TextEditingController(
+                            text: newEntry.repeatAfter.toString(),
+                          ),
                           inputFormatters: [
                             FilteringTextInputFormatter.digitsOnly,
                             FilteringTextInputFormatter.deny(
@@ -304,20 +313,13 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                 PlatformButton(
                   text: AppLocalizations.of(context).save,
                   onPressed: () {
-                    if (_entryNameController.text.isEmpty) {
+                    if (newEntry.data.name.isEmpty) {
                       showMessage(
                         AppLocalizations.of(context).errorEmptyName,
                         context,
                       );
                       return;
                     }
-                    newEntry.data.name = _entryNameController.text;
-                    newEntry.data.amount =
-                        double.parse(_entryBalanceController.text);
-                    newEntry.repeatAfter =
-                        int.parse(_repeatAfterController.text);
-                    newEntry.data.description =
-                        _entryDescriptionController.text;
                     if (widget.editEntry != null) {
                       Navigator.of(context).pop(newEntry);
                       return;

lib/views/graph_view.dart

@@ -97,8 +97,7 @@ class _GraphViewState extends State<GraphView> {
     super.initState();
     loadWallet();
     SharedPreferences.getInstance().then((s) {
-      chartType = s.getInt("yearlygraph") ?? 1;
+      chartType = s.getInt("monthlygraph") ?? 2;
-      logger.d(chartType);
       setState(() {});
     });
   }
@@ -198,9 +197,7 @@ class _GraphViewState extends State<GraphView> {
           title: DropdownButton<int>(
             value: (selectedWallet == null)
                 ? -1
-                : wallets.indexOf(
+                : wallets.indexOf(selectedWallet!),
-                    wallets.where((w) => w.name == selectedWallet!.name).first,
-                  ),
             items: [
               ...wallets.map(
                 (e) => DropdownMenuItem(
@@ -336,7 +333,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.surface,
+                                    : Theme.of(context).colorScheme.background,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.all(8),
@@ -430,7 +427,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.surface,
+                                    : Theme.of(context).colorScheme.background,
                               ),
                               width: MediaQuery.of(context).size.width * 0.95,
                               height: MediaQuery.of(context).size.height * 0.4,
@@ -560,7 +557,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.surface,
+                                    : Theme.of(context).colorScheme.background,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.all(8),
@@ -653,7 +650,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.surface,
+                                    : Theme.of(context).colorScheme.background,
                               ),
                               width: MediaQuery.of(context).size.width * 0.95,
                               height: MediaQuery.of(context).size.height * 0.4,

lib/views/home.dart

@@ -166,11 +166,7 @@ class _HomeViewState extends State<HomeView> {
             secondChild: DropdownButton<int>(
               value: (selectedWallet == null)
                   ? -1
-                  : wallets.indexOf(
+                  : wallets.indexOf(selectedWallet!),
-                      wallets
-                          .where((w) => w.name == selectedWallet!.name)
-                          .first,
-                    ),
               items: [
                 ...wallets.map(
                   (e) => DropdownMenuItem(
@@ -359,7 +355,7 @@ class _HomeViewState extends State<HomeView> {
                                           style: TextStyle(
                                             color: Theme.of(context)
                                                 .colorScheme
-                                                .onSurface,
+                                                .onBackground,
                                           ),
                                         ),
                                         TextSpan(
@@ -409,7 +405,7 @@ class _HomeViewState extends State<HomeView> {
                                           style: TextStyle(
                                             color: Theme.of(context)
                                                 .colorScheme
-                                                .onSurface,
+                                                .onBackground,
                                           ),
                                         ),
                                       ],
@@ -594,7 +590,7 @@ class _HomeViewState extends State<HomeView> {
                                                 style: TextStyle(
                                                   color: Theme.of(context)
                                                       .colorScheme
-                                                      .surface
+                                                      .background
                                                       .calculateTextColor(),
                                                 ),
                                               ),

lib/views/recurring_view.dart

@@ -63,11 +63,8 @@ class _RecurringEntriesViewState extends State<RecurringEntriesView> {
       drawer: makeDrawer(context, 3),
       appBar: AppBar(
         title: DropdownButton<int>(
-          value: (selectedWallet == null)
+          value:
-              ? -1
+              (selectedWallet == null) ? -1 : wallets.indexOf(selectedWallet!),
-              : wallets.indexOf(
-                  wallets.where((w) => w.name == selectedWallet!.name).first,
-                ),
           items: [
             ...wallets.map(
               (e) => DropdownMenuItem(

lib/views/settings/graph_type.dart

@@ -37,7 +37,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
       body: SettingsList(
         applicationType: ApplicationType.both,
         darkTheme: SettingsThemeData(
-          settingsListBackground: Theme.of(context).colorScheme.surface,
+          settingsListBackground: Theme.of(context).colorScheme.background,
           titleTextColor: Theme.of(context).colorScheme.primary,
         ),
         sections: [

lib/views/settings/settings.dart

@@ -42,7 +42,7 @@ class _SettingsViewState extends State<SettingsView> {
       body: SettingsList(
         applicationType: ApplicationType.both,
         darkTheme: SettingsThemeData(
-          settingsListBackground: Theme.of(context).colorScheme.surface,
+          settingsListBackground: Theme.of(context).colorScheme.background,
           titleTextColor: Theme.of(context).colorScheme.primary,
         ),
         sections: [

pubspec.lock

@@ -512,10 +512,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.18.1"
   introduction_screen:
     dependency: "direct main"
     description:
@@ -1101,10 +1101,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.0.0"
   watcher:
     dependency: transitive
     description: