From f9425948ca854aa12c713b4fdb624774e72b9c7d Mon Sep 17 00:00:00 2001
From: GT610 <79314033+GT-610@users.noreply.github.com>
Date: Sun, 8 Feb 2026 22:18:56 +0800
Subject: [PATCH] refactor: Simplify conditional rendering logic using null
 aware operators (#1049)

---
 lib/view/page/server/detail/view.dart         | 2 +-
 lib/view/page/server/discovery/discovery.dart | 2 +-
 lib/view/page/setting/entries/app.dart        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart
index d77b98c3..3e609501 100644
--- a/lib/view/page/server/detail/view.dart
+++ b/lib/view/page/server/detail/view.dart
@@ -103,7 +103,7 @@ class _ServerDetailPageState extends ConsumerState<ServerDetailPage> with Single
   Widget _buildMainPage(ServerState si) {
     final buildFuncs = !_moveServerFuncs;
     final logo = _buildLogo(si);
-    final children = <Widget>[if (logo != null) logo, if (buildFuncs) ServerFuncBtns(spi: si.spi)];
+    final children = <Widget>[?logo, if (buildFuncs) ServerFuncBtns(spi: si.spi)];
     for (final card in _cardsOrder) {
       final child = _cardBuildMap[card]?.call(si);
       if (child != null) {
diff --git a/lib/view/page/server/discovery/discovery.dart b/lib/view/page/server/discovery/discovery.dart
index e7264ac9..61209f38 100644
--- a/lib/view/page/server/discovery/discovery.dart
+++ b/lib/view/page/server/discovery/discovery.dart
@@ -162,7 +162,7 @@ class _SshDiscoveryPageState extends ConsumerState<SshDiscoveryPage> {
         layoutBuilder: (currentChild, previousChildren) {
           return Stack(
             alignment: Alignment.centerRight,
-            children: <Widget>[...previousChildren, if (currentChild != null) currentChild],
+            children: <Widget>[...previousChildren, ?currentChild],
           );
         },
         child: selectedResults.isNotEmpty
diff --git a/lib/view/page/setting/entries/app.dart b/lib/view/page/setting/entries/app.dart
index 41afedd8..85d2c14d 100644
--- a/lib/view/page/setting/entries/app.dart
+++ b/lib/view/page/setting/entries/app.dart
@@ -11,8 +11,8 @@ extension _App on _AppSettingsPageState {
       _buildCheckUpdate(),
       _buildHomeTabs(),
       PlatformPublicSettings.buildBioAuth,
-      if (androidSettings != null) androidSettings,
-      if (specific != null) specific,
+      ?androidSettings,
+      ?specific,
       _buildAppMore(),
     ];