fix: set correct graph type when opening graph view

fixes #41
fix: don't display 'Add new wallet' when returning from a screen
2024-04-22 16:59:08 +02:00 · 2024-04-22 16:36:20 +02:00 · 2024-04-22 16:25:59 +02:00 · 2024-04-22 16:18:48 +02:00 · 2024-04-22 15:53:38 +02:00
10 changed files with 72 additions and 67 deletions
--- a/lib/util/color_schemes.g.dart
+++ b/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),
--- a/lib/util/graphs.dart
+++ b/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(
--- a/lib/views/create_entry.dart
+++ b/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;
--- a/lib/views/create_recur_entry.dart
+++ b/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;
--- a/lib/views/graph_view.dart
+++ b/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,
--- a/lib/views/home.dart
+++ b/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(),
                                                ),
                                              ),
--- a/lib/views/recurring_view.dart
+++ b/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(
--- a/lib/views/settings/graph_type.dart
+++ b/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: [
--- a/lib/views/settings/settings.dart
+++ b/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: [
--- a/pubspec.lock
+++ b/pubspec.lock
@ -512,10 +512,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
      url: "https://pub.dev"
    source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
  introduction_screen:
    dependency: "direct main"
    description:
@ -1101,10 +1101,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
      url: "https://pub.dev"
    source: hosted
-    version: "14.0.0"
+    version: "14.2.1"
  watcher:
    dependency: transitive
    description:
Author	SHA1	Message	Date
Matyáš Caras	8ff63c9492	fix: set correct graph type when opening graph view fixes #41	2024-04-22 16:59:08 +02:00
Matyáš Caras	1faa5e2f78	fix: don't display 'Add new wallet' when returning from a screen	2024-04-22 16:36:20 +02:00
Matyáš Caras	5cbb9a12dc	fix: remove deprecated code	2024-04-22 16:25:59 +02:00
Matyáš Caras	58dd06f39f	fix: use controllers for textfields Fixes #39	2024-04-22 16:18:48 +02:00
Matyáš Caras	d832080a6d	fix: implement breaking change from fl_chart	2024-04-22 15:53:38 +02:00