Compare commits

..

No commits in common. "71f7a3031840e372203ecf0311aadf36e8cfe88c" and "0e69edf6af51faab483dfb7354fa2ac3ab56330c" have entirely different histories.

12 changed files with 32 additions and 33 deletions

View file

@ -1,3 +1,16 @@
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
google()

View file

@ -10,17 +10,11 @@ pluginManagement {
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
repositories {
google()
mavenCentral()
gradlePluginPortal()
plugins {
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
}
}
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}
include ":app"
apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

View file

@ -111,7 +111,8 @@ void main() {
);
});
testWidgets('Test rendering of entries', (WidgetTester tester) async {
testWidgets('Test correct rendering of entries',
(WidgetTester tester) async {
// Delete all data
await WalletManager.deleteAllData();
expect((await WalletManager.listWallets()).length, equals(0));

View file

@ -136,8 +136,7 @@ class Wallet {
: recurringEntries[recurringEntries.indexOf(ent)].lastRunDate.day,
); // add the variable again to check if we aren't missing any entries
logger.i(
"Last recurred date is now on ${DateFormat.yMMMMd().format(m)} (${n.isAfter(m)})",
);
"Last recurred date is now on ${DateFormat.yMMMMd().format(m)} (${n.isAfter(m)})");
}
WalletManager.saveWallet(this); // save wallet
}
@ -174,7 +173,7 @@ class Wallet {
fontFamily: 'MaterialIcons',
),
color: Colors.white,
),
)
],
currency: Currency.from(
json: {

View file

@ -522,7 +522,6 @@ class Indicator extends StatelessWidget {
/// Text shown next to the indicator circle
final String text;
/// Text style of the indicator
final TextStyle textStyle;
@override

View file

@ -192,9 +192,7 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
onPressed: () {
if (newEntry.data.name.isEmpty) {
showMessage(
AppLocalizations.of(context).errorEmptyName,
context,
);
AppLocalizations.of(context).errorEmptyName, context);
return;
}
if (widget.editEntry != null) {

View file

@ -315,9 +315,7 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
onPressed: () {
if (newEntry.data.name.isEmpty) {
showMessage(
AppLocalizations.of(context).errorEmptyName,
context,
);
AppLocalizations.of(context).errorEmptyName, context);
return;
}
if (widget.editEntry != null) {

View file

@ -490,7 +490,6 @@ class _HomeViewState extends State<HomeView> {
}
description.write("${line.replaceAll(regex, "")}\n");
}
if (!ctx.mounted) return;
Navigator.of(ctx).pop();
// show edit
final newEntry =

View file

@ -146,7 +146,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
(await SharedPreferences.getInstance())
.getBool("useMaterialYou") ??
false;
if (!context.mounted) return;
if (!mounted) return;
await showDialog(
context: context,
builder: (c) => PlatformDialog(
@ -227,7 +227,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
await WalletManager.saveWallet(
selectedWallet!,
);
if (!context.mounted) return;
if (!mounted) return;
Navigator.of(context).pop();
},
child: Text(

View file

@ -70,7 +70,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
final s = await SharedPreferences.getInstance();
await s.setInt("yearlygraph", 1);
_yearly = 1;
if (!ctx.mounted) return;
if (!mounted) return;
Navigator.of(ctx).pop();
setState(() {});
},
@ -90,7 +90,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
final s = await SharedPreferences.getInstance();
await s.setInt("yearlygraph", 2);
_yearly = 2;
if (!ctx.mounted) return;
if (!mounted) return;
Navigator.of(ctx).pop();
setState(() {});
},
@ -128,7 +128,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
final s = await SharedPreferences.getInstance();
await s.setInt("monthlygraph", 1);
_monthly = 1;
if (!ctx.mounted) return;
if (!mounted) return;
Navigator.of(ctx).pop();
setState(() {});
},
@ -148,7 +148,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
final s = await SharedPreferences.getInstance();
await s.setInt("monthlygraph", 2);
_monthly = 2;
if (!ctx.mounted) return;
if (!mounted) return;
Navigator.of(ctx).pop();
setState(() {});
},

View file

@ -75,9 +75,7 @@ class _TessdataListViewState extends State<TessdataListView> {
onPressed: () async {
await TessdataApi.deleteData(lang);
_tessdata[i][lang] = true;
if (context.mounted) {
Navigator.of(context).pop();
}
if (mounted) Navigator.of(context).pop();
},
),
PlatformButton(

View file

@ -325,10 +325,10 @@ packages:
dependency: "direct main"
description:
name: flex_color_picker
sha256: "0871edc170153cfc3de316d30625f40a85daecfa76ce541641f3cc0ec7757cbf"
sha256: f37476ab3e80dcaca94e428e159944d465dd16312fda9ff41e07e86f04bfa51c
url: "https://pub.dev"
source: hosted
version: "3.3.1"
version: "3.3.0"
flex_seed_scheme:
dependency: transitive
description: