From be6f1b387d638f704f1ede9dce13264e5817e69b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 3 Mar 2020 18:53:30 +0200
Subject: [PATCH] Designs

---
 lib/data/models/design_model.dart      | 2 +-
 lib/ui/design/design_screen.dart       | 3 ++-
 lib/ui/design/edit/design_edit_vm.dart | 4 ++--
 lib/ui/design/view/design_view_vm.dart | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart
index f27dcc2e4..cd5fd94f5 100644
--- a/lib/data/models/design_model.dart
+++ b/lib/data/models/design_model.dart
@@ -110,7 +110,7 @@ abstract class DesignEntity extends Object
   }
 
   @override
-  String get listDisplayName => null;
+  String get listDisplayName => name;
 
   @override
   double get listDisplayAmount => null;
diff --git a/lib/ui/design/design_screen.dart b/lib/ui/design/design_screen.dart
index ca37b037b..fc335727c 100644
--- a/lib/ui/design/design_screen.dart
+++ b/lib/ui/design/design_screen.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
@@ -23,7 +24,7 @@ class DesignScreen extends StatelessWidget {
     @required this.viewModel,
   }) : super(key: key);
 
-  static const String route = '/design';
+  static const String route = '/$kSettings/$kSettingsCustomDesigns';
 
   final DesignScreenVM viewModel;
 
diff --git a/lib/ui/design/edit/design_edit_vm.dart b/lib/ui/design/edit/design_edit_vm.dart
index 1645d972a..3a64368a2 100644
--- a/lib/ui/design/edit/design_edit_vm.dart
+++ b/lib/ui/design/edit/design_edit_vm.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
-import 'package:invoiceninja_flutter/ui/design/design_screen.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
@@ -17,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 
 class DesignEditScreen extends StatelessWidget {
   const DesignEditScreen({Key key}) : super(key: key);
-  static const String route = '/design/edit';
+  static const String route = '/$kSettings/$kSettingsCustomDesignsEdit';
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/design/view/design_view_vm.dart b/lib/ui/design/view/design_view_vm.dart
index 2f687ebe7..ce739fdeb 100644
--- a/lib/ui/design/view/design_view_vm.dart
+++ b/lib/ui/design/view/design_view_vm.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -16,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 
 class DesignViewScreen extends StatelessWidget {
   const DesignViewScreen({Key key}) : super(key: key);
-  static const String route = '/design/view';
+  static const String route = '/$kSettings/$kSettingsCustomDesignsView';
 
   @override
   Widget build(BuildContext context) {