From 8f68fc32f51ed6452b45fee36f8ace5c172cfe34 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 30 Oct 2019 16:52:09 +0200
Subject: [PATCH] Settings

---
 lib/data/repositories/auth_repository.dart | 16 +++++++++-------
 lib/ui/settings/device_settings_list.dart  | 22 +++++++++++++---------
 lib/ui/settings/settings_screen.dart       |  2 --
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart
index 4bfa571d8..a7827b827 100644
--- a/lib/data/repositories/auth_repository.dart
+++ b/lib/data/repositories/auth_repository.dart
@@ -83,13 +83,15 @@ class AuthRepository {
 
   Future<LoginResponse> sendRequest(
       {String url, dynamic data, String token}) async {
-    /*
-    url +=
-        '?include=tax_rates,users,custom_payment_terms,task_statuses,expense_categories&include_static=true';
-    */
-
-    url +=
-        '?include=account,user,token,company.groups,company.company_gateways.gateway&include_static=true';
+    final includes = [
+      'account',
+      'user',
+      'token',
+      'company.users',
+      'company.groups',
+      'company.company_gateways',
+    ];
+    url += '?include=${includes.join(',')}&include_static=true';
 
     final dynamic response =
         await webClient.post(url, token ?? '', data: json.encode(data));
diff --git a/lib/ui/settings/device_settings_list.dart b/lib/ui/settings/device_settings_list.dart
index 3a87ac79a..4bce45135 100644
--- a/lib/ui/settings/device_settings_list.dart
+++ b/lib/ui/settings/device_settings_list.dart
@@ -52,6 +52,15 @@ class _DeviceSettingsState extends State<DeviceSettings> {
                     secondary: Icon(FontAwesomeIcons.moon),
                     activeColor: Theme.of(context).accentColor,
                   ),
+                  SwitchListTile(
+                    title: Text(AppLocalization.of(context)
+                        .longPressSelectionIsDefault),
+                    value: widget.viewModel.longPressSelectionIsDefault,
+                    onChanged: (value) => widget.viewModel
+                        .onLongPressSelectionIsDefault(context, value),
+                    secondary: Icon(FontAwesomeIcons.checkSquare),
+                    activeColor: Theme.of(context).accentColor,
+                  ),
                   FutureBuilder(
                     future: widget.viewModel.authenticationSupported,
                     builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -84,15 +93,10 @@ class _DeviceSettingsState extends State<DeviceSettings> {
                           activeColor: Theme.of(context).accentColor,
                         )
                       : SizedBox(),
-                  SwitchListTile(
-                    title: Text(AppLocalization.of(context)
-                        .longPressSelectionIsDefault),
-                    value: widget.viewModel.longPressSelectionIsDefault,
-                    onChanged: (value) => widget.viewModel
-                        .onLongPressSelectionIsDefault(context, value),
-                    secondary: Icon(FontAwesomeIcons.checkSquare),
-                    activeColor: Theme.of(context).accentColor,
-                  ),
+                ],
+              ),
+              FormCard(
+                children: <Widget>[
                   ListTile(
                     leading: Icon(FontAwesomeIcons.syncAlt),
                     title: Text(AppLocalization.of(context).refreshData),
diff --git a/lib/ui/settings/settings_screen.dart b/lib/ui/settings/settings_screen.dart
index b2bb10938..6018db553 100644
--- a/lib/ui/settings/settings_screen.dart
+++ b/lib/ui/settings/settings_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
 import 'package:invoiceninja_flutter/ui/settings/settings_list_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class SettingsScreen extends StatelessWidget {
   static const String route = '/settings';
@@ -13,7 +12,6 @@ class SettingsScreen extends StatelessWidget {
 
     return AppScaffold(
       appBarTitle: Text(localization.settings),
-      hideHamburgerButton: !isMobile(context),
       body: SettingsListBuilder(),
     );
   }