Add FPS

Author: Robert-Stackflow

lib/Screens/Setting/experiment_setting_screen.dart

@@ -81,70 +81,79 @@ class _ExperimentSettingScreenState extends State<ExperimentSettingScreen>
           children: [
             if (ResponsiveUtil.isLandscape()) const SizedBox(height: 10),
             ..._privacySettings(),
-            if (ResponsiveUtil.isAndroid()) const SizedBox(height: 10),
-            if (ResponsiveUtil.isAndroid())
-              ItemBuilder.buildEntryItem(
-                // tip: _modes.isNotEmpty
-                //     ? _modes[_refreshRate.clamp(0, _modes.length - 1)]
-                //         .toString()
-                //     : "",
-                context: context,
-                title: "刷新率",
-                description:
-                    "意在解决部分机型高刷失效的问题，如无问题，请不要修改\n如果您的设备支持LTPO，可能会设置失败\n已选模式: ${_modes.isNotEmpty ? _modes[_refreshRate.clamp(0, _modes.length - 1)].toString() : ""}\n首选模式: ${_preferredMode?.toString() ?? "Unknown"}\n活动模式: ${_activeMode?.toString() ?? "Unknown"}",
-                topRadius: true,
-                bottomRadius: true,
-                onTap: () {
-                  getRefreshRate();
-                  BottomSheetBuilder.showListBottomSheet(
-                    context,
-                    (context) => TileList.fromOptions(
-                      _supportedModeTuples,
-                      (item2) async {
-                        try {
-                          ILogger.info(
-                              "Try to set display mode: ${item2.toString()}");
-                          ILogger.info(
-                              "Active display mode before set: ${_activeMode.toString()}\nPreferred display mode before set: ${_preferredMode.toString()}");
-                          await FlutterDisplayMode.setPreferredMode(item2);
-                          _activeMode = await FlutterDisplayMode.active;
-                          _preferredMode = await FlutterDisplayMode.preferred;
-                          ILogger.info(
-                              "Active display mode after set: ${_activeMode.toString()}\nPreferred display mode after set: ${_preferredMode.toString()}");
-                          if (_preferredMode?.toString() != item2.toString()) {
-                            IToast.showTop("刷新率设置失败");
-                          } else {
-                            if (_activeMode?.toString() != item2.toString()) {
-                              IToast.showTop("刷新率设置成功，但当前显示模式未改变");
-                            } else {
-                              IToast.showTop("刷新率设置成功");
-                            }
-                          }
-                        } catch (e, t) {
-                          IToast.showTop("刷新率设置失败: ${e.toString()}");
-                          ILogger.error("Failed to set display mode", e, t);
-                        }
-                        _refreshRate = _modes.indexOf(item2);
-                        getRefreshRate();
-                        HiveUtil.put(HiveUtil.refreshRateKey, _refreshRate);
-                        Navigator.pop(context);
-                      },
-                      selected:
-                          _modes[_refreshRate.clamp(0, _modes.length - 1)],
-                      context: context,
-                      title: "选择刷新率",
-                      onCloseTap: () => Navigator.pop(context),
-                    ),
-                  );
-                },
-              ),
+            if (ResponsiveUtil.isAndroid()) ..._fpsSettings(),
             const SizedBox(height: 30),
           ],
         ),
       ),
     );
   }
 
