From 521c8ad18e68461396b53a90597fb010522c8946 Mon Sep 17 00:00:00 2001 From: open-trade Date: Mon, 16 Nov 2020 21:21:27 +0800 Subject: [PATCH] add loading --- flutter_hbb/lib/common.dart | 10 ++++++++++ flutter_hbb/lib/home_page.dart | 2 +- flutter_hbb/lib/main.dart | 3 ++- flutter_hbb/pubspec.lock | 14 ++++++++++++++ flutter_hbb/pubspec.yaml | 1 + 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/flutter_hbb/lib/common.dart b/flutter_hbb/lib/common.dart index 7f041f427..817c1539b 100644 --- a/flutter_hbb/lib/common.dart +++ b/flutter_hbb/lib/common.dart @@ -5,6 +5,7 @@ import 'dart:io'; import 'dart:ffi'; import 'dart:async'; import 'dart:convert'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; class HexColor extends Color { HexColor(final String hexColor) : super(_getColorFromHex(hexColor)); @@ -104,3 +105,12 @@ class Peer { hostname = json['hostname'], platform = json['platform']; } + +// https://github.com/huangjianke/flutter_easyloading +void showLoading(String text) { + EasyLoading.show(status: text); +} + +void dismissLoading() { + EasyLoading.dismiss(); +} diff --git a/flutter_hbb/lib/home_page.dart b/flutter_hbb/lib/home_page.dart index bf02c4436..ea349b5c4 100644 --- a/flutter_hbb/lib/home_page.dart +++ b/flutter_hbb/lib/home_page.dart @@ -72,7 +72,7 @@ class _HomePageState extends State { fontSize: 30, color: Color(0xFF00B6F0), ), - keyboardType: TextInputType.text, + keyboardType: TextInputType.number, decoration: InputDecoration( labelText: 'Remote ID', border: InputBorder.none, diff --git a/flutter_hbb/lib/main.dart b/flutter_hbb/lib/main.dart index de0f03e07..f2993d410 100644 --- a/flutter_hbb/lib/main.dart +++ b/flutter_hbb/lib/main.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'common.dart'; import 'home_page.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; void main() { runApp(App()); @@ -19,7 +20,7 @@ class App extends StatelessWidget { primarySwatch: Colors.blue, visualDensity: VisualDensity.adaptivePlatformDensity, ), - home: HomePage(title: 'RustDesk'), + home: FlutterEasyLoading(child: HomePage(title: 'RustDesk')), )); } } diff --git a/flutter_hbb/pubspec.lock b/flutter_hbb/pubspec.lock index 758ed271c..e4652d505 100644 --- a/flutter_hbb/pubspec.lock +++ b/flutter_hbb/pubspec.lock @@ -76,6 +76,20 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_easyloading: + dependency: "direct main" + description: + name: flutter_easyloading + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" + flutter_spinkit: + dependency: transitive + description: + name: flutter_spinkit + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.2+1" flutter_test: dependency: "direct dev" description: flutter diff --git a/flutter_hbb/pubspec.yaml b/flutter_hbb/pubspec.yaml index ad8c52b05..c75c075f3 100644 --- a/flutter_hbb/pubspec.yaml +++ b/flutter_hbb/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: ffi: ^0.1.3 path_provider: ^1.6.24 provider: ^4.3.2+2 + flutter_easyloading: ^2.1.3 dev_dependencies: flutter_test: