From 687db37daf86aa7b84438c677f410936dd519495 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 9 Dec 2024 21:42:19 +0800
Subject: [PATCH] :bug: Fix first time login did not connect to ws
 :wastebasket: Remove next version notice

---
 android/app/src/main/AndroidManifest.xml |  3 ++-
 assets/translations/zh.json              |  2 --
 lib/screens/auth/login.dart              |  5 +++++
 lib/screens/home.dart                    | 10 ----------
 pubspec.lock                             |  8 ++++++++
 pubspec.yaml                             |  1 +
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c7010c3..aede704 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:label="Solian"
@@ -55,4 +56,4 @@
             <data android:mimeType="text/plain" />
         </intent>
     </queries>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/assets/translations/zh.json b/assets/translations/zh.json
index 31dcd91..ff733ed 100644
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -1,6 +1,4 @@
 {
-  "nextVersionAlert": "高强度开发提示",
-  "nextVersionNotice": "您正在使用的是 Solian 2.0 的抢先体验版本，目前稳定分支（sn.solsynth.dev）版本为 1.4。该版本还在持续的开发中，部分功能可能不稳定，也并非所有功能都支持了。您可以通过 TestFlight 回滚到 1.4.X 或者继续体验新版本（sn-next.solsynth.dev）。",
   "screen": "页面",
   "screenAbout": "关于",
   "screenHome": "首页",
diff --git a/lib/screens/auth/login.dart b/lib/screens/auth/login.dart
index e5e5567..84eaee0 100644
--- a/lib/screens/auth/login.dart
+++ b/lib/screens/auth/login.dart
@@ -11,6 +11,8 @@ import 'package:surface/types/auth.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
+import '../../providers/websocket.dart';
+
 final Map<int, (String label, IconData icon, bool isOtp)> _factorLabelMap = {
   0: ('authFactorPassword'.tr(), Symbols.password, false),
   1: ('authFactorEmail'.tr(), Symbols.email, true),
@@ -156,6 +158,9 @@ class _LoginCheckScreenState extends State<_LoginCheckScreen> {
       final user = context.read<UserProvider>();
       await user.refreshUser();
       if (!mounted) return;
+      final ws = context.read<WebSocketProvider>();
+      await ws.connect();
+      if (!mounted) return;
       Navigator.pop(context, true);
     } catch (err) {
       context.showErrorDialog(err);
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index a57b7f3..20a6cb8 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -64,16 +64,6 @@ class _HomeScreenState extends State<HomeScreen> {
                       : MainAxisAlignment.start,
                   children: [
                     if (constraints.maxWidth <= 640) const Gap(8),
-                    Card(
-                      child: ListTile(
-                        isThreeLine: true,
-                        leading: const Icon(Symbols.construction),
-                        title: Text('nextVersionAlert').tr(),
-                        subtitle: Text('nextVersionNotice').tr(),
-                        contentPadding: const EdgeInsets.symmetric(
-                            vertical: 8, horizontal: 16),
-                      ),
-                    ).padding(horizontal: 8),
                     _HomeDashSpecialDayWidget().padding(top: 8, horizontal: 8),
                     StaggeredGrid.count(
                       crossAxisCount: 2,
diff --git a/pubspec.lock b/pubspec.lock
index 578fc09..d20cc00 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1522,6 +1522,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.3"
+  screenshot:
+    dependency: "direct main"
+    description:
+      name: screenshot
+      sha256: "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sdp_transform:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 823c906..2626742 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -100,6 +100,7 @@ dependencies:
   email_validator: ^3.0.0
   package_info_plus: ^8.1.1
   intl: ^0.19.0
+  screenshot: ^3.0.0
 
 dev_dependencies:
   flutter_test: