diff --git a/lib/editors/bottom_bar.dart b/lib/editors/bottom_bar.dart
index 7513b7a3..994e5b73 100644
--- a/lib/editors/bottom_bar.dart
+++ b/lib/editors/bottom_bar.dart
@@ -95,7 +95,7 @@ class EditorBottomBar extends StatelessWidget {
icon: const Icon(Icons.undo),
onPressed: undoAllowed ? onUndoSelected : null,
),
- FlatButton.icon(
+ TextButton.icon(
icon: const Icon(Icons.folder),
label: Text(parentFolder.publicName),
onPressed: () {
diff --git a/lib/oauthapp.dart b/lib/oauthapp.dart
index a9ada6fc..c83eba41 100644
--- a/lib/oauthapp.dart
+++ b/lib/oauthapp.dart
@@ -38,13 +38,13 @@ class OAuthAppState extends State<OAuthApp> {
title: const Text('OAuth Test'),
),
body: Column(children: <Widget>[
- RaisedButton(
+ ElevatedButton(
child: const Text("Open OAuth URL"),
onPressed: () {
githost.launchOAuthScreen();
},
),
- RaisedButton(
+ ElevatedButton(
child: const Text("List Repos"),
onPressed: () async {
try {
@@ -57,7 +57,7 @@ class OAuthAppState extends State<OAuthApp> {
}
},
),
- RaisedButton(
+ ElevatedButton(
child: const Text("Create Repo"),
onPressed: () async {
try {
@@ -68,7 +68,7 @@ class OAuthAppState extends State<OAuthApp> {
}
},
),
- RaisedButton(
+ ElevatedButton(
child: const Text("Add Deploy Key"),
onPressed: () async {
try {
diff --git a/lib/screens/filesystem_screen.dart b/lib/screens/filesystem_screen.dart
index 93f88edc..f25813f3 100644
--- a/lib/screens/filesystem_screen.dart
+++ b/lib/screens/filesystem_screen.dart
@@ -47,14 +47,14 @@ class _FileSystemScreenState extends State<FileSystemScreen> {
title: Text(tr("screens.filesystem.ignoredFile.title")),
content: Text(ignoredFile.reason.toString()),
actions: <Widget>[
- FlatButton(
+ TextButton(
onPressed: () async {
Navigator.of(context).pop(false);
_renameFile(ignoredFile.filePath);
},
child: Text(tr('screens.filesystem.ignoredFile.rename')),
),
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(tr('screens.filesystem.ignoredFile.ok')),
),
diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index e16893a4..17c5b3f9 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -228,11 +228,11 @@ class _CreateFolderAlertDialogState extends State<CreateFolderAlertDialog> {
return AlertDialog(
title: Text(tr("screens.folders.dialog.title")),
actions: <Widget>[
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(tr("screens.folders.dialog.discard")),
),
- FlatButton(
+ TextButton(
onPressed: () {
var newFolderName = _textController.text;
return Navigator.of(context).pop(newFolderName);
@@ -262,7 +262,7 @@ class FolderErrorDialog extends StatelessWidget {
title: Text(tr("screens.folders.errorDialog.title")),
content: Text(content),
actions: <Widget>[
- FlatButton(
+ TextButton(
child: Text(tr("screens.folders.errorDialog.ok")),
onPressed: () => Navigator.of(context).pop(),
),
diff --git a/lib/screens/onboarding_screens.dart b/lib/screens/onboarding_screens.dart
index e16ce603..6c34c7c6 100644
--- a/lib/screens/onboarding_screens.dart
+++ b/lib/screens/onboarding_screens.dart
@@ -158,7 +158,7 @@ class OnBoardingBottomButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return FlatButton(
+ return TextButton(
key: key,
child: Text(
text,
diff --git a/lib/screens/purchase_screen.dart b/lib/screens/purchase_screen.dart
index e9a69de4..5b63912a 100644
--- a/lib/screens/purchase_screen.dart
+++ b/lib/screens/purchase_screen.dart
@@ -99,7 +99,7 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
child: Wrap(
children: [
RestorePurchaseButton(),
- OutlineButton(
+ OutlinedButton(
child: Text(tr("feature_timeline.title")),
onPressed: () {
var route = MaterialPageRoute(
diff --git a/lib/screens/settings_experimental.dart b/lib/screens/settings_experimental.dart
index b3a56b01..3a95c2bb 100644
--- a/lib/screens/settings_experimental.dart
+++ b/lib/screens/settings_experimental.dart
@@ -151,7 +151,7 @@ class _PasswordForm extends StatelessWidget {
},
),
actions: <Widget>[
- FlatButton(
+ TextButton(
child: const Text('Ok'),
onPressed: () {
Navigator.of(context).pop();
diff --git a/lib/screens/settings_git_remote.dart b/lib/screens/settings_git_remote.dart
index fbe416e0..4edac5b8 100644
--- a/lib/screens/settings_git_remote.dart
+++ b/lib/screens/settings_git_remote.dart
@@ -279,11 +279,11 @@ class IrreversibleActionConfirmationDialog extends StatelessWidget {
title: Text(title),
content: Text(tr("settings.gitRemote.changeHost.subtitle")),
actions: <Widget>[
- FlatButton(
+ TextButton(
child: Text(tr("settings.gitRemote.changeHost.ok")),
onPressed: () => Navigator.of(context).pop(true),
),
- FlatButton(
+ TextButton(
child: Text(tr("settings.gitRemote.changeHost.cancel")),
onPressed: () => Navigator.of(context).pop(),
),
diff --git a/lib/screens/settings_note_metadata.dart b/lib/screens/settings_note_metadata.dart
index abd346d9..a1443086 100644
--- a/lib/screens/settings_note_metadata.dart
+++ b/lib/screens/settings_note_metadata.dart
@@ -391,11 +391,11 @@ class _CustomMetDataTileState extends State<CustomMetDataTile> {
return AlertDialog(
title: Text(tr("settings.noteMetaData.customMetaData.title")),
actions: <Widget>[
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(widget.value),
child: Text(tr("settings.cancel")),
),
- FlatButton(
+ TextButton(
onPressed: () {
var text = _textController.text.trim();
var map = MarkdownYAMLCodec.parseYamlText(text);
diff --git a/lib/screens/settings_widgets.dart b/lib/screens/settings_widgets.dart
index 756242fc..2a10823f 100644
--- a/lib/screens/settings_widgets.dart
+++ b/lib/screens/settings_widgets.dart
@@ -45,7 +45,7 @@ class ListPreference extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
),
actions: <Widget>[
- FlatButton(
+ TextButton(
child: Text(tr('settings.cancel')),
onPressed: () {
Navigator.of(context).pop();
diff --git a/lib/setup/key_editors.dart b/lib/setup/key_editors.dart
index 5b4da8f7..36b5a322 100644
--- a/lib/setup/key_editors.dart
+++ b/lib/setup/key_editors.dart
@@ -95,7 +95,7 @@ class KeyEditor extends StatelessWidget {
),
),
),
- OutlineButton(
+ OutlinedButton(
child: Text(tr("setup.keyEditors.load")),
onPressed: _pickAndLoadFile,
),
diff --git a/lib/widgets/note_delete_dialog.dart b/lib/widgets/note_delete_dialog.dart
index 88e037fa..c4f46dc2 100644
--- a/lib/widgets/note_delete_dialog.dart
+++ b/lib/widgets/note_delete_dialog.dart
@@ -8,11 +8,11 @@ class NoteDeleteDialog extends StatelessWidget {
return AlertDialog(
title: Text(tr('widgets.NoteDeleteDialog.title')),
actions: <Widget>[
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(tr('widgets.NoteDeleteDialog.no')),
),
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(tr('widgets.NoteDeleteDialog.yes')),
),
diff --git a/lib/widgets/purchase_widget.dart b/lib/widgets/purchase_widget.dart
index f1249ed0..6bbc441e 100644
--- a/lib/widgets/purchase_widget.dart
+++ b/lib/widgets/purchase_widget.dart
@@ -299,7 +299,7 @@ class PurchaseFailedDialog extends StatelessWidget {
title: Text(tr('widgets.PurchaseWidget.failed')),
content: Text(text),
actions: <Widget>[
- FlatButton(
+ TextButton(
child: Text(tr('settings.ok')),
onPressed: () => Navigator.of(context).pop(),
),
@@ -320,7 +320,7 @@ class _RestorePurchaseButtonState extends State<RestorePurchaseButton> {
Widget build(BuildContext context) {
var text = computing ? '...' : tr('purchase_screen.restore');
- return OutlineButton(
+ return OutlinedButton(
child: Text(text),
onPressed: () async {
setState(() {
diff --git a/lib/widgets/rename_dialog.dart b/lib/widgets/rename_dialog.dart
index c2a694de..c1b3a5eb 100644
--- a/lib/widgets/rename_dialog.dart
+++ b/lib/widgets/rename_dialog.dart
@@ -68,11 +68,11 @@ class _RenameDialogState extends State<RenameDialog> {
return AlertDialog(
title: Text(widget.dialogTitle),
actions: <Widget>[
- FlatButton(
+ TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(tr('widgets.rename.no')),
),
- FlatButton(
+ TextButton(
onPressed: () {
if (_formKey.currentState.validate()) {
var newName = _textController.text;
diff --git a/lib/widgets/sorting_mode_selector.dart b/lib/widgets/sorting_mode_selector.dart
index 81184611..991cf7cd 100644
--- a/lib/widgets/sorting_mode_selector.dart
+++ b/lib/widgets/sorting_mode_selector.dart
@@ -43,14 +43,14 @@ class _SortingModeSelectorState extends State<SortingModeSelector> {
crossAxisAlignment: CrossAxisAlignment.start,
),
actions: [
- OutlineButton(
+ OutlinedButton(
key: const ValueKey("Cancel"),
child: Text(tr('settings.cancel')),
onPressed: () {
Navigator.of(context).pop();
},
),
- OutlineButton(
+ OutlinedButton(
key: const ValueKey("Ok"),
child: Text(tr('settings.ok')),
onPressed: () {