From c5ea37f9bdd361d632c6a22abc38419969658647 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Wed, 7 Sep 2022 00:40:53 +0800 Subject: [PATCH] refactor: replace deprecated methods --- lib/models/auth.dart | 24 +++++++++++------------- lib/utils/utils.dart | 9 +++++---- lib/widgets/html_view.dart | 8 +++----- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/lib/models/auth.dart b/lib/models/auth.dart index ae8b87a..a8e76b5 100644 --- a/lib/models/auth.dart +++ b/lib/models/auth.dart @@ -84,7 +84,7 @@ class AuthModel with ChangeNotifier { // https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/#web-application-flow Future _onSchemeDetected(Uri? uri) async { - await closeWebView(); + await closeInAppWebView(); loading = true; notifyListeners(); @@ -143,9 +143,7 @@ class AuthModel with ChangeNotifier { throw info['message']; } if (info['error'] != null) { - throw info['error'] + - '. ' + - (info['error_description'] ?? ''); + throw info['error'] + '. ' + (info['error_description'] ?? ''); } final user = GitlabUser.fromJson(info); await _addAccount(Account( @@ -693,15 +691,15 @@ class AuthModel with ChangeNotifier { Client? _gqlClient; Client get gqlClient { _gqlClient ??= Client( - link: HttpLink( - '$_apiPrefix/graphql', - defaultHeaders: {HttpHeaders.authorizationHeader: 'token $token'}, - ), - // https://ferrygraphql.com/docs/fetch-policies#default-fetchpolicies - defaultFetchPolicies: { - OperationType.query: FetchPolicy.NetworkOnly, - }, - ); + link: HttpLink( + '$_apiPrefix/graphql', + defaultHeaders: {HttpHeaders.authorizationHeader: 'token $token'}, + ), + // https://ferrygraphql.com/docs/fetch-policies#default-fetchpolicies + defaultFetchPolicies: { + OperationType.query: FetchPolicy.NetworkOnly, + }, + ); return _gqlClient!; } diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index f57787b..3c2810f 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -96,8 +96,8 @@ class GithubPalette { // final pageSize = 5; const PAGE_SIZE = 30; -var createWarning = - (String text) => Text(text, style: const TextStyle(color: Colors.redAccent)); +var createWarning = (String text) => + Text(text, style: const TextStyle(color: Colors.redAccent)); var warningSpan = const TextSpan(text: 'xxx', style: TextStyle(color: Colors.redAccent)); @@ -169,8 +169,9 @@ class PrimerBranchName extends StatelessWidget { launchStringUrl(String? url) async { if (url == null) return; - if (await canLaunch(url)) { - await launch(url); + final uri = Uri.parse(url); + if (await canLaunchUrl(uri)) { + await launchUrl(uri); } else { // TODO: fallback } diff --git a/lib/widgets/html_view.dart b/lib/widgets/html_view.dart index 10a48ec..0b012ff 100644 --- a/lib/widgets/html_view.dart +++ b/lib/widgets/html_view.dart @@ -7,10 +7,8 @@ import 'package:webview_flutter/webview_flutter.dart'; class HtmlView extends StatefulWidget { final String html; HtmlView(String text, {String? cssText, List cssLinks = const []}) - : html = '${cssLinks - .map((link) => - '') - .join('')}$text'; + : html = + '${cssLinks.map((link) => '').join('')}$text'; @override _HtmlViewState createState() => _HtmlViewState(); @@ -24,7 +22,7 @@ class _HtmlViewState extends State { updateHeight() async { final value = await controller - .evaluateJavascript("document.documentElement.scrollHeight;"); + .runJavascriptReturningResult("document.documentElement.scrollHeight;"); // print(value); if (mounted) { setState(() {