fix(deps): update dependency flutter_iconpicker to <3.4.6

fixes #41

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.1.1
+- Removed deprecated code
+- Updated dependencies
+- Fix wrong graph type upon opening graph view
+- Fix text fields behaving unexpectedly
+- Fix `Add new wallet` showing in the app bar when returning from another view
+- Fix new wallet name being rewritten to the default placeholder
+
 # 1.1.0
 - Fix indicators for Pie Chart
 - Fix entries not showing up immediately after creation

lib/util/color_schemes.g.dart

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

lib/util/graphs.dart

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

lib/util/utils.dart

@@ -12,7 +12,7 @@ void showAbout(BuildContext context) {
     context: context,
     applicationLegalese: AppLocalizations.of(context).license,
     applicationName: "Prašule",
-    applicationVersion: "1.1.0",
+    applicationVersion: "1.1.1",
     applicationIcon: const CircleAvatar(
       backgroundImage: AssetImage("assets/icon/full_ico.png"),
     ),

lib/views/create_entry.dart

@@ -16,7 +16,8 @@ class CreateSingleEntryView extends StatefulWidget {
   /// Used when user wants to add new entry
   const CreateSingleEntryView({
     required this.w,
-    required this.locale, super.key,
+    required this.locale,
+    super.key,
     this.editEntry,
   });
 
@@ -28,6 +29,7 @@ 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
@@ -36,6 +38,9 @@ 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();
@@ -50,6 +55,9 @@ 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(() {});
   }
 
@@ -71,10 +79,7 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).name,
-                    controller: TextEditingController(text: newEntry.data.name),
-                    onChanged: (v) {
-                      newEntry.data.name = v;
-                    },
+                    controller: _entryNameController,
                   ),
                 ),
                 const SizedBox(
@@ -84,9 +89,7 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).amount,
-                    controller: TextEditingController(
-                      text: newEntry.data.amount.toString(),
-                    ),
+                    controller: _entryBalanceController,
                     keyboardType:
                         const TextInputType.numberWithOptions(decimal: true),
                     inputFormatters: [
@@ -94,9 +97,6 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                         RegExp(r'\d+[\.,]{0,1}\d{0,}'),
                       ),
                     ],
-                    onChanged: (v) {
-                      newEntry.data.amount = double.parse(v);
-                    },
                   ),
                 ),
                 const SizedBox(
@@ -183,12 +183,7 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                   child: PlatformField(
                     keyboardType: TextInputType.multiline,
                     maxLines: null,
-                    controller: TextEditingController(
-                      text: newEntry.data.description,
-                    ),
-                    onChanged: (v) {
-                      newEntry.data.description = v;
-                    },
+                    controller: _entryDescriptionController,
                   ),
                 ),
                 const SizedBox(
@@ -197,10 +192,10 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                 Text(AppLocalizations.of(context).date),
                 PlatformButton(
                   style: ButtonStyle(
-                    backgroundColor: MaterialStateProperty.all(
+                    backgroundColor: WidgetStateProperty.all(
                       Theme.of(context).colorScheme.primary,
                     ),
-                    foregroundColor: MaterialStateProperty.all(
+                    foregroundColor: WidgetStateProperty.all(
                       Theme.of(context).colorScheme.onPrimary,
                     ),
                   ),
@@ -224,13 +219,18 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                 PlatformButton(
                   text: AppLocalizations.of(context).save,
                   onPressed: () {
-                    if (newEntry.data.name.isEmpty) {
+                    if (_entryNameController.text.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,7 +7,6 @@ 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';
@@ -39,6 +38,10 @@ 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();
@@ -55,6 +58,10 @@ 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(() {});
   }
 
@@ -76,10 +83,7 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).name,
-                    controller: TextEditingController(text: newEntry.data.name),
-                    onChanged: (v) {
-                      newEntry.data.name = v;
-                    },
+                    controller: _entryNameController,
                   ),
                 ),
                 const SizedBox(
@@ -89,9 +93,7 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   width: MediaQuery.of(context).size.width * 0.8,
                   child: PlatformField(
                     labelText: AppLocalizations.of(context).amount,
-                    controller: TextEditingController(
-                      text: newEntry.data.amount.toString(),
-                    ),
+                    controller: _entryBalanceController,
                     keyboardType:
                         const TextInputType.numberWithOptions(decimal: true),
                     inputFormatters: [
@@ -99,10 +101,6 @@ 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(
@@ -189,12 +187,7 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                   child: PlatformField(
                     keyboardType: TextInputType.multiline,
                     maxLines: null,
-                    controller: TextEditingController(
-                      text: newEntry.data.description,
-                    ),
-                    onChanged: (v) {
-                      newEntry.data.description = v;
-                    },
+                    controller: _entryDescriptionController,
                   ),
                 ),
                 const SizedBox(
@@ -215,9 +208,7 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                       SizedBox(
                         width: 50,
                         child: PlatformField(
-                          controller: TextEditingController(
-                            text: newEntry.repeatAfter.toString(),
-                          ),
+                          controller: _repeatAfterController,
                           inputFormatters: [
                             FilteringTextInputFormatter.digitsOnly,
                             FilteringTextInputFormatter.deny(
@@ -313,13 +304,20 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                 PlatformButton(
                   text: AppLocalizations.of(context).save,
                   onPressed: () {
-                    if (newEntry.data.name.isEmpty) {
+                    if (_entryNameController.text.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,7 +97,8 @@ class _GraphViewState extends State<GraphView> {
     super.initState();
     loadWallet();
     SharedPreferences.getInstance().then((s) {
-      chartType = s.getInt("monthlygraph") ?? 2;
+      chartType = s.getInt("yearlygraph") ?? 1;
+      logger.d(chartType);
       setState(() {});
     });
   }
@@ -197,7 +198,9 @@ class _GraphViewState extends State<GraphView> {
           title: DropdownButton<int>(
             value: (selectedWallet == null)
                 ? -1
-                : wallets.indexOf(selectedWallet!),
+                : wallets.indexOf(
+                    wallets.where((w) => w.name == selectedWallet!.name).first,
+                  ),
             items: [
               ...wallets.map(
                 (e) => DropdownMenuItem(
@@ -333,7 +336,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.background,
+                                    : Theme.of(context).colorScheme.surface,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.all(8),
@@ -427,7 +430,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.background,
+                                    : Theme.of(context).colorScheme.surface,
                               ),
                               width: MediaQuery.of(context).size.width * 0.95,
                               height: MediaQuery.of(context).size.height * 0.4,
@@ -557,7 +560,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.background,
+                                    : Theme.of(context).colorScheme.surface,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.all(8),
@@ -650,7 +653,7 @@ class _GraphViewState extends State<GraphView> {
                                     ? Theme.of(context)
                                         .colorScheme
                                         .secondaryContainer
-                                    : Theme.of(context).colorScheme.background,
+                                    : Theme.of(context).colorScheme.surface,
                               ),
                               width: MediaQuery.of(context).size.width * 0.95,
                               height: MediaQuery.of(context).size.height * 0.4,

lib/views/home.dart

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

lib/views/recurring_view.dart

@@ -63,8 +63,11 @@ class _RecurringEntriesViewState extends State<RecurringEntriesView> {
       drawer: makeDrawer(context, 3),
       appBar: AppBar(
         title: DropdownButton<int>(
-          value:
-              (selectedWallet == null) ? -1 : wallets.indexOf(selectedWallet!),
+          value: (selectedWallet == null)
+              ? -1
+              : 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.background,
+          settingsListBackground: Theme.of(context).colorScheme.surface,
           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.background,
+          settingsListBackground: Theme.of(context).colorScheme.surface,
           titleTextColor: Theme.of(context).colorScheme.primary,
         ),
         sections: [

pubspec.lock

@@ -277,10 +277,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d"
+      sha256: "2b7c1f5d867da9a054661641c8f499c55c47c39acccb97b3bc673f5fa9a39e74"
       url: "https://pub.dev"
     source: hosted
-    version: "0.66.2"
+    version: "0.67.0"
   flex_color_picker:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: prasule
 description: Open-source private expense tracker
 
-version: 1.1.0+7
+version: 1.1.1+8
 
 environment:
   sdk: '>=3.1.0-262.2.beta <4.0.0'
@@ -18,12 +18,12 @@ dependencies:
   currency_picker: ^2.0.16
   dio: ^5.3.0
   dynamic_color: ^1.6.6
-  fl_chart: ^0.66.0
+  fl_chart: ^0.67.0
   flex_color_picker: ^3.3.0
   flutter:
     sdk: flutter
   flutter_file_dialog: ^3.0.2
-  flutter_iconpicker: <3.4.5
+  flutter_iconpicker: <3.4.6
   flutter_localizations:
     sdk: flutter
   flutter_slidable: ^3.0.0