Reformat code with latest Flutter 3 linting

lib/core/manager/dialog_manager.dart

@@ -30,8 +30,7 @@ class _DialogManagerState extends State<DialogManager> {
   void _showDialog(DialogRequest request) {
     List<Widget> actions = <Widget>[];
 
-    if (request.buttonTitleDeny != null &&
+    if (request.buttonTitleDeny != null && request.buttonTitleDeny!.isNotEmpty) {
-        request.buttonTitleDeny!.isNotEmpty) {
       Widget denyBtn = TextButton(
         child: Text(request.buttonTitleDeny!),
         onPressed: () {

lib/core/models/rest/apikey.dart

@@ -15,11 +15,7 @@ class ApiKey {
 
   final String? comment;
 
-  ApiKey(
+  ApiKey({required this.key, required this.created, required this.accessLevel, this.comment});
-      {required this.key,
-      required this.created,
-      required this.accessLevel,
-      this.comment});
 
   // JSON Init
   factory ApiKey.fromJson(Map<String, dynamic> json) => _$ApiKeyFromJson(json);

lib/core/models/rest/apikeys.dart

@@ -12,8 +12,7 @@ class ApiKeys {
   ApiKeys({required this.apikeys});
 
   // JSON Init
-  factory ApiKeys.fromJson(Map<String, dynamic> json) =>
+  factory ApiKeys.fromJson(Map<String, dynamic> json) => _$ApiKeysFromJson(json);
-      _$ApiKeysFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$ApiKeysToJson(this);

lib/core/models/rest/apikeys_response.dart

@@ -15,8 +15,7 @@ class ApiKeysResponse {
   ApiKeysResponse({required this.status, required this.data});
 
   // JSON Init
-  factory ApiKeysResponse.fromJson(Map<String, dynamic> json) =>
+  factory ApiKeysResponse.fromJson(Map<String, dynamic> json) => _$ApiKeysResponseFromJson(json);
-      _$ApiKeysResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$ApiKeysResponseToJson(this);

lib/core/models/rest/config_response.dart

@@ -15,8 +15,7 @@ class ConfigResponse {
   ConfigResponse({required this.status, required this.data});
 
   // JSON Init
-  factory ConfigResponse.fromJson(Map<String, dynamic> json) =>
+  factory ConfigResponse.fromJson(Map<String, dynamic> json) => _$ConfigResponseFromJson(json);
-      _$ConfigResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$ConfigResponseToJson(this);

lib/core/models/rest/create_apikey_response.dart

@@ -13,8 +13,7 @@ class CreateApiKeyResponse {
   CreateApiKeyResponse({required this.status, required this.data});
 
   // JSON Init
-  factory CreateApiKeyResponse.fromJson(Map<String, dynamic> json) =>
+  factory CreateApiKeyResponse.fromJson(Map<String, dynamic> json) => _$CreateApiKeyResponseFromJson(json);
-      _$CreateApiKeyResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$CreateApiKeyResponseToJson(this);

lib/core/models/rest/history.dart

@@ -19,8 +19,7 @@ class History {
   History({required this.items, required this.multipasteItems, this.totalSize});
 
   // JSON Init
-  factory History.fromJson(Map<String, dynamic> json) =>
+  factory History.fromJson(Map<String, dynamic> json) => _$HistoryFromJson(json);
-      _$HistoryFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$HistoryToJson(this);

lib/core/models/rest/history_item.dart

@@ -23,8 +23,7 @@ class HistoryItem {
       this.thumbnail});
 
   // JSON Init
-  factory HistoryItem.fromJson(Map<String, dynamic> json) =>
+  factory HistoryItem.fromJson(Map<String, dynamic> json) => _$HistoryItemFromJson(json);
-      _$HistoryItemFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$HistoryItemToJson(this);

lib/core/models/rest/history_multipaste_item.dart

@@ -15,8 +15,7 @@ class HistoryMultipasteItem {
   HistoryMultipasteItem(this.items, {required this.date, required this.urlId});
 
   // JSON Init
-  factory HistoryMultipasteItem.fromJson(Map<String, dynamic> json) =>
+  factory HistoryMultipasteItem.fromJson(Map<String, dynamic> json) => _$HistoryMultipasteItemFromJson(json);
-      _$HistoryMultipasteItemFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$HistoryMultipasteItemToJson(this);

lib/core/models/rest/history_multipaste_item_entry.dart

@@ -9,8 +9,7 @@ class HistoryMultipasteItemEntry {
   HistoryMultipasteItemEntry({required this.id});
 
   // JSON Init
-  factory HistoryMultipasteItemEntry.fromJson(Map<String, dynamic> json) =>
+  factory HistoryMultipasteItemEntry.fromJson(Map<String, dynamic> json) => _$HistoryMultipasteItemEntryFromJson(json);
-      _$HistoryMultipasteItemEntryFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$HistoryMultipasteItemEntryToJson(this);

lib/core/models/rest/history_response.dart

@@ -15,8 +15,7 @@ class HistoryResponse {
   HistoryResponse({required this.status, required this.data});
 
   // JSON Init
-  factory HistoryResponse.fromJson(Map<String, dynamic> json) =>
+  factory HistoryResponse.fromJson(Map<String, dynamic> json) => _$HistoryResponseFromJson(json);
-      _$HistoryResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$HistoryResponseToJson(this);

lib/core/models/rest/rest_error.dart

@@ -15,8 +15,7 @@ class RestError {
     required this.errorId,
   }); // JSON Init
 
-  factory RestError.fromJson(Map<String, dynamic> json) =>
+  factory RestError.fromJson(Map<String, dynamic> json) => _$RestErrorFromJson(json);
-      _$RestErrorFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$RestErrorToJson(this);

lib/core/models/rest/uploaded.dart

@@ -13,8 +13,7 @@ class Uploaded {
   Uploaded({required this.ids, required this.urls});
 
   // JSON Init
-  factory Uploaded.fromJson(Map<String, dynamic> json) =>
+  factory Uploaded.fromJson(Map<String, dynamic> json) => _$UploadedFromJson(json);
-      _$UploadedFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$UploadedToJson(this);

lib/core/models/rest/uploaded_multi.dart

@@ -13,8 +13,7 @@ class UploadedMulti {
   UploadedMulti({required this.url, required this.urlId});
 
   // JSON Init
-  factory UploadedMulti.fromJson(Map<String, dynamic> json) =>
+  factory UploadedMulti.fromJson(Map<String, dynamic> json) => _$UploadedMultiFromJson(json);
-      _$UploadedMultiFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$UploadedMultiToJson(this);

lib/core/models/rest/uploaded_multi_response.dart

@@ -15,8 +15,7 @@ class UploadedMultiResponse {
   UploadedMultiResponse({required this.status, required this.data});
 
   // JSON Init
-  factory UploadedMultiResponse.fromJson(Map<String, dynamic> json) =>
+  factory UploadedMultiResponse.fromJson(Map<String, dynamic> json) => _$UploadedMultiResponseFromJson(json);
-      _$UploadedMultiResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$UploadedMultiResponseToJson(this);

lib/core/models/rest/uploaded_response.dart

@@ -15,8 +15,7 @@ class UploadedResponse {
   UploadedResponse({required this.status, required this.data});
 
   // JSON Init
-  factory UploadedResponse.fromJson(Map<String, dynamic> json) =>
+  factory UploadedResponse.fromJson(Map<String, dynamic> json) => _$UploadedResponseFromJson(json);
-      _$UploadedResponseFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$UploadedResponseToJson(this);

lib/core/models/session.dart

@@ -13,8 +13,7 @@ class Session {
       : url = '',
         apiKey = '';
 
-  factory Session.fromJson(Map<String, dynamic> json) =>
+  factory Session.fromJson(Map<String, dynamic> json) => _$SessionFromJson(json);
-      _$SessionFromJson(json);
 
   Map<String, dynamic> toJson() => _$SessionToJson(this);
 }

lib/core/models/uploaded_paste.dart

@@ -26,8 +26,7 @@ class UploadedPaste {
       this.items});
 
   // JSON Init
-  factory UploadedPaste.fromJson(Map<String, dynamic> json) =>
+  factory UploadedPaste.fromJson(Map<String, dynamic> json) => _$UploadedPasteFromJson(json);
-      _$UploadedPasteFromJson(json);
 
   // JSON Export
   Map<String, dynamic> toJson() => _$UploadedPasteToJson(this);

lib/core/repositories/file_repository.dart

@@ -33,10 +33,8 @@ class FileRepository {
     return response;
   }
 
-  Future<UploadedResponse> postUpload(
+  Future<UploadedResponse> postUpload(List<File>? files, Map<String, String>? additionalFiles) async {
-      List<File>? files, Map<String, String>? additionalFiles) async {
+    var response = await _api.post('/file/upload', files: files, additionalFiles: additionalFiles);
-    var response = await _api.post('/file/upload',
-        files: files, additionalFiles: additionalFiles);
     return UploadedResponse.fromJson(json.decode(response.body));
   }
 
@@ -44,12 +42,10 @@ class FileRepository {
     Map<String, String> multiPasteIds = Map();
 
     ids.forEach((element) {
-      multiPasteIds.putIfAbsent(
+      multiPasteIds.putIfAbsent("ids[${ids.indexOf(element) + 1}]", () => element);
-          "ids[${ids.indexOf(element) + 1}]", () => element);
     });
 
-    var response =
+    var response = await _api.post('/file/create_multipaste', fields: multiPasteIds);
-        await _api.post('/file/create_multipaste', fields: multiPasteIds);
     return UploadedMultiResponse.fromJson(json.decode(response.body));
   }
 }

lib/core/repositories/user_repository.dart

@@ -8,8 +8,8 @@ import '../services/api.dart';
 class UserRepository {
   Api _api = locator<Api>();
 
-  Future<CreateApiKeyResponse> postApiKey(String url, String username,
+  Future<CreateApiKeyResponse> postApiKey(
-      String password, String accessLevel, String comment) async {
+      String url, String username, String password, String accessLevel, String comment) async {
     _api.setUrl(url);
 
     var fields = Map.fromEntries([

lib/core/services/api.dart

@@ -24,34 +24,25 @@ class Api implements ApiErrorConverter {
   String _url = "";
   String _apiKey = "";
 
-  Map<String, String> _headers = {
+  Map<String, String> _headers = {"Content-Type": _applicationJson, "Accept": _applicationJson};
-    "Content-Type": _applicationJson,
-    "Accept": _applicationJson
-  };
   Duration _timeout = Duration(seconds: Constants.apiRequestTimeoutLimit);
 
   Future<http.Response> fetch<T>(String route) async {
     try {
-      _logger.d(
+      _logger
-          "Requesting GET API endpoint '${_url + route}' with headers '$_headers' and maximum timeout '$_timeout'");
+          .d("Requesting GET API endpoint '${_url + route}' with headers '$_headers' and maximum timeout '$_timeout'");
-      var response = await http
+      var response = await http.get(Uri.parse(_url + route), headers: _headers).timeout(_timeout);
-          .get(Uri.parse(_url + route), headers: _headers)
-          .timeout(_timeout);
       handleRestErrors(response);
       return response;
     } on TimeoutException {
-      throw ServiceException(
+      throw ServiceException(code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
-          code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
     } on SocketException {
-      throw ServiceException(
+      throw ServiceException(code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
-          code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
     }
   }
 
   Future<http.Response> post<T>(String route,
-      {Map<String, String?>? fields,
+      {Map<String, String?>? fields, List<File>? files, Map<String, String>? additionalFiles}) async {
-      List<File>? files,
-      Map<String, String>? additionalFiles}) async {
     try {
       var uri = Uri.parse(_url + route);
       var request = http.MultipartRequest('POST', uri)
@@ -68,34 +59,27 @@ class Api implements ApiErrorConverter {
 
       if (files != null && files.isNotEmpty) {
         files.forEach((element) async {
-          request.files.add(await http.MultipartFile.fromPath(
+          request.files.add(await http.MultipartFile.fromPath('file[${files.indexOf(element) + 1}]', element.path));
-              'file[${files.indexOf(element) + 1}]', element.path));
         });
       }
 
       if (additionalFiles != null && additionalFiles.length > 0) {
         List<String> keys = additionalFiles.keys.toList();
         additionalFiles.forEach((key, value) {
-          var index = files != null
+          var index = files != null ? files.length + keys.indexOf(key) + 1 : keys.indexOf(key) + 1;
-              ? files.length + keys.indexOf(key) + 1
+          request.files.add(http.MultipartFile.fromString('file[$index]', value, filename: key));
-              : keys.indexOf(key) + 1;
-          request.files.add(http.MultipartFile.fromString('file[$index]', value,
-              filename: key));
         });
       }
 
-      _logger.d(
+      _logger.d("Requesting POST API endpoint '${uri.toString()}' and ${request.files.length} files");
-          "Requesting POST API endpoint '${uri.toString()}' and ${request.files.length} files");
       var multiResponse = await request.send();
       var response = await http.Response.fromStream(multiResponse);
       handleRestErrors(response);
       return response;
     } on TimeoutException {
-      throw ServiceException(
+      throw ServiceException(code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
-          code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
     } on SocketException {
-      throw ServiceException(
+      throw ServiceException(code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
-          code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
     }
   }
 
@@ -123,17 +107,14 @@ class Api implements ApiErrorConverter {
   /// have a json decoded object. Replace this with a custom
   /// conversion method by overwriting the interface if needed
   void handleRestErrors(http.Response response) {
-    if (response.statusCode != HttpStatus.ok &&
+    if (response.statusCode != HttpStatus.ok && response.statusCode != HttpStatus.noContent) {
-        response.statusCode != HttpStatus.noContent) {
       if (response.headers.containsKey(HttpHeaders.contentTypeHeader)) {
-        ContentType responseContentType =
+        ContentType responseContentType = ContentType.parse(response.headers[HttpHeaders.contentTypeHeader]!);
-            ContentType.parse(response.headers[HttpHeaders.contentTypeHeader]!);
 
         if (ContentType.json.primaryType == responseContentType.primaryType &&
             ContentType.json.subType == responseContentType.subType) {
           var parsedBody = convert(response);
-          throw new RestServiceException(response.statusCode,
+          throw new RestServiceException(response.statusCode, responseBody: parsedBody);
-              responseBody: parsedBody);
         }
       }
 

lib/core/services/dialog_service.dart

@@ -27,28 +27,20 @@ class DialogService {
         title: title,
         description: description,
         buttonTitleAccept:
-            buttonTitleAccept == null || buttonTitleAccept.isEmpty
+            buttonTitleAccept == null || buttonTitleAccept.isEmpty ? translate('dialog.confirm') : buttonTitleAccept));
-                ? translate('dialog.confirm')
-                : buttonTitleAccept));
     return _dialogCompleter!.future;
   }
 
   Future<DialogResponse> showConfirmationDialog(
-      {String? title,
+      {String? title, String? description, String? buttonTitleAccept, String? buttonTitleDeny}) {
-      String? description,
-      String? buttonTitleAccept,
-      String? buttonTitleDeny}) {
     _dialogCompleter = Completer<DialogResponse>();
     _showDialogListener(DialogRequest(
         title: title,
         description: description,
         buttonTitleAccept:
-            buttonTitleAccept == null || buttonTitleAccept.isEmpty
+            buttonTitleAccept == null || buttonTitleAccept.isEmpty ? translate('dialog.confirm') : buttonTitleAccept,
-                ? translate('dialog.confirm')
+        buttonTitleDeny:
-                : buttonTitleAccept,
+            buttonTitleDeny == null || buttonTitleDeny.isEmpty ? translate('dialog.cancel') : buttonTitleDeny));
-        buttonTitleDeny: buttonTitleDeny == null || buttonTitleDeny.isEmpty
-            ? translate('dialog.cancel')
-            : buttonTitleDeny));
     return _dialogCompleter!.future;
   }
 

lib/core/services/file_service.dart

@@ -23,8 +23,7 @@ class FileService {
     return await _fileRepository.postDelete(id);
   }
 
-  Future<UploadedResponse> uploadPaste(
+  Future<UploadedResponse> uploadPaste(List<File>? files, Map<String, String>? additionalFiles) async {
-      List<File>? files, Map<String, String>? additionalFiles) async {
     return await _fileRepository.postUpload(files, additionalFiles);
   }
 

lib/core/services/permission_service.dart

@@ -57,8 +57,7 @@ class PermissionService extends StoppableService {
       return;
     }
 
-    var ignoredDialog =
+    var ignoredDialog = await _storageService.hasStoragePermissionDialogIgnored();
-        await _storageService.hasStoragePermissionDialogIgnored();
 
     if (ignoredDialog) {
       _logger.d('Permanently ignored permission request, skipping');
@@ -105,9 +104,8 @@ class PermissionService extends StoppableService {
     super.start();
     await checkEnabledAndPermission();
 
-    _serviceCheckTimer = Timer.periodic(
+    _serviceCheckTimer =
-        Duration(milliseconds: Constants.mediaPermissionCheckInterval),
+        Timer.periodic(Duration(milliseconds: Constants.mediaPermissionCheckInterval), (_serviceTimer) async {
-        (_serviceTimer) async {
       if (!super.serviceStopped) {
         await checkEnabledAndPermission();
       } else {

lib/core/services/user_service.dart

@@ -12,10 +12,9 @@ class UserService {
   final FileService _fileService = locator<FileService>();
   final UserRepository _userRepository = locator<UserRepository>();
 
-  Future<CreateApiKeyResponse> createApiKey(String url, String username,
+  Future<CreateApiKeyResponse> createApiKey(
-      String password, String accessLevel, String comment) async {
+      String url, String username, String password, String accessLevel, String comment) async {
-    return await _userRepository.postApiKey(
+    return await _userRepository.postApiKey(url, username, password, accessLevel, comment);
-        url, username, password, accessLevel, comment);
   }
 
   Future<ApiKeysResponse> getApiKeys() async {
@@ -27,8 +26,7 @@ class UserService {
     try {
       await _fileService.getHistory();
     } on ServiceException catch (e) {
-      throw new ServiceException(
+      throw new ServiceException(code: ErrorCode.INVALID_API_KEY, message: e.message);
-          code: ErrorCode.INVALID_API_KEY, message: e.message);
     }
   }
 }

lib/core/viewmodels/history_model.dart

@@ -34,8 +34,7 @@ class HistoryModel extends BaseModel {
   String? errorMessage;
 
   void init() {
-    _refreshTriggerSubscription =
+    _refreshTriggerSubscription = _refreshService.refreshEventController.stream.listen((event) {
-        _refreshService.refreshEventController.stream.listen((event) {
       if (event == RefreshEvent.RefreshHistory) {
         _logger.d('History needs a refresh');
         getHistory();
@@ -55,8 +54,7 @@ class HistoryModel extends BaseModel {
           pastes.add(
             UploadedPaste(
                 id: key,
-                date:
+                date: DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch),
-                    DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch),
                 filename: value.filename,
                 filesize: int.parse(value.filesize),
                 hash: value.hash,
@@ -92,11 +90,9 @@ class HistoryModel extends BaseModel {
             e.responseBody is RestError &&
             e.responseBody.message != null) {
           if (e.statusCode == HttpStatus.badRequest) {
-            errorMessage = translate('api.bad_request',
+            errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
-                args: {'reason': e.responseBody.message});
           } else {
-            errorMessage = translate('api.general_rest_error_payload',
+            errorMessage = translate('api.general_rest_error_payload', args: {'message': e.responseBody.message});
-                args: {'message': e.responseBody.message});
           }
         } else {
           errorMessage = translate('api.general_rest_error');
@@ -119,8 +115,7 @@ class HistoryModel extends BaseModel {
   Future deletePaste(String id) async {
     DialogResponse res = await _dialogService.showConfirmationDialog(
         title: translate('history.delete_dialog.title'),
-        description:
+        description: translate('history.delete_dialog.description', args: {'id': id}),
-            translate('history.delete_dialog.description', args: {'id': id}),
         buttonTitleAccept: translate('history.delete_dialog.accept'),
         buttonTitleDeny: translate('history.delete_dialog.deny'));
 
@@ -144,8 +139,7 @@ class HistoryModel extends BaseModel {
             e.statusCode != HttpStatus.forbidden &&
             e.responseBody is RestError &&
             e.responseBody.message != null) {
-          errorMessage = translate('api.general_rest_error_payload',
+          errorMessage = translate('api.general_rest_error_payload', args: {'message': e.responseBody.message});
-              args: {'message': e.responseBody.message});
         } else {
           errorMessage = translate('api.general_rest_error');
         }

lib/core/viewmodels/login_model.dart

@@ -117,19 +117,14 @@ class LoginModel extends BaseModel {
     try {
       if (useCredentialsLogin) {
         CreateApiKeyResponse apiKeyResponse = await _userService.createApiKey(
-            url,
+            url, username, password, 'apikey', 'fbmobile-${new DateTime.now().millisecondsSinceEpoch}');
-            username,
-            password,
-            'apikey',
-            'fbmobile-${new DateTime.now().millisecondsSinceEpoch}');
 
         var newKey = apiKeyResponse.data['new_key'];
         if (newKey != null) {
           success = await _sessionService.login(url, newKey);
         } else {
           throw new ServiceException(
-              code: ErrorCode.INVALID_API_KEY,
+              code: ErrorCode.INVALID_API_KEY, message: translate('login.errors.invalid_api_key'));
-              message: translate('login.errors.invalid_api_key'));
         }
       } else {
         _sessionService.setApiConfig(url, apiKey);
@@ -141,15 +136,13 @@ class LoginModel extends BaseModel {
       if (e is RestServiceException) {
         if (e.statusCode == HttpStatus.unauthorized) {
           errorMessage = translate('login.errors.wrong_credentials');
-        } else if (e.statusCode != HttpStatus.unauthorized &&
+        } else if (e.statusCode != HttpStatus.unauthorized && e.statusCode == HttpStatus.forbidden) {
-            e.statusCode == HttpStatus.forbidden) {
           errorMessage = translate('login.errors.forbidden');
         } else if (e.statusCode == HttpStatus.notFound) {
           errorMessage = translate('api.incompatible_error_not_found');
         }
         if (e.statusCode == HttpStatus.badRequest) {
-          errorMessage = translate('api.bad_request',
+          errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
-              args: {'reason': e.responseBody.message});
         } else {
           errorMessage = translate('api.general_rest_error');
         }

lib/ui/app_router.dart

@@ -27,8 +27,7 @@ class AppRouter {
         return MaterialPageRoute(
             builder: (_) => Scaffold(
                   body: Center(
-                    child: Text(translate('dev.no_route',
+                    child: Text(translate('dev.no_route', args: {'route': settings.name})),
-                        args: {'route': settings.name})),
                   ),
                 ));
     }

lib/ui/views/base_view.dart

@@ -31,9 +31,7 @@ class _BaseViewState<T extends BaseModel> extends State<BaseView<T>> {
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider<T?>(
+    return ChangeNotifierProvider<T?>(create: (context) => model, child: Consumer<T>(builder: widget.builder!));
-        create: (context) => model,
-        child: Consumer<T>(builder: widget.builder!));
   }
 
   @override

lib/ui/views/history_view.dart

@@ -42,8 +42,7 @@ class HistoryView extends StatelessWidget {
             ? Container(
                 padding: EdgeInsets.all(0),
                 child: RefreshIndicator(
-                    onRefresh: () async => await model.getHistory(),
+                    onRefresh: () async => await model.getHistory(), child: _renderItems(model, url, context)))
-                    child: _renderItems(model, url, context)))
             : Container(
                 padding: EdgeInsets.all(25),
                 child: CenteredErrorRow(
@@ -63,8 +62,7 @@ class HistoryView extends StatelessWidget {
         var openInBrowserButton = _renderOpenInBrowser(model, fullPasteUrl);
 
         var dateWidget = ListTile(
-          title: Text(
+          title: Text(FormatterUtil.formatEpoch(paste.date!.millisecondsSinceEpoch)),
-              FormatterUtil.formatEpoch(paste.date!.millisecondsSinceEpoch)),
           subtitle: Text(translate('history.date')),
         );
 
@@ -76,8 +74,7 @@ class HistoryView extends StatelessWidget {
         var copyWidget = ListTile(
             title: Text(translate('history.copy_link.description')),
             trailing: IconButton(
-                icon: Icon(Icons.copy,
+                icon: Icon(Icons.copy, color: blueColor, textDirection: TextDirection.ltr),
-                    color: blueColor, textDirection: TextDirection.ltr),
                 onPressed: () {
                   FlutterClipboard.copy(fullPasteUrl).then((value) {
                     final snackBar = SnackBar(
@@ -168,14 +165,12 @@ class HistoryView extends StatelessWidget {
             trailing: Wrap(children: [
               openInBrowserButton,
               IconButton(
-                  icon: Icon(Icons.share,
+                  icon: Icon(Icons.share, color: blueColor, textDirection: TextDirection.ltr),
-                      color: blueColor, textDirection: TextDirection.ltr),
                   onPressed: () async {
                     await Share.share(fullPasteUrl);
                   })
             ]),
-            subtitle: Text(!paste.isMulti! ? paste.filename! : '',
+            subtitle: Text(!paste.isMulti! ? paste.filename! : '', style: TextStyle(fontStyle: FontStyle.italic)),
-                style: TextStyle(fontStyle: FontStyle.italic)),
           ),
         ));
       });
@@ -196,8 +191,7 @@ class HistoryView extends StatelessWidget {
 
   Widget _renderOpenInBrowser(HistoryModel model, String url) {
     return IconButton(
-        icon: Icon(Icons.open_in_new,
+        icon: Icon(Icons.open_in_new, color: blueColor, textDirection: TextDirection.ltr),
-            color: blueColor, textDirection: TextDirection.ltr),
         onPressed: () {
           return model.openLink(url);
         });

lib/ui/views/login_view.dart

@@ -59,18 +59,13 @@ class LoginView extends StatelessWidget {
                           child: Icon(Icons.help, color: buttonBackgroundColor),
                           onTap: () {
                             _dialogService.showDialog(
-                                title: translate(
+                                title: translate('login.compatibility_dialog.title'),
-                                    'login.compatibility_dialog.title'),
+                                description: translate('login.compatibility_dialog.body'));
-                                description: translate(
-                                    'login.compatibility_dialog.body'));
                           },
                         ),
                         InkWell(
-                          child: Icon(
+                          child:
-                              model.useCredentialsLogin
+                              Icon(model.useCredentialsLogin ? Icons.person_outline : Icons.vpn_key, color: blueColor),
-                                  ? Icons.person_outline
-                                  : Icons.vpn_key,
-                              color: blueColor),
                           onTap: () {
                             model.toggleLoginMethod();
                           },
@@ -90,13 +85,11 @@ class LoginView extends StatelessWidget {
                           apiKeyController: model.apiKeyController),
                   UIHelper.verticalSpaceMedium(),
                   ElevatedButton(
-                    child: Text(translate('login.button'),
+                    child: Text(translate('login.button'), style: TextStyle(color: buttonForegroundColor)),
-                        style: TextStyle(color: buttonForegroundColor)),
                     onPressed: () async {
                       var loginSuccess = await model.login();
                       if (loginSuccess) {
-                        _navigationService
+                        _navigationService.navigateAndReplaceTo(HomeView.routeName);
-                            .navigateAndReplaceTo(HomeView.routeName);
                       }
                     },
                   )

lib/ui/views/tabbar_anonymous.dart

@@ -9,8 +9,7 @@ class AnonymousTabBarView extends StatefulWidget {
   AnonymousTabBarState createState() => AnonymousTabBarState();
 }
 
-class AnonymousTabBarState extends State<AnonymousTabBarView>
+class AnonymousTabBarState extends State<AnonymousTabBarView> with SingleTickerProviderStateMixin {
-    with SingleTickerProviderStateMixin {
   TabController? _tabController;
   int _currentTabIndex = 0;
 

lib/ui/views/tabbar_container_view.dart

@@ -9,8 +9,7 @@ class TabBarContainerView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Session? currentSession = Provider.of<Session?>(context);
-    bool isAuthenticated =
+    bool isAuthenticated = currentSession != null ? currentSession.apiKey.isNotEmpty : false;
-        currentSession != null ? currentSession.apiKey.isNotEmpty : false;
 
     if (isAuthenticated) {
       return AuthenticatedTabBarView();

lib/ui/views/upload_view.dart

@@ -26,8 +26,7 @@ class UploadView extends StatelessWidget {
   }
 
   bool _isUploadButtonEnabled(UploadModel model) {
-    return model.pasteTextTouched ||
+    return model.pasteTextTouched || (model.paths != null && model.paths!.length > 0);
-        (model.paths != null && model.paths!.length > 0);
   }
 
   Widget _render(UploadModel model, BuildContext context) {
@@ -40,9 +39,7 @@ class UploadView extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                 CircularProgressIndicator(),
-                (model.stateMessage != null && model.stateMessage!.isNotEmpty
+                (model.stateMessage != null && model.stateMessage!.isNotEmpty ? Text(model.stateMessage!) : Container())
-                    ? Text(model.stateMessage!)
-                    : Container())
               ]))
         : ListView(children: <Widget>[
             Padding(
@@ -61,15 +58,12 @@ class UploadView extends StatelessWidget {
                                 color: buttonBackgroundColor,
                               ),
                               suffixIcon: IconButton(
-                                onPressed: () =>
+                                onPressed: () => model.pasteTextController.clear(),
-                                    model.pasteTextController.clear(),
                                 icon: Icon(Icons.clear),
                               ),
                               hintText: translate('upload.text_to_be_pasted'),
-                              contentPadding:
+                              contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
-                                  EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
+                              border: OutlineInputBorder(borderRadius: BorderRadius.circular(32.0)),
-                              border: OutlineInputBorder(
-                                  borderRadius: BorderRadius.circular(32.0)),
                             ),
                             controller: model.pasteTextController)),
                     Padding(
@@ -85,24 +79,20 @@ class UploadView extends StatelessWidget {
                           crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
                             ElevatedButton.icon(
-                                icon: Icon(Icons.file_copy_sharp,
+                                icon: Icon(Icons.file_copy_sharp, color: blueColor),
-                                    color: blueColor),
                                 onPressed: () => model.openFileExplorer(),
                                 label: Text(
                                   translate('upload.open_file_explorer'),
-                                  style:
+                                  style: TextStyle(color: buttonForegroundColor),
-                                      TextStyle(color: buttonForegroundColor),
                                 )),
                             ElevatedButton.icon(
                                 icon: Icon(Icons.cancel, color: orangeColor),
-                                onPressed: model.paths != null &&
+                                onPressed: model.paths != null && model.paths!.length > 0
-                                        model.paths!.length > 0
                                     ? () => model.clearCachedFiles()
                                     : null,
                                 label: Text(
                                   translate('upload.clear_temporary_files'),
-                                  style:
+                                  style: TextStyle(color: buttonForegroundColor),
-                                      TextStyle(color: buttonForegroundColor),
                                 )),
                           ],
                         )),
@@ -128,48 +118,35 @@ class UploadView extends StatelessWidget {
                                   onPressed: !_isUploadButtonEnabled(model)
                                       ? null
                                       : () async {
-                                          Map<String, bool>? items =
+                                          Map<String, bool>? items = await model.upload();
-                                              await model.upload();
+                                          String? clipboardContent = model.generatePasteLinks(items, url);
-                                          String? clipboardContent = model
-                                              .generatePasteLinks(items, url);
 
-                                          if (clipboardContent != null &&
+                                          if (clipboardContent != null && clipboardContent.isNotEmpty) {
-                                              clipboardContent.isNotEmpty) {
+                                            FlutterClipboard.copy(clipboardContent).then((value) {
-                                            FlutterClipboard.copy(
-                                                    clipboardContent)
-                                                .then((value) {
                                               final snackBar = SnackBar(
                                                 action: SnackBarAction(
-                                                  label: translate(
+                                                  label: translate('upload.dismiss'),
-                                                      'upload.dismiss'),
                                                   textColor: blueColor,
                                                   onPressed: () {
-                                                    ScaffoldMessenger.of(
+                                                    ScaffoldMessenger.of(context).hideCurrentSnackBar();
-                                                            context)
-                                                        .hideCurrentSnackBar();
                                                   },
                                                 ),
-                                                content: Text(translate(
+                                                content: Text(translate('upload.uploaded')),
-                                                    'upload.uploaded')),
                                                 duration: Duration(seconds: 10),
                                               );
-                                              ScaffoldMessenger.of(context)
+                                              ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                                                  .showSnackBar(snackBar);
                                             });
                                           }
                                         },
-                                  icon: Icon(Icons.upload_rounded,
+                                  icon: Icon(Icons.upload_rounded, color: greenColor),
-                                      color: greenColor),
                                   label: Text(
                                     translate('upload.upload'),
-                                    style:
+                                    style: TextStyle(color: buttonForegroundColor),
-                                        TextStyle(color: buttonForegroundColor),
                                   )),
                             ])),
                     model.errorMessage != null && model.errorMessage!.isNotEmpty
                         ? (Padding(
-                            padding:
+                            padding: const EdgeInsets.only(top: 10.0, bottom: 10.0),
-                                const EdgeInsets.only(top: 10.0, bottom: 10.0),
                             child: CenteredErrorRow(model.errorMessage)))
                         : Container(),
                     Builder(
@@ -181,28 +158,16 @@ class UploadView extends StatelessWidget {
                           : model.paths != null
                               ? Container(
                                   padding: const EdgeInsets.only(bottom: 30.0),
-                                  height:
+                                  height: MediaQuery.of(context).size.height * 0.50,
-                                      MediaQuery.of(context).size.height * 0.50,
                                   child: ListView.separated(
-                                    itemCount: model.paths != null &&
+                                    itemCount: model.paths != null && model.paths!.isNotEmpty ? model.paths!.length : 1,
-                                            model.paths!.isNotEmpty
+                                    itemBuilder: (BuildContext context, int index) {
-                                        ? model.paths!.length
+                                      final bool isMultiPath = model.paths != null && model.paths!.isNotEmpty;
-                                        : 1,
-                                    itemBuilder:
-                                        (BuildContext context, int index) {
-                                      final bool isMultiPath =
-                                          model.paths != null &&
-                                              model.paths!.isNotEmpty;
                                       final String name = (isMultiPath
-                                          ? model.paths!
+                                          ? model.paths!.map((e) => e.name).toList()[index]
-                                              .map((e) => e.name)
-                                              .toList()[index]
                                           : model.fileName ?? '...');
                                       final path = model.paths!.length > 0
-                                          ? model.paths!
+                                          ? model.paths!.map((e) => e.path).toList()[index].toString()
-                                              .map((e) => e.path)
-                                              .toList()[index]
-                                              .toString()
                                           : '';
 
                                       return Card(
@@ -213,9 +178,7 @@ class UploadView extends StatelessWidget {
                                         subtitle: Text(path),
                                       ));
                                     },
-                                    separatorBuilder:
+                                    separatorBuilder: (BuildContext context, int index) => const Divider(),
-                                        (BuildContext context, int index) =>
-                                            const Divider(),
                                   ),
                                 )
                               : Container(),

lib/ui/widgets/swipe_navigation.dart

@@ -32,7 +32,6 @@ class _SwipeNavigationState extends State<SwipeNavigation> {
 
   @override
   Widget build(BuildContext context) {
-    return SimpleGestureDetector(
+    return SimpleGestureDetector(onHorizontalSwipe: _onHorizontalSwipe, child: widget.child!);
-        onHorizontalSwipe: _onHorizontalSwipe, child: widget.child!);
   }
 }