From edc56251d116805473d407c0cd41c253da367009 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 19 Aug 2019 14:24:26 +0300 Subject: [PATCH] Tablet layout --- lib/ui/expense/view/expense_view.dart | 2 ++ lib/ui/invoice/view/invoice_view.dart | 2 ++ lib/ui/product/view/product_view.dart | 2 ++ lib/ui/project/view/project_view.dart | 2 ++ lib/ui/task/view/task_view.dart | 2 ++ lib/ui/vendor/view/vendor_view.dart | 2 ++ 6 files changed, 12 insertions(+) diff --git a/lib/ui/expense/view/expense_view.dart b/lib/ui/expense/view/expense_view.dart index 9433ac4bf..dd9855ca0 100644 --- a/lib/ui/expense/view/expense_view.dart +++ b/lib/ui/expense/view/expense_view.dart @@ -10,6 +10,7 @@ import 'package:invoiceninja_flutter/ui/expense/view/expense_view_documents.dart import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_overview.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class ExpenseView extends StatefulWidget { const ExpenseView({ @@ -144,6 +145,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { memoizedExpenseDocumentsSelector(documentState.map, viewModel.expense); return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle( entity: expense, title: expense.publicNotes.isNotEmpty diff --git a/lib/ui/invoice/view/invoice_view.dart b/lib/ui/invoice/view/invoice_view.dart index ffa0fd9a0..9efc45492 100644 --- a/lib/ui/invoice/view/invoice_view.dart +++ b/lib/ui/invoice/view/invoice_view.dart @@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_overview.dart' import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_state_title.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class InvoiceView extends StatefulWidget { const InvoiceView({ @@ -125,6 +126,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { documentState.map, viewModel.state.expenseState.map, invoice); return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle( entity: invoice, title: diff --git a/lib/ui/product/view/product_view.dart b/lib/ui/product/view/product_view.dart index 0a20fce8b..0b5f5fdb8 100644 --- a/lib/ui/product/view/product_view.dart +++ b/lib/ui/product/view/product_view.dart @@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/ui/app/one_value_header.dart'; import 'package:invoiceninja_flutter/ui/product/view/product_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class ProductView extends StatefulWidget { const ProductView({ @@ -123,6 +124,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final product = viewModel.product; return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle(entity: product), actions: [ user.canEditEntity(product) diff --git a/lib/ui/project/view/project_view.dart b/lib/ui/project/view/project_view.dart index 18bbe3fc9..ab27561e6 100644 --- a/lib/ui/project/view/project_view.dart +++ b/lib/ui/project/view/project_view.dart @@ -18,6 +18,7 @@ import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class ProjectView extends StatefulWidget { const ProjectView({ @@ -180,6 +181,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final user = viewModel.company.user; return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle(entity: project), actions: project.isNew ? [] diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart index 5553839c5..4abf3d284 100644 --- a/lib/ui/task/view/task_view.dart +++ b/lib/ui/task/view/task_view.dart @@ -14,6 +14,7 @@ import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class TaskView extends StatefulWidget { const TaskView({ @@ -243,6 +244,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final user = viewModel.company.user; return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle( entity: task, title: AppLocalization.of(context).task, diff --git a/lib/ui/vendor/view/vendor_view.dart b/lib/ui/vendor/view/vendor_view.dart index 42ece1259..e885f998e 100644 --- a/lib/ui/vendor/view/vendor_view.dart +++ b/lib/ui/vendor/view/vendor_view.dart @@ -7,6 +7,7 @@ import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_details.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_overview.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class VendorView extends StatefulWidget { const VendorView({ @@ -122,6 +123,7 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final user = viewModel.company.user; return AppBar( + automaticallyImplyLeading: isMobile(context), title: EntityStateTitle(entity: vendor), bottom: TabBar( controller: controller,