CHANGELOG.md

@@ -9,8 +9,6 @@
 - Make search case-insensitive
 - Added titles above graphs
 - Some extra optimization for iOS
-- Fix starting balance not saving
-- Fix overlay disabling tappig on edit/delete buttons on home view
 # 1.0.0-alpha+5
 - Add tests
 - Add searching through entries to homepage

lib/l10n/app_cs.arb

@@ -113,6 +113,5 @@
     "search":"Prohledat",
     "expensesPerYear":"Měsíční výdaje v roce {year}",
     "expensesPerMonth":"Denní výdaje během měsíce {monthYear}",
-    "expensesPerCategory":"Total expenses per category",
+    "expensesPerCategory":"Total expenses per category"
-    "date":"Datum"
 }

lib/l10n/app_en.arb

@@ -247,6 +247,5 @@
             }
         }
     },
-    "expensesPerCategory":"Total expenses per category",
+    "expensesPerCategory":"Total expenses per category"
-    "date":"Date"
 }

lib/views/create_entry.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:intl/intl.dart';
 import 'package:prasule/api/category.dart';
 import 'package:prasule/api/entry_data.dart';
 import 'package:prasule/api/wallet.dart';
@@ -14,12 +13,7 @@ import 'package:prasule/util/show_message.dart';
 /// Used when user wants to add new entry
 class CreateSingleEntryView extends StatefulWidget {
   /// Used when user wants to add new entry
-  const CreateSingleEntryView({
+  const CreateSingleEntryView({required this.w, super.key, this.editEntry});
-    required this.w,
-    super.key,
-    this.editEntry,
-    required this.locale,
-  });
 
   /// The wallet, where the entry will be saved to
   final Wallet w;
@@ -29,8 +23,6 @@ class CreateSingleEntryView extends StatefulWidget {
   /// Is null unless we are editing an existing entry
   final WalletSingleEntry? editEntry;
 
-  final String locale;
-
   @override
   State createState() => _CreateSingleEntryViewState();
 }
@@ -192,33 +184,6 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                     },
                   ),
                 ),
-                const SizedBox(
-                  height: 20,
-                ),
-                Text(AppLocalizations.of(context).date),
-                PlatformButton(
-                  style: ButtonStyle(
-                    backgroundColor: MaterialStateProperty.all(
-                      Theme.of(context).colorScheme.primary,
-                    ),
-                    foregroundColor: MaterialStateProperty.all(
-                      Theme.of(context).colorScheme.onPrimary,
-                    ),
-                  ),
-                  text: DateFormat.yMMMMd(widget.locale).format(newEntry.date),
-                  onPressed: () async {
-                    final date = await showDatePicker(
-                      initialDate: newEntry.date,
-                      context: context,
-                      firstDate: DateTime.now()
-                          .subtract(const Duration(days: 20 * 365)),
-                      lastDate: DateTime.now().add(const Duration(days: 365)),
-                    );
-                    if (date == null) return;
-                    newEntry.date = date;
-                    setState(() {});
-                  },
-                ),
                 const SizedBox(
                   height: 15,
                 ),

lib/views/home.dart

@@ -117,10 +117,7 @@ class _HomeViewState extends State<HomeView> {
               onTap: () async {
                 final sw = await Navigator.of(context).push<Wallet>(
                   MaterialPageRoute(
-                    builder: (c) => CreateSingleEntryView(
+                    builder: (c) => CreateSingleEntryView(w: selectedWallet!),
-                      w: selectedWallet!,
-                      locale: locale,
-                    ),
                   ),
                 );
                 if (sw != null) {
@@ -422,7 +419,6 @@ class _HomeViewState extends State<HomeView> {
                                                 MaterialPageRoute(
                                                   builder: (c) =>
                                                       CreateSingleEntryView(
-                                                    locale: locale,
                                                     w: selectedWallet!,
                                                     editEntry: element,
                                                   ),
@@ -581,25 +577,24 @@ class _HomeViewState extends State<HomeView> {
                               ],
                             ),
                           ),
-                          if (_searchActive)
+                          OverlayEntry(
-                            OverlayEntry(
+                            builder: (context) => SizedBox(
-                              builder: (context) => SizedBox(
+                              width: MediaQuery.of(context).size.width,
-                                width: MediaQuery.of(context).size.width,
+                              height: MediaQuery.of(context).size.height,
-                                height: MediaQuery.of(context).size.height,
+                              child: GestureDetector(
-                                child: GestureDetector(
+                                onTap: () {
-                                  onTap: () {
+                                  if (!_searchActive) return;
-                                    if (!_searchActive) return;
+                                  if (!searchFocus.hasFocus) {
-                                    if (!searchFocus.hasFocus) {
+                                    _searchActive = false;
-                                      _searchActive = false;
+                                    _filter = "";
-                                      _filter = "";
+                                    setState(() {});
-                                      setState(() {});
+                                    return;
-                                      return;
+                                  }
-                                    }
+                                  searchFocus.unfocus();
-                                    searchFocus.unfocus();
+                                },
-                                  },
-                                ),
                               ),
                             ),
+                          ),
                         ],
                       ),
           ),
@@ -715,7 +710,6 @@ class _HomeViewState extends State<HomeView> {
                     await Navigator.of(context).push<WalletSingleEntry>(
                   platformRoute<WalletSingleEntry>(
                     (c) => CreateSingleEntryView(
-                      locale: locale,
                       w: selectedWallet!,
                       editEntry: WalletSingleEntry(
                         data: EntryData(

lib/views/setup.dart

@@ -51,7 +51,7 @@ class _SetupViewState extends State<SetupView> {
   );
   List<WalletCategory> categories = <WalletCategory>[];
   String name = "";
-  final _balanceController = TextEditingController(text: "0.0");
+  double balance = 0;
 
   @override
   void didChangeDependencies() {
@@ -155,10 +155,10 @@ class _SetupViewState extends State<SetupView> {
                 return;
               }
               final wallet = Wallet(
-                  name: name,
+                name: name,
-                  currency: _selectedCurrency,
+                currency: _selectedCurrency,
-                  categories: categories,
+                categories: categories,
-                  starterBalance: double.parse(_balanceController.text));
+              );
               await WalletManager.saveWallet(wallet);
 
               if (widget.newWallet && context.mounted) {
@@ -267,7 +267,7 @@ class _SetupViewState extends State<SetupView> {
                         keyboardType: const TextInputType.numberWithOptions(
                           decimal: true,
                         ),
-                        controller: _balanceController,
+                        controller: TextEditingController(text: "0.0"),
                         inputFormatters: [
                           FilteringTextInputFormatter.allow(
                             RegExp(r'\d+[\.,]{0,1}\d{0,}'),
@@ -277,6 +277,11 @@ class _SetupViewState extends State<SetupView> {
                           padding: const EdgeInsets.only(right: 4),
                           child: Text(_selectedCurrency.symbol),
                         ),
+                        onChanged: (t) {
+                          final b = double.tryParse(t);
+                          if (b == null) return;
+                          balance = b;
+                        },
                       ),
                     ),
                   ],