#30 fix: context.pop()

lib/core/extension/navigator.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 extension ContextX on BuildContext {
-  void pop<T>([T? result]) {
-    Navigator.of(this).pop(T);
+  void pop<T extends Object?>([T? result]) {
+    Navigator.of(this).pop<T>(result);
   }
 }

lib/core/update.dart

@@ -3,12 +3,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:logging/logging.dart';
 import 'package:r_upgrade/r_upgrade.dart';
+import 'package:toolbox/core/extension/navigator.dart';
 
 import '../data/provider/app.dart';
 import '../data/res/build_data.dart';
 import '../data/service/app.dart';
 import '../locator.dart';
-import 'utils/navigator.dart';
 import 'utils/platform.dart';
 import 'utils/ui.dart';
 

lib/core/utils/server.dart

@@ -30,8 +30,10 @@ enum GenSSHClientStatus {
   pwd,
 }
 
-Future<SSHClient> genClient(ServerPrivateInfo spi,
-    {void Function(GenSSHClientStatus)? onStatus}) async {
+Future<SSHClient> genClient(
+  ServerPrivateInfo spi, {
+  void Function(GenSSHClientStatus)? onStatus,
+}) async {
   final onStatus_ = onStatus ?? (_) {};
   onStatus_(GenSSHClientStatus.socket);
   final socket = await SSHSocket.connect(

lib/core/utils/ui.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:toolbox/core/utils/navigator.dart';
+import 'package:toolbox/core/extension/navigator.dart';
 import 'package:toolbox/data/res/ui.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -46,18 +46,18 @@ Future<bool> openUrl(String url) async {
   return await launchUrl(url.uri, mode: LaunchMode.externalApplication);
 }
 
-Future<T?>? showRoundDialog<T>({
+Future<T?> showRoundDialog<T>({
   required BuildContext context,
   Widget? child,
   List<Widget>? actions,
   Widget? title,
   EdgeInsets? padding,
   bool barrierDismiss = true,
-}) {
-  return showDialog<T>(
+}) async {
+  return await showDialog<T>(
     context: context,
     barrierDismissible: barrierDismiss,
-    builder: (ctx) {
+    builder: (_) {
       return CardDialog(
         title: title,
         content: child,