feat: platform theme add, platform filled button macos fontSize adjus…

…tment
KRTirtho · Oct 31, 2022 · a5d845f · a5d845f
1 parent b295739
commit a5d845f
Show file tree

Hide file tree

Showing 7 changed files with 322 additions and 24 deletions.
diff --git a/lib/platform_ui.dart b/lib/platform_ui.dart
@@ -16,3 +16,4 @@ export 'src/platform_tab_view.dart';
 export 'src/platform_property.dart';
 export 'src/platform_app_bar.dart';
 export 'src/platform_sidebar.dart';
+export 'src/platform_theme.dart';
diff --git a/lib/src/platform_app.dart b/lib/src/platform_app.dart
@@ -9,6 +9,7 @@ import 'package:macos_ui/macos_ui.dart';
 import 'package:platform_ui/src/platform_app_router.dart';
 import 'package:platform_ui/src/platform_mixin.dart';
 import 'package:platform_ui/src/platform_property.dart';
+import 'package:platform_ui/src/platform_theme.dart';
 
 // TODO: Implement [PlatformTheme]
 
@@ -139,7 +140,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
       routeInformationParser: routeInformationParser,
       routerDelegate: routerDelegate,
       backButtonDispatcher: backButtonDispatcher,
-      builder: builder,
+      builder: buildPlatformTheme,
       title: title,
       onGenerateTitle: onGenerateTitle,
       androidTheme: androidTheme,
@@ -178,6 +179,13 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
     );
   }
 
