From ebd225c3b5cc71262fd13f043ad849088b7e3d2f Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Thu, 25 Mar 2021 16:28:04 +0100 Subject: [PATCH] Fix linter + auto format --- lib/app_settings.dart | 2 +- lib/core/note.dart | 4 ++-- lib/screens/login_screen.dart | 3 +-- lib/screens/settings_display_images.dart | 2 +- lib/settings.dart | 2 +- lib/ssh/keygen.dart | 3 ++- lib/widgets/images/image_caption.dart | 6 ++++-- lib/widgets/images/image_details.dart | 6 ++++-- lib/widgets/images/markdown_image.dart | 11 ++++++----- lib/widgets/images/themable_image.dart | 1 + 10 files changed, 23 insertions(+), 17 deletions(-) diff --git a/lib/app_settings.dart b/lib/app_settings.dart index b2139b5e..5e8c01c3 100644 --- a/lib/app_settings.dart +++ b/lib/app_settings.dart @@ -71,7 +71,7 @@ class AppSettings extends ChangeNotifier { _pseudoId = pref.getString("pseudoId"); if (_pseudoId == null) { - _pseudoId = Uuid().v4(); + _pseudoId = const Uuid().v4(); pref.setString("pseudoId", _pseudoId); } diff --git a/lib/core/note.dart b/lib/core/note.dart index a40929cd..40edb1d8 100644 --- a/lib/core/note.dart +++ b/lib/core/note.dart @@ -153,7 +153,7 @@ class Note with NotesNotifier { } catch (e, stackTrace) { Log.e("_buildFileName: $e"); logExceptionWarning(e, stackTrace); - _filePath = p.join(parent.folderPath, Uuid().v4()); + _filePath = p.join(parent.folderPath, const Uuid().v4()); } switch (_fileFormat) { case NoteFileFormat.OrgMode: @@ -591,7 +591,7 @@ class Note with NotesNotifier { case NoteFileNameFormat.Iso8601WithTimeZoneWithoutColon: return toIso8601WithTimezone(date).replaceAll(":", "_"); case NoteFileNameFormat.UuidV4: - return Uuid().v4(); + return const Uuid().v4(); case NoteFileNameFormat.Zettelkasten: return toZettleDateTime(date); } diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index 953103aa..1f94a771 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -37,8 +37,7 @@ import 'package:gitjournal/widgets/scroll_view_without_animation.dart'; //import 'package:gotrue/gotrue.dart'; - -const _localDevServer = 'http://192.168.1.130:9999/'; +// const _localDevServer = 'http://192.168.1.130:9999/'; // const _prodServer = 'https://api.gitjournal.io/auth/'; class LoginPage extends StatefulWidget { diff --git a/lib/screens/settings_display_images.dart b/lib/screens/settings_display_images.dart index 0935b6ee..fa3a40fa 100644 --- a/lib/screens/settings_display_images.dart +++ b/lib/screens/settings_display_images.dart @@ -19,12 +19,12 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; +import 'package:provider/provider.dart'; import 'package:gitjournal/screens/settings_display_images_caption.dart'; import 'package:gitjournal/screens/settings_display_images_theming.dart'; import 'package:gitjournal/screens/settings_screen.dart'; import 'package:gitjournal/settings.dart'; -import 'package:provider/provider.dart'; class SettingsDisplayImagesScreen extends StatefulWidget { @override diff --git a/lib/settings.dart b/lib/settings.dart index 6ad0f770..8ed394e8 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -1125,7 +1125,7 @@ class SettingsVectorGraphicsAdjustColors { } String generateRandomId() { - return Uuid().v4().substring(0, 8); + return const Uuid().v4().substring(0, 8); } class SettingsTheme { diff --git a/lib/ssh/keygen.dart b/lib/ssh/keygen.dart index f669343b..fee9a9d4 100644 --- a/lib/ssh/keygen.dart +++ b/lib/ssh/keygen.dart @@ -4,9 +4,10 @@ import 'package:git_bindings/git_bindings.dart' as gb; import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; -import 'package:gitjournal/ssh/rsa_key_pair.dart'; import 'package:gitjournal/utils/logger.dart'; +// import 'package:gitjournal/ssh/rsa_key_pair.dart'; + class SshKey { final String publicKey; final String privateKey; diff --git a/lib/widgets/images/image_caption.dart b/lib/widgets/images/image_caption.dart index edddfc4a..9204e155 100644 --- a/lib/widgets/images/image_caption.dart +++ b/lib/widgets/images/image_caption.dart @@ -16,11 +16,13 @@ limitations under the License. import 'dart:ui'; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; + +import 'package:easy_localization/easy_localization.dart'; +import 'package:provider/provider.dart'; + import 'package:gitjournal/settings.dart'; import 'package:gitjournal/utils/hero_dialog.dart'; -import 'package:provider/provider.dart'; class ImageCaption extends StatelessWidget { final String altText; diff --git a/lib/widgets/images/image_details.dart b/lib/widgets/images/image_details.dart index 94e43d8f..f4318b93 100644 --- a/lib/widgets/images/image_details.dart +++ b/lib/widgets/images/image_details.dart @@ -15,11 +15,13 @@ limitations under the License. */ import 'package:flutter/material.dart'; + +import 'package:photo_view/photo_view.dart'; +import 'package:provider/provider.dart'; + import 'package:gitjournal/settings.dart'; import 'package:gitjournal/widgets/images/markdown_image.dart'; import 'package:gitjournal/widgets/images/themable_image.dart'; -import 'package:photo_view/photo_view.dart'; -import 'package:provider/provider.dart'; class ImageDetails extends StatefulWidget { final ThemableImage image; diff --git a/lib/widgets/images/markdown_image.dart b/lib/widgets/images/markdown_image.dart index 45a1bdc0..01da95cb 100644 --- a/lib/widgets/images/markdown_image.dart +++ b/lib/widgets/images/markdown_image.dart @@ -17,19 +17,20 @@ limitations under the License. import 'dart:io'; import 'dart:ui'; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; + +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; +import 'package:provider/provider.dart'; + +import 'package:gitjournal/settings.dart'; +import 'package:gitjournal/utils/logger.dart'; import 'package:gitjournal/widgets/images/image_caption.dart'; import 'package:gitjournal/widgets/images/image_details.dart'; import 'package:gitjournal/widgets/images/themable_image.dart'; -import 'package:provider/provider.dart'; - -import 'package:gitjournal/utils/logger.dart'; -import 'package:gitjournal/settings.dart'; class MarkdownImage extends StatelessWidget { final double width; diff --git a/lib/widgets/images/themable_image.dart b/lib/widgets/images/themable_image.dart index e8b484b7..6d50ade0 100644 --- a/lib/widgets/images/themable_image.dart +++ b/lib/widgets/images/themable_image.dart @@ -18,6 +18,7 @@ import 'dart:io'; import 'dart:ui'; import 'package:flutter/material.dart'; + import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/svg.dart';