diff --git a/assets/translations/en.json b/assets/translations/en.json index 1f355b93de..254ecc1521 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -134,7 +134,7 @@ "add_new_user": "Add a first user", "new_user": "New user", "not_ready": "Please connect server, domain and DNS in the Providers tab, to be able to add a first user", - "nobody_here": "'Здесь пока никого'", + "nobody_here": "Здесь пока никого", "login": "Login", "onboarding": "Onboarding", "console": "Console", @@ -149,7 +149,7 @@ "1": "Connect Hetzner server", "2": "Here, your data and SelfPrivacy services wiil reside", "how": "How to obtain API token", - "3": "'Connect CloudFlare'", + "3": "Connect CloudFlare", "4": "To manage your domain's DNS", "5": "CloudFlare API Token", "6": "Connect Backblaze storage", @@ -164,7 +164,7 @@ "15": "Server created. DNS checks and server boot in progress...", "16": "Until the next check: ", "17": "Check", - "18": "How to obtain Hetzner API Token'", + "18": "How to obtain Hetzner API Token", "19": "1 Go via this link ", "20": "\n" } diff --git a/lib/config/bloc_observer.dart b/lib/config/bloc_observer.dart index 526ee86390..e54b399bf2 100644 --- a/lib/config/bloc_observer.dart +++ b/lib/config/bloc_observer.dart @@ -8,7 +8,7 @@ class SimpleBlocObserver extends BlocObserver { SimpleBlocObserver(); @override - void onError(Bloc cubit, Object error, StackTrace stackTrace) { + void onError(BlocBase cubit, Object error, StackTrace stackTrace) { final navigator = getIt.get().navigator!; navigator.push( diff --git a/lib/logic/api_maps/api_map.dart b/lib/logic/api_maps/api_map.dart index 13f05e725e..505ec1780b 100644 --- a/lib/logic/api_maps/api_map.dart +++ b/lib/logic/api_maps/api_map.dart @@ -33,37 +33,46 @@ class ConsoleInterceptor extends InterceptorsWrapper { } @override - Future onRequest(RequestOptions options) async { + Future onRequest( + RequestOptions options, + RequestInterceptorHandler requestInterceptorHandler, + ) async { addMessage( Message( text: 'request-uri: ${options.uri}\nheaders: ${options.headers}\ndata: ${options.data}', ), ); - return super.onRequest(options); + return super.onRequest(options, requestInterceptorHandler); } @override - Future onResponse(Response response) async { + Future onResponse( + Response response, + ResponseInterceptorHandler requestInterceptorHandler, + ) async { addMessage( Message( text: - 'response-uri: ${response.request.uri}\ncode: ${response.statusCode}\ndata: ${response.toString()}\n', + 'response-uri: ${response.realUri}\ncode: ${response.statusCode}\ndata: ${response.toString()}\n', ), ); - return super.onResponse(response); + return super.onResponse( + response, + requestInterceptorHandler, + ); } @override - Future onError(DioError err) async { + Future onError(DioError err, ErrorInterceptorHandler handler) async { var response = err.response; log(err.toString()); addMessage( Message.warn( text: - 'response-uri: ${response?.request.uri}\ncode: ${response?.statusCode}\ndata: ${response?.toString()}\n', + 'response-uri: ${response?.realUri}\ncode: ${response?.statusCode}\ndata: ${response?.toString()}\n', ), ); - return super.onError(err); + return super.onError(err, handler); } } diff --git a/lib/ui/components/brand_modal_sheet/brand_modal_sheet.dart b/lib/ui/components/brand_modal_sheet/brand_modal_sheet.dart index 681ded5317..7670c94dbd 100644 --- a/lib/ui/components/brand_modal_sheet/brand_modal_sheet.dart +++ b/lib/ui/components/brand_modal_sheet/brand_modal_sheet.dart @@ -43,18 +43,17 @@ class BrandModalSheet extends StatelessWidget { ), ), Container( - constraints: BoxConstraints( - minHeight: MediaQuery.of(context).size.height - 32 - 4, - maxHeight: MediaQuery.of(context).size.height, - ), - decoration: BoxDecoration( - borderRadius: - BorderRadius.vertical(top: Radius.circular(20)), - color: Theme.of(context).scaffoldBackgroundColor, - ), - width: double.infinity, - child: child - ), + constraints: BoxConstraints( + minHeight: MediaQuery.of(context).size.height - 132, + maxHeight: MediaQuery.of(context).size.height - 132, + ), + decoration: BoxDecoration( + borderRadius: + BorderRadius.vertical(top: Radius.circular(20)), + color: Theme.of(context).scaffoldBackgroundColor, + ), + width: double.infinity, + child: child), ], ), ), diff --git a/lib/ui/pages/initializing/initializing.dart b/lib/ui/pages/initializing/initializing.dart index 4375f42240..0f914a6b49 100644 --- a/lib/ui/pages/initializing/initializing.dart +++ b/lib/ui/pages/initializing/initializing.dart @@ -181,7 +181,7 @@ class InitializingPage extends StatelessWidget { ), SizedBox(height: 10), BrandButton.text( - onPressed: () {}, + onPressed: () => _showModal(context, _HowHetzner()), title: 'initializing.how'.tr(), ), ], @@ -488,7 +488,7 @@ class _HowHetzner extends StatelessWidget { Widget build(BuildContext context) { return BrandModalSheet( child: Padding( - padding: brandPagePadding1, + padding: brandPagePadding2.copyWith(top: 25), child: BrandMarkdown( fileName: 'how_hetzner', )), diff --git a/pubspec.lock b/pubspec.lock index a7267e0046..088143aa13 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "17.0.0" + version: "14.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "0.41.2" archive: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.0-nullsafety.3" + version: "7.0.0" boolean_selector: dependency: transitive description: @@ -63,14 +63,14 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.6.3" + version: "1.6.2" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.6" + version: "0.4.5" build_daemon: dependency: transitive description: @@ -84,7 +84,7 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.5.4" + version: "1.5.3" build_runner: dependency: "direct dev" description: @@ -105,14 +105,14 @@ packages: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "4.3.2" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.0.2" + version: "7.1.0" characters: dependency: transitive description: @@ -140,7 +140,7 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.2.0" clock: dependency: transitive description: @@ -154,7 +154,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "3.5.0" collection: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "0.15.2" crypto: dependency: "direct main" description: @@ -203,14 +203,14 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.3.14" + version: "1.3.12" dio: dependency: "direct main" description: name: dio url: "https://pub.dartlang.org" source: hosted - version: "4.0.0-beta7" + version: "4.0.0-prev1" easy_localization: dependency: "direct main" description: @@ -273,7 +273,7 @@ packages: name: fixnum url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.10.11" flutter: dependency: "direct main" description: flutter @@ -285,7 +285,7 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "7.0.0-nullsafety.5" + version: "7.0.0" flutter_launcher_icons: dependency: "direct dev" description: @@ -398,7 +398,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.5" + version: "0.3.4" js: dependency: transitive description: @@ -461,7 +461,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.9.7" nested: dependency: transitive description: @@ -482,7 +482,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.9.3" package_info: dependency: "direct main" description: @@ -594,21 +594,28 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.4.4" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "0.1.8" + version: "0.1.7" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.5" shared_preferences: dependency: transitive description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" shared_preferences_linux: dependency: transitive description: @@ -650,21 +657,21 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "2.0.1" shelf_static: dependency: transitive description: name: shelf_static url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.2.9+2" shelf_web_socket: dependency: transitive description: @@ -725,7 +732,7 @@ packages: name: stream_transform url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.2.0" string_scanner: dependency: transitive description: @@ -830,7 +837,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.1.0+1" + version: "5.5.0" wakelock: dependency: "direct main" description: @@ -872,7 +879,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.9.7+15" web_socket_channel: dependency: transitive description: @@ -886,7 +893,7 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.7.5" win32: dependency: transitive description: