Add widgets builder for mailbox

2021-07-29 12:48:23 +07:00
parent b84270870a
commit 5d3d2f4c1e
10 changed files with 503 additions and 103 deletions
@@ -4,19 +4,20 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:get/get.dart';

 typedef OnOpenMailboxNewFolderActionClick = void Function();

 class MailboxNewFolderTileBuilder {
-  final imagePath = Get.find<ImagePaths>();
+
+  final BuildContext _context;
+  final ResponsiveUtils _responsiveUtils;

  String? _icon;
  String? _name;

  OnOpenMailboxNewFolderActionClick? _onOpenMailboxFolderActionClick;

-  MailboxNewFolderTileBuilder();
+  MailboxNewFolderTileBuilder(this._context, this._responsiveUtils);

  MailboxNewFolderTileBuilder addIcon(String icon) {
    _icon = icon;
@@ -44,24 +45,28 @@ class MailboxNewFolderTileBuilder {
        decoration: BoxDecoration(
          borderRadius: BorderRadius.circular(16),
          color: AppColor.mailboxBackgroundColor),
-        child: ListTile(
-          onTap: () => {
-            if (_onOpenMailboxFolderActionClick != null) {
-              _onOpenMailboxFolderActionClick!()
-            }
-          },
-          leading: Transform(
-            transform: Matrix4.translationValues(24.0, 0.0, 0.0),
-            child: _icon != null
-              ? SvgPicture.asset(_icon!, width: 24, height: 24, color: AppColor.mailboxIconColor, fit: BoxFit.fill)
-              : SizedBox.shrink()),
-          title: Transform(
-            transform: Matrix4.translationValues(10.0, 0.0, 0.0),
-            child: Text(
-              _name ?? '',
-              maxLines: 1,
-              style: TextStyle(fontSize: 15, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
-            )),
+        child: MediaQuery(
+          data: MediaQueryData(padding: EdgeInsets.zero),
+          child: ListTile(
+            contentPadding: EdgeInsets.zero,
+            onTap: () => {
+              if (_onOpenMailboxFolderActionClick != null) {
+                _onOpenMailboxFolderActionClick!()
+              }
+            },
+            leading: Padding(
+              padding: EdgeInsets.only(left: _responsiveUtils.isMobile(_context) ? 42 : 34),
+              child: _icon != null
+                ? SvgPicture.asset(_icon!, width: 24, height: 24, color: AppColor.mailboxIconColor, fit: BoxFit.fill)
+                : SizedBox.shrink()),
+            title: Padding(
+              padding: EdgeInsets.only(left: 8),
+              child: Text(
+                _name ?? '',
+                maxLines: 1,
+                style: TextStyle(fontSize: 15, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
+              )),
+          )
        )
      )
    );
@@ -2,7 +2,6 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';

@@ -10,13 +9,17 @@ typedef OnOpenMailBoxFolderActionClick = void Function(MailboxTree mailboxTree);

 class MailBoxFolderTileBuilder extends StatelessWidget {

-  final imagePaths = Get.find<ImagePaths>();
-
  final MailboxNode _mailboxNode;
+  final BuildContext _context;
+  final ImagePaths _imagePaths;
+  final ResponsiveUtils _responsiveUtils;

  final OnOpenMailBoxFolderActionClick? onOpenMailBoxFolderActionClick;

  MailBoxFolderTileBuilder(
+    this._context,
+    this._imagePaths,
+    this._responsiveUtils,
    this._mailboxNode,
    {
      this.onOpenMailBoxFolderActionClick
@@ -31,27 +34,32 @@ class MailBoxFolderTileBuilder extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(16),
        color: AppColor.mailboxBackgroundColor),
-      child: ListTile(
-        leading: Transform(
-          transform: Matrix4.translationValues(20.0, 0.0, 0.0),
-          child: SvgPicture.asset(imagePaths.icMailboxFolder, width: 24, height: 24, color: AppColor.mailboxIconColor, fit: BoxFit.fill)),
-        title: Transform(
-          transform: Matrix4.translationValues(10.0, 0.0, 0.0),
-          child: Text(
-            _mailboxNode.item.name!.name,
-            maxLines: 1,
-            style: TextStyle(fontSize: 15, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
-          )),
-        trailing: Transform(
-          transform: Matrix4.translationValues(-16.0, 0.0, 0.0),
-          child: _mailboxNode.hasChildren()
-            ? SvgPicture.asset(
-                imagePaths.icFolderArrow,
-                width: 12,
-                height: 12,
-                color: AppColor.mailboxIconColor,
-                fit: BoxFit.fill)
-            : SizedBox.shrink()))
+      child: MediaQuery(
+        data: MediaQueryData(padding: EdgeInsets.zero),
+        child: ListTile(
+          contentPadding: EdgeInsets.zero,
+          leading: Padding(
+            padding: EdgeInsets.only(left: _responsiveUtils.isMobile(_context) ? 40 : 34),
+            child: SvgPicture.asset(_imagePaths.icMailboxFolder, width: 24, height: 24, color: AppColor.mailboxIconColor, fit: BoxFit.fill)),
+          title: Padding(
+            padding: EdgeInsets.only(left: 8),
+            child: Text(
+              _mailboxNode.item.name!.name,
+              maxLines: 1,
+              style: TextStyle(fontSize: 15, color: AppColor.mailboxTextColor, fontWeight: FontWeight.bold),
+            )),
+          trailing: Padding(
+            padding: EdgeInsets.only(right: _responsiveUtils.isMobile(_context) ? 36 : 8, left: 16),
+            child: _mailboxNode.hasChildren()
+              ? SvgPicture.asset(
+                  _imagePaths.icFolderArrow,
+                  width: 12,
+                  height: 12,
+                  color: AppColor.mailboxIconColor,
+                  fit: BoxFit.fill)
+              : SizedBox.shrink())
+        )
+      )
    );
  }
 }
@@ -4,20 +4,28 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:get/get.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart';

 typedef OnOpenMailboxActionClick = void Function();

 class MailboxTileBuilder {
-  final imagePaths = Get.find<ImagePaths>();

  final PresentationMailbox _presentationMailbox;
+  final SelectMode _selectMode;
+  final BuildContext _context;
+  final ImagePaths _imagePaths;
+  final ResponsiveUtils _responsiveUtils;

  OnOpenMailboxActionClick? _onOpenMailboxActionClick;

-  MailboxTileBuilder(this._presentationMailbox);
+  MailboxTileBuilder(
+    this._context,
+    this._imagePaths,
+    this._responsiveUtils,
+    this._presentationMailbox,
+    this._selectMode
+  );

  MailboxTileBuilder onOpenMailboxAction(OnOpenMailboxActionClick onOpenMailboxActionClick) {
    _onOpenMailboxActionClick = onOpenMailboxActionClick;
@@ -34,52 +42,56 @@ class MailboxTileBuilder {
        alignment: Alignment.center,
        decoration: BoxDecoration(
          borderRadius: BorderRadius.circular(16),
-          color: _presentationMailbox.selectMode == SelectMode.ACTIVE
+          color: _selectMode== SelectMode.ACTIVE
            ? AppColor.mailboxSelectedBackgroundColor
            : AppColor.mailboxBackgroundColor),
-        child: ListTile(
-          focusColor: AppColor.primaryLightColor,
-          hoverColor: AppColor.primaryLightColor,
-          onTap: () => {
-            if (_onOpenMailboxActionClick != null) {
-              _onOpenMailboxActionClick!()
-            }
-          },
-          leading: Transform(
-            transform: Matrix4.translationValues(20.0, 0.0, 0.0),
-            child: SvgPicture.asset(
-              '${_presentationMailbox.getMailboxIcon(imagePaths)}',
-              width: 24,
-              height: 24,
-              color: _presentationMailbox.selectMode == SelectMode.ACTIVE
-                ? AppColor.mailboxSelectedIconColor
-                : AppColor.mailboxIconColor,
-              fit: BoxFit.fill)),
-          title: Transform(
-            transform: Matrix4.translationValues(8.0, 0.0, 0.0),
-            child: Text(
-              _presentationMailbox.name!.name,
-              maxLines: 1,
-              overflow:TextOverflow.ellipsis,
-              style: TextStyle(
-                fontSize: 15,
-                color: _presentationMailbox.selectMode == SelectMode.ACTIVE
-                  ? AppColor.mailboxSelectedTextColor
-                  : AppColor.mailboxTextColor,
-                fontWeight: FontWeight.bold),
+        child: MediaQuery(
+          data: MediaQueryData(padding: EdgeInsets.zero),
+          child: ListTile(
+            focusColor: AppColor.primaryLightColor,
+            hoverColor: AppColor.primaryLightColor,
+            contentPadding: EdgeInsets.zero,
+            onTap: () => {
+              if (_onOpenMailboxActionClick != null) {
+                _onOpenMailboxActionClick!()
+              }
+            },
+            leading: Padding(
+              padding: EdgeInsets.only(left: _responsiveUtils.isMobile(_context) ? 40 : 20),
+              child: SvgPicture.asset(
+                '${_presentationMailbox.getMailboxIcon(_imagePaths)}',
+                width: 24,
+                height: 24,
+                color: _selectMode == SelectMode.ACTIVE
+                  ? AppColor.mailboxSelectedIconColor
+                  : AppColor.mailboxIconColor,
+                fit: BoxFit.fill)),
+            title: Padding(
+              padding: EdgeInsets.only(left: 8),
+              child: Text(
+                _presentationMailbox.name!.name,
+                maxLines: 1,
+                overflow:TextOverflow.ellipsis,
+                style: TextStyle(
+                  fontSize: 15,
+                  color: _selectMode == SelectMode.ACTIVE
+                    ? AppColor.mailboxSelectedTextColor
+                    : AppColor.mailboxTextColor,
+                  fontWeight: FontWeight.bold),
+              )),
+            trailing: Padding(
+              padding: EdgeInsets.only(right: _responsiveUtils.isMobile(_context) ? 36 : 24, left: 16),
+              child: Text(
+                '${_presentationMailbox.getCountUnReadEmails()}',
+                maxLines: 1,
+                style: TextStyle(
+                  fontSize: 15,
+                  color: _selectMode == SelectMode.ACTIVE
+                    ? AppColor.mailboxSelectedTextNumberColor
+                    : AppColor.mailboxTextNumberColor,
+                  fontWeight: FontWeight.bold))
            )),
-          trailing: Transform(
-            transform: Matrix4.translationValues(-16.0, 0.0, 0.0),
-            child: Text(
-              '${_presentationMailbox.getCountUnReadEmails()}',
-              maxLines: 1,
-              style: TextStyle(
-                fontSize: 15,
-                color: _presentationMailbox.selectMode == SelectMode.ACTIVE
-                  ? AppColor.mailboxSelectedTextNumberColor
-                  : AppColor.mailboxTextNumberColor,
-                fontWeight: FontWeight.bold))
-          )),
+        )
      )
    );
  }
@@ -5,20 +5,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
-import 'package:get/get.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';

 typedef OnNewSearchQuery = Function(String);

 class SearchFormWidgetBuilder {
-  final imagePath = Get.find<ImagePaths>();
-  final TextEditingController _typeAheadController = TextEditingController();

+  final _typeAheadController = TextEditingController();
  final BuildContext _context;
+  final ImagePaths _imagePaths;

  OnNewSearchQuery? _onNewSearchQuery;

-  SearchFormWidgetBuilder(this._context);
+  SearchFormWidgetBuilder(this._context, this._imagePaths);

  SearchFormWidgetBuilder onNewSearchQuery(OnNewSearchQuery onNewSearchQuery) {
    _onNewSearchQuery = onNewSearchQuery;
@@ -46,7 +45,7 @@ class SearchFormWidgetBuilder {
            hintStyle: TextStyle(color: AppColor.searchHintTextColor, fontSize: 15.0, fontWeight: FontWeight.w500),
            icon: Padding(
              padding: EdgeInsets.only(left: 20),
-              child: SvgPicture.asset(imagePath.icSearch, width: 24, height: 24, fit: BoxFit.fill),
+              child: SvgPicture.asset(_imagePaths.icSearch, width: 24, height: 24, fit: BoxFit.fill),
            ))),
        debounceDuration: Duration(milliseconds: 300),
        suggestionsCallback: (pattern) async {
@@ -4,11 +4,9 @@ import 'package:core/core.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:get/get.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';

 class StorageWidgetBuilder {
-  final imagePath = Get.find<ImagePaths>();
  final BuildContext _context;

  StorageWidgetBuilder(this._context);
@@ -4,16 +4,15 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:get/get.dart';

 typedef OnOpenUserInformationActionClick = void Function();

 class UserInformationWidgetBuilder {
-  final imagePath = Get.find<ImagePaths>();
+  final ImagePaths _imagePaths;

  OnOpenUserInformationActionClick? _onOpenUserInformationActionClick;

-  UserInformationWidgetBuilder();
+  UserInformationWidgetBuilder(this._imagePaths);

  UserInformationWidgetBuilder onOpenUserInformationAction(
      OnOpenUserInformationActionClick onOpenUserInformationActionClick) {
@@ -34,7 +33,7 @@ class UserInformationWidgetBuilder {
            _onOpenUserInformationActionClick!();
          }
        },
-        leading: SvgPicture.asset(imagePath.icTMailLogo, width: 40, height: 40, fit: BoxFit.fill),
+        leading: SvgPicture.asset(_imagePaths.icTMailLogo, width: 40, height: 40, fit: BoxFit.fill),
        title: Transform(
          transform: Matrix4.translationValues(0.0, 0.0, 0.0),
          child: Text(
@@ -52,7 +51,7 @@ class UserInformationWidgetBuilder {
        trailing: Transform(
          transform: Matrix4.translationValues(0.0, 0.0, 0.0),
          child: IconButton(
-            icon: SvgPicture.asset(imagePath.icNextArrow, width: 7, height: 12, fit: BoxFit.fill),
+            icon: SvgPicture.asset(_imagePaths.icNextArrow, width: 7, height: 12, fit: BoxFit.fill),
            onPressed: () => {}))),
    );
  }