+  _fpsSettings() {
+    return [
+      const SizedBox(height: 10),
+      ItemBuilder.buildEntryItem(
+        context: context,
+        title: "刷新率",
+        description:
+            "意在解决部分机型高刷失效的问题，如无问题，请不要修改\n如果您的设备支持LTPO，可能会设置失败\n已选模式: ${_modes.isNotEmpty ? _modes[_refreshRate.clamp(0, _modes.length - 1)].toString() : ""}\n首选模式: ${_preferredMode?.toString() ?? "Unknown"}\n活动模式: ${_activeMode?.toString() ?? "Unknown"}",
+        topRadius: true,
+        onTap: () {
+          getRefreshRate();
+          BottomSheetBuilder.showListBottomSheet(
+            context,
+            (context) => TileList.fromOptions(
+              _supportedModeTuples,
+              (item2) async {
+                try {
+                  ILogger.info("Try to set display mode: ${item2.toString()}");
+                  ILogger.info(
+                      "Active display mode before set: ${_activeMode.toString()}\nPreferred display mode before set: ${_preferredMode.toString()}");
+                  await FlutterDisplayMode.setPreferredMode(item2);
+                  _activeMode = await FlutterDisplayMode.active;
+                  _preferredMode = await FlutterDisplayMode.preferred;
+                  ILogger.info(
+                      "Active display mode after set: ${_activeMode.toString()}\nPreferred display mode after set: ${_preferredMode.toString()}");
+                  if (_preferredMode?.toString() != item2.toString()) {
+                    IToast.showTop("刷新率设置失败");
+                  } else {
+                    if (_activeMode?.toString() != item2.toString()) {
+                      IToast.showTop("刷新率设置成功，但当前显示模式未改变");
+                    } else {
+                      IToast.showTop("刷新率设置成功");
+                    }
+                  }
+                } catch (e, t) {
+                  IToast.showTop("刷新率设置失败: ${e.toString()}");
+                  ILogger.error("Failed to set display mode", e, t);
+                }
+                _refreshRate = _modes.indexOf(item2);
+                getRefreshRate();
+                HiveUtil.put(HiveUtil.refreshRateKey, _refreshRate);
+                Navigator.pop(context);
+              },
+              selected: _modes[_refreshRate.clamp(0, _modes.length - 1)],
+              context: context,
+              title: "选择刷新率",
+              onCloseTap: () => Navigator.pop(context),
+            ),
+          );
+        },
+      ),
+      ItemBuilder.buildRadioItem(
+        context: context,
+        value: appProvider.showFPS,
+        title: "显示实时FPS",
+        bottomRadius: true,
+        onTap: () {
+          setState(() {
+            appProvider.showFPS = !appProvider.showFPS;
+          });
+        },
+      ),
+    ];
+  }
+
   _privacySettings() {
     return [
       ItemBuilder.buildCaptionItem(

lib/Screens/panel_screen.dart

@@ -20,6 +20,7 @@ import 'package:loftify/Screens/Navigation/mine_screen.dart';
 import 'package:loftify/Screens/refresh_interface.dart';
 import 'package:loftify/Utils/ilogger.dart';
 import 'package:provider/provider.dart';
+import 'package:show_fps/show_fps.dart';
 
 import '../Utils/app_provider.dart';
 import '../Utils/constant.dart';

lib/Utils/app_provider.dart

@@ -66,6 +66,16 @@ class AppProvider with ChangeNotifier {
 
   bool shownShortcutHelp = false;
 
+  bool _showFPS = HiveUtil.getBool(HiveUtil.showFPSKey, defaultValue: false);
+
+  bool get showFPS => _showFPS;
+
+  set showFPS(bool value) {
+    _showFPS = value;
+    HiveUtil.put(HiveUtil.showFPSKey, value);
+    notifyListeners();
+  }
+
   String _captchaToken = "";
 
   String get captchaToken => _captchaToken;

lib/Utils/hive_util.dart

@@ -104,6 +104,7 @@ class HiveUtil {
   //System
   static const String firstLoginKey = "firstLogin";
   static const String refreshRateKey = "refreshRate";
+  static const String showFPSKey = "showFPS";
 
   static confirmLogout(BuildContext context) {
     DialogBuilder.showConfirmDialog(

lib/main.dart

@@ -20,6 +20,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path/path.dart';
 import 'package:protocol_handler/protocol_handler.dart';
 import 'package:provider/provider.dart';
+import 'package:show_fps/show_fps.dart';
 import 'package:window_manager/window_manager.dart';
 
 import 'Screens/main_screen.dart';
@@ -151,6 +152,27 @@ class MyApp extends StatelessWidget {
     this.title = 'Loftify',
   });
 
+  _buildFPS(BuildContext context, Widget child) {
+    if (appProvider.showFPS) {
+      return ShowFPS(
+        alignment: Alignment.topRight,
+        visible: true,
+        showChart: false,
+        textStyle: Theme.of(context)
+            .textTheme
+            .titleLarge
+            ?.apply(color: Colors.red, fontSizeDelta: 10),
+        // decoration: BoxDecoration(
+        //   color: Colors.black54,
+        //   borderRadius: BorderRadius.circular(8),
+        // ),
+        child: child,
+      );
+    } else {
+      return child;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
@@ -206,7 +228,7 @@ class MyApp extends StatelessWidget {
                           FocusManager.instance.primaryFocus?.unfocus();
                         }
                       },
-                      child: widget,
+                      child: _buildFPS(context, widget),
                     ),
                   ),
                 ],

pubspec.lock

@@ -1499,6 +1499,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.2"
+  show_fps:
+    dependency: "direct main"
+    description:
+      path: "third-party/show_fps"
+      relative: true
+    source: path
+    version: "1.0.6"
   sky_engine:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -77,6 +77,8 @@ dependencies:
   flutter_native_splash: ^2.4.1 # Splash屏
   palette_generator: ^0.3.3+3 # 获取主色调
   vector_math: ^2.1.4
+  show_fps:
+    path: third-party/show_fps
   # 平台适配
   responsive_builder: ^0.7.1 # 响应式布局
   tray_manager: ^0.2.3 # 托盘图标

third-party/show_fps/CHANGELOG.md

@@ -0,0 +1,27 @@
+## 1.0.6
+
+- Bug fixes & improvements.
+
+## 1.0.5
+
+- Documentation update.
+
+## 1.0.4
+
+- Fixed customization in FPS Badge position.
+
+## 1.0.3
+
+- Font size fixed.
+
+## 1.0.2
+
+- README.md update.
+
+## 1.0.1
+
+- FPS chart graph color is now blue.
+
+## 1.0.0
+
+- Show FPS Badge on top of the screen.

third-party/show_fps/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Mantresh Khurana
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

third-party/show_fps/README.md

@@ -0,0 +1,44 @@
+# Show FPS
+
+[![GitHub stars](https://img.shields.io/github/stars/mantreshkhurana/show_fps.svg?style=social)](https://github.com/mantreshkhurana/show_fps)
+[![pub package](https://img.shields.io/pub/v/show_fps.svg)](https://pub.dartlang.org/packages/show_fps)
+
+Use ShowFPS to monitor your app's FPS (Frames Per Second) in real time.
+
+![Screenshot](https://raw.githubusercontent.com/mantreshkhurana/show_fps/stable/screenshots/screenshot-1.png)
+
+## Installation
+
+Add `show_fps: ^1.0.6` in your project's pubspec.yaml:
+
+```yaml
+dependencies:
+  show_fps: ^1.0.6
+```
+
+## Usage
+
+Import `show_fps` in your dart file:
+
+```dart
+import 'package:show_fps/show_fps.dart';
+```
+
+Then warp your Main Widget with `ShowFPS` widget:
+
+```dart
+CupertinoApp(
+      title: 'FPS Monitor',
+      theme: CupertinoThemeData(
+        brightness: Brightness.light,
+      ),
+      debugShowCheckedModeBanner: false,
+      home: ShowFPS(
+        alignment: Alignment.topRight,
+        visible: true,
+        showChart: false,
+        borderRadius: BorderRadius.all(Radius.circular(11)),
+        child: MyHomePage(title: 'FPS Monitor'),
+      ),
+    );
+```