+  static Widget buildPlatformTheme(BuildContext context, Widget? child) {
+    return PlatformTheme(
+      theme: PlatformThemeData.fromContext(context),
+      child: child ?? Container(),
+    );
+  }
+
   @override
   Widget android(context) {
     return MaterialApp(
@@ -190,7 +198,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
       onGenerateInitialRoutes: onGenerateInitialRoutes,
       onUnknownRoute: onUnknownRoute,
       navigatorObservers: navigatorObservers!,
-      builder: builder,
+      builder: buildPlatformTheme,
       title: title,
       onGenerateTitle: onGenerateTitle,
       theme: androidTheme,
@@ -235,7 +243,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
       onGenerateInitialRoutes: onGenerateInitialRoutes,
       onUnknownRoute: onUnknownRoute,
       navigatorObservers: navigatorObservers!,
-      builder: builder,
+      builder: buildPlatformTheme,
       title: title,
       onGenerateTitle: onGenerateTitle,
       theme: iosTheme,
@@ -280,7 +288,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
       onGenerateInitialRoutes: onGenerateInitialRoutes,
       onUnknownRoute: onUnknownRoute,
       navigatorObservers: navigatorObservers!,
-      builder: builder,
+      builder: buildPlatformTheme,
       title: title,
       onGenerateTitle: onGenerateTitle,
       theme: macosTheme,
@@ -321,7 +329,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
       onGenerateInitialRoutes: onGenerateInitialRoutes,
       onUnknownRoute: onUnknownRoute,
       navigatorObservers: navigatorObservers!,
-      builder: builder,
+      builder: buildPlatformTheme,
       title: title,
       onGenerateTitle: onGenerateTitle,
       theme: windowsTheme,

diff --git a/lib/src/platform_filled_button.dart b/lib/src/platform_filled_button.dart
@@ -116,20 +116,36 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
           cursor: mouseCursor,
           child: GestureDetector(
             onLongPress: onLongPress,
-            child: PushButton(
-              onPressed: onPressed,
-              pressedOpacity: macOSiOSPressedOpacity,
-              borderRadius:
-                  borderRadius ?? const BorderRadius.all(Radius.circular(4.0)),
-              buttonSize: macOSButtonSize,
-              isSecondary: macOSIsSecondary,
-              mouseCursor: mouseCursor,
-              color: style?.backgroundColor?.resolve(allStates),
-              disabledColor:
-                  style?.backgroundColor?.resolve({MaterialState.disabled}) ??
-                      CupertinoColors.quaternarySystemFill,
-              padding: style?.padding?.resolve(allStates),
-              child: child,
+            child: IconTheme(
+              data: IconTheme.of(context).copyWith(
+                color:
+                    style?.foregroundColor?.resolve(Utils.allMaterialStates) ??
+                        MacosTheme.of(context).pushButtonTheme.secondaryColor,
+              ),
+              child: PushButton(
+                onPressed: onPressed,
+                pressedOpacity: macOSiOSPressedOpacity,
+                borderRadius: borderRadius ??
+                    const BorderRadius.all(Radius.circular(4.0)),
+                buttonSize: macOSButtonSize,
+                isSecondary: macOSIsSecondary,
+                mouseCursor: mouseCursor,
+                color: style?.backgroundColor?.resolve(allStates),
+                disabledColor:
+                    style?.backgroundColor?.resolve({MaterialState.disabled}) ??
+                        CupertinoColors.quaternarySystemFill,
+                padding: style?.padding?.resolve(allStates),
+                child: DefaultTextStyle(
+                  style: MacosTheme.of(context).typography.body.copyWith(
+                        color: style?.foregroundColor
+                                ?.resolve(Utils.allMaterialStates) ??
+                            MacosTheme.of(context)
+                                .pushButtonTheme
+                                .secondaryColor,
+                      ),
+                  child: child,
+                ),
+              ),
             ),
           ),
         ),

diff --git a/lib/src/platform_property.dart b/lib/src/platform_property.dart
@@ -32,6 +32,23 @@ class PlatformProperty<T> {
     }
   }
 
+  factory PlatformProperty.only({
+    T? android,
+    T? ios,
+    T? macos,
+    T? linux,
+    T? windows,
+    required T other,
+  }) {
+    return PlatformProperty(
+      android: android ?? other,
+      ios: ios ?? other,
+      macos: macos ?? other,
+      linux: linux ?? other,
+      windows: windows ?? other,
+    );
+  }
+
   factory PlatformProperty.all(T value) {
     return PlatformProperty(
       android: value,
@@ -59,7 +76,8 @@ class PlatformProperty<T> {
       Map<T, Set<TargetPlatform>> groups) {
     assert(groups.isNotEmpty);
 
-    final platforms = TargetPlatform.values..remove(TargetPlatform.fuchsia);
+    final platforms = List.from(TargetPlatform.values)
+      ..remove(TargetPlatform.fuchsia);
     assert(groups.values.expand<TargetPlatform>((element) => element).length ==
         platforms.length);
 

diff --git a/lib/src/platform_sidebar.dart b/lib/src/platform_sidebar.dart
@@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:macos_ui/macos_ui.dart';
 import 'package:platform_ui/platform_ui.dart';
+import 'package:collection/collection.dart';
 
 class PlatformSidebarItem {
   final Widget title;
@@ -25,10 +26,18 @@ class PlatformSidebarItem {
     );
   }
 
-  SidebarItem macos() {
+  SidebarItem macos(BuildContext context, bool isActive) {
     return SidebarItem(
       label: title,
-      leading: icon,
+      leading: IconTheme(
+        data: IconTheme.of(context).copyWith(
+          color: isActive
+              ? MacosTheme.of(context).canvasColor
+              : MacosTheme.of(context).primaryColor,
+          size: 16,
+        ),
+        child: icon,
+      ),
     );
   }
 
@@ -207,7 +216,9 @@ class _PlatformSidebarState extends State<PlatformSidebar>
           return SidebarItems(
             currentIndex: currentIndex,
             onChanged: onIndexChanged,
-            items: widget.body.keys.map((e) => e.macos()).toList(),
+            items: widget.body.keys
+                .mapIndexed((i, e) => e.macos(context, i == currentIndex))
+                .toList(),
           );
         },
       ),

diff --git a/lib/src/platform_text_button.dart b/lib/src/platform_text_button.dart
@@ -4,6 +4,7 @@ import 'package:fluent_ui/fluent_ui.dart' as FluentUI;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:macos_ui/macos_ui.dart';
 import 'package:platform_ui/platform_ui.dart';
 import "package:platform_ui/src/utils.dart";
 
@@ -108,7 +109,40 @@ class PlatformTextButton extends StatelessWidget with PlatformMixin<Widget> {
 
   @override
   Widget macos(context) {
-    return ios(context);
+    return ClipRect(
+      clipBehavior: clipBehavior,
+      child: Focus(
+        autofocus: autofocus,
+        focusNode: focusNode,
+        child: MouseRegion(
+          onHover: onHover,
+          cursor: mouseCursor,
+          child: GestureDetector(
+            onLongPress: onLongPress,
+            child: CupertinoButton(
+              color: style?.foregroundColor?.resolve(allStates),
+              onPressed: onPressed,
+              pressedOpacity: macOSiOSPressedOpacity,
+              borderRadius:
+                  borderRadius ?? const BorderRadius.all(Radius.circular(8.0)),
+              minSize: style?.minimumSize?.resolve(allStates)?.width,
+              disabledColor:
+                  style?.backgroundColor?.resolve({MaterialState.disabled}) ??
+                      CupertinoColors.quaternarySystemFill,
+              padding: style?.padding?.resolve(allStates),
+              child: DefaultTextStyle(
+                style: MacosTheme.of(context).typography.body.copyWith(
+                      color: style?.foregroundColor
+                              ?.resolve(Utils.allMaterialStates) ??
+                          MacosTheme.of(context).primaryColor,
+                    ),
+                child: child,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
   }
 
   @override