add focus node check

kidozh · Dec 1, 2024 · 57e8db8 · 57e8db8
1 parent 1bafdd0
commit 57e8db8
Show file tree

Hide file tree

Showing 13 changed files with 422 additions and 305 deletions.
diff --git a/lib/app/MainApp.dart b/lib/app/MainApp.dart
@@ -782,6 +782,8 @@ class MainTwoPaneState extends State<MainTwoPaneStatefulWidget>
         navigatorKey: this.navigatorKey,
       );
     }
+
+
     double paneProportion = 0.35;
     // directly give
     return OrientationBuilder(builder: (context, orientation) {

diff --git a/lib/client/SteamApiClient.dart b/lib/client/SteamApiClient.dart
@@ -15,5 +15,6 @@ abstract class SteamApiClient {
   @GET("/api/appdetails")
   Future<String> getSteamGameResultByAppId(
       @Query("appids") String appId,
+      @Query("l") String language
       );
 }
diff --git a/lib/client/SteamApiClient.g.dart b/lib/client/SteamApiClient.g.dart
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -867,5 +867,11 @@
   },
   "openGameInSteam": "View in Steam",
   "gameFreeOfCharge": "Free",
-  "gameComingSoon": "Coming Soon"
+  "gameComingSoon": "Coming Soon",
+  "gameLanguageNotSupported": "Not support {language}",
+  "@gameLanguageNotSupported": {
+    "placeholders": {
+      "language": {}
+    }
+  }
 }
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
@@ -868,6 +868,12 @@
   },
   "openGameInSteam": "在Steam中打开",
   "gameFreeOfCharge": "免费",
-  "gameComingSoon": "即将发售"
+  "gameComingSoon": "即将发售",
+  "gameLanguageNotSupported": "不支持{language}",
+  "@gameLanguageNotSupported": {
+    "placeholders": {
+      "language": {}
+    }
+  }
 
 }
diff --git a/lib/page/TestFlightBannerPage.dart b/lib/page/TestFlightBannerPage.dart
@@ -10,6 +10,7 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 
+import '../provider/ThemeNotifierProvider.dart';
 import '../provider/UserPreferenceNotifierProvider.dart';
 import '../utility/PostTextFieldUtils.dart';
 

diff --git a/lib/page/ViewThreadSliverPage.dart b/lib/page/ViewThreadSliverPage.dart
@@ -130,7 +130,7 @@ class _ViewThreadSliverState extends State<ViewThreadStatefulSliverWidget> {
   ButtonState _sendReplyStatus = ButtonState.idle;
   ViewThreadQuery viewThreadQuery = ViewThreadQuery();
   Map<String, List<Comment>> postCommentList = {};
-  final FocusNode _focusNode = FocusNode();
+  final FocusNode _focusNode = FocusNode(debugLabel: "view_thread_textfield");
 
   // smiley=1, extra=2 or none = 0
   int dialogStatus = 0;
@@ -176,7 +176,7 @@ class _ViewThreadSliverState extends State<ViewThreadStatefulSliverWidget> {
 
   void bindFocusNode() {
     _focusNode.addListener(() {
-      //print("In focus node");
+      debugDumpFocusTree();
       if (_focusNode.hasFocus) {
         setState(() {
           dialogStatus = SHOW_NONE_DIALOG;
@@ -190,9 +190,10 @@ class _ViewThreadSliverState extends State<ViewThreadStatefulSliverWidget> {
 
     _scrollController.addListener(() {
       // remove focus when
+
       if (_focusNode.hasFocus) {
         DateTime now = DateTime.now();
-        if(now.difference(lastFocusAt).inSeconds > 10){
+        if(now.difference(lastFocusAt).inSeconds > 1){
           print("Unfocus node due to scroll ${now.difference(lastFocusAt).inSeconds}");
           _focusNode.unfocus();
         }

diff --git a/lib/utility/NetworkUtils.dart b/lib/utility/NetworkUtils.dart
@@ -40,7 +40,7 @@ class NetworkUtils{
   static Dio getDio(){
     return Dio(BaseOptions(
       headers: {
-        'Accept-Language': LanguageCode.code.code
+        'Accept-Language': "zh-CN,zh;q=0.9,zh-TW;q=0.8,en;q=0.6"
       }
     ));
   }

diff --git a/lib/widget/DiscuzHtmlWidget.dart b/lib/widget/DiscuzHtmlWidget.dart
@@ -132,8 +132,9 @@ class DiscuzHtmlWidget extends StatelessWidget {
               };
             } else if(element.className == "reply_wrap"){
               return {
-                "background-color": "#${Theme.of(context).colorScheme.primaryContainer.value.toRadixString(16).substring(2)}",
-                "padding" : "0.1em",
+                "border": "0.4rem dashed #${Theme.of(context).colorScheme.primary.value.toRadixString(16).substring(2)}",
+                "background-color" : "#${Theme.of(context).colorScheme.primaryContainer.value.toRadixString(16).substring(2)}",
+                "padding" : "0.5em",
                 "margin-bottom": "0.1em"
               };
             }