Add android separates the core process

Support core status check and force restart

Optimize proxies page and access page

Update flutter and pub dependencies

Optimize more details

CHANGELOG.md

@@ -1,19 +1,3 @@
-## v0.8.88
-
-- Add android separates the core process
-
-- Support core status check and force restart
-
-- Optimize proxies page and access page
-
-- Update flutter and pub dependencies
-
-- Update go version
-
-- Optimize more details
-
-- Update changelog
-
 ## v0.8.87
 
 - Optimize desktop view

android/app/src/main/kotlin/com/follow/clash/Service.kt

@@ -3,7 +3,6 @@ package com.follow.clash
 import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.common.formatString
 import com.follow.clash.common.intent
-import com.follow.clash.service.IAckInterface
 import com.follow.clash.service.ICallbackInterface
 import com.follow.clash.service.IEventInterface
 import com.follow.clash.service.IRemoteInterface
@@ -45,11 +44,8 @@ object Service {
         return delegate.useService {
             it.invokeAction(
                 data, object : ICallbackInterface.Stub() {
-                    override fun onResult(
-                        result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
+                    override fun onResult(result: ByteArray?, isSuccess: Boolean) {
                         res.add(result ?: byteArrayOf())
-                        ack?.onAck()
                         if (isSuccess) {
                             cb(res.formatString())
                         }
@@ -65,24 +61,24 @@ object Service {
         return delegate.useService {
             it.setEventListener(
                 when (cb != null) {
-                true -> object : IEventInterface.Stub() {
-                    override fun onEvent(
-                        id: String, data: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
-                        if (results[id] == null) {
-                            results[id] = mutableListOf()
-                        }
-                        results[id]?.add(data ?: byteArrayOf())
-                        ack?.onAck()
-                        if (isSuccess) {
-                            cb(results[id]?.formatString())
-                            results.remove(id)
+                    true -> object : IEventInterface.Stub() {
+                        override fun onEvent(
+                            id: String, data: ByteArray?, isSuccess: Boolean
+                        ) {
+                            if (results[id] == null) {
+                                results[id] = mutableListOf()
+                            }
+                            results[id]?.add(data ?: byteArrayOf())
+                            if (isSuccess) {
+                                cb(results[id]?.formatString())
+                                results.remove(id)
+                            }
                         }
                     }
-                }
 
-                false -> null
-            })
+                    false -> null
+                }
+            )
         }
     }
 
@@ -104,11 +100,11 @@ object Service {
 
     private suspend fun awaitIResultInterface(
         block: (IResultInterface) -> Unit
-    ): Long = suspendCancellableCoroutine { continuation ->
+    ): Unit = suspendCancellableCoroutine { continuation ->
         val callback = object : IResultInterface.Stub() {
-            override fun onResult(time: Long) {
+            override fun onResult() {
                 if (continuation.isActive) {
-                    continuation.resume(time)
+                    continuation.resume(Unit)
                 }
             }
         }
@@ -123,25 +119,19 @@ object Service {
     }
 
 
-    suspend fun startService(options: VpnOptions, runTime: Long): Long {
-        return delegate.useService {
+    suspend fun startService(options: VpnOptions) {
+        delegate.useService {
             awaitIResultInterface { callback ->
-                it.startService(options, runTime, callback)
+                it.startService(options, callback)
             }
-        }.getOrNull() ?: 0L
+        }
     }
 
-    suspend fun stopService(): Long {
-        return delegate.useService {
+    suspend fun stopService() {
+        delegate.useService {
             awaitIResultInterface { callback ->
                 it.stopService(callback)
             }
-        }.getOrNull() ?: 0L
-    }
-
-    suspend fun getRunTime(): Long {
-        return delegate.useService {
-            it.runTime
-        }.getOrNull() ?: 0L
+        }
     }
 }

android/app/src/main/kotlin/com/follow/clash/State.kt

@@ -52,18 +52,6 @@ object State {
         action?.invoke()
     }
 
-    suspend fun handleSyncState() {
-        runLock.withLock {
-            Service.bind()
-            runTime = Service.getRunTime()
-            val runState = when (runTime == 0L) {
-                true -> RunState.STOP
-                false -> RunState.START
-            }
-            runStateFlow.tryEmit(runState)
-        }
-    }
-
     suspend fun handleStartServiceAction() {
         tilePlugin?.handleStart()
         if (flutterEngine != null) {
@@ -103,9 +91,6 @@ object State {
 
     suspend fun startServiceWithEngine() {
         runLock.withLock {
-            if (serviceFlutterEngine != null || runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
-                return
-            }
             withContext(Dispatchers.Main) {
                 serviceFlutterEngine = FlutterEngine(GlobalState.application)
                 serviceFlutterEngine?.plugins?.add(ServicePlugin())
@@ -134,7 +119,8 @@ object State {
                     return@launch
                 }
                 appPlugin?.prepare(options.enable) {
-                    runTime = Service.startService(options, runTime)
+                    Service.startService(options)
+                    runTime = System.currentTimeMillis()
                     runStateFlow.tryEmit(RunState.START)
                 }
             }
@@ -149,8 +135,9 @@ object State {
                     return@launch
                 }
                 runStateFlow.tryEmit(RunState.PENDING)
-                runTime = Service.stopService()
+                Service.stopService()
                 runStateFlow.tryEmit(RunState.STOP)
+                runTime = 0
             }
             destroyServiceEngine()
         }

android/app/src/main/kotlin/com/follow/clash/TileService.kt

@@ -4,9 +4,8 @@ import android.annotation.SuppressLint
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.follow.clash.common.Components
-import com.follow.clash.common.GlobalState
-import com.follow.clash.common.intent
+import com.follow.clash.common.QuickAction
+import com.follow.clash.common.quickIntent
 import com.follow.clash.common.toPendingIntent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -32,7 +31,6 @@ class TileService : TileService() {
         scope?.cancel()
         scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
         scope?.launch {
-            State.handleSyncState()
             State.runStateFlow.collect {
                 updateTile(it)
             }
@@ -40,22 +38,20 @@ class TileService : TileService() {
     }
 
     @SuppressLint("StartActivityAndCollapseDeprecated")
-    private fun activityTransfer() {
-        val intent = Components.TEMP_ACTIVITY.intent
+    private fun handleToggle() {
+        val intent = QuickAction.TOGGLE.quickIntent
         val pendingIntent = intent.toPendingIntent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
         } else {
-            @Suppress("DEPRECATION") startActivityAndCollapse(intent)
+            @Suppress("DEPRECATION")
+            startActivityAndCollapse(intent)
         }
     }
 
     override fun onClick() {
         super.onClick()
-        activityTransfer()
-        GlobalState.launch {
-            State.handleToggleAction()
-        }
+        handleToggle()
     }
 
     override fun onStopListening() {

android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt

@@ -38,7 +38,7 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
         "init" -> {
-            handleInit(call, result)
+            handleInit(result)
         }
 
         "shutdown" -> {
@@ -131,16 +131,11 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         }
     }
 
-    fun handleInit(call: MethodCall, result: MethodChannel.Result) {
+    fun handleInit(result: MethodChannel.Result) {
         Service.bind()
         launch {
-            val needSetEventListener = call.arguments<Boolean>() ?: false
-            when (needSetEventListener) {
-                true -> Service.setEventListener {
-                    handleSendEvent(it)
-                }
-
-                false -> Service.setEventListener(null)
+            Service.setEventListener {
+                handleSendEvent(it)
             }.onSuccess {
                 result.success("")
             }.onFailure {
@@ -152,9 +147,6 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
     }
 
     private fun handleGetRunTime(result: MethodChannel.Result) {
-        launch {
-            State.handleSyncState()
-            result.success(State.runTime)
-        }
+        return result.success(State.runTime)
     }
 }

android/common/src/main/java/com/follow/clash/common/Ext.kt

@@ -220,6 +220,7 @@ val Long.formatBytes: String
 fun String.chunkedForAidl(charset: Charset = Charsets.UTF_8): List<ByteArray> {
     val allBytes = toByteArray(charset)
     val total = allBytes.size
+
     val maxBytes = when {
         total <= 100 * 1024 -> total
         total <= 1024 * 1024 -> 64 * 1024

android/common/src/main/java/com/follow/clash/common/Service.kt

@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -60,9 +59,7 @@ class ServiceDelegate<T>(
             withTimeout(timeoutMillis) {
                 val state = serviceState.filterNotNull().first()
                 state.first?.let {
-                    withContext(Dispatchers.Default) {
-                        block(it)
-                    }
+                    block(it)
                 } ?: throw Exception(state.second)
             }
         }

android/service/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
             android:process=":remote">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="proxy" />
+                android:value="service" />
         </service>
 
         <service

android/service/src/main/aidl/com/follow/clash/service/IAckInterface.aidl

@@ -1,8 +0,0 @@
-// IAckInterface.aidl
-package com.follow.clash.service;
-
-import com.follow.clash.service.IAckInterface;
-
-interface IAckInterface {
-   oneway void onAck();
-}

android/service/src/main/aidl/com/follow/clash/service/ICallbackInterface.aidl

@@ -1,8 +1,6 @@
 // ICallbackInterface.aidl
 package com.follow.clash.service;
 
-import com.follow.clash.service.IAckInterface;
-
 interface ICallbackInterface {
-    oneway void onResult(in byte[] data,in boolean isSuccess, in IAckInterface ack);
+    oneway void onResult(in byte[] data,in boolean isSuccess);
 }

android/service/src/main/aidl/com/follow/clash/service/IEventInterface.aidl

@@ -1,8 +1,6 @@
 // IEventInterface.aidl
 package com.follow.clash.service;
 
-import com.follow.clash.service.IAckInterface;
-
 interface IEventInterface {
-    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess, in IAckInterface ack);
+    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess);
 }

android/service/src/main/aidl/com/follow/clash/service/IRemoteInterface.aidl

@@ -10,9 +10,8 @@ import com.follow.clash.service.models.NotificationParams;
 interface IRemoteInterface {
     void invokeAction(in String data, in ICallbackInterface callback);
     void updateNotificationParams(in NotificationParams params);
-    void startService(in VpnOptions options, in long runTime, in IResultInterface result);
+    void startService(in VpnOptions options, in IResultInterface result);
     void stopService(in IResultInterface result);
     void setEventListener(in IEventInterface event);
     void setCrashlytics(in boolean enable);
-    long getRunTime();
 }

android/service/src/main/aidl/com/follow/clash/service/IResultInterface.aidl

@@ -2,5 +2,5 @@
 package com.follow.clash.service;
 
 interface IResultInterface {
-    oneway void onResult(in long runTime);
+    oneway void onResult();
 }

android/service/src/main/java/com/follow/clash/service/RemoteService.kt

@@ -8,22 +8,23 @@ import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.common.chunkedForAidl
 import com.follow.clash.common.intent
 import com.follow.clash.core.Core
-import com.follow.clash.service.State.delegate
-import com.follow.clash.service.State.intent
-import com.follow.clash.service.State.runLock
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.util.UUID
-import kotlin.coroutines.resume
 
 class RemoteService : Service(),
     CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
+    private var delegate: ServiceDelegate<IBaseService>? = null
+    private var intent: Intent? = null
+
+    val runLock = Mutex()
+
     private fun handleStopService(result: IResultInterface) {
         launch {
             runLock.withLock {
@@ -31,8 +32,7 @@ class RemoteService : Service(),
                     service.stop()
                     delegate?.unbind()
                 }
-                State.runTime = 0
-                result.onResult(0)
+                result.onResult()
             }
         }
     }
@@ -43,7 +43,7 @@ class RemoteService : Service(),
         delegate = null
     }
 
-    private fun handleStartService(runTime: Long, result: IResultInterface) {
+    private fun handleStartService(result: IResultInterface) {
         launch {
             runLock.withLock {
                 val nextIntent = when (State.options?.enable == true) {
@@ -65,11 +65,7 @@ class RemoteService : Service(),
                 delegate?.useService { service ->
                     service.start()
                 }
-                State.runTime = when (runTime != 0L) {
-                    true -> runTime
-                    false -> System.currentTimeMillis()
-                }
-                result.onResult(State.runTime)
+                result.onResult()
             }
         }
     }
@@ -77,22 +73,11 @@ class RemoteService : Service(),
     private val binder = object : IRemoteInterface.Stub() {
         override fun invokeAction(data: String, callback: ICallbackInterface) {
             Core.invokeAction(data) {
-                launch {
-                    runCatching {
-                        val chunks = it?.chunkedForAidl() ?: listOf()
-                        for ((index, chunk) in chunks.withIndex()) {
-                            suspendCancellableCoroutine { cont ->
-                                callback.onResult(
-                                    chunk,
-                                    index == chunks.lastIndex,
-                                    object : IAckInterface.Stub() {
-                                        override fun onAck() {
-                                            cont.resume(Unit)
-                                        }
-                                    },
-                                )
-                            }
-                        }
+                runCatching {
+                    val chunks = it?.chunkedForAidl() ?: listOf()
+                    val totalSize = chunks.size
+                    chunks.forEachIndexed { index, chunk ->
+                        callback.onResult(chunk, totalSize - 1 == index)
                     }
                 }
             }
@@ -102,14 +87,12 @@ class RemoteService : Service(),
             State.notificationParamsFlow.tryEmit(params)
         }
 
-
         override fun startService(
             options: VpnOptions,
-            runtime: Long,
             result: IResultInterface,
         ) {
             State.options = options
-            handleStartService(runtime, result)
+            handleStartService(result)
         }
 
         override fun stopService(result: IResultInterface) {
@@ -117,27 +100,15 @@ class RemoteService : Service(),
         }
 
         override fun setEventListener(eventListener: IEventInterface?) {
-            GlobalState.log("RemoveEventListener ${eventListener == null}")
+            GlobalState.log("isRemoveEventListener is ${eventListener == null}")
             when (eventListener != null) {
                 true -> Core.callSetEventListener {
-                    launch {
-                        runCatching {
-                            val id = UUID.randomUUID().toString()
-                            val chunks = it?.chunkedForAidl() ?: listOf()
-                            for ((index, chunk) in chunks.withIndex()) {
-                                suspendCancellableCoroutine { cont ->
-                                    eventListener.onEvent(
-                                        id,
-                                        chunk,
-                                        index == chunks.lastIndex,
-                                        object : IAckInterface.Stub() {
-                                            override fun onAck() {
-                                                cont.resume(Unit)
-                                            }
-                                        },
-                                    )
-                                }
-                            }
+                    runCatching {
+                        val id = UUID.randomUUID().toString()
+                        val chunks = it?.chunkedForAidl() ?: listOf()
+                        val totalSize = chunks.size
+                        chunks.forEachIndexed { index, chunk ->
+                            eventListener.onEvent(id, chunk, totalSize - 1 == index)
                         }
                     }
                 }
@@ -149,18 +120,9 @@ class RemoteService : Service(),
         override fun setCrashlytics(enable: Boolean) {
             GlobalState.setCrashlytics(enable)
         }
-
-        override fun getRunTime(): Long {
-            return State.runTime
-        }
     }
 
     override fun onBind(intent: Intent?): IBinder {
         return binder
     }
-
-    override fun onDestroy() {
-        GlobalState.log("Remote service destroy")
-        super.onDestroy()
-    }
 }

android/service/src/main/java/com/follow/clash/service/State.kt

@@ -1,22 +1,12 @@
 package com.follow.clash.service
 
-import android.content.Intent
-import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.sync.Mutex
 
 object State {
     var options: VpnOptions? = null
     var notificationParamsFlow: MutableStateFlow<NotificationParams?> = MutableStateFlow(
         NotificationParams()
     )
-
-    val runLock = Mutex()
-    var runTime: Long = 0L
-
-    var delegate: ServiceDelegate<IBaseService>? = null
-
-    var intent: Intent? = null
 }

android/service/src/main/java/com/follow/clash/service/VpnService.kt

@@ -213,7 +213,6 @@ class VpnService : SystemVpnService(), IBaseService,
                 allowBypass()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
-                GlobalState.log("Open http proxy")
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1", options.port, options.bypassDomain

android/service/src/main/java/com/follow/clash/service/models/Traffic.kt

@@ -1,6 +1,5 @@
 package com.follow.clash.service.models
 
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.formatBytes
 import com.follow.clash.core.Core
 import com.google.gson.Gson
@@ -18,8 +17,7 @@ fun Core.getSpeedTrafficText(onlyStatisticsProxy: Boolean): String {
         val res = getTraffic(onlyStatisticsProxy)
         val traffic = Gson().fromJson(res, Traffic::class.java)
         return traffic.speedText
-    } catch (e: Exception) {
-        GlobalState.log(e.message + "")
+    } catch (_: Exception) {
         return ""
     }
 }

android/service/src/main/java/com/follow/clash/service/modules/NotificationModule.kt

@@ -47,6 +47,9 @@ class NotificationModule(private val service: Service) : Module() {
     private val scope = CoroutineScope(Dispatchers.Default)
 
     override fun onInstall() {
+        State.notificationParamsFlow.value?.let {
+            update(it.extended)
+        }
         scope.launch {
             val screenFlow = service.receiveBroadcastFlow {
                 addAction(Intent.ACTION_SCREEN_ON)
@@ -66,12 +69,6 @@ class NotificationModule(private val service: Service) : Module() {
                 .collect { (params, _) ->
                     update(params!!)
                 }
-
-            State.notificationParamsFlow.value?.let {
-                update(it.extended)
-            } ?: run {
-                update(NotificationParams().extended)
-            }
         }
     }
 

core/action.go

@@ -53,8 +53,8 @@ func handleAction(action *Action, result ActionResult) {
 		result.success(handleShutdown())
 		return
 	case validateConfigMethod:
-		path := action.Data.(string)
-		result.success(handleValidateConfig(path))
+		data := []byte(action.Data.(string))
+		result.success(handleValidateConfig(data))
 		return
 	case updateConfigMethod:
 		data := []byte(action.Data.(string))

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.25
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/hub.go

@@ -83,9 +83,8 @@ func handleShutdown() bool {
 	return true
 }
 
-func handleValidateConfig(path string) string {
-	buf, err := readFile(path)
-	_, err = config.UnmarshalRawConfig(buf)
+func handleValidateConfig(bytes []byte) string {
+	_, err := config.UnmarshalRawConfig(bytes)
 	if err != nil {
 		return err.Error()
 	}

lib/common/function.dart

@@ -36,25 +36,16 @@ class Throttler {
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
-    bool fire = false,
   }) {
     final timer = _operations[tag];
     if (timer != null) {
       return true;
     }
-    if (fire) {
+    _operations[tag] = Timer(duration, () {
+      _operations[tag]?.cancel();
+      _operations.remove(tag);
       Function.apply(func, args);
-      _operations[tag] = Timer(duration, () {
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    } else {
-      _operations[tag] = Timer(duration, () {
-        Function.apply(func, args);
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    }
+    });
     return false;
   }
 

lib/common/navigator.dart

@@ -134,15 +134,11 @@ class CommonPageTransition extends StatefulWidget {
     bool allowSnapshotting,
     Widget? child,
   ) {
-    final CurvedAnimation animation = CurvedAnimation(
+    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
       parent: secondaryAnimation,
       curve: Curves.linearToEaseOut,
       reverseCurve: Curves.easeInToLinear,
-    );
-    final Animation<Offset> delegatedPositionAnimation = animation.drive(
-      _kMiddleLeftTween,
-    );
-    animation.dispose();
+    ).drive(_kMiddleLeftTween);
 
     assert(debugCheckHasDirectionality(context));
     final TextDirection textDirection = Directionality.of(context);

lib/common/path.dart

@@ -71,11 +71,6 @@ class AppPath {
     return join(homeDirPath, 'config.json');
   }
 
-  Future<String> get validateFilePath async {
-    final homeDirPath = await appPath.homeDirPath;
-    return join(homeDirPath, 'temp', 'validate${utils.id}.yaml');
-  }
-
   Future<String> get sharedPreferencesPath async {
     final directory = await dataDir.future;
     return join(directory.path, 'shared_preferences.json');

lib/common/print.dart

@@ -1,4 +1,3 @@
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
@@ -13,14 +12,14 @@ class CommonPrint {
     return _instance!;
   }
 
-  void log(String? text, {LogLevel logLevel = LogLevel.info}) {
+  void log(String? text) {
     final payload = '[APP] $text';
     debugPrint(payload);
     if (!globalState.isInit) {
       return;
     }
     globalState.appController.addLog(
-      Log.app(payload).copyWith(logLevel: logLevel),
+      Log.app(payload),
     );
   }
 }

lib/common/request.dart

@@ -73,13 +73,13 @@ class Request {
   }
 
   final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
-    'https://ipwho.is': IpInfo.fromIpWhoIsJson,
-    'https://api.myip.com': IpInfo.fromMyIpJson,
-    'https://ipapi.co/json': IpInfo.fromIpApiCoJson,
-    'https://ident.me/json': IpInfo.fromIdentMeJson,
-    'http://ip-api.com/json': IpInfo.fromIpAPIJson,
-    'https://api.ip.sb/geoip': IpInfo.fromIpSbJson,
-    'https://ipinfo.io/json': IpInfo.fromIpInfoIoJson,
+    'https://ipwho.is/': IpInfo.fromIpWhoIsJson,
+    'https://api.myip.com/': IpInfo.fromMyIpJson,
+    'https://ipapi.co/json/': IpInfo.fromIpApiCoJson,
+    'https://ident.me/json/': IpInfo.fromIdentMeJson,
+    'http://ip-api.com/json/': IpInfo.fromIpAPIJson,
+    'https://api.ip.sb/geoip/': IpInfo.fromIpSbJson,
+    'https://ipinfo.io/json/': IpInfo.fromIpInfoIoJson,
   };
 
   Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
@@ -92,13 +92,11 @@ class Request {
         }
       }
 
-      final future = dio
-          .get<Map<String, dynamic>>(
-            source.key,
-            cancelToken: cancelToken,
-            options: Options(responseType: ResponseType.json),
-          )
-          .timeout(const Duration(seconds: 10));
+      final future = dio.get<Map<String, dynamic>>(
+        source.key,
+        cancelToken: cancelToken,
+        options: Options(responseType: ResponseType.json),
+      );
       future
           .then((res) {
             if (res.statusCode == HttpStatus.ok && res.data != null) {

lib/common/string.dart

@@ -11,15 +11,16 @@ extension StringExtension on String {
   }
 
   dynamic get splitByMultipleSeparators {
-    final parts = split(
-      RegExp(r'[, ;]+'),
-    ).where((part) => part.isNotEmpty).toList();
+    final parts =
+        split(RegExp(r'[, ;]+')).where((part) => part.isNotEmpty).toList();
 
     return parts.length > 1 ? parts : this;
   }
 
   int compareToLower(String other) {
-    return toLowerCase().compareTo(other.toLowerCase());
+    return toLowerCase().compareTo(
+      other.toLowerCase(),
+    );
   }
 
   List<int> get encodeUtf16LeWithBom {
@@ -65,9 +66,9 @@ extension StringExtension on String {
     return md5.convert(bytes).toString();
   }
 
-  // bool containsToLower(String target) {
-  //   return toLowerCase().contains(target);
-  // }
+// bool containsToLower(String target) {
+//   return toLowerCase().contains(target);
+// }
 }
 
 extension StringExtensionSafe on String? {

lib/common/system.dart

@@ -181,10 +181,7 @@ class Windows {
     calloc.free(argumentsPtr);
     calloc.free(operationPtr);
 
-    commonPrint.log(
-      'windows runas: $command $arguments resultCode:$result',
-      logLevel: LogLevel.warning,
-    );
+    commonPrint.log('windows runas: $command $arguments resultCode:$result');
 
     if (result < 42) {
       return false;

lib/controller.dart

@@ -353,7 +353,7 @@ class AppController {
       try {
         await updateProfile(profile);
       } catch (e) {
-        commonPrint.log(e.toString(), logLevel: LogLevel.warning);
+        commonPrint.log(e.toString());
       }
     }
   }
@@ -529,7 +529,6 @@ class AppController {
     FlutterError.onError = (details) {
       commonPrint.log(
         'exception: ${details.exception} stack: ${details.stack}',
-        logLevel: LogLevel.warning,
       );
     };
     updateTray(true);
@@ -552,12 +551,7 @@ class AppController {
 
   Future<void> _connectCore() async {
     _ref.read(coreStatusProvider.notifier).value = CoreStatus.connecting;
-    final result = await Future.wait([
-      coreController.preload(),
-      if (!globalState.isService) Future.delayed(Duration(milliseconds: 300)),
-    ]);
-    final String message = result[0];
-    await Future.delayed(commonDuration);
+    final message = await coreController.preload();
     if (message.isNotEmpty) {
       _ref.read(coreStatusProvider.notifier).value = CoreStatus.disconnected;
       if (context.mounted) {
@@ -962,7 +956,7 @@ class AppController {
       final res = await futureFunction();
       return res;
     } catch (e) {
-      commonPrint.log('$futureFunction ===> $e', logLevel: LogLevel.warning);
+      commonPrint.log('$futureFunction ===> $e');
       if (realSilence) {
         globalState.showNotifier(e.toString());
       } else {

lib/core/controller.dart

@@ -71,20 +71,8 @@ class CoreController {
 
   FutureOr<bool> get isInit => _interface.isInit;
 
-  Future<String> validateConfig(String data) async {
-    final path = await appPath.validateFilePath;
-    await globalState.genValidateFile(path, data);
-    final res = await _interface.validateConfig(path);
-    await File(path).delete();
-    return res;
-  }
-
-  Future<String> validateConfigFormBytes(Uint8List bytes) async {
-    final path = await appPath.validateFilePath;
-    await globalState.genValidateFileFormBytes(path, bytes);
-    final res = await _interface.validateConfig(path);
-    await File(path).delete();
-    return res;
+  FutureOr<String> validateConfig(String data) {
+    return _interface.validateConfig(data);
   }
 
   Future<String> updateConfig(UpdateParams updateParams) async {

lib/core/interface.dart

@@ -17,7 +17,7 @@ mixin CoreInterface {
 
   Future<bool> forceGc();
 
-  Future<String> validateConfig(String path);
+  Future<String> validateConfig(String data);
 
   Future<Result> getConfig(String path);
 
@@ -125,10 +125,10 @@ abstract class CoreHandlerInterface with CoreInterface {
   }
 
   @override
-  Future<String> validateConfig(String path) async {
+  Future<String> validateConfig(String data) async {
     return await _invoke<String>(
           method: ActionMethod.validateConfig,
-          data: path,
+          data: data,
         ) ??
         '';
   }

lib/core/service.dart

@@ -52,7 +52,7 @@ class CoreService extends CoreHandlerInterface {
         }
       },
       (error, stack) async {
-        commonPrint.log('Service error: $error', logLevel: LogLevel.warning);
+        commonPrint.log('Service error: $error');
       },
     );
   }
@@ -97,7 +97,7 @@ class CoreService extends CoreHandlerInterface {
     _process?.stderr.listen((e) {
       final error = utf8.decode(e);
       if (error.isNotEmpty) {
-        commonPrint.log(error, logLevel: LogLevel.warning);
+        commonPrint.log(error);
       }
     });
     await _socketCompleter.future;

lib/main.dart

@@ -22,7 +22,6 @@ Future<void> main() async {
 @pragma('vm:entry-point')
 Future<void> _service(List<String> flags) async {
   WidgetsFlutterBinding.ensureInitialized();
-  globalState.isService = true;
   await globalState.init();
   await coreController.preload();
   tile?.addListener(

lib/manager/message_manager.dart

@@ -101,7 +101,7 @@ class MessageManagerState extends State<MessageManager> {
                               _cancelMessage(messages.last.id);
                             },
                             child: Card(
-                              shape: const RoundedSuperellipseBorder(
+                              shape: const RoundedRectangleBorder(
                                 borderRadius: BorderRadius.all(
                                   Radius.circular(14),
                                 ),
@@ -127,7 +127,6 @@ class MessageManagerState extends State<MessageManager> {
                                     ),
                                     SizedBox(width: 16),
                                     IconButton(
-                                      padding: EdgeInsets.all(2),
                                       visualDensity: VisualDensity.compact,
                                       onPressed: () {
                                         _cancelMessage(messages.last.id);

lib/manager/theme_manager.dart

@@ -87,23 +87,13 @@ class ThemeManager extends ConsumerWidget {
           top: padding.top > height * 0.3 ? 20.0 : padding.top,
         ),
       ),
-      child: Theme(
-        data: Theme.of(context).copyWith(
-          floatingActionButtonTheme: Theme.of(context).floatingActionButtonTheme
-              .copyWith(
-                shape: const RoundedSuperellipseBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(16.0)),
-                ),
-              ),
-        ),
-        child: LayoutBuilder(
-          builder: (_, container) {
-            globalState.appController.updateViewSize(
-              Size(container.maxWidth, container.maxHeight),
-            );
-            return _buildSystemUi(child);
-          },
-        ),
+      child: LayoutBuilder(
+        builder: (_, container) {
+          globalState.appController.updateViewSize(
+            Size(container.maxWidth, container.maxHeight),
+          );
+          return _buildSystemUi(child);
+        },
       ),
     );
   }

lib/manager/vpn_manager.dart

@@ -24,16 +24,11 @@ class _VpnContainerState extends ConsumerState<VpnManager> {
   }
 
   void showTip() {
-    throttler.call(
-      FunctionTag.vpnTip,
-      () {
-        if (ref.read(isStartProvider)) {
-          globalState.showNotifier(appLocalizations.vpnTip);
-        }
-      },
-      duration: const Duration(seconds: 6),
-      fire: true,
-    );
+    debouncer.call(FunctionTag.vpnTip, () {
+      if (ref.read(isStartProvider)) {
+        globalState.showNotifier(appLocalizations.vpnTip);
+      }
+    });
   }
 
   @override

lib/manager/window_manager.dart

@@ -271,11 +271,9 @@ class AppIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: ShapeDecoration(
+      decoration: BoxDecoration(
         color: context.colorScheme.surfaceContainerHighest,
-        shape: RoundedSuperellipseBorder(
-          borderRadius: BorderRadius.circular(14),
-        ),
+        borderRadius: BorderRadius.circular(14),
       ),
       padding: EdgeInsets.all(8),
       child: Transform.translate(

lib/models/profile.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
@@ -173,7 +174,7 @@ extension ProfileExtension on Profile {
   }
 
   Future<Profile> saveFile(Uint8List bytes) async {
-    final message = await coreController.validateConfigFormBytes(bytes);
+    final message = await coreController.validateConfig(utf8.decode(bytes));
     if (message.isNotEmpty) {
       throw message;
     }
@@ -181,4 +182,14 @@ extension ProfileExtension on Profile {
     await file.writeAsBytes(bytes);
     return copyWith(lastUpdateDate: DateTime.now());
   }
+
+  Future<Profile> saveFileWithString(String value) async {
+    final message = await coreController.validateConfig(value);
+    if (message.isNotEmpty) {
+      throw message;
+    }
+    final file = await getFile();
+    await file.writeAsString(value);
+    return copyWith(lastUpdateDate: DateTime.now());
+  }
 }

lib/pages/scan.dart

@@ -169,8 +169,8 @@ class ScannerOverlay extends CustomPainter {
     final backgroundPath = Path()..addRect(Rect.largest);
 
     final cutoutPath = Path()
-      ..addRSuperellipse(
-        RSuperellipse.fromRectAndCorners(
+      ..addRRect(
+        RRect.fromRectAndCorners(
           scanWindow,
           topLeft: Radius.circular(borderRadius),
           topRight: Radius.circular(borderRadius),
@@ -195,7 +195,7 @@ class ScannerOverlay extends CustomPainter {
       ..style = PaintingStyle.stroke
       ..strokeWidth = 4.0;
 
-    final border = RSuperellipse.fromRectAndCorners(
+    final borderRect = RRect.fromRectAndCorners(
       scanWindow,
       topLeft: Radius.circular(borderRadius),
       topRight: Radius.circular(borderRadius),
@@ -204,7 +204,7 @@ class ScannerOverlay extends CustomPainter {
     );
 
     canvas.drawPath(backgroundWithCutout, backgroundPaint);
-    canvas.drawRSuperellipse(border, borderPaint);
+    canvas.drawRRect(borderRect, borderPaint);
   }
 
   @override

lib/plugins/service.dart

@@ -86,11 +86,7 @@ class Service {
   }
 
   Future<String> init() async {
-    return await methodChannel.invokeMethod<String>(
-          'init',
-          !globalState.isService,
-        ) ??
-        '';
+    return await methodChannel.invokeMethod<String>('init') ?? '';
   }
 
   Future<bool> shutdown() async {

lib/state.dart

@@ -48,7 +48,6 @@ class GlobalState {
   AppController? _appController;
   bool isInit = false;
   bool isUserDisconnected = false;
-  bool isService = false;
 
   bool get isStart => startTime != null && startTime!.isBeforeNow;
 
@@ -239,7 +238,7 @@ class GlobalState {
     return VpnOptions(
       stack: config.patchClashConfig.tun.stack.name,
       enable: vpnProps.enable,
-      systemProxy: vpnProps.systemProxy,
+      systemProxy: networkProps.systemProxy,
       port: port,
       ipv6: vpnProps.ipv6,
       dnsHijacking: vpnProps.dnsHijacking,
@@ -323,42 +322,6 @@ class GlobalState {
     }
   }
 
-  Future<void> genValidateFile(String path, String data) async {
-    final res = await Isolate.run<String>(() async {
-      try {
-        final file = File(path);
-        if (!await file.exists()) {
-          await file.create(recursive: true);
-        }
-        await file.writeAsString(data);
-        return '';
-      } catch (e) {
-        return e.toString();
-      }
-    });
-    if (res.isNotEmpty) {
-      throw res;
-    }
-  }
-
-  Future<void> genValidateFileFormBytes(String path, Uint8List bytes) async {
-    final res = await Isolate.run<String>(() async {
-      try {
-        final file = File(path);
-        if (!await file.exists()) {
-          await file.create(recursive: true);
-        }
-        await file.writeAsBytes(bytes);
-        return '';
-      } catch (e) {
-        return e.toString();
-      }
-    });
-    if (res.isNotEmpty) {
-      throw res;
-    }
-  }
-
   AndroidState getAndroidState() {
     return AndroidState(
       currentProfileName: config.currentProfile?.label ?? '',

lib/views/dashboard/widgets/start_button.dart

@@ -14,7 +14,7 @@ class StartButton extends ConsumerStatefulWidget {
 
 class _StartButtonState extends ConsumerState<StartButton>
     with SingleTickerProviderStateMixin {
-  AnimationController? _controller;
+  late AnimationController _controller;
   late Animation<double> _animation;
   bool isStart = false;
 
@@ -28,7 +28,7 @@ class _StartButtonState extends ConsumerState<StartButton>
       duration: const Duration(milliseconds: 200),
     );
     _animation = CurvedAnimation(
-      parent: _controller!,
+      parent: _controller,
       curve: Curves.easeOutBack,
     );
     ref.listenManual(runTimeProvider.select((state) => state != null), (
@@ -44,8 +44,7 @@ class _StartButtonState extends ConsumerState<StartButton>
 
   @override
   void dispose() {
-    _controller?.dispose();
-    _controller = null;
+    _controller.dispose();
     super.dispose();
   }
 
@@ -60,9 +59,9 @@ class _StartButtonState extends ConsumerState<StartButton>
   void updateController() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (isStart && mounted) {
-        _controller?.forward();
+        _controller.forward();
       } else {
-        _controller?.reverse();
+        _controller.reverse();
       }
     });
   }
@@ -75,13 +74,12 @@ class _StartButtonState extends ConsumerState<StartButton>
     }
     return Theme(
       data: Theme.of(context).copyWith(
-        floatingActionButtonTheme: Theme.of(context).floatingActionButtonTheme
-            .copyWith(
-              sizeConstraints: BoxConstraints(minWidth: 56, maxWidth: 200),
-            ),
+        floatingActionButtonTheme: FloatingActionButtonThemeData(
+          sizeConstraints: BoxConstraints(minWidth: 56, maxWidth: 200),
+        ),
       ),
       child: AnimatedBuilder(
-        animation: _controller!.view,
+        animation: _controller.view,
         builder: (_, child) {
           final textWidth =
               globalState.measure

lib/views/dashboard/widgets/traffic_usage.dart

@@ -128,11 +128,10 @@ class TrafficUsage extends StatelessWidget {
                                         Container(
                                           width: 20,
                                           height: 8,
-                                          decoration: ShapeDecoration(
+                                          decoration: BoxDecoration(
                                             color: primaryColor,
-                                            shape: RoundedSuperellipseBorder(
-                                              borderRadius:
-                                                  BorderRadius.circular(3),
+                                            borderRadius: BorderRadius.circular(
+                                              3,
                                             ),
                                           ),
                                         ),
@@ -152,11 +151,10 @@ class TrafficUsage extends StatelessWidget {
                                         Container(
                                           width: 20,
                                           height: 8,
-                                          decoration: ShapeDecoration(
+                                          decoration: BoxDecoration(
                                             color: secondaryColor,
-                                            shape: RoundedSuperellipseBorder(
-                                              borderRadius:
-                                                  BorderRadius.circular(3),
+                                            borderRadius: BorderRadius.circular(
+                                              3,
                                             ),
                                           ),
                                         ),

lib/views/developer.dart

@@ -2,6 +2,7 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/core/controller.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/common.dart';
+import 'package:fl_clash/providers/app.dart';
 import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
@@ -18,14 +19,12 @@ class DeveloperView extends ConsumerWidget {
       items: [
         ListItem(
           title: Text(appLocalizations.messageTest),
-          minVerticalPadding: 14,
           onTap: () {
             context.showNotifier(appLocalizations.messageTestTip);
           },
         ),
         ListItem(
           title: Text(appLocalizations.logsTest),
-          minVerticalPadding: 14,
           onTap: () {
             for (int i = 0; i < 1000; i++) {
               globalState.appController.addLog(
@@ -38,7 +37,6 @@ class DeveloperView extends ConsumerWidget {
         ),
         ListItem(
           title: Text(appLocalizations.crashTest),
-          minVerticalPadding: 14,
           onTap: () {
             if (kDebugMode) {
               coreController.crash();
@@ -47,20 +45,18 @@ class DeveloperView extends ConsumerWidget {
         ),
         ListItem(
           title: Text(appLocalizations.clearData),
-          minVerticalPadding: 14,
           onTap: () async {
             await globalState.appController.handleClear();
           },
         ),
-        // ListItem(
-        //   title: Text('Loading'),
-        //   minVerticalPadding: 14,
-        //   onTap: () {
-        //     ref.read(loadingProvider.notifier).value = !ref.read(
-        //       loadingProvider,
-        //     );
-        //   },
-        // ),
+        ListItem(
+          title: Text('Loading'),
+          onTap: () {
+            ref.read(loadingProvider.notifier).value = !ref.read(
+              loadingProvider,
+            );
+          },
+        ),
       ],
     );
   }

lib/views/proxies/tab.dart

@@ -360,7 +360,7 @@ class DelayTestButton extends StatefulWidget {
 class _DelayTestButtonState extends State<DelayTestButton>
     with SingleTickerProviderStateMixin {
   late AnimationController _controller;
-  late Animation<double> _animation;
+  late Animation<double> _scale;
 
   Future<void> _healthcheck() async {
     if (_controller.isAnimating) {
@@ -378,10 +378,10 @@ class _DelayTestButtonState extends State<DelayTestButton>
     super.initState();
     _controller = AnimationController(
       vsync: this,
-      duration: const Duration(milliseconds: 400),
+      duration: const Duration(milliseconds: 200),
     );
-    _animation = Tween<double>(begin: 1.0, end: 0.0).animate(
-      CurvedAnimation(parent: _controller, curve: Curves.easeInOutBack),
+    _scale = Tween<double>(begin: 1.0, end: 0.0).animate(
+      CurvedAnimation(parent: _controller, curve: const Interval(0, 1)),
     );
   }
 
@@ -399,10 +399,7 @@ class _DelayTestButtonState extends State<DelayTestButton>
         return SizedBox(
           width: 56,
           height: 56,
-          child: FadeTransition(
-            opacity: _animation,
-            child: ScaleTransition(scale: _animation, child: child),
-          ),
+          child: Transform.scale(scale: _scale.value, child: child),
         );
       },
       child: FloatingActionButton(

lib/widgets/card.dart

@@ -177,9 +177,7 @@ class CommonCard extends StatelessWidget {
       style: ButtonStyle(
         padding: const WidgetStatePropertyAll(EdgeInsets.zero),
         shape: WidgetStatePropertyAll(
-          RoundedSuperellipseBorder(
-            borderRadius: BorderRadius.circular(radius),
-          ),
+          RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius)),
         ),
         iconColor: WidgetStatePropertyAll(context.colorScheme.primary),
         iconSize: WidgetStateProperty.all(20),

lib/widgets/color_scheme_box.dart

@@ -37,7 +37,7 @@ class ColorSchemeBox extends StatelessWidget {
                   ),
                   child: Container(
                     padding: const EdgeInsets.all(8),
-                    child: ClipRSuperellipse(
+                    child: ClipRRect(
                       borderRadius: BorderRadius.circular(36),
                       child: SizedBox(
                         width: 72,
@@ -47,16 +47,22 @@ class ColorSchemeBox extends StatelessWidget {
                           children: [
                             GridItem(
                               mainAxisCellCount: 2,
-                              child: Container(color: colorScheme.primary),
+                              child: Container(
+                                color: colorScheme.primary,
+                              ),
                             ),
                             GridItem(
                               mainAxisCellCount: 1,
-                              child: Container(color: colorScheme.secondary),
+                              child: Container(
+                                color: colorScheme.secondary,
+                              ),
                             ),
                             GridItem(
                               mainAxisCellCount: 1,
-                              child: Container(color: colorScheme.tertiary),
-                            ),
+                              child: Container(
+                                color: colorScheme.tertiary,
+                              ),
+                            )
                           ],
                         ),
                       ),
@@ -67,8 +73,11 @@ class ColorSchemeBox extends StatelessWidget {
                   const Positioned(
                     bottom: 4,
                     right: 4,
-                    child: Icon(Icons.colorize, size: 20),
-                  ),
+                    child: Icon(
+                      Icons.colorize,
+                      size: 20,
+                    ),
+                  )
               ],
             );
           },
@@ -103,7 +112,9 @@ class PrimaryColorBox extends ConsumerWidget {
       ),
     );
     return Theme(
-      data: themeData.copyWith(colorScheme: colorScheme),
+      data: themeData.copyWith(
+        colorScheme: colorScheme,
+      ),
       child: child,
     );
   }

lib/widgets/list.dart

@@ -18,21 +18,30 @@ class RadioDelegate<T> extends Delegate {
   final T value;
   final void Function()? onTab;
 
-  const RadioDelegate({required this.value, this.onTab});
+  const RadioDelegate({
+    required this.value,
+    this.onTab,
+  });
 }
 
 class SwitchDelegate<T> extends Delegate {
   final bool value;
   final ValueChanged<bool>? onChanged;
 
-  const SwitchDelegate({required this.value, this.onChanged});
+  const SwitchDelegate({
+    required this.value,
+    this.onChanged,
+  });
 }
 
 class CheckboxDelegate<T> extends Delegate {
   final bool value;
   final ValueChanged<bool?>? onChanged;
 
-  const CheckboxDelegate({this.value = false, this.onChanged});
+  const CheckboxDelegate({
+    this.value = false,
+    this.onChanged,
+  });
 }
 
 class OpenDelegate extends Delegate {
@@ -120,7 +129,6 @@ class ListItem<T> extends StatelessWidget {
   final double? horizontalTitleGap;
   final TextStyle? titleTextStyle;
   final TextStyle? subtitleTextStyle;
-  final double minVerticalPadding;
   final void Function()? onTap;
 
   const ListItem({
@@ -135,7 +143,6 @@ class ListItem<T> extends StatelessWidget {
     this.onTap,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : delegate = const Delegate();
 
@@ -151,7 +158,6 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTap = null;
 
@@ -167,7 +173,6 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTap = null;
 
@@ -183,7 +188,6 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTap = null;
 
@@ -199,7 +203,6 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTap = null;
 
@@ -214,10 +217,9 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
-  }) : trailing = null,
-       onTap = null;
+  })  : trailing = null,
+        onTap = null;
 
   const ListItem.switchItem({
     super.key,
@@ -230,10 +232,9 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
-  }) : trailing = null,
-       onTap = null;
+  })  : trailing = null,
+        onTap = null;
 
   const ListItem.radio({
     super.key,
@@ -246,10 +247,9 @@ class ListItem<T> extends StatelessWidget {
     this.dense,
     this.titleTextStyle,
     this.subtitleTextStyle,
-    this.minVerticalPadding = 12,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
-  }) : leading = null,
-       onTap = null;
+  })  : leading = null,
+        onTap = null;
 
   Widget _buildListTile({
     void Function()? onTap,
@@ -264,7 +264,7 @@ class ListItem<T> extends StatelessWidget {
       leading: leading ?? this.leading,
       horizontalTitleGap: horizontalTitleGap,
       title: title,
-      minVerticalPadding: minVerticalPadding,
+      minVerticalPadding: 12,
       subtitle: subtitle,
       titleAlignment: tileTitleAlignment,
       onTap: onTap,
@@ -282,7 +282,7 @@ class ListItem<T> extends StatelessWidget {
         closedBuilder: (_, action) {
           openAction() {
             final isMobile = globalState.appState.viewMode == ViewMode.mobile;
-            if (!isMobile) {
+            if (!isMobile || system.isDesktop) {
               showExtend(
                 context,
                 props: ExtendProps(
@@ -306,7 +306,9 @@ class ListItem<T> extends StatelessWidget {
             action();
           }
 
-          return _buildListTile(onTap: openAction);
+          return _buildListTile(
+            onTap: openAction,
+          );
         },
         openBuilder: (_, action) {
           return openDelegate.wrap
@@ -420,7 +422,9 @@ class ListItem<T> extends StatelessWidget {
       );
     }
 
-    return _buildListTile(onTap: onTap);
+    return _buildListTile(
+      onTap: onTap,
+    );
   }
 }
 
@@ -444,9 +448,13 @@ class ListHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       alignment: Alignment.centerLeft,
-      padding:
-          padding ??
-          const EdgeInsets.only(left: 16, right: 8, top: 24, bottom: 8),
+      padding: padding ??
+          const EdgeInsets.only(
+            left: 16,
+            right: 8,
+            top: 24,
+            bottom: 8,
+          ),
       child: Row(
         mainAxisSize: MainAxisSize.max,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -458,18 +466,19 @@ class ListHeader extends StatelessWidget {
                 Text(
                   title,
                   style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    color: Theme.of(
-                      context,
-                    ).colorScheme.onSurfaceVariant.opacity80,
-                    fontWeight: FontWeight.w600,
-                  ),
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurfaceVariant
+                            .opacity80,
+                        fontWeight: FontWeight.w600,
+                      ),
                 ),
                 if (subTitle != null)
                   Text(
                     subTitle!,
                     style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
+                          color: Theme.of(context).colorScheme.outline,
+                        ),
                   ),
               ],
             ),
@@ -477,7 +486,12 @@ class ListHeader extends StatelessWidget {
           Row(
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.end,
-            children: [...genActions(actions, space: space)],
+            children: [
+              ...genActions(
+                actions,
+                space: space,
+              ),
+            ],
           ),
         ],
       ),
@@ -492,11 +506,18 @@ List<Widget> generateSection({
   bool separated = true,
 }) {
   final genItems = separated
-      ? items.separated(const Divider(height: 0))
+      ? items.separated(
+          const Divider(
+            height: 0,
+          ),
+        )
       : items;
   return [
     if (items.isNotEmpty && title != null)
-      ListHeader(title: title, actions: actions),
+      ListHeader(
+        title: title,
+        actions: actions,
+      ),
     ...genItems,
   ];
 }
@@ -507,26 +528,22 @@ Widget generateSectionV2({
   List<Widget>? actions,
   bool separated = true,
 }) {
-  final genItems = items
-      .map<Widget>((item) {
-        return ClipRSuperellipse(
-          borderRadius: BorderRadius.circular(4),
-          child: CommonCard(
-            type: CommonCardType.filled,
-            radius: 0,
-            child: item,
-          ),
-        );
-      })
-      .separated(const Divider(height: 2, color: Colors.transparent));
   return Column(
     children: [
       if (items.isNotEmpty && title != null)
-        ListHeader(title: title, actions: actions),
-      ClipRSuperellipse(
-        borderRadius: BorderRadius.circular(14),
-        child: Column(children: [...genItems]),
-      ),
+        ListHeader(
+          title: title,
+          actions: actions,
+        ),
+      CommonCard(
+        radius: 18,
+        type: CommonCardType.filled,
+        child: Column(
+          children: [
+            ...items,
+          ],
+        ),
+      )
     ],
   );
 }
@@ -538,10 +555,18 @@ List<Widget> generateInfoSection({
   bool separated = true,
 }) {
   final genItems = separated
-      ? items.separated(const Divider(height: 0))
+      ? items.separated(
+          const Divider(
+            height: 0,
+          ),
+        )
       : items;
   return [
-    if (items.isNotEmpty) InfoHeader(info: info, actions: actions),
+    if (items.isNotEmpty)
+      InfoHeader(
+        info: info,
+        actions: actions,
+      ),
     ...genItems,
   ];
 }
@@ -550,6 +575,8 @@ Widget generateListView(List<Widget> items) {
   return ListView.builder(
     itemCount: items.length,
     itemBuilder: (_, index) => items[index],
-    padding: const EdgeInsets.only(bottom: 16),
+    padding: const EdgeInsets.only(
+      bottom: 16,
+    ),
   );
 }

lib/widgets/open_container.dart

@@ -2,15 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
 typedef CloseContainerActionCallback<S> = void Function({S? returnValue});
-typedef OpenContainerBuilder<S> =
-    Widget Function(
-      BuildContext context,
-      CloseContainerActionCallback<S> action,
-    );
-typedef CloseContainerBuilder =
-    Widget Function(BuildContext context, VoidCallback action);
+typedef OpenContainerBuilder<S> = Widget Function(
+  BuildContext context,
+  CloseContainerActionCallback<S> action,
+);
+typedef CloseContainerBuilder = Widget Function(
+  BuildContext context,
+  VoidCallback action,
+);
 
-enum ContainerTransitionType { fade, fadeThrough }
+enum ContainerTransitionType {
+  fade,
+  fadeThrough,
+}
 
 typedef ClosedCallback<S> = void Function(S data);
 
@@ -52,23 +56,20 @@ class _OpenContainerState<T> extends State<OpenContainer<T?>> {
   Future<void> openContainer() async {
     final Color middleColor =
         widget.middleColor ?? Theme.of(context).canvasColor;
-    final T? data =
-        await Navigator.of(
-          context,
-          rootNavigator: widget.useRootNavigator,
-        ).push(
-          _OpenContainerRoute<T>(
-            middleColor: middleColor,
-            closedBuilder: widget.closedBuilder,
-            openBuilder: widget.openBuilder,
-            hideableKey: _hideableKey,
-            closedBuilderKey: _closedBuilderKey,
-            transitionDuration: widget.transitionDuration,
-            transitionType: widget.transitionType,
-            useRootNavigator: widget.useRootNavigator,
-            routeSettings: widget.routeSettings,
-          ),
-        );
+    final T? data = await Navigator.of(
+      context,
+      rootNavigator: widget.useRootNavigator,
+    ).push(_OpenContainerRoute<T>(
+      middleColor: middleColor,
+      closedBuilder: widget.closedBuilder,
+      openBuilder: widget.openBuilder,
+      hideableKey: _hideableKey,
+      closedBuilderKey: _closedBuilderKey,
+      transitionDuration: widget.transitionDuration,
+      transitionType: widget.transitionType,
+      useRootNavigator: widget.useRootNavigator,
+      routeSettings: widget.routeSettings,
+    ));
     if (widget.onClosed != null) {
       widget.onClosed!(data);
     }
@@ -96,7 +97,10 @@ class _OpenContainerState<T> extends State<OpenContainer<T?>> {
 }
 
 class _Hideable extends StatefulWidget {
-  const _Hideable({super.key, required this.child});
+  const _Hideable({
+    super.key,
+    required this.child,
+  });
 
   final Widget child;
 
@@ -157,9 +161,9 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
     required this.transitionType,
     required this.useRootNavigator,
     required RouteSettings? routeSettings,
-  }) : _closedOpacityTween = _getClosedOpacityTween(transitionType),
-       _openOpacityTween = _getOpenOpacityTween(transitionType),
-       super(settings: routeSettings);
+  })  : _closedOpacityTween = _getClosedOpacityTween(transitionType),
+        _openOpacityTween = _getOpenOpacityTween(transitionType),
+        super(settings: routeSettings);
 
   static _FlippableTweenSequence<Color?> _getColorTween({
     required ContainerTransitionType transitionType,
@@ -169,89 +173,99 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
   }) {
     switch (transitionType) {
       case ContainerTransitionType.fade:
-        return _FlippableTweenSequence<Color?>(<TweenSequenceItem<Color?>>[
-          TweenSequenceItem<Color>(
-            tween: ConstantTween<Color>(closedColor),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<Color?>(
-            tween: ColorTween(begin: closedColor, end: openColor),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<Color>(
-            tween: ConstantTween<Color>(openColor),
-            weight: 3 / 5,
-          ),
-        ]);
+        return _FlippableTweenSequence<Color?>(
+          <TweenSequenceItem<Color?>>[
+            TweenSequenceItem<Color>(
+              tween: ConstantTween<Color>(closedColor),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<Color?>(
+              tween: ColorTween(begin: closedColor, end: openColor),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<Color>(
+              tween: ConstantTween<Color>(openColor),
+              weight: 3 / 5,
+            ),
+          ],
+        );
       case ContainerTransitionType.fadeThrough:
-        return _FlippableTweenSequence<Color?>(<TweenSequenceItem<Color?>>[
-          TweenSequenceItem<Color?>(
-            tween: ColorTween(begin: closedColor, end: middleColor),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<Color?>(
-            tween: ColorTween(begin: middleColor, end: openColor),
-            weight: 4 / 5,
-          ),
-        ]);
+        return _FlippableTweenSequence<Color?>(
+          <TweenSequenceItem<Color?>>[
+            TweenSequenceItem<Color?>(
+              tween: ColorTween(begin: closedColor, end: middleColor),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<Color?>(
+              tween: ColorTween(begin: middleColor, end: openColor),
+              weight: 4 / 5,
+            ),
+          ],
+        );
     }
   }
 
   static _FlippableTweenSequence<double> _getClosedOpacityTween(
-    ContainerTransitionType transitionType,
-  ) {
+      ContainerTransitionType transitionType) {
     switch (transitionType) {
       case ContainerTransitionType.fade:
-        return _FlippableTweenSequence<double>(<TweenSequenceItem<double>>[
-          TweenSequenceItem<double>(
-            tween: ConstantTween<double>(1.0),
-            weight: 1,
-          ),
-        ]);
+        return _FlippableTweenSequence<double>(
+          <TweenSequenceItem<double>>[
+            TweenSequenceItem<double>(
+              tween: ConstantTween<double>(1.0),
+              weight: 1,
+            ),
+          ],
+        );
       case ContainerTransitionType.fadeThrough:
-        return _FlippableTweenSequence<double>(<TweenSequenceItem<double>>[
-          TweenSequenceItem<double>(
-            tween: Tween<double>(begin: 1.0, end: 0.0),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<double>(
-            tween: ConstantTween<double>(0.0),
-            weight: 4 / 5,
-          ),
-        ]);
+        return _FlippableTweenSequence<double>(
+          <TweenSequenceItem<double>>[
+            TweenSequenceItem<double>(
+              tween: Tween<double>(begin: 1.0, end: 0.0),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<double>(
+              tween: ConstantTween<double>(0.0),
+              weight: 4 / 5,
+            ),
+          ],
+        );
     }
   }
 
   static _FlippableTweenSequence<double> _getOpenOpacityTween(
-    ContainerTransitionType transitionType,
-  ) {
+      ContainerTransitionType transitionType) {
     switch (transitionType) {
       case ContainerTransitionType.fade:
-        return _FlippableTweenSequence<double>(<TweenSequenceItem<double>>[
-          TweenSequenceItem<double>(
-            tween: ConstantTween<double>(0.0),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<double>(
-            tween: Tween<double>(begin: 0.0, end: 1.0),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<double>(
-            tween: ConstantTween<double>(1.0),
-            weight: 3 / 5,
-          ),
-        ]);
+        return _FlippableTweenSequence<double>(
+          <TweenSequenceItem<double>>[
+            TweenSequenceItem<double>(
+              tween: ConstantTween<double>(0.0),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<double>(
+              tween: Tween<double>(begin: 0.0, end: 1.0),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<double>(
+              tween: ConstantTween<double>(1.0),
+              weight: 3 / 5,
+            ),
+          ],
+        );
       case ContainerTransitionType.fadeThrough:
-        return _FlippableTweenSequence<double>(<TweenSequenceItem<double>>[
-          TweenSequenceItem<double>(
-            tween: ConstantTween<double>(0.0),
-            weight: 1 / 5,
-          ),
-          TweenSequenceItem<double>(
-            tween: Tween<double>(begin: 0.0, end: 1.0),
-            weight: 4 / 5,
-          ),
-        ]);
+        return _FlippableTweenSequence<double>(
+          <TweenSequenceItem<double>>[
+            TweenSequenceItem<double>(
+              tween: ConstantTween<double>(0.0),
+              weight: 1 / 5,
+            ),
+            TweenSequenceItem<double>(
+              tween: Tween<double>(begin: 0.0, end: 1.0),
+              weight: 4 / 5,
+            ),
+          ],
+        );
     }
   }
 
@@ -311,9 +325,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
   @override
   void dispose() {
     if (hideableKey.currentState?.isVisible == false) {
-      SchedulerBinding.instance.addPostFrameCallback(
-        (Duration d) => _toggleHideable(hide: false),
-      );
+      SchedulerBinding.instance
+          .addPostFrameCallback((Duration d) => _toggleHideable(hide: false));
     }
     super.dispose();
   }
@@ -330,12 +343,10 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
     required BuildContext navigatorContext,
     bool delayForSourceRoute = false,
   }) {
-    final RenderBox navigator =
-        Navigator.of(
-              navigatorContext,
-              rootNavigator: useRootNavigator,
-            ).context.findRenderObject()!
-            as RenderBox;
+    final RenderBox navigator = Navigator.of(
+      navigatorContext,
+      rootNavigator: useRootNavigator,
+    ).context.findRenderObject()! as RenderBox;
     final Size navSize = _getSize(navigator);
     _rectTween.end = Offset.zero & navSize;
 
@@ -348,9 +359,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
     }
 
     if (delayForSourceRoute) {
-      SchedulerBinding.instance.addPostFrameCallback(
-        takeMeasurementsInSourceRoute,
-      );
+      SchedulerBinding.instance
+          .addPostFrameCallback(takeMeasurementsInSourceRoute);
     } else {
       takeMeasurementsInSourceRoute();
     }
@@ -441,9 +451,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
           final Animation<double> curvedAnimation = CurvedAnimation(
             parent: animation,
             curve: Curves.fastOutSlowIn,
-            reverseCurve: _transitionWasInterrupted
-                ? null
-                : Curves.fastOutSlowIn.flipped,
+            reverseCurve:
+                _transitionWasInterrupted ? null : Curves.fastOutSlowIn.flipped,
           );
           TweenSequence<Color?>? colorTween;
           TweenSequence<double>? closedOpacityTween, openOpacityTween;
@@ -499,9 +508,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
                             child: (hideableKey.currentState?.isInTree ?? false)
                                 ? null
                                 : FadeTransition(
-                                    opacity: closedOpacityTween!.animate(
-                                      animation,
-                                    ),
+                                    opacity:
+                                        closedOpacityTween!.animate(animation),
                                     child: Builder(
                                       key: closedBuilderKey,
                                       builder: (BuildContext context) {
@@ -513,18 +521,22 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
                                   ),
                           ),
                         ),
+
                         // Open child fading in.
-                        OverflowBox(
-                          maxWidth: _rectTween.end!.width,
-                          maxHeight: _rectTween.end!.height,
+                        FittedBox(
+                          fit: BoxFit.fitWidth,
                           alignment: Alignment.topLeft,
-                          child: FadeTransition(
-                            opacity: openOpacityTween!.animate(animation),
-                            child: Builder(
-                              key: _openBuilderKey,
-                              builder: (BuildContext context) {
-                                return openBuilder(context, closeContainer);
-                              },
+                          child: SizedBox(
+                            width: _rectTween.end!.width,
+                            height: _rectTween.end!.height,
+                            child: FadeTransition(
+                              opacity: openOpacityTween!.animate(animation),
+                              child: Builder(
+                                key: _openBuilderKey,
+                                builder: (BuildContext context) {
+                                  return openBuilder(context, closeContainer);
+                                },
+                              ),
                             ),
                           ),
                         ),
@@ -566,12 +578,10 @@ class _FlippableTweenSequence<T> extends TweenSequence<T> {
     if (_flipped == null) {
       final List<TweenSequenceItem<T>> newItems = <TweenSequenceItem<T>>[];
       for (int i = 0; i < _items.length; i++) {
-        newItems.add(
-          TweenSequenceItem<T>(
-            tween: _items[i].tween,
-            weight: _items[_items.length - 1 - i].weight,
-          ),
-        );
+        newItems.add(TweenSequenceItem<T>(
+          tween: _items[i].tween,
+          weight: _items[_items.length - 1 - i].weight,
+        ));
       }
       _flipped = _FlippableTweenSequence<T>(newItems);
     }

lib/widgets/palette.dart

@@ -243,7 +243,7 @@ class _ShadePainter extends CustomPainter {
       effectiveSquareRadius * 2,
       effectiveSquareRadius * 2,
     );
-    final RSuperellipse rSuperellipse = RSuperellipse.fromRectAndRadius(
+    final RRect rRect = RRect.fromRectAndRadius(
       rectBox,
       Radius.circular(trackBorderRadius),
     );
@@ -254,8 +254,8 @@ class _ShadePainter extends CustomPainter {
         HSVColor.fromAHSV(1, colorHue, 1, 1).toColor(),
       ],
     ).createShader(rectBox);
-    canvas.drawRSuperellipse(
-      rSuperellipse,
+    canvas.drawRRect(
+      rRect,
       Paint()
         ..style = PaintingStyle.fill
         ..shader = horizontal,
@@ -266,8 +266,8 @@ class _ShadePainter extends CustomPainter {
       end: Alignment.bottomCenter,
       colors: <Color>[Colors.transparent, Colors.black],
     ).createShader(rectBox);
-    canvas.drawRSuperellipse(
-      rSuperellipse,
+    canvas.drawRRect(
+      rRect,
       Paint()
         ..style = PaintingStyle.fill
         ..shader = vertical,

lib/widgets/popup.dart

@@ -38,9 +38,10 @@ class CommonPopupRoute<T> extends PopupRoute<T> {
     Widget child,
   ) {
     final align = Alignment.topRight;
-    final curveAnimation = animation
-        .drive(Tween(begin: 0.0, end: 1.0))
-        .drive(CurveTween(curve: Curves.easeOutBack));
+    final animationValue = CurvedAnimation(
+      parent: animation,
+      curve: Curves.easeIn,
+    ).value;
     return SafeArea(
       child: ValueListenableBuilder(
         valueListenable: offsetNotifier,
@@ -57,17 +58,15 @@ class CommonPopupRoute<T> extends PopupRoute<T> {
         },
         child: AnimatedBuilder(
           animation: animation,
-          builder: (_, child) {
-            return FadeTransition(
-              opacity: curveAnimation,
-              child: ScaleTransition(
+          builder: (_, Widget? child) {
+            return Opacity(
+              opacity: 0.1 + 0.9 * animationValue,
+              child: Transform.scale(
                 alignment: align,
-                scale: curveAnimation,
-                child: SlideTransition(
-                  position: curveAnimation.drive(
-                    Tween(begin: const Offset(0, -0.02), end: Offset.zero),
-                  ),
-                  child: child,
+                scale: 0.7 + 0.3 * animationValue,
+                child: Transform.translate(
+                  offset: Offset(0, -10) * (1 - animationValue),
+                  child: child!,
                 ),
               ),
             );
@@ -79,7 +78,7 @@ class CommonPopupRoute<T> extends PopupRoute<T> {
   }
 
   @override
-  Duration get transitionDuration => const Duration(milliseconds: 250);
+  Duration get transitionDuration => const Duration(milliseconds: 150);
 }
 
 class PopupController extends ValueNotifier<bool> {
@@ -271,8 +270,8 @@ class CommonPopupMenu extends StatelessWidget {
           elevation: 12,
           color: context.colorScheme.surfaceContainer,
           clipBehavior: Clip.antiAlias,
-          shape: RoundedSuperellipseBorder(
-            borderRadius: BorderRadius.circular(14),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12),
           ),
           child: Column(
             mainAxisSize: MainAxisSize.min,

lib/widgets/scaffold.dart

@@ -18,6 +18,7 @@ class CommonScaffold extends StatefulWidget {
   final Widget body;
   final Color? backgroundColor;
   final String? title;
+  final Widget? leading;
   final List<Widget>? actions;
   final bool? centerTitle;
   final Widget? floatingActionButton;
@@ -30,6 +31,7 @@ class CommonScaffold extends StatefulWidget {
     this.appBar,
     required this.body,
     this.backgroundColor,
+    this.leading,
     this.title,
     this.actions,
     this.centerTitle,
@@ -161,7 +163,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
     _keywordsNotifier.value = keywords;
   }
 
-  Widget? _buildLeading(VoidCallback? backAction) {
+  Widget? _buildLeading() {
     if (_isEdit) {
       return IconButton(
         onPressed: _appBarState.value.editState?.onExit,
@@ -174,16 +176,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
         icon: Icon(Icons.arrow_back),
       );
     }
-    return backAction != null
-        ? BackButton(
-            onPressed: () {
-              if (!mounted) {
-                return;
-              }
-              backAction();
-            },
-          )
-        : null;
+    return widget.leading;
   }
 
   Widget _buildTitle(AppBarSearchState? startState) {
@@ -258,7 +251,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
     );
   }
 
-  PreferredSizeWidget _buildAppBar(VoidCallback? backAction) {
+  PreferredSizeWidget _buildAppBar() {
     return PreferredSize(
       preferredSize: const Size.fromHeight(kToolbarHeight),
       child: Stack(
@@ -270,11 +263,8 @@ class CommonScaffoldState extends State<CommonScaffold> {
                 builder: (_, state, _) {
                   return _buildAppBarWrap(
                     AppBar(
-                      automaticallyImplyLeading: backAction != null
-                          ? false
-                          : true,
                       centerTitle: widget.centerTitle ?? false,
-                      leading: _buildLeading(backAction),
+                      leading: _buildLeading(),
                       title: _buildTitle(state.searchState),
                       actions: _buildActions(
                         state.searchState != null,
@@ -295,7 +285,6 @@ class CommonScaffoldState extends State<CommonScaffold> {
   @override
   Widget build(BuildContext context) {
     assert(widget.appBar != null || widget.title != null);
-    final backActionProvider = CommonScaffoldBackActionProvider.of(context);
     final body = SafeArea(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -338,7 +327,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
       ),
     );
     return Scaffold(
-      appBar: _buildAppBar(backActionProvider?.backAction),
+      appBar: _buildAppBar(),
       body: body,
       resizeToAvoidBottomInset: true,
       backgroundColor: widget.backgroundColor,
@@ -360,23 +349,3 @@ List<Widget> genActions(List<Widget> actions, {double? space}) {
     SizedBox(width: 8),
   ];
 }
-
-class CommonScaffoldBackActionProvider extends InheritedWidget {
-  final VoidCallback? backAction;
-
-  const CommonScaffoldBackActionProvider({
-    super.key,
-    required this.backAction,
-    required super.child,
-  });
-
-  static CommonScaffoldBackActionProvider? of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<CommonScaffoldBackActionProvider>();
-  }
-
-  @override
-  bool updateShouldNotify(CommonScaffoldBackActionProvider oldWidget) {
-    return false;
-  }
-}

lib/widgets/sheet.dart

@@ -39,7 +39,11 @@ class ExtendProps {
   });
 }
 
-enum SheetType { page, bottomSheet, sideSheet }
+enum SheetType {
+  page,
+  bottomSheet,
+  sideSheet,
+}
 
 typedef SheetBuilder = Widget Function(BuildContext context, SheetType type);
 
@@ -51,24 +55,28 @@ Future<T?> showSheet<T>({
   final isMobile = globalState.appState.viewMode == ViewMode.mobile;
   return switch (isMobile) {
     true => showModalBottomSheet<T>(
-      context: context,
-      isScrollControlled: props.isScrollControlled,
-      builder: (_) {
-        return SafeArea(child: builder(context, SheetType.bottomSheet));
-      },
-      showDragHandle: false,
-      useSafeArea: props.useSafeArea,
-    ),
+        context: context,
+        isScrollControlled: props.isScrollControlled,
+        builder: (_) {
+          return SafeArea(
+            child: builder(context, SheetType.bottomSheet),
+          );
+        },
+        showDragHandle: false,
+        useSafeArea: props.useSafeArea,
+      ),
     false => showModalSideSheet<T>(
-      useSafeArea: props.useSafeArea,
-      isScrollControlled: props.isScrollControlled,
-      context: context,
-      constraints: BoxConstraints(maxWidth: props.maxWidth ?? 360),
-      filter: props.blur ? commonFilter : null,
-      builder: (_) {
-        return builder(context, SheetType.sideSheet);
-      },
-    ),
+        useSafeArea: props.useSafeArea,
+        isScrollControlled: props.isScrollControlled,
+        context: context,
+        constraints: BoxConstraints(
+          maxWidth: props.maxWidth ?? 360,
+        ),
+        filter: props.blur ? commonFilter : null,
+        builder: (_) {
+          return builder(context, SheetType.sideSheet);
+        },
+      ),
   };
 }
 
@@ -79,16 +87,21 @@ Future<T?> showExtend<T>(
 }) {
   final isMobile = globalState.appState.viewMode == ViewMode.mobile;
   return switch (isMobile || props.forceFull) {
-    true => BaseNavigator.push(context, builder(context, SheetType.page)),
+    true => BaseNavigator.push(
+        context,
+        builder(context, SheetType.page),
+      ),
     false => showModalSideSheet<T>(
-      useSafeArea: props.useSafeArea,
-      context: context,
-      constraints: BoxConstraints(maxWidth: props.maxWidth ?? 360),
-      filter: props.blur ? commonFilter : null,
-      builder: (context) {
-        return builder(context, SheetType.sideSheet);
-      },
-    ),
+        useSafeArea: props.useSafeArea,
+        context: context,
+        constraints: BoxConstraints(
+          maxWidth: props.maxWidth ?? 360,
+        ),
+        filter: props.blur ? commonFilter : null,
+        builder: (context) {
+          return builder(context, SheetType.sideSheet);
+        },
+      ),
   };
 }
 
@@ -121,11 +134,13 @@ class _AdaptiveSheetScaffoldState extends State<AdaptiveSheetScaffold> {
       automaticallyImplyLeading: bottomSheet
           ? false
           : widget.actions.isEmpty && sideSheet
-          ? false
-          : true,
+              ? false
+              : true,
       centerTitle: bottomSheet,
       backgroundColor: backgroundColor,
-      title: Text(widget.title),
+      title: Text(
+        widget.title,
+      ),
       actions: genActions([
         if (widget.actions.isEmpty && sideSheet) CloseButton(),
         ...widget.actions,
@@ -135,11 +150,9 @@ class _AdaptiveSheetScaffoldState extends State<AdaptiveSheetScaffold> {
       final handleSize = Size(32, 4);
       return Container(
         clipBehavior: Clip.hardEdge,
-        decoration: ShapeDecoration(
+        decoration: BoxDecoration(
           color: backgroundColor,
-          shape: RoundedSuperellipseBorder(
-            borderRadius: BorderRadius.vertical(top: Radius.circular(28.0)),
-          ),
+          borderRadius: BorderRadius.vertical(top: Radius.circular(28.0)),
         ),
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -150,16 +163,17 @@ class _AdaptiveSheetScaffoldState extends State<AdaptiveSheetScaffold> {
                 alignment: Alignment.center,
                 height: handleSize.height,
                 width: handleSize.width,
-                decoration: ShapeDecoration(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(handleSize.height / 2),
                   color: context.colorScheme.onSurfaceVariant,
-                  shape: RoundedSuperellipseBorder(
-                    borderRadius: BorderRadius.circular(handleSize.height / 2),
-                  ),
                 ),
               ),
             ),
             appBar,
-            Flexible(flex: 1, child: widget.body),
+            Flexible(
+              flex: 1,
+              child: widget.body,
+            )
           ],
         ),
       );

lib/widgets/side_sheet.dart

@@ -82,12 +82,12 @@ class _SideSheetState extends State<SideSheet> {
     final Color surfaceTintColor = colorScheme.surfaceTint;
     final Color shadowColor = widget.shadowColor ?? Colors.transparent;
     final double elevation = widget.elevation ?? 0;
-    final ShapeBorder shape =
-        widget.shape ??
-        RoundedSuperellipseBorder(borderRadius: BorderRadius.circular(0));
+    final ShapeBorder shape = widget.shape ??
+        RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(0),
+        );
 
-    final BoxConstraints constraints =
-        widget.constraints ??
+    final BoxConstraints constraints = widget.constraints ??
         const BoxConstraints(maxWidth: 320, minWidth: 320);
 
     final Clip clipBehavior = widget.clipBehavior ?? Clip.none;
@@ -103,7 +103,10 @@ class _SideSheetState extends State<SideSheet> {
       child: widget.builder(context),
     );
 
-    return ConstrainedBox(constraints: constraints, child: sideSheet);
+    return ConstrainedBox(
+      constraints: constraints,
+      child: sideSheet,
+    );
   }
 }
 
@@ -125,8 +128,7 @@ class _SideSheetLayoutWithSizeListener extends SingleChildRenderObjectWidget {
 
   @override
   _RenderSideSheetLayoutWithSizeListener createRenderObject(
-    BuildContext context,
-  ) {
+      BuildContext context) {
     return _RenderSideSheetLayoutWithSizeListener(
       onChildSizeChanged: onChildSizeChanged,
       animationValue: animationValue,
@@ -136,10 +138,8 @@ class _SideSheetLayoutWithSizeListener extends SingleChildRenderObjectWidget {
   }
 
   @override
-  void updateRenderObject(
-    BuildContext context,
-    _RenderSideSheetLayoutWithSizeListener renderObject,
-  ) {
+  void updateRenderObject(BuildContext context,
+      _RenderSideSheetLayoutWithSizeListener renderObject) {
     renderObject.onChildSizeChanged = onChildSizeChanged;
     renderObject.animationValue = animationValue;
     renderObject.isScrollControlled = isScrollControlled;
@@ -155,12 +155,12 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
     required double animationValue,
     required bool isScrollControlled,
     required double scrollControlDisabledMaxHeightRatio,
-  }) : _onChildSizeChanged = onChildSizeChanged,
-       _animationValue = animationValue,
-       _isScrollControlled = isScrollControlled,
-       _scrollControlDisabledMaxHeightRatio =
-           scrollControlDisabledMaxHeightRatio,
-       super(child);
+  })  : _onChildSizeChanged = onChildSizeChanged,
+        _animationValue = animationValue,
+        _isScrollControlled = isScrollControlled,
+        _scrollControlDisabledMaxHeightRatio =
+            scrollControlDisabledMaxHeightRatio,
+        super(child);
 
   Size _lastSize = Size.zero;
 
@@ -219,9 +219,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
 
   @override
   double computeMinIntrinsicWidth(double height) {
-    final double width = _getSize(
-      BoxConstraints.tightForFinite(height: height),
-    ).width;
+    final double width =
+        _getSize(BoxConstraints.tightForFinite(height: height)).width;
     if (width.isFinite) {
       return width;
     }
@@ -230,9 +229,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
 
   @override
   double computeMaxIntrinsicWidth(double height) {
-    final double width = _getSize(
-      BoxConstraints.tightForFinite(height: height),
-    ).width;
+    final double width =
+        _getSize(BoxConstraints.tightForFinite(height: height)).width;
     if (width.isFinite) {
       return width;
     }
@@ -241,9 +239,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
 
   @override
   double computeMinIntrinsicHeight(double width) {
-    final double height = _getSize(
-      BoxConstraints.tightForFinite(width: width),
-    ).height;
+    final double height =
+        _getSize(BoxConstraints.tightForFinite(width: width)).height;
     if (height.isFinite) {
       return height;
     }
@@ -252,9 +249,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
 
   @override
   double computeMaxIntrinsicHeight(double width) {
-    final double height = _getSize(
-      BoxConstraints.tightForFinite(width: width),
-    ).height;
+    final double height =
+        _getSize(BoxConstraints.tightForFinite(width: width)).height;
     if (height.isFinite) {
       return height;
     }
@@ -267,7 +263,9 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
   }
 
   BoxConstraints _getConstraintsForChild(BoxConstraints constraints) {
-    return BoxConstraints(maxHeight: constraints.maxHeight);
+    return BoxConstraints(
+      maxHeight: constraints.maxHeight,
+    );
   }
 
   Offset _getPositionForChild(Size size, Size childSize) {
@@ -278,9 +276,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
   void performLayout() {
     size = _getSize(constraints);
     if (child != null) {
-      final BoxConstraints childConstraints = _getConstraintsForChild(
-        constraints,
-      );
+      final BoxConstraints childConstraints =
+          _getConstraintsForChild(constraints);
       assert(childConstraints.debugAssertIsValid(isAppliedConstraint: true));
       child!.layout(
         childConstraints,
@@ -291,9 +288,8 @@ class _RenderSideSheetLayoutWithSizeListener extends RenderShiftedBox {
         size,
         childConstraints.isTight ? childConstraints.smallest : child!.size,
       );
-      final Size childSize = childConstraints.isTight
-          ? childConstraints.smallest
-          : child!.size;
+      final Size childSize =
+          childConstraints.isTight ? childConstraints.smallest : child!.size;
 
       if (_lastSize != childSize) {
         _lastSize = childSize;
@@ -358,9 +354,8 @@ class _ModalSideSheetState<T> extends State<_ModalSideSheet<T>> {
   Widget build(BuildContext context) {
     assert(debugCheckHasMediaQuery(context));
     assert(debugCheckHasMaterialLocalizations(context));
-    final MaterialLocalizations localizations = MaterialLocalizations.of(
-      context,
-    );
+    final MaterialLocalizations localizations =
+        MaterialLocalizations.of(context);
     final String routeLabel = _getRouteLabel(localizations);
 
     return AnimatedBuilder(
@@ -411,27 +406,26 @@ class _ModalSideSheetState<T> extends State<_ModalSideSheet<T>> {
 }
 
 class ModalSideSheetRoute<T> extends PopupRoute<T> {
-  ModalSideSheetRoute({
-    required this.builder,
-    this.capturedThemes,
-    this.barrierLabel,
-    this.barrierOnTapHint,
-    this.backgroundColor,
-    this.elevation,
-    this.shape,
-    this.clipBehavior,
-    this.constraints,
-    this.modalBarrierColor,
-    this.isDismissible = true,
-    this.isScrollControlled = false,
-    this.scrollControlDisabledMaxHeightRatio =
-        _defaultScrollControlDisabledMaxHeightRatio,
-    super.settings,
-    this.transitionAnimationController,
-    this.anchorPoint,
-    this.useSafeArea = false,
-    super.filter,
-  });
+  ModalSideSheetRoute(
+      {required this.builder,
+      this.capturedThemes,
+      this.barrierLabel,
+      this.barrierOnTapHint,
+      this.backgroundColor,
+      this.elevation,
+      this.shape,
+      this.clipBehavior,
+      this.constraints,
+      this.modalBarrierColor,
+      this.isDismissible = true,
+      this.isScrollControlled = false,
+      this.scrollControlDisabledMaxHeightRatio =
+          _defaultScrollControlDisabledMaxHeightRatio,
+      super.settings,
+      this.transitionAnimationController,
+      this.anchorPoint,
+      this.useSafeArea = false,
+      super.filter});
 
   final WidgetBuilder builder;
 
@@ -510,11 +504,8 @@ class ModalSideSheetRoute<T> extends PopupRoute<T> {
   }
 
   @override
-  Widget buildPage(
-    BuildContext context,
-    Animation<double> animation,
-    Animation<double> secondaryAnimation,
-  ) {
+  Widget buildPage(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation) {
     final Widget content = DisplayFeatureSubScreen(
       anchorPoint: anchorPoint,
       child: Builder(
@@ -548,7 +539,9 @@ class ModalSideSheetRoute<T> extends PopupRoute<T> {
         ColorTween(
           begin: barrierColor.opacity0,
           end: barrierColor,
-        ).chain(CurveTween(curve: barrierCurve)),
+        ).chain(
+          CurveTween(curve: barrierCurve),
+        ),
       );
       return AnimatedModalBarrier(
         color: color,
@@ -594,39 +587,32 @@ Future<T?> showModalSideSheet<T>({
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMaterialLocalizations(context));
 
-  final NavigatorState navigator = Navigator.of(
-    context,
-    rootNavigator: useRootNavigator,
-  );
+  final NavigatorState navigator =
+      Navigator.of(context, rootNavigator: useRootNavigator);
   final MaterialLocalizations localizations = MaterialLocalizations.of(context);
-  return navigator.push(
-    ModalSideSheetRoute<T>(
-      builder: builder,
-      filter: filter,
-      capturedThemes: InheritedTheme.capture(
-        from: context,
-        to: navigator.context,
-      ),
-      isScrollControlled: isScrollControlled,
-      scrollControlDisabledMaxHeightRatio: scrollControlDisabledMaxHeightRatio,
-      barrierLabel: barrierLabel ?? localizations.scrimLabel,
-      barrierOnTapHint: localizations.scrimOnTapHint(
-        localizations.bottomSheetLabel,
-      ),
-      backgroundColor: backgroundColor,
-      elevation: elevation,
-      shape: shape,
-      clipBehavior: clipBehavior,
-      constraints: constraints,
-      isDismissible: isDismissible,
-      modalBarrierColor:
-          barrierColor ?? Theme.of(context).bottomSheetTheme.modalBarrierColor,
-      settings: routeSettings,
-      transitionAnimationController: transitionAnimationController,
-      anchorPoint: anchorPoint,
-      useSafeArea: useSafeArea,
-    ),
-  );
+  return navigator.push(ModalSideSheetRoute<T>(
+    builder: builder,
+    filter: filter,
+    capturedThemes:
+        InheritedTheme.capture(from: context, to: navigator.context),
+    isScrollControlled: isScrollControlled,
+    scrollControlDisabledMaxHeightRatio: scrollControlDisabledMaxHeightRatio,
+    barrierLabel: barrierLabel ?? localizations.scrimLabel,
+    barrierOnTapHint:
+        localizations.scrimOnTapHint(localizations.bottomSheetLabel),
+    backgroundColor: backgroundColor,
+    elevation: elevation,
+    shape: shape,
+    clipBehavior: clipBehavior,
+    constraints: constraints,
+    isDismissible: isDismissible,
+    modalBarrierColor:
+        barrierColor ?? Theme.of(context).bottomSheetTheme.modalBarrierColor,
+    settings: routeSettings,
+    transitionAnimationController: transitionAnimationController,
+    anchorPoint: anchorPoint,
+    useSafeArea: useSafeArea,
+  ));
 }
 
 // class ModalAppBar extends StatelessWidget {

lib/widgets/tab.dart

@@ -8,10 +8,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/physics.dart';
 import 'package:flutter/rendering.dart';
 
-const EdgeInsetsGeometry _kHorizontalItemPadding = EdgeInsets.symmetric(
-  vertical: 2,
-  horizontal: 3,
-);
+const EdgeInsetsGeometry _kHorizontalItemPadding =
+    EdgeInsets.symmetric(vertical: 2, horizontal: 3);
 
 const Radius _kCornerRadius = Radius.circular(9);
 
@@ -65,11 +63,11 @@ class CommonTabBar<T extends Object> extends StatefulWidget {
     this.padding = _kHorizontalItemPadding,
     this.backgroundColor,
     this.proportionalWidth = false,
-  }) : assert(children.length >= 2),
-       assert(
-         groupValue == null || children.keys.contains(groupValue),
-         'The groupValue must be either null or one of the keys in the children map.',
-       );
+  })  : assert(children.length >= 2),
+        assert(
+          groupValue == null || children.keys.contains(groupValue),
+          'The groupValue must be either null or one of the keys in the children map.',
+        );
   final Map<T, Widget> children;
   final Set<T> disabledChildren;
   final T? groupValue;
@@ -192,9 +190,8 @@ class _CommonTabBarState<T extends Object> extends State<CommonTabBar<T>>
   void _playThumbScaleAnimation({required bool isExpanding}) {
     thumbScaleAnimation = thumbScaleController.drive(
       Tween<double>(
-        begin: thumbScaleAnimation.value,
-        end: isExpanding ? 1 : _kMinThumbScale,
-      ),
+          begin: thumbScaleAnimation.value,
+          end: isExpanding ? 1 : _kMinThumbScale),
     );
     thumbScaleController.animateWith(_kThumbSpringAnimationSimulation);
   }
@@ -234,9 +231,8 @@ class _CommonTabBarState<T extends Object> extends State<CommonTabBar<T>>
   void onDown(DragDownDetails details) {
     final T touchDownSegment = segmentForXPosition(details.localPosition.dx);
     _startedOnSelectedSegment = touchDownSegment == highlighted;
-    _startedOnDisabledSegment = widget.disabledChildren.contains(
-      touchDownSegment,
-    );
+    _startedOnDisabledSegment =
+        widget.disabledChildren.contains(touchDownSegment);
     if (widget.disabledChildren.contains(touchDownSegment)) {
       return;
     }
@@ -377,10 +373,8 @@ class _CommonTabBarState<T extends Object> extends State<CommonTabBar<T>>
       child: Container(
         clipBehavior: Clip.antiAlias,
         padding: widget.padding.resolve(Directionality.of(context)),
-        decoration: ShapeDecoration(
-          shape: RoundedSuperellipseBorder(
-            borderRadius: const BorderRadius.all(_kCornerRadius),
-          ),
+        decoration: BoxDecoration(
+          borderRadius: const BorderRadius.all(_kCornerRadius),
           color: widget.backgroundColor,
         ),
         child: AnimatedBuilder(
@@ -461,9 +455,8 @@ class _SegmentState<T> extends State<_Segment<T>>
           end: widget.shouldScaleContent ? _kMinThumbScale : 1.0,
         ),
       );
-      highlightPressScaleController.animateWith(
-        _kThumbSpringAnimationSimulation,
-      );
+      highlightPressScaleController
+          .animateWith(_kThumbSpringAnimationSimulation);
     }
   }
 
@@ -487,21 +480,20 @@ class _SegmentState<T> extends State<_Segment<T>>
         alignment: Alignment.center,
         children: <Widget>[
           AnimatedOpacity(
-            opacity: widget.shouldFadeoutContent
-                ? _kContentPressedMinOpacity
-                : 1,
+            opacity:
+                widget.shouldFadeoutContent ? _kContentPressedMinOpacity : 1,
             duration: _kOpacityAnimationDuration,
             curve: Curves.ease,
             child: AnimatedDefaultTextStyle(
               style: DefaultTextStyle.of(context).style.merge(
-                TextStyle(
-                  fontWeight: widget.highlighted
-                      ? _kHighlightedFontWeight
-                      : _kFontWeight,
-                  fontSize: _kFontSize,
-                  color: widget.enabled ? null : _kDisabledContentColor,
-                ),
-              ),
+                    TextStyle(
+                      fontWeight: widget.highlighted
+                          ? _kHighlightedFontWeight
+                          : _kFontWeight,
+                      fontSize: _kFontSize,
+                      color: widget.enabled ? null : _kDisabledContentColor,
+                    ),
+                  ),
               duration: _kHighlightAnimationDuration,
               curve: Curves.ease,
               child: ScaleTransition(
@@ -513,9 +505,7 @@ class _SegmentState<T> extends State<_Segment<T>>
           ),
           DefaultTextStyle.merge(
             style: const TextStyle(
-              fontWeight: _kHighlightedFontWeight,
-              fontSize: _kFontSize,
-            ),
+                fontWeight: _kHighlightedFontWeight, fontSize: _kFontSize),
             child: widget.child,
           ),
         ],
@@ -580,7 +570,9 @@ class _SegmentSeparatorState extends State<_SegmentSeparator>
         return Padding(
           padding: _kSeparatorInset,
           child: DecoratedBox(
-            decoration: BoxDecoration(color: Colors.transparent),
+            decoration: BoxDecoration(
+              color: Colors.transparent,
+            ),
             child: child,
           ),
         );
@@ -620,9 +612,7 @@ class _CommonTabBarRenderWidget<T extends Object>
 
   @override
   void updateRenderObject(
-    BuildContext context,
-    _RenderSegmentedControl<T> renderObject,
-  ) {
+      BuildContext context, _RenderSegmentedControl<T> renderObject) {
     assert(renderObject.state == state);
     renderObject
       ..thumbColor = thumbColor
@@ -639,24 +629,20 @@ enum _SegmentLocation { leftmost, rightmost, inbetween }
 
 class _RenderSegmentedControl<T extends Object> extends RenderBox
     with
-        ContainerRenderObjectMixin<
-          RenderBox,
-          ContainerBoxParentData<RenderBox>
-        >,
-        RenderBoxContainerDefaultsMixin<
-          RenderBox,
-          ContainerBoxParentData<RenderBox>
-        > {
+        ContainerRenderObjectMixin<RenderBox,
+            ContainerBoxParentData<RenderBox>>,
+        RenderBoxContainerDefaultsMixin<RenderBox,
+            ContainerBoxParentData<RenderBox>> {
   _RenderSegmentedControl({
     required int? highlightedIndex,
     required Color thumbColor,
     required double thumbScale,
     required bool proportionalWidth,
     required this.state,
-  }) : _highlightedIndex = highlightedIndex,
-       _thumbColor = thumbColor,
-       _thumbScale = thumbScale,
-       _proportionalWidth = proportionalWidth;
+  })  : _highlightedIndex = highlightedIndex,
+        _thumbColor = thumbColor,
+        _thumbScale = thumbScale,
+        _proportionalWidth = proportionalWidth;
 
   final _CommonTabBarState<T> state;
 
@@ -853,9 +839,7 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
       child = nonSeparatorChildAfter(child);
     }
     return math.min(
-      childWidth,
-      (constraints.maxWidth - totalSeparatorWidth) / childCount,
-    );
+        childWidth, (constraints.maxWidth - totalSeparatorWidth) / childCount);
   }
 
   List<double> _getChildWidths(BoxConstraints constraints) {
@@ -889,28 +873,20 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
   }
 
   Size _computeOverallSize(BoxConstraints constraints) {
-    final double maxChildHeight = _getMaxChildHeight(
-      constraints,
-      constraints.maxWidth,
-    );
+    final double maxChildHeight =
+        _getMaxChildHeight(constraints, constraints.maxWidth);
     return constraints.constrain(
-      Size(
-        _getChildWidths(constraints).sum + totalSeparatorWidth,
-        maxChildHeight,
-      ),
+      Size(_getChildWidths(constraints).sum + totalSeparatorWidth,
+          maxChildHeight),
     );
   }
 
   @override
   double? computeDryBaseline(
-    covariant BoxConstraints constraints,
-    TextBaseline baseline,
-  ) {
+      covariant BoxConstraints constraints, TextBaseline baseline) {
     final List<double> segmentWidths = _getChildWidths(constraints);
-    final double childHeight = _getMaxChildHeight(
-      constraints,
-      constraints.maxWidth,
-    );
+    final double childHeight =
+        _getMaxChildHeight(constraints, constraints.maxWidth);
 
     int index = 0;
     BaselineOffset baselineOffset = BaselineOffset.noBaseline;
@@ -952,10 +928,8 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
       final BoxConstraints childConstraints = BoxConstraints.tight(
         Size(segmentWidths[index ~/ 2], childHeight),
       );
-      child.layout(
-        index.isEven ? childConstraints : separatorConstraints,
-        parentUsesSize: true,
-      );
+      child.layout(index.isEven ? childConstraints : separatorConstraints,
+          parentUsesSize: true);
       final _SegmentedControlContainerBoxParentData childParentData =
           child.parentData! as _SegmentedControlContainerBoxParentData;
       final Offset childOffset = Offset(start, 0);
@@ -985,9 +959,9 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
     final double leftMost = firstChildOffset.dx;
     final double rightMost =
         (children.last.parentData! as _SegmentedControlContainerBoxParentData)
-            .offset
-            .dx +
-        children.last.size.width;
+                .offset
+                .dx +
+            children.last.size.width;
     assert(rightMost > leftMost);
     return Rect.fromLTRB(
       math.max(thumbRect.left, leftMost - _kThumbInsets.left),
@@ -1018,10 +992,8 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
         if (thumbTween == null) {
           final Rect startingRect =
               moveThumbRectInBound(currentThumbRect, children) ?? newThumbRect;
-          state.thumbAnimatable = RectTween(
-            begin: startingRect,
-            end: newThumbRect,
-          );
+          state.thumbAnimatable =
+              RectTween(begin: startingRect, end: newThumbRect);
         } else if (newThumbRect != thumbTween.transform(1)) {
           final Rect startingRect =
               moveThumbRectInBound(currentThumbRect, children) ?? newThumbRect;
@@ -1036,7 +1008,7 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
 
       final Rect unscaledThumbRect =
           state.thumbAnimatable?.evaluate(state.thumbController) ??
-          newThumbRect;
+              newThumbRect;
       currentThumbRect = unscaledThumbRect;
 
       final _SegmentLocation childLocation;
@@ -1073,10 +1045,7 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
   final Paint separatorPaint = Paint();
 
   void _paintSeparator(
-    PaintingContext context,
-    Offset offset,
-    RenderBox child,
-  ) {
+      PaintingContext context, Offset offset, RenderBox child) {
     final _SegmentedControlContainerBoxParentData childParentData =
         child.parentData! as _SegmentedControlContainerBoxParentData;
     context.paintChild(child, offset + childParentData.offset);
@@ -1089,20 +1058,23 @@ class _RenderSegmentedControl<T extends Object> extends RenderBox
   }
 
   void _paintThumb(PaintingContext context, Offset offset, Rect thumbRect) {
-    final RSuperellipse thumbRSuperellipse = RSuperellipse.fromRectAndRadius(
-      thumbRect.shift(offset),
-      _kThumbRadius,
-    );
+    // const List<BoxShadow> thumbShadow = <BoxShadow>[
+    //   BoxShadow(color: Color(0x1F000000), offset: Offset(0, 3), blurRadius: 8),
+    //   BoxShadow(color: Color(0x0A000000), offset: Offset(0, 3), blurRadius: 1),
+    // ];
 
-    context.canvas.drawRSuperellipse(
-      thumbRSuperellipse.inflate(0.5),
-      Paint()..color = const Color(0x0A000000),
-    );
+    final RRect thumbRRect =
+        RRect.fromRectAndRadius(thumbRect.shift(offset), _kThumbRadius);
 
-    context.canvas.drawRSuperellipse(
-      thumbRSuperellipse,
-      Paint()..color = thumbColor,
-    );
+    // for (final BoxShadow shadow in thumbShadow) {
+    //   context.canvas
+    //       .drawRRect(thumbRRect.shift(shadow.offset), shadow.toPaint());
+    // }
+
+    context.canvas.drawRRect(
+        thumbRRect.inflate(0.5), Paint()..color = const Color(0x0A000000));
+
+    context.canvas.drawRRect(thumbRRect, Paint()..color = thumbColor);
   }
 
   @override

lib/widgets/widgets.dart

@@ -1,14 +1,10 @@
-export 'activate_box.dart';
 export 'animate_grid.dart';
+export 'pop_scope.dart';
 export 'builder.dart';
 export 'card.dart';
 export 'chip.dart';
 export 'color_scheme_box.dart';
-export 'container.dart';
-export 'dialog.dart';
 export 'disabled_mask.dart';
-export 'donut_chart.dart';
-export 'effect.dart';
 export 'fade_box.dart';
 export 'float_layout.dart';
 export 'grid.dart';
@@ -17,19 +13,23 @@ export 'input.dart';
 export 'keep_scope.dart';
 export 'line_chart.dart';
 export 'list.dart';
-export 'notification.dart';
 export 'null_status.dart';
 export 'open_container.dart';
-export 'palette.dart';
-export 'pop_scope.dart';
 export 'popup.dart';
 export 'scaffold.dart';
-export 'scroll.dart';
 export 'setting.dart';
 export 'sheet.dart';
 export 'side_sheet.dart';
 export 'subscription_info_view.dart';
-export 'super_grid.dart';
-export 'tab.dart';
 export 'text.dart';
+export 'super_grid.dart';
+export 'donut_chart.dart';
+export 'activate_box.dart';
 export 'wave.dart';
+export 'scroll.dart';
+export 'dialog.dart';
+export 'effect.dart';
+export 'palette.dart';
+export 'tab.dart';
+export 'container.dart';
+export 'notification.dart';

pubspec.lock

@@ -666,10 +666,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02"
+      sha256: a45bef33deb24839a51fb85a4d9e504ead2b1ad1c4779d02d09bf6a8857cdd52
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.13+3"
+    version: "0.8.13+2"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -1010,10 +1010,10 @@ packages:
     dependency: transitive
     description:
       name: pool
-      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.2"
+    version: "1.5.1"
   posix:
     dependency: transitive
     description:
@@ -1471,10 +1471,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b"
+      sha256: "07cffecb7d68cbc6437cd803d5f11a86fe06736735c3dfe46ff73bcb0f958eed"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.22"
+    version: "6.3.21"
   url_launcher_ios:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.89+2025092401
+version: 0.8.88+2025091902
 environment:
   sdk: '>=3.8.0 <4.0.0'