Fix/show step1 (#92)

* (fix/show_step1) : Wishlist share process indicator visible on short process * (fix/show_step1) : Wishlist share process indicator visible on short process
XPEHO · Jul 28, 2020 · 86bcb3f · 86bcb3f
1 parent d67cf1f
commit 86bcb3f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Authentication-page : Account creation page not scrollable
 - Loyalty Cards Page : Changed floating button icon
 - Widget_item : Product designation overflow
+- Share_one and Mainpage : Wishlist share process indicator visible on short process
 
 ### Security
 

diff --git a/lib/pages/Mainpage.dart b/lib/pages/Mainpage.dart
@@ -9,6 +9,7 @@ import 'package:MobileOne/pages/profile.dart';
 import 'package:MobileOne/pages/share.dart';
 import 'package:MobileOne/services/user_service.dart';
 import 'package:MobileOne/utility/colors.dart';
+import 'package:MobileOne/utility/arguments.dart';
 import 'package:barcode_scan/barcode_scan.dart';
 import 'package:flutter/material.dart';
 import 'package:MobileOne/providers/user_picture_provider.dart';
@@ -41,6 +42,7 @@ class MainPageState extends State<MainPage> {
   Function _floatingButtonAction;
 
   final PageStorageBucket _bucket = PageStorageBucket();
+  bool isOnlyOneStep = false;
 
   @override
   void initState() {
@@ -172,7 +174,11 @@ class MainPageState extends State<MainPage> {
   }
 
   goToShareOnePage() {
-    Navigator.of(context).pushNamed("/shareOne");
+    isOnlyOneStep = false;
+    Navigator.of(context).pushNamed("/shareOne",
+        arguments: ShareArguments(
+          isOnlyOneStep: isOnlyOneStep,
+        ));
   }
 
   goToSharePage() {

diff --git a/lib/pages/openedListPage.dart b/lib/pages/openedListPage.dart
@@ -2,6 +2,7 @@ import 'package:MobileOne/localization/localization.dart';
 import 'package:MobileOne/providers/itemsList_provider.dart';
 import 'package:MobileOne/providers/wishlistsList_provider.dart';
 import 'package:MobileOne/services/user_service.dart';
+import 'package:MobileOne/utility/arguments.dart';
 import 'package:MobileOne/widgets/widget_item.dart';
 import 'package:MobileOne/widgets/widget_popup.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
@@ -264,6 +265,7 @@ class OpenedListPageState extends State<OpenedListPage> {
   }
 
   void openSharePage(Object uuid) {
-    Navigator.of(context).pushNamed('/shareOne', arguments: uuid);
+    Navigator.of(context)
+        .pushNamed('/shareOne', arguments: ShareArguments(previousList: uuid));
   }
 }
diff --git a/lib/pages/share.dart b/lib/pages/share.dart
@@ -1,5 +1,6 @@
 import 'package:MobileOne/localization/localization.dart';
 import 'package:MobileOne/providers/share_provider.dart';
+import 'package:MobileOne/utility/arguments.dart';
 import 'package:MobileOne/widgets/widget_share_lists.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
@@ -131,7 +132,8 @@ class ShareState extends State<Share> {
   }
 
   void openShareOnePage() {
-    Navigator.pushNamed(context, '/shareOne', arguments: previousList);
+    Navigator.pushNamed(context, '/shareOne',
+        arguments: ShareArguments(previousList: previousList));
   }
 
   void openMainPage() {

diff --git a/lib/pages/share_one.dart b/lib/pages/share_one.dart
@@ -1,5 +1,6 @@
 import 'package:MobileOne/localization/localization.dart';
 import 'package:MobileOne/providers/share_provider.dart';
+import 'package:MobileOne/utility/arguments.dart';
 import 'package:MobileOne/widgets/widget_share_contact.dart';
 import 'package:contacts_service/contacts_service.dart';
 import 'package:flutter/material.dart';
@@ -72,16 +73,18 @@ class ShareStateOneState extends State<ShareOne> {
   }
 
   Widget build(BuildContext context) {
-    final previousList = ModalRoute.of(context).settings.arguments;
+    ShareArguments _argsShare = ModalRoute.of(context).settings.arguments;
     bool isSearching = _myController.text.isNotEmpty;
     return Scaffold(
       resizeToAvoidBottomPadding: false,
       body: Column(
         children: <Widget>[
           header(context),
-          headerSteps(context),
+          (_argsShare.isOnlyOneStep == false)
+              ? headerSteps(context)
+              : Container(height: MediaQuery.of(context).size.height * 0.1),
           searchContact(context),
-          searchNewContact(context, previousList),
+          searchNewContact(context, _argsShare.previousList),
           Padding(
             padding: EdgeInsets.only(top: 5),
             child: Container(
@@ -91,7 +94,7 @@ class ShareStateOneState extends State<ShareOne> {
                   ? Center(
                       child: CircularProgressIndicator(),
                     )
-                  : buildListView(isSearching, previousList),
+                  : buildListView(isSearching, _argsShare.previousList),
             ),
           )
         ],

diff --git a/lib/utility/arguments.dart b/lib/utility/arguments.dart
@@ -6,3 +6,9 @@ class CardArguments {
 
   CardArguments(this.cards, this.colorOfCard);
 }
+
+class ShareArguments {
+  var previousList;
+  bool isOnlyOneStep;
+  ShareArguments({this.previousList, this.isOnlyOneStep});
+}