From a01b87510c0a57c00c45e1ee47aa24d54b75980d Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Sun, 8 Jan 2023 23:30:34 +0900
Subject: [PATCH] move login.dart
---
flutter/lib/common/hbbs/hbbs.dart | 8 --------
flutter/lib/common/widgets/address_book.dart | 2 +-
flutter/lib/{desktop => common}/widgets/login.dart | 0
flutter/lib/desktop/pages/desktop_setting_page.dart | 2 +-
flutter/lib/mobile/pages/connection_page.dart | 2 +-
flutter/lib/mobile/pages/settings_page.dart | 4 ++--
6 files changed, 5 insertions(+), 13 deletions(-)
rename flutter/lib/{desktop => common}/widgets/login.dart (100%)
diff --git a/flutter/lib/common/hbbs/hbbs.dart b/flutter/lib/common/hbbs/hbbs.dart
index 6a80f8269..27238db67 100644
--- a/flutter/lib/common/hbbs/hbbs.dart
+++ b/flutter/lib/common/hbbs/hbbs.dart
@@ -103,14 +103,6 @@ class LoginResponse {
LoginResponse.fromJson(Map<String, dynamic> json) {
access_token = json['access_token'];
type = json['type'];
- print("user: ${json['user']}");
- print("user id: ${json['user']['id']}");
- print("user name: ${json['user']['name']}");
- print("user email: ${json['user']['id']}");
- print("user note: ${json['user']['note']}");
- print("user status: ${json['user']['status']}");
- print("user grp: ${json['user']['grp']}");
- print("user is_admin: ${json['user']['is_admin']}");
user = json['user'] != null ? UserPayload.fromJson(json['user']) : null;
}
}
diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart
index 3e7f46814..34d5af485 100644
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -3,12 +3,12 @@ import 'package:flutter_hbb/common/formatter/id_formatter.dart';
import 'package:flutter_hbb/common/widgets/peer_card.dart';
import 'package:flutter_hbb/common/widgets/peers_view.dart';
import 'package:flutter_hbb/desktop/widgets/popup_menu.dart';
-import 'package:flutter_hbb/desktop/widgets/login.dart';
import '../../consts.dart';
import '../../desktop/widgets/material_mod_popup_menu.dart' as mod_menu;
import 'package:get/get.dart';
import '../../common.dart';
+import 'login.dart';
class AddressBook extends StatefulWidget {
final EdgeInsets? menuPadding;
diff --git a/flutter/lib/desktop/widgets/login.dart b/flutter/lib/common/widgets/login.dart
similarity index 100%
rename from flutter/lib/desktop/widgets/login.dart
rename to flutter/lib/common/widgets/login.dart
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 15f78daeb..ca8e47e69 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -8,7 +8,6 @@ import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
-import 'package:flutter_hbb/desktop/widgets/login.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter_hbb/models/server_model.dart';
import 'package:get/get.dart';
@@ -18,6 +17,7 @@ import 'package:url_launcher/url_launcher_string.dart';
import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
import '../../common/widgets/dialog.dart';
+import '../../common/widgets/login.dart';
const double _kTabWidth = 235;
const double _kTabHeight = 42;
diff --git a/flutter/lib/mobile/pages/connection_page.dart b/flutter/lib/mobile/pages/connection_page.dart
index b8104387e..6fce887bf 100644
--- a/flutter/lib/mobile/pages/connection_page.dart
+++ b/flutter/lib/mobile/pages/connection_page.dart
@@ -7,9 +7,9 @@ import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../common.dart';
+import '../../common/widgets/login.dart';
import '../../common/widgets/peer_tab_page.dart';
import '../../consts.dart';
-import '../../desktop/widgets/login.dart';
import '../../models/model.dart';
import '../../models/platform_model.dart';
import 'home_page.dart';
diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart
index 0764f8247..b14f3ee65 100644
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -9,7 +9,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../common.dart';
import '../../common/widgets/dialog.dart';
-import '../../desktop/widgets/login.dart';
+import '../../common/widgets/login.dart';
import '../../models/model.dart';
import '../../models/platform_model.dart';
import '../widgets/dialog.dart';
@@ -398,7 +398,7 @@ void showServerSettings(OverlayDialogManager dialogManager) async {
void showLanguageSettings(OverlayDialogManager dialogManager) async {
try {
final langs = json.decode(await bind.mainGetLangs()) as List<dynamic>;
- var lang = await bind.mainGetLocalOption(key: "lang");
+ var lang = bind.mainGetLocalOption(key: "lang");
dialogManager.show((setState, close) {
setLang(v) {
if (lang != v) {