TF-381 Navigation route ThreadView to EmailView on browser

core/lib/presentation/utils/responsive_utils.dart

@@ -1,39 +1,47 @@
 import 'package:flutter/widgets.dart';
+import 'package:get/get.dart';
 
 class ResponsiveUtils {
 
-  static const int minDesktopWidth = 1288;
-  static const int minTabletWidth = 600;
-  static const int minTabletLargeWidth = 900;
+  final int minDesktopWidth = 1200;
+  final int minTabletWidth = 600;
+  final int minTabletLargeWidth = 900;
 
-  static const double _loginTextFieldWidthSmallScreen = 280.0;
-  static const double _loginTextFieldWidthLargeScreen = 320.0;
-  static const double _loginButtonWidth = 240.0;
+  final double _loginTextFieldWidthSmallScreen = 280.0;
+  final double _loginTextFieldWidthLargeScreen = 320.0;
+  final double _loginButtonWidth = 240.0;
 
   final double tabletHorizontalMargin = 120.0;
   final double tabletVerticalMargin = 200.0;
   final double desktopVerticalMargin = 120.0;
   final double desktopHorizontalMargin = 200.0;
 
-  bool isMobileDevice(BuildContext context) => MediaQuery.of(context).size.shortestSide < minTabletWidth;
+  bool isMobileDevice(BuildContext context) => context.mediaQueryShortestSide < minTabletWidth;
 
-  double getSizeWidthScreen(BuildContext context) => MediaQuery.of(context).size.width;
+  double getSizeScreenWidth(BuildContext context) => context.width;
 
-  double getSizeHeightScreen(BuildContext context) => MediaQuery.of(context).size.height;
+  double getSizeScreenHeight(BuildContext context) => context.height;
 
-  double getMinSizeScreen(BuildContext context) => MediaQuery.of(context).size.shortestSide;
+  double getSizeScreenShortestSide(BuildContext context) => context.mediaQueryShortestSide;
 
-  bool isMobile(BuildContext context) => getSizeWidthScreen(context) < minTabletWidth;
+  double getDeviceWidth(BuildContext context) {
+    if (GetPlatform.isDesktop) {
+      return context.width;
+    }
+    return context.mediaQueryShortestSide;
+  }
 
-  bool isTablet(BuildContext context) => getSizeWidthScreen(context) >= minTabletWidth && getSizeWidthScreen(context) < minTabletLargeWidth;
+  bool isMobile(BuildContext context) => getDeviceWidth(context) < minTabletWidth;
 
-  bool isDesktop(BuildContext context) => getSizeWidthScreen(context) > minDesktopWidth;
+  bool isTablet(BuildContext context) => getDeviceWidth(context) >= minTabletWidth && getDeviceWidth(context) < minDesktopWidth;
 
-  bool isTabletLarge(BuildContext context) => getSizeWidthScreen(context) >= minTabletLargeWidth && getSizeWidthScreen(context) <= minDesktopWidth;
+  bool isDesktop(BuildContext context) => getDeviceWidth(context) >= minDesktopWidth;
 
-  bool isPortrait(BuildContext context) => MediaQuery.of(context).orientation == Orientation.portrait;
+  bool isTabletLarge(BuildContext context) => getDeviceWidth(context) >= minTabletLargeWidth && getDeviceWidth(context) < minDesktopWidth;
 
-  bool isLandscape(BuildContext context) => MediaQuery.of(context).orientation == Orientation.landscape;
+  bool isPortrait(BuildContext context) =>  context.orientation == Orientation.portrait;
+
+  bool isLandscape(BuildContext context) => context.orientation == Orientation.landscape;
 
   double getWidthLoginTextField(BuildContext context) => isMobile(context) ? _loginTextFieldWidthSmallScreen : _loginTextFieldWidthLargeScreen;
 

core/lib/presentation/views/responsive/responsive_widget.dart

@@ -1,9 +1,9 @@
-import 'package:core/presentation/utils/responsive_utils.dart';
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 
 class ResponsiveWidget extends StatelessWidget {
   final Widget mobile;
-  final Widget tablet;
+  final Widget? tablet;
   final Widget? tabletLarge;
   final Widget? desktop;
 
@@ -11,27 +11,18 @@ class ResponsiveWidget extends StatelessWidget {
 
   const ResponsiveWidget({
     Key? key,
+    required this.responsiveUtils,
     required this.mobile,
-    required this.tablet,
+    this.tablet,
     this.desktop,
     this.tabletLarge,
-    required this.responsiveUtils,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
-      if (responsiveUtils.isMobileDevice(context)) {
-        return mobile;
-      } else if (responsiveUtils.isDesktop(context)) {
-        return desktop ?? tablet;
-      } else if (responsiveUtils.isTabletLarge(context)) {
-        return tabletLarge ?? tablet;
-      } else if (responsiveUtils.isTablet(context)) {
-        return tablet;
-      } else {
-        return mobile;
-      }
-    });
+    if (desktop != null && responsiveUtils.isDesktop(context)) return desktop!;
+    if (tabletLarge != null && responsiveUtils.isTabletLarge(context)) return tabletLarge!;
+    if (tablet != null && responsiveUtils.isTablet(context)) return tablet!;
+    return mobile;
   }
 }