fix merge conflicts
This commit is contained in:
@@ -304,11 +304,11 @@ class _SettingsViewState extends State<SettingsView> {
|
|||||||
final loc = AppLocalizations.of(context);
|
final loc = AppLocalizations.of(context);
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case ExportResult.success:
|
case ExportResult.success:
|
||||||
showSnackbar(message: loc.data_successfully_exported);
|
showSnackbar(context: context, message: loc.data_successfully_exported);
|
||||||
case ExportResult.canceled:
|
case ExportResult.canceled:
|
||||||
showSnackbar(message: loc.export_canceled);
|
showSnackbar(context: context, message: loc.export_canceled);
|
||||||
case ExportResult.unknownException:
|
case ExportResult.unknownException:
|
||||||
showSnackbar(message: loc.unknown_exception);
|
showSnackbar(context: context, message: loc.unknown_exception);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: game_tracker
|
name: game_tracker
|
||||||
description: "Game Tracking App for Card Games"
|
description: "Game Tracking App for Card Games"
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
version: 0.0.7+212
|
version: 0.0.7+214
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.8.1
|
sdk: ^3.8.1
|
||||||
|
|||||||
Reference in New Issue
Block a user