Merge pull request #3351 from NicKoehler/file-manager-redesign

Back icon fix and backgroundColor flutter migration
2023-02-24 16:14:41 +08:00 · 2023-02-24 16:14:41 +08:00 · af2ef7ac5e
commit af2ef7ac5e
parent ca991ff39f ab9acc76fc
14 changed files with 48 additions and 39 deletions
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@ -45,9 +45,10 @@ var isWeb = false;
 var isWebDesktop = false;
 var version = "";
 int androidVersion = 0;
+
 /// Incriment count for textureId.
 int _textureId = 0;
-int get newTextureId => _textureId ++;
+int get newTextureId => _textureId++;
 final textureRenderer = TextureRgbaRenderer();

 /// only available for Windows target
@ -165,7 +166,6 @@ class MyTheme {

  static ThemeData lightTheme = ThemeData(
    brightness: Brightness.light,
-    backgroundColor: Color(0xFFEEEEEE),
    hoverColor: Color.fromARGB(255, 224, 224, 224),
    scaffoldBackgroundColor: Color(0xFFFFFFFF),
    textTheme: const TextTheme(
@ -177,7 +177,6 @@ class MyTheme {
        labelLarge: TextStyle(fontSize: 16.0, color: MyTheme.accent80)),
    cardColor: Color(0xFFEEEEEE),
    hintColor: Color(0xFFAAAAAA),
-    primarySwatch: Colors.blue,
    visualDensity: VisualDensity.adaptivePlatformDensity,
    tabBarTheme: const TabBarTheme(
      labelColor: Colors.black87,
@ -190,6 +189,10 @@ class MyTheme {
            style: ButtonStyle(splashFactory: NoSplash.splashFactory),
          )
        : null,
+    colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.blue).copyWith(
+      brightness: Brightness.light,
+      background: Color(0xFFEEEEEE),
+    ),
  ).copyWith(
    extensions: <ThemeExtension<dynamic>>[
      ColorThemeExtension.light,
@ -198,7 +201,6 @@ class MyTheme {
  );
  static ThemeData darkTheme = ThemeData(
    brightness: Brightness.dark,
-    backgroundColor: Color(0xFF24252B),
    hoverColor: Color.fromARGB(255, 45, 46, 53),
    scaffoldBackgroundColor: Color(0xFF18191E),
    textTheme: const TextTheme(
@ -209,7 +211,6 @@ class MyTheme {
        labelLarge: TextStyle(
            fontSize: 16.0, fontWeight: FontWeight.bold, color: accent80)),
    cardColor: Color(0xFF24252B),
-    primarySwatch: Colors.blue,
    visualDensity: VisualDensity.adaptivePlatformDensity,
    tabBarTheme: const TabBarTheme(
      labelColor: Colors.white70,
@ -227,6 +228,10 @@ class MyTheme {
        : null,
    checkboxTheme:
        const CheckboxThemeData(checkColor: MaterialStatePropertyAll(dark)),
+    colorScheme: ColorScheme.fromSwatch(
+      brightness: Brightness.dark,
+      primarySwatch: Colors.blue,
+    ).copyWith(background: Color(0xFF24252B)),
  ).copyWith(
    extensions: <ThemeExtension<dynamic>>[
      ColorThemeExtension.dark,
--- a/flutter/lib/common/widgets/chat_page.dart
+++ b/flutter/lib/common/widgets/chat_page.dart
@ -75,7 +75,8 @@ class ChatPage extends StatelessWidget implements PageShape {
                                  hintText:
                                      "${translate('Write a message')}...",
                                  filled: true,
-                                  fillColor: Theme.of(context).backgroundColor,
+                                  fillColor:
+                                      Theme.of(context).colorScheme.background,
                                  contentPadding: EdgeInsets.all(10),
                                  border: OutlineInputBorder(
                                    borderRadius: BorderRadius.circular(6),
@ -88,7 +89,8 @@ class ChatPage extends StatelessWidget implements PageShape {
                              : defaultInputDecoration(
                                  hintText:
                                      "${translate('Write a message')}...",
-                                  fillColor: Theme.of(context).backgroundColor),
+                                  fillColor:
+                                      Theme.of(context).colorScheme.background),
                          sendButtonBuilder: defaultSendButton(
                              padding: EdgeInsets.symmetric(
                                  horizontal: 6, vertical: 0),
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@ -170,8 +170,8 @@ class _PeerCardState extends State<_PeerCard>
            ),
            Expanded(
              child: Container(
-                decoration:
-                    BoxDecoration(color: Theme.of(context).backgroundColor),
+                decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.background),
                child: Row(
                  children: [
                    Expanded(
@ -266,7 +266,7 @@ class _PeerCardState extends State<_PeerCard>
                  ),
                ),
                Container(
-                  color: Theme.of(context).backgroundColor,
+                  color: Theme.of(context).colorScheme.background,
                  child: Row(
                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                    children: [
@ -1173,7 +1173,7 @@ class ActionMore extends StatelessWidget {
            radius: 14,
            backgroundColor: _hover.value
                ? Theme.of(context).scaffoldBackgroundColor
-                : Theme.of(context).backgroundColor,
+                : Theme.of(context).colorScheme.background,
            child: Icon(Icons.more_vert,
                size: 18,
                color: _hover.value
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@ -156,7 +156,7 @@ class _PeerTabPageState extends State<PeerTabPage>
                      padding: const EdgeInsets.symmetric(horizontal: 8),
                      decoration: BoxDecoration(
                        color: model.currentTab == t
-                            ? Theme.of(context).backgroundColor
+                            ? Theme.of(context).colorScheme.background
                            : null,
                        borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
                      ),
@ -231,7 +231,8 @@ class _PeerTabPageState extends State<PeerTabPage>

  Widget _createPeerViewTypeSwitch(BuildContext context) {
    final textColor = Theme.of(context).textTheme.titleLarge?.color;
-    final activeDeco = BoxDecoration(color: Theme.of(context).backgroundColor);
+    final activeDeco =
+        BoxDecoration(color: Theme.of(context).colorScheme.background);
    return Row(
      children: [PeerUiType.grid, PeerUiType.list]
          .map((type) => Obx(
@ -351,7 +352,7 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
    return Container(
      width: 120,
      decoration: BoxDecoration(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
        borderRadius: BorderRadius.circular(6),
      ),
      child: Obx(() => Row(
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@ -164,7 +164,7 @@ class _ConnectionPageState extends State<ConnectionPage>
      width: 320 + 20 * 2,
      padding: const EdgeInsets.fromLTRB(20, 24, 20, 22),
      decoration: BoxDecoration(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
        borderRadius: const BorderRadius.all(Radius.circular(13)),
      ),
      child: Ink(
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@ -71,7 +71,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
      value: gFFI.serverModel,
      child: Container(
        width: 200,
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
        child: DesktopScrollWrapper(
          scrollController: _leftPaneScrollController,
          child: SingleChildScrollView(
@ -185,7 +185,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
          radius: 15,
          backgroundColor: hover.value
              ? Theme.of(context).scaffoldBackgroundColor
-              : Theme.of(context).backgroundColor,
+              : Theme.of(context).colorScheme.background,
          child: Icon(
            Icons.more_vert_outlined,
            size: 20,
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@ -108,7 +108,7 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
  Widget build(BuildContext context) {
    super.build(context);
    return Scaffold(
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,
      body: Row(
        children: <Widget>[
          SizedBox(
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@ -65,7 +65,7 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
  Widget build(BuildContext context) {
    final tabWidget = Container(
        child: Scaffold(
-            backgroundColor: Theme.of(context).backgroundColor,
+            backgroundColor: Theme.of(context).colorScheme.background,
            body: DesktopTab(
              controller: tabController,
              tail: ActionIcon(
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@ -752,9 +752,12 @@ class _FileManagerPageState extends State<FileManagerPage>
                    padding: EdgeInsets.only(
                      right: 3,
                    ),
-                    child: SvgPicture.asset(
-                      "assets/arrow.svg",
-                      color: Theme.of(context).tabBarTheme.labelColor,
+                    child: RotatedBox(
+                      quarterTurns: 2,
+                      child: SvgPicture.asset(
+                        "assets/arrow.svg",
+                        color: Theme.of(context).tabBarTheme.labelColor,
+                      ),
                    ),
                    color: Theme.of(context).cardColor,
                    hoverColor: Theme.of(context).hoverColor,
--- a/flutter/lib/desktop/pages/port_forward_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_page.dart
@ -91,7 +91,7 @@ class _PortForwardPageState extends State<PortForwardPage>
                Flexible(
                  child: Container(
                    decoration: BoxDecoration(
-                        color: Theme.of(context).backgroundColor,
+                        color: Theme.of(context).colorScheme.background,
                        border: Border.all(width: 1, color: MyTheme.border)),
                    child:
                        widget.isRDP ? buildRdp(context) : buildTunnel(context),
@ -134,7 +134,7 @@ class _PortForwardPageState extends State<PortForwardPage>

    return Theme(
      data: Theme.of(context)
-          .copyWith(backgroundColor: Theme.of(context).backgroundColor),
+          .copyWith(backgroundColor: Theme.of(context).colorScheme.background),
      child: Obx(() => ListView.builder(
          controller: ScrollController(),
          itemCount: pfs.length + 2,
@ -169,7 +169,8 @@ class _PortForwardPageState extends State<PortForwardPage>

    return Container(
      height: _kRowHeight,
-      decoration: BoxDecoration(color: Theme.of(context).backgroundColor),
+      decoration:
+          BoxDecoration(color: Theme.of(context).colorScheme.background),
      child: Row(children: [
        buildTunnelInputCell(context,
            controller: localPortController,
@ -229,7 +230,7 @@ class _PortForwardPageState extends State<PortForwardPage>
                borderSide: BorderSide(color: MyTheme.color(context).border!)),
            focusedBorder: OutlineInputBorder(
                borderSide: BorderSide(color: MyTheme.color(context).border!)),
-            fillColor: Theme.of(context).backgroundColor,
+            fillColor: Theme.of(context).colorScheme.background,
            contentPadding: const EdgeInsets.all(10),
            hintText: hint,
            hintStyle:
@ -251,7 +252,7 @@ class _PortForwardPageState extends State<PortForwardPage>
              ? MyTheme.currentThemeMode() == ThemeMode.dark
                  ? const Color(0xFF202020)
                  : const Color(0xFFF4F5F6)
-              : Theme.of(context).backgroundColor),
+              : Theme.of(context).colorScheme.background),
      child: Row(children: [
        text(pf.localPort.toString()),
        const SizedBox(width: _kColumn1Width),
@ -293,7 +294,7 @@ class _PortForwardPageState extends State<PortForwardPage>
        ).marginOnly(left: _kTextLeftMargin));
    return Theme(
      data: Theme.of(context)
-          .copyWith(backgroundColor: Theme.of(context).backgroundColor),
+          .copyWith(backgroundColor: Theme.of(context).colorScheme.background),
      child: ListView.builder(
          controller: ScrollController(),
          itemCount: 2,
@ -312,8 +313,8 @@ class _PortForwardPageState extends State<PortForwardPage>
            } else {
              return Container(
                height: _kRowHeight,
-                decoration:
-                    BoxDecoration(color: Theme.of(context).backgroundColor),
+                decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.background),
                child: Row(children: [
                  Expanded(
                    child: Align(
--- a/flutter/lib/desktop/pages/port_forward_tab_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart
@ -96,7 +96,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
      decoration: BoxDecoration(
          border: Border.all(color: MyTheme.color(context).border!)),
      child: Scaffold(
-          backgroundColor: Theme.of(context).backgroundColor,
+          backgroundColor: Theme.of(context).colorScheme.background,
          body: DesktopTab(
            controller: tabController,
            onWindowCloseButton: () async {
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@ -225,7 +225,7 @@ class _RemotePageState extends State<RemotePage>

  Widget buildBody(BuildContext context) {
    return Scaffold(
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).colorScheme.background,

      /// the Overlay key will be set with _blockableOverlayState in BlockableOverlay
      /// see override build() in [BlockableOverlay]
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@ -141,7 +141,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
              width: stateGlobal.windowBorderWidth.value),
        ),
        child: Scaffold(
-          backgroundColor: Theme.of(context).backgroundColor,
+          backgroundColor: Theme.of(context).colorScheme.background,
          body: DesktopTab(
            controller: tabController,
            onWindowCloseButton: handleWindowCloseButton,
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@ -49,10 +49,7 @@ class _DesktopServerPageState extends State<DesktopServerPage>

  @override
  void onWindowClose() {
-    Future.wait([
-      gFFI.serverModel.closeAll(),
-      gFFI.close()
-    ]).then((_)  {
+    Future.wait([gFFI.serverModel.closeAll(), gFFI.close()]).then((_) {
      if (Platform.isMacOS) {
        RdPlatformChannel.instance.terminate();
      } else {
@ -82,7 +79,7 @@ class _DesktopServerPageState extends State<DesktopServerPage>
                decoration: BoxDecoration(
                    border: Border.all(color: MyTheme.color(context).border!)),
                child: Scaffold(
-                  backgroundColor: Theme.of(context).backgroundColor,
+                  backgroundColor: Theme.of(context).colorScheme.background,
                  body: Center(
                    child: Column(
                      mainAxisAlignment: MainAxisAlignment.start,
@ -189,7 +186,7 @@ class ConnectionManagerState extends State<ConnectionManager> {
                windowManager.startDragging();
              },
              child: Container(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
              ),
            ),
          ),