Compare commits
No commits in common. "d889611e19290f045ab3b938feace9666322c9f6" and "8e319759f26709107b7c2d82e3d95e475c27c2e7" have entirely different histories.
d889611e19
...
8e319759f2
15 changed files with 51 additions and 558 deletions
2
.flutter
2
.flutter
|
@ -1 +1 @@
|
|||
Subproject commit 0b591f2c82e9f59276ed68c7d4cbd63196f7c865
|
||||
Subproject commit 476aa717cd342d11e16439b71f4f4c9209c50712
|
|
@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
|
|||
|
||||
android {
|
||||
namespace "cafe.caras.prasule"
|
||||
compileSdkVersion 34
|
||||
compileSdkVersion 33
|
||||
ndkVersion flutter.ndkVersion
|
||||
|
||||
compileOptions {
|
||||
|
|
|
@ -12,7 +12,7 @@ class Wallet {
|
|||
final String name;
|
||||
final List<WalletCategory> categories;
|
||||
final List<WalletSingleEntry> entries;
|
||||
double starterBalance;
|
||||
double availableAmount;
|
||||
@JsonKey(fromJson: _currencyFromJson)
|
||||
final Currency currency;
|
||||
|
||||
|
@ -21,7 +21,7 @@ class Wallet {
|
|||
required this.currency,
|
||||
this.categories = const [],
|
||||
this.entries = const [],
|
||||
this.starterBalance = 0});
|
||||
this.availableAmount = 0});
|
||||
|
||||
/// Connect the generated [_$WalletEntry] function to the `fromJson`
|
||||
/// factory.
|
||||
|
@ -38,23 +38,4 @@ class Wallet {
|
|||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
static final Wallet empty = Wallet(
|
||||
name: "Empty",
|
||||
currency: Currency.from(
|
||||
json: {
|
||||
"code": "USD",
|
||||
"name": "United States Dollar",
|
||||
"symbol": "\$",
|
||||
"flag": "USD",
|
||||
"decimal_digits": 2,
|
||||
"number": 840,
|
||||
"name_plural": "US dollars",
|
||||
"thousands_separator": ",",
|
||||
"decimal_separator": ".",
|
||||
"space_between_amount_and_symbol": false,
|
||||
"symbol_on_left": true,
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
@ -18,13 +18,13 @@ Wallet _$WalletFromJson(Map<String, dynamic> json) => Wallet(
|
|||
(e) => WalletSingleEntry.fromJson(e as Map<String, dynamic>))
|
||||
.toList() ??
|
||||
const [],
|
||||
starterBalance: (json['starterBalance'] as num?)?.toDouble() ?? 0,
|
||||
availableAmount: (json['availableAmount'] as num?)?.toDouble() ?? 0,
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$WalletToJson(Wallet instance) => <String, dynamic>{
|
||||
'name': instance.name,
|
||||
'categories': instance.categories,
|
||||
'entries': instance.entries,
|
||||
'starterBalance': instance.starterBalance,
|
||||
'availableAmount': instance.availableAmount,
|
||||
'currency': instance.currency,
|
||||
};
|
||||
|
|
|
@ -13,11 +13,7 @@ class WalletManager {
|
|||
}
|
||||
var wallets = <Wallet>[];
|
||||
for (var w in path.listSync().map((e) => e.path.split("/").last).toList()) {
|
||||
try {
|
||||
wallets.add(await loadWallet(w));
|
||||
} catch (e) {
|
||||
// TODO: do something with unreadable wallets
|
||||
}
|
||||
}
|
||||
return wallets;
|
||||
}
|
||||
|
@ -42,7 +38,7 @@ class WalletManager {
|
|||
if (!path.existsSync()) {
|
||||
path.createSync();
|
||||
}
|
||||
// if (!wallet.existsSync()) return false;
|
||||
if (wallet.existsSync()) return false;
|
||||
wallet.writeAsStringSync(jsonEncode(w.toJson()));
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"welcome": "Vítejte!",
|
||||
"welcomeAboutPrasule": "Prašule je správce výdajů navržený pro lidi, kteří nechtějí vyplňovat každý malý detail.",
|
||||
"welcomeInstruction": "Na této obrazovce si nastavíte svoji 'peněženku', ve které budou zaznamenány vaše výdaje uspořádané do kategorií, které si nastavíte hned potom.",
|
||||
"setupWalletNameCurrency": "Nastavte si název a výchozí měnu peněženky",
|
||||
"setupWalletNameCurrency": "Nastavte si název a měnu peněženky",
|
||||
"setupNamePlaceholder": "Moje super peněženka",
|
||||
"setupCurrency": "Měna: {currency}",
|
||||
"setupCategoriesHeading": "Vytvořit kategorie",
|
||||
|
@ -55,12 +55,6 @@
|
|||
"license":"©️ 2023 Matyáš Caras\nVydáno pod licencí GNU AGPL license verze 3",
|
||||
"description":"Popis",
|
||||
"newWallet":"Přidat novou peněženku",
|
||||
"walletExists":"Peněženka s tímto názvem již existuje!",
|
||||
"setupStartingBalance":"Počáteční zůstatek",
|
||||
"graphs":"Grafy",
|
||||
"createTestData":"Vytvořit vzorková data",
|
||||
"spendingStats":"Statistiky utrácení",
|
||||
"yearly":"Roční",
|
||||
"monthly":"Měsíční"
|
||||
"walletExists":"Peněženka s tímto názvem již existuje!"
|
||||
|
||||
}
|
|
@ -10,7 +10,7 @@
|
|||
"welcome": "Welcome!",
|
||||
"welcomeAboutPrasule": "Prašule is an expense tracker tool designed for people, who don't want to spend too much time filling in all the little details.",
|
||||
"welcomeInstruction": "On this screen you will set up your 'wallet', in which you will track your expenses categorized under categories, which you can later set in the settings menu.",
|
||||
"setupWalletNameCurrency": "Set your wallet's name and default currency",
|
||||
"setupWalletNameCurrency": "Set your wallet's name and currency",
|
||||
"setupNamePlaceholder": "Your awesome name here...",
|
||||
"setupCurrency": "Currency: {currency}",
|
||||
"@setupCurrency": {
|
||||
|
@ -91,11 +91,5 @@
|
|||
"license":"©️ 2023 Matyáš Caras\nReleased under the GNU AGPL license version 3",
|
||||
"description":"Description",
|
||||
"newWallet":"Add new wallet",
|
||||
"walletExists":"A wallet with this name already exists!",
|
||||
"setupStartingBalance":"Starting balance",
|
||||
"graphs":"Graphs",
|
||||
"createTestData":"Create test data",
|
||||
"spendingStats":"Spending statistics",
|
||||
"yearly":"Yearly",
|
||||
"monthly":"Monthly"
|
||||
"walletExists":"A wallet with this name already exists!"
|
||||
}
|
|
@ -24,7 +24,6 @@ class MyApp extends StatelessWidget {
|
|||
return (Platform.isAndroid)
|
||||
? DynamicColorBuilder(
|
||||
builder: (light, dark) => MaterialApp(
|
||||
debugShowCheckedModeBanner: false,
|
||||
localizationsDelegates: const [
|
||||
AppLocalizations.delegate,
|
||||
...GlobalMaterialLocalizations.delegates,
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import 'package:prasule/pw/platformroute.dart';
|
||||
import 'package:prasule/views/graph_view.dart';
|
||||
import 'package:prasule/views/home.dart';
|
||||
|
||||
/// Makes the drawer because I won't enter the same code in every view
|
||||
Drawer makeDrawer(BuildContext context, int page) => Drawer(
|
||||
child: ListView(
|
||||
children: [
|
||||
const DrawerHeader(child: Text("Prašule")),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.home),
|
||||
title: Text(
|
||||
AppLocalizations.of(context)!.home,
|
||||
),
|
||||
selected: page == 1,
|
||||
onTap: () {
|
||||
if (page == 1) {
|
||||
Navigator.of(context).pop();
|
||||
return;
|
||||
}
|
||||
Navigator.of(context)
|
||||
.pushReplacement(platformRoute((p0) => const HomeView()));
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.bar_chart),
|
||||
title: Text(
|
||||
AppLocalizations.of(context)!.graphs,
|
||||
),
|
||||
selected: page == 2,
|
||||
onTap: () {
|
||||
if (page == 2) {
|
||||
Navigator.of(context).pop();
|
||||
return;
|
||||
}
|
||||
Navigator.of(context)
|
||||
.pushReplacement(platformRoute((p0) => const GraphView()));
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
|
@ -1,74 +0,0 @@
|
|||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
/// Monthly/Yearly expenses [LineChart]
|
||||
class ExpensesChart extends StatelessWidget {
|
||||
const ExpensesChart(
|
||||
{super.key,
|
||||
required this.date,
|
||||
required this.locale,
|
||||
this.data = const [],
|
||||
this.yearly = false});
|
||||
final bool yearly;
|
||||
final DateTime date;
|
||||
final String locale;
|
||||
final List<double> data;
|
||||
List<double> get dataSorted {
|
||||
var list = List<double>.from(data);
|
||||
list.sort((a, b) => a.compareTo(b));
|
||||
return list;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return LineChart(
|
||||
LineChartData(
|
||||
maxX: (yearly) ? 12 : DateTime(date.year, date.month, 0).day.toDouble(),
|
||||
maxY: dataSorted.last,
|
||||
minX: 1,
|
||||
minY: 0,
|
||||
backgroundColor: Theme.of(context).colorScheme.background,
|
||||
lineBarsData: [
|
||||
LineChartBarData(
|
||||
isCurved: true,
|
||||
barWidth: 8,
|
||||
isStrokeCapRound: true,
|
||||
dotData: const FlDotData(show: false),
|
||||
belowBarData: BarAreaData(show: false),
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
spots: List.generate(
|
||||
(yearly) ? 12 : DateTime(date.year, date.month, 0).day,
|
||||
(index) => FlSpot(index.toDouble() + 1, data[index]),
|
||||
),
|
||||
),
|
||||
], // actual data
|
||||
titlesData: FlTitlesData(
|
||||
rightTitles: const AxisTitles(
|
||||
sideTitles: SideTitles(showTitles: false),
|
||||
),
|
||||
topTitles: const AxisTitles(
|
||||
sideTitles: SideTitles(showTitles: false),
|
||||
),
|
||||
bottomTitles: AxisTitles(
|
||||
sideTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTitlesWidget: (value, meta) {
|
||||
String text;
|
||||
if (yearly) {
|
||||
text = DateFormat.MMM(locale).format(
|
||||
DateTime(date.year, value.toInt(), 1),
|
||||
);
|
||||
} else {
|
||||
text = value.toInt().toString();
|
||||
}
|
||||
return SideTitleWidget(
|
||||
axisSide: meta.axisSide, child: Text(text));
|
||||
},
|
||||
),
|
||||
),
|
||||
), // axis descriptions
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
|
@ -1,228 +0,0 @@
|
|||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:prasule/api/wallet.dart';
|
||||
import 'package:prasule/api/walletmanager.dart';
|
||||
import 'package:prasule/main.dart';
|
||||
import 'package:prasule/pw/platformbutton.dart';
|
||||
import 'package:prasule/pw/platformroute.dart';
|
||||
import 'package:prasule/util/drawer.dart';
|
||||
import 'package:prasule/util/graphs.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import 'package:prasule/views/settings/settings.dart';
|
||||
import 'package:prasule/views/setup.dart';
|
||||
|
||||
class GraphView extends StatefulWidget {
|
||||
const GraphView({super.key});
|
||||
|
||||
@override
|
||||
State<GraphView> createState() => _GraphViewState();
|
||||
}
|
||||
|
||||
class _GraphViewState extends State<GraphView> {
|
||||
var _selectedDate = DateTime.now();
|
||||
Wallet? selectedWallet;
|
||||
List<Wallet> wallets = [];
|
||||
String? locale;
|
||||
var yearlyBtnSet = {"monthly"};
|
||||
bool get yearly => yearlyBtnSet.contains("yearly");
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
locale ??= Localizations.localeOf(context).languageCode;
|
||||
}
|
||||
|
||||
List<double> generateChartData() {
|
||||
if (selectedWallet == null) return [0];
|
||||
var data = List<double>.filled(
|
||||
(yearly)
|
||||
? 12
|
||||
: DateTime(_selectedDate.year, _selectedDate.month, 0).day,
|
||||
0.0);
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
var entriesForRange = selectedWallet!.entries.where((element) => (!yearly)
|
||||
? element.date.month == _selectedDate.month &&
|
||||
element.date.year == _selectedDate.year &&
|
||||
element.date.day == i + 1
|
||||
: element.date.month == i + 1 &&
|
||||
element.date.year == _selectedDate.year);
|
||||
var sum = 0.0;
|
||||
for (var e in entriesForRange) {
|
||||
sum += e.data.amount;
|
||||
}
|
||||
data[i] = sum;
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
void loadWallet() async {
|
||||
wallets = await WalletManager.listWallets();
|
||||
if (wallets.isEmpty && mounted) {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (c) => const SetupView()));
|
||||
return;
|
||||
}
|
||||
selectedWallet = wallets.first;
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
loadWallet();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: DropdownButton<int>(
|
||||
value:
|
||||
(selectedWallet == null) ? -1 : wallets.indexOf(selectedWallet!),
|
||||
items: [
|
||||
...wallets.map(
|
||||
(e) => DropdownMenuItem(
|
||||
value: wallets.indexOf(
|
||||
e,
|
||||
),
|
||||
child: Text(e.name),
|
||||
),
|
||||
),
|
||||
DropdownMenuItem(
|
||||
value: -1,
|
||||
child: Text(AppLocalizations.of(context)!.newWallet),
|
||||
)
|
||||
],
|
||||
onChanged: (v) async {
|
||||
if (v == null || v == -1) {
|
||||
await Navigator.of(context).push(
|
||||
platformRoute(
|
||||
(c) => const SetupView(
|
||||
newWallet: true,
|
||||
),
|
||||
),
|
||||
);
|
||||
wallets = await WalletManager.listWallets();
|
||||
logger.i(wallets.length);
|
||||
selectedWallet = wallets.last;
|
||||
setState(() {});
|
||||
return;
|
||||
}
|
||||
selectedWallet = wallets[v];
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
actions: [
|
||||
PopupMenuButton(
|
||||
itemBuilder: (context) => [
|
||||
AppLocalizations.of(context)!.settings,
|
||||
AppLocalizations.of(context)!.about
|
||||
].map((e) => PopupMenuItem(value: e, child: Text(e))).toList(),
|
||||
onSelected: (value) {
|
||||
if (value == AppLocalizations.of(context)!.settings) {
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(
|
||||
builder: (context) => const SettingsView(),
|
||||
),
|
||||
);
|
||||
} else if (value == AppLocalizations.of(context)!.about) {
|
||||
showAboutDialog(
|
||||
context: context,
|
||||
applicationLegalese: AppLocalizations.of(context)!.license,
|
||||
applicationName: "Prašule");
|
||||
}
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
drawer: makeDrawer(context, 2),
|
||||
body: SingleChildScrollView(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: MediaQuery.of(context).size.width * 0.9,
|
||||
height: MediaQuery.of(context).size.height,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SegmentedButton<String>(
|
||||
segments: [
|
||||
ButtonSegment<String>(
|
||||
value: "spending",
|
||||
label: Text(AppLocalizations.of(context)!.spendingStats),
|
||||
)
|
||||
],
|
||||
selected: const {"spending"},
|
||||
// TODO: onSelectionChanged
|
||||
),
|
||||
const SizedBox(
|
||||
height: 5,
|
||||
),
|
||||
SegmentedButton<String>(
|
||||
segments: [
|
||||
ButtonSegment<String>(
|
||||
value: "yearly",
|
||||
label: Text(AppLocalizations.of(context)!.yearly),
|
||||
),
|
||||
ButtonSegment<String>(
|
||||
value: "monthly",
|
||||
label: Text(AppLocalizations.of(context)!.monthly),
|
||||
),
|
||||
],
|
||||
selected: yearlyBtnSet,
|
||||
onSelectionChanged: (selection) {
|
||||
yearlyBtnSet = selection;
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
PlatformButton(
|
||||
text: (yearly)
|
||||
? DateFormat.y(locale).format(_selectedDate)
|
||||
: DateFormat.yMMMM(locale).format(_selectedDate),
|
||||
onPressed: () async {
|
||||
var firstDate = (selectedWallet!.entries
|
||||
..sort((a, b) => a.date.compareTo(b.date)))
|
||||
.first
|
||||
.date;
|
||||
var lastDate = (selectedWallet!.entries
|
||||
..sort((a, b) => b.date.compareTo(a.date)))
|
||||
.first
|
||||
.date;
|
||||
var newDate = await showDatePicker(
|
||||
context: context,
|
||||
initialDate: _selectedDate,
|
||||
firstDate: firstDate,
|
||||
lastDate: lastDate,
|
||||
initialEntryMode: (yearly)
|
||||
? DatePickerEntryMode.input
|
||||
: DatePickerEntryMode.calendar,
|
||||
initialDatePickerMode: (yearly)
|
||||
? DatePickerMode.year
|
||||
: DatePickerMode.day);
|
||||
if (newDate == null) return;
|
||||
_selectedDate = newDate;
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
const SizedBox(
|
||||
height: 5,
|
||||
),
|
||||
SizedBox(
|
||||
width: MediaQuery.of(context).size.width * 0.9,
|
||||
height: 300,
|
||||
child: ExpensesChart(
|
||||
date: _selectedDate,
|
||||
locale: locale ?? "en",
|
||||
yearly: yearly,
|
||||
data: generateChartData(),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
|
@ -1,7 +1,3 @@
|
|||
import 'dart:math';
|
||||
|
||||
import 'package:currency_picker/currency_picker.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_slidable/flutter_slidable.dart';
|
||||
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
||||
|
@ -20,7 +16,6 @@ import 'package:prasule/network/tessdata.dart';
|
|||
import 'package:prasule/pw/platformbutton.dart';
|
||||
import 'package:prasule/pw/platformdialog.dart';
|
||||
import 'package:prasule/pw/platformroute.dart';
|
||||
import 'package:prasule/util/drawer.dart';
|
||||
import 'package:prasule/views/create_entry.dart';
|
||||
import 'package:prasule/views/settings/settings.dart';
|
||||
import 'package:prasule/views/settings/tessdata_list.dart';
|
||||
|
@ -66,52 +61,10 @@ class _HomeViewState extends State<HomeView> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
drawer: makeDrawer(context, 1),
|
||||
floatingActionButton: SpeedDial(
|
||||
icon: Icons.add,
|
||||
activeIcon: Icons.close,
|
||||
children: [
|
||||
if (kDebugMode)
|
||||
SpeedDialChild(
|
||||
child: const Icon(Icons.bug_report),
|
||||
label: AppLocalizations.of(context)!.createTestData,
|
||||
onTap: () {
|
||||
// debug option to quickly fill a wallet with data
|
||||
if (selectedWallet == null) return;
|
||||
selectedWallet!.entries.clear();
|
||||
var random = Random();
|
||||
for (var i = 0; i < 30; i++) {
|
||||
selectedWallet!.entries.add(
|
||||
WalletSingleEntry(
|
||||
data: EntryData(
|
||||
name: "Test Entry #${i + 1}",
|
||||
amount: random.nextInt(20000).toDouble(),
|
||||
),
|
||||
type: EntryType.expense,
|
||||
date: DateTime(
|
||||
2023,
|
||||
random.nextInt(12) + 1,
|
||||
random.nextInt(28) + 1,
|
||||
),
|
||||
category: selectedWallet!.categories[
|
||||
random.nextInt(selectedWallet!.categories.length)],
|
||||
id: selectedWallet!.nextId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
logger.i(selectedWallet!.entries.length);
|
||||
|
||||
// save and reload
|
||||
WalletManager.saveWallet(selectedWallet!).then((value) {
|
||||
Navigator.of(context).pushReplacement(
|
||||
platformRoute(
|
||||
(p0) => const HomeView(),
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
),
|
||||
SpeedDialChild(
|
||||
child: const Icon(Icons.edit),
|
||||
label: AppLocalizations.of(context)!.addNew,
|
||||
|
@ -240,32 +193,9 @@ class _HomeViewState extends State<HomeView> {
|
|||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.primary),
|
||||
),
|
||||
elements: selectedWallet!.entries,
|
||||
itemComparator: (a, b) => b.date.compareTo(a.date),
|
||||
elements: selectedWallet!.entries
|
||||
..sort((a, b) => a.date.compareTo(b.date)),
|
||||
groupBy: (e) => DateFormat.yMMMM(locale).format(e.date),
|
||||
groupComparator: (a, b) {
|
||||
// TODO: better sorting algorithm lol
|
||||
var yearA = RegExp(r'\d+').firstMatch(a);
|
||||
if (yearA == null) return 0;
|
||||
var yearB = RegExp(r'\d+').firstMatch(b);
|
||||
if (yearB == null) return 0;
|
||||
var compareYears = int.parse(yearA.group(0)!)
|
||||
.compareTo(int.parse(yearB.group(0)!));
|
||||
if (compareYears != 0) return compareYears;
|
||||
var months = List<String>.generate(
|
||||
12,
|
||||
(index) => DateFormat.MMMM(locale).format(
|
||||
DateTime(2023, index + 1),
|
||||
),
|
||||
);
|
||||
var monthA = RegExp(r'[^0-9 ]+').firstMatch(a);
|
||||
if (monthA == null) return 0;
|
||||
var monthB = RegExp(r'[^0-9 ]+').firstMatch(b);
|
||||
if (monthB == null) return 0;
|
||||
return months.indexOf(monthB.group(0)!).compareTo(
|
||||
months.indexOf(monthA.group(0)!),
|
||||
);
|
||||
},
|
||||
itemBuilder: (context, element) => Slidable(
|
||||
endActionPane:
|
||||
ActionPane(motion: const ScrollMotion(), children: [
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:currency_picker/currency_picker.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_iconpicker/flutter_iconpicker.dart';
|
||||
import 'package:introduction_screen/introduction_screen.dart';
|
||||
import 'package:prasule/api/category.dart';
|
||||
|
@ -37,7 +36,6 @@ class _SetupViewState extends State<SetupView> {
|
|||
});
|
||||
var categories = <WalletCategory>[];
|
||||
var name = "";
|
||||
var balance = 0.0;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
|
@ -203,28 +201,8 @@ class _SetupViewState extends State<SetupView> {
|
|||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
const SizedBox(
|
||||
height: 5,
|
||||
),
|
||||
SizedBox(
|
||||
width: MediaQuery.of(context).size.width * 0.7,
|
||||
child: PlatformField(
|
||||
labelText:
|
||||
AppLocalizations.of(context)!.setupStartingBalance,
|
||||
keyboardType: const TextInputType.numberWithOptions(
|
||||
decimal: true),
|
||||
inputFormatters: [
|
||||
FilteringTextInputFormatter.allow(
|
||||
RegExp(r'\d+[\.,]{0,1}\d{0,}'),
|
||||
)
|
||||
],
|
||||
onChanged: (t) {
|
||||
balance = double.parse(t);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
PageViewModel(
|
||||
|
|
102
pubspec.lock
102
pubspec.lock
|
@ -5,26 +5,26 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: _fe_analyzer_shared
|
||||
sha256: "36a321c3d2cbe01cbcb3540a87b8843846e0206df3e691fa7b23e19e78de6d49"
|
||||
sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "65.0.0"
|
||||
version: "64.0.0"
|
||||
analyzer:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: analyzer
|
||||
sha256: dfe03b90ec022450e22513b5e5ca1f01c0c01de9c3fba2f7fd233cb57a6b9a07
|
||||
sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.3.0"
|
||||
version: "6.2.0"
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: archive
|
||||
sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
|
||||
sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.4.9"
|
||||
version: "3.4.6"
|
||||
args:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -69,10 +69,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: build_daemon
|
||||
sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
|
||||
sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.1"
|
||||
version: "4.0.0"
|
||||
build_resolvers:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -173,10 +173,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: coverage
|
||||
sha256: ac86d3abab0f165e4b8f561280ff4e066bceaac83c424dd19f1ae2c2fcd12ca9
|
||||
sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.7.1"
|
||||
version: "1.6.4"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -241,14 +241,6 @@ packages:
|
|||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.6.8"
|
||||
equatable:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: equatable
|
||||
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.5"
|
||||
fake_async:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -269,10 +261,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: file
|
||||
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
|
||||
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.0"
|
||||
version: "6.1.4"
|
||||
file_selector_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -313,14 +305,6 @@ packages:
|
|||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
fl_chart:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: fl_chart
|
||||
sha256: "6b9eb2b3017241d05c482c01f668dd05cc909ec9a0114fdd49acd958ff2432fa"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.64.0"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
|
@ -399,10 +383,10 @@ packages:
|
|||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_lints
|
||||
sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
|
||||
sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "3.0.0"
|
||||
flutter_localizations:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
|
@ -420,10 +404,10 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_slidable
|
||||
sha256: "19ed4813003a6ff4e9c6bcce37e792a2a358919d7603b2b31ff200229191e44c"
|
||||
sha256: cc4231579e3eae41ae166660df717f4bad1359c87f4a4322ad8ba1befeb3d2be
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "3.0.0"
|
||||
flutter_speed_dial:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -644,22 +628,6 @@ packages:
|
|||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.7.1"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "7e108028e3d258667d079986da8c0bc32da4cb57431c2af03b1dc1038621a9dc"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "9.0.13"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_testing
|
||||
sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -696,18 +664,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: material_color_utilities
|
||||
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
|
||||
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.8.0"
|
||||
version: "0.5.0"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
|
||||
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.11.0"
|
||||
version: "1.10.0"
|
||||
mime:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -808,10 +776,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: platform
|
||||
sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
|
||||
sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.3"
|
||||
version: "3.1.2"
|
||||
plugin_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -840,18 +808,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: process
|
||||
sha256: "266ca5be5820feefc777793d0a583acfc8c40834893c87c00c6c09e2cf58ea42"
|
||||
sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.1"
|
||||
version: "4.2.4"
|
||||
provider:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: provider
|
||||
sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
|
||||
sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.1.1"
|
||||
version: "6.0.5"
|
||||
pub_semver:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1053,10 +1021,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
|
||||
sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "13.0.0"
|
||||
version: "11.10.0"
|
||||
watcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1069,10 +1037,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: web
|
||||
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
|
||||
sha256: "14f1f70c51119012600c5f1f60ca68efda5a9b6077748163c6af2893ec5df8fc"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.0"
|
||||
version: "0.2.1-beta"
|
||||
web_socket_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1085,10 +1053,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: webdriver
|
||||
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
|
||||
sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.3"
|
||||
version: "3.0.2"
|
||||
webkit_inspection_protocol:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1101,10 +1069,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: win32
|
||||
sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
|
||||
sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.1.0"
|
||||
version: "5.0.9"
|
||||
xdg_directories:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -1130,5 +1098,5 @@ packages:
|
|||
source: hosted
|
||||
version: "3.1.2"
|
||||
sdks:
|
||||
dart: ">=3.2.0-194.0.dev <4.0.0"
|
||||
dart: ">=3.2.0-157.0.dev <4.0.0"
|
||||
flutter: ">=3.7.0"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
name: prasule
|
||||
description: Open-source private expense tracker
|
||||
|
||||
version: 1.0.0-alpha2+2
|
||||
version: 1.0.0-alpha+1
|
||||
|
||||
environment:
|
||||
sdk: '>=3.1.0-262.2.beta <4.0.0'
|
||||
|
@ -38,7 +38,6 @@ dependencies:
|
|||
flutter_slidable: ^3.0.0
|
||||
flutter_localizations:
|
||||
sdk: flutter
|
||||
fl_chart: ^0.64.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
|
Loading…
Reference in a new issue