From 3e2cb33bc7572bcc3de5b44efb273afbe64c3722 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 15 Aug 2019 10:19:23 +0300 Subject: [PATCH] Tablet layout --- lib/ui/app/form_card.dart | 10 +++++----- lib/ui/auth/login_view.dart | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/ui/app/form_card.dart b/lib/ui/app/form_card.dart index 707418574..1e1776acd 100644 --- a/lib/ui/app/form_card.dart +++ b/lib/ui/app/form_card.dart @@ -1,23 +1,23 @@ import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; -import 'package:invoiceninja_flutter/utils/platforms.dart'; class FormCard extends StatelessWidget { const FormCard({ Key key, + this.isResponsive = false, @required this.children, this.crossAxisAlignment, }) : super(key: key); final List children; final CrossAxisAlignment crossAxisAlignment; + final bool isResponsive; @override Widget build(BuildContext context) { return Padding( - padding: calculateLayout(context) == AppLayout.mobile - ? const EdgeInsets.all(12) - : const EdgeInsets.only(top: 12, left: 250, right: 250), + padding: isResponsive + ? const EdgeInsets.only(top: 12, left: 250, right: 250) + : const EdgeInsets.all(12), child: Card( elevation: 4.0, child: Padding( diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart index e8c956174..d4eb022d2 100644 --- a/lib/ui/auth/login_view.dart +++ b/lib/ui/auth/login_view.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/progress_button.dart'; import 'package:invoiceninja_flutter/ui/auth/login_vm.dart'; @@ -6,6 +7,7 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/utils/keys.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class LoginView extends StatefulWidget { const LoginView({ @@ -127,6 +129,7 @@ class _LoginState extends State { Form( key: _formKey, child: FormCard( + isResponsive: calculateLayout(context) == AppLayout.mobile, children: [ isOneTimePassword ? TextFormField(