feat: pass context to platform specific methods

KRTirtho · Oct 5, 2022 · ed40eaa · ed40eaa
1 parent 23b244f
commit ed40eaa
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 47 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -10,7 +10,7 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    platform = TargetPlatform.windows;
+    platform = TargetPlatform.android;
     return const PlatformApp(
       title: 'Flutter Demo',
       home: MyHomePage(title: 'Flutter Demo Home Page'),

diff --git a/lib/src/platform_app.dart b/lib/src/platform_app.dart
@@ -94,7 +94,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
   }) : super(key: key);
 
   @override
-  Widget android() {
+  Widget android(context) {
     return MaterialApp(
       navigatorKey: navigatorKey,
       scaffoldMessengerKey: scaffoldMessengerKey,
@@ -134,7 +134,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget ios() {
+  Widget ios(context) {
     return CupertinoApp(
       navigatorKey: navigatorKey,
       home: home,
@@ -168,12 +168,12 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget linux() {
-    return android();
+  Widget linux(context) {
+    return android(context);
   }
 
   @override
-  Widget macos() {
+  Widget macos(context) {
     return MacosApp(
       navigatorKey: navigatorKey,
       home: home,
@@ -208,7 +208,7 @@ class PlatformApp extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget windows() {
+  Widget windows(context) {
     return FluentApp(
       navigatorKey: navigatorKey,
       home: home,

diff --git a/lib/src/platform_filled_button.dart b/lib/src/platform_filled_button.dart
@@ -44,7 +44,7 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
   Set<MaterialState> get allStates => Utils.allMaterialStates;
 
   @override
-  Widget android() {
+  Widget android(context) {
     return MouseRegion(
       onHover: onHover,
       cursor: mouseCursor,
@@ -70,7 +70,7 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget ios() {
+  Widget ios(context) {
     return ClipRect(
       clipBehavior: clipBehavior,
       child: Focus(
@@ -100,12 +100,12 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget linux() {
-    return android();
+  Widget linux(context) {
+    return android(context);
   }
 
   @override
-  Widget macos() {
+  Widget macos(context) {
     return ClipRect(
       clipBehavior: clipBehavior,
       child: Focus(
@@ -138,7 +138,7 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget windows() {
+  Widget windows(context) {
     return ClipRect(
       clipBehavior: clipBehavior,
       child: MouseRegion(
@@ -192,7 +192,7 @@ class PlatformFilledButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(context) {
     return getPlatformType(context);
   }
 }
diff --git a/lib/src/platform_icon_button.dart b/lib/src/platform_icon_button.dart
@@ -47,7 +47,7 @@ class PlatformIconButton extends StatelessWidget with PlatformMixin<Widget> {
   }) : super(key: key);
 
   @override
-  Widget android() {
+  Widget android(context) {
     return IconButton(
       iconSize: iconSize,
       visualDensity: visualDensity,
@@ -77,7 +77,7 @@ class PlatformIconButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget ios() {
+  Widget ios(context) {
     final cupertinoButton = CupertinoButton(
       alignment: alignment,
       onPressed: onPressed,
@@ -103,12 +103,12 @@ class PlatformIconButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget linux() {
-    return android();
+  Widget linux(context) {
+    return android(context);
   }
 
   @override
-  Widget macos() {
+  Widget macos(context) {
     return Focus(
       focusNode: focusNode,
       autofocus: autofocus,
@@ -138,7 +138,7 @@ class PlatformIconButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget windows() {
+  Widget windows(context) {
     return Align(
       alignment: alignment,
       child: FluentUI.Tooltip(

diff --git a/lib/src/platform_mixin.dart b/lib/src/platform_mixin.dart
@@ -4,27 +4,26 @@ import 'package:flutter/material.dart';
 TargetPlatform? platform;
 
 mixin PlatformMixin<T> {
-  T android();
-  T ios();
-  T macos();
-  T windows();
-  T linux();
+  T android(BuildContext context);
+  T ios(BuildContext context);
+  T macos(BuildContext context);
+  T windows(BuildContext context);
+  T linux(BuildContext context);
 
   T getPlatformType(BuildContext context) {
-    if (kIsWeb) return android();
+    if (kIsWeb) return android(context);
     switch (platform ?? defaultTargetPlatform) {
-      case TargetPlatform.android:
-        return android();
       case TargetPlatform.iOS:
-        return ios();
+        return ios(context);
       case TargetPlatform.macOS:
-        return macos();
+        return macos(context);
       case TargetPlatform.windows:
-        return windows();
+        return windows(context);
       case TargetPlatform.linux:
-        return linux();
+        return linux(context);
+      case TargetPlatform.android:
       default:
-        return android();
+        return android(context);
     }
   }
 }
diff --git a/lib/src/platform_scaffold.dart b/lib/src/platform_scaffold.dart
@@ -58,7 +58,7 @@ class PlatformScaffold extends StatelessWidget with PlatformMixin<Widget> {
     this.restorationId,
   }) : super(key: key);
   @override
-  Widget android() {
+  Widget android(context) {
     return Scaffold(
       extendBody: extendBody,
       extendBodyBehindAppBar: extendBodyBehindAppBar,
@@ -88,7 +88,7 @@ class PlatformScaffold extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget ios() {
+  Widget ios(context) {
     return CupertinoPageScaffold(
       // TODO: Do something for [CuopertinoNavBar]
       backgroundColor: backgroundColor,
@@ -99,12 +99,12 @@ class PlatformScaffold extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget linux() {
-    return android();
+  Widget linux(context) {
+    return android(context);
   }
 
   @override
-  Widget macos() {
+  Widget macos(context) {
     return MacosScaffold(
       // TODO: Do something for [macOS ToolBar]
       toolBar: null,
@@ -118,8 +118,8 @@ class PlatformScaffold extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget windows() {
-    return android();
+  Widget windows(context) {
+    return android(context);
   }
 
   @override

diff --git a/lib/src/platform_text_button.dart b/lib/src/platform_text_button.dart
@@ -45,7 +45,7 @@ class PlatformTextButton extends StatelessWidget with PlatformMixin<Widget> {
   };
 
   @override
-  Widget android() {
+  Widget android(context) {
     return MouseRegion(
       onHover: onHover,
       cursor: mouseCursor,
@@ -71,7 +71,7 @@ class PlatformTextButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget ios() {
+  Widget ios(context) {
     return ClipRect(
       clipBehavior: clipBehavior,
       child: Focus(
@@ -102,17 +102,17 @@ class PlatformTextButton extends StatelessWidget with PlatformMixin<Widget> {
   }
 
   @override
-  Widget linux() {
-    return android();
+  Widget linux(context) {
+    return android(context);
   }
 
   @override
-  Widget macos() {
-    return ios();
+  Widget macos(context) {
+    return ios(context);
   }
 
   @override
-  Widget windows() {
+  Widget windows(context) {
     return ClipRect(
       clipBehavior: clipBehavior,
       child: MouseRegion(