commit cb73a2cb5030c588a38aec180d8925c67fb3bfb7
author Anthony Léonard <anthony.leonard@savoirfairelinux.com> Thu Jan 18 11:45:56 2018 -0500
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Thu Jan 18 17:22:49 2018 -0500
tree e550178e6af2b731d7da521f10a7bd69a5e8e8c6
parent d00cd18036f10378696e55884284f9338543adab

hide list type selector when no requests in list

The whole selector is hidden when no requests are pending for a given
account. In this case, only conversation list is displayed.

When it needs to be visible again, we re-add it to the view with its
constraints.

Also diminish potential number of data reloads in smartview by moving
some code.

Change-Id: Ib00aa8b59a70e65015f9c28402278054b591522d
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>

src/SmartViewVC.mm

diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 5b666d5..e529a39 100755
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2015-2018 Savoir-faire Linux Inc.
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
  *  Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>
  *  Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
@@ -53,7 +53,8 @@
     //UI elements
     __unsafe_unretained IBOutlet RingTableView* smartView;
     __unsafe_unretained IBOutlet NSSearchField* searchField;
-    __unsafe_unretained IBOutlet NSSegmentedControl *listTypeSelector;
+    __strong IBOutlet NSSegmentedControl *listTypeSelector;
+    bool selectorIsPresent;
 
     QMetaObject::Connection modelSortedConnection_, filterChangedConnection_, newConversationConnection_, conversationRemovedConnection_;
 
@@ -107,6 +108,7 @@
     [searchField.layer setBackgroundColor:[NSColor colorWithCalibratedRed:0.949 green:0.949 blue:0.949 alpha:0.9].CGColor];
 
     currentFilterType = lrc::api::profile::Type::RING;
+    selectorIsPresent = true;
 }
 
 - (void)placeCall:(id)sender
@@ -126,17 +128,40 @@
 -(void) reloadData
 {
     [smartView deselectAll:nil];
-    [smartView reloadData];
 
     if (!model_->owner.contactModel->hasPendingRequests()) {
         if (currentFilterType == lrc::api::profile::Type::PENDING) {
             [self selectConversationList];
         }
-        [listTypeSelector setEnabled:NO forSegment:REQUEST_SEG];
+        if (selectorIsPresent) {
+            [listTypeSelector removeFromSuperview];
+            selectorIsPresent = false;
+        }
     } else {
-        [listTypeSelector setEnabled:YES forSegment:REQUEST_SEG];
+        if (!selectorIsPresent) {
+            // First we restore the selector with selection on "Conversations"
+            [self.view addSubview:listTypeSelector];
+            [listTypeSelector setSelected:YES forSegment:CONVERSATION_SEG];
+
+            // Then constraints are recreated (as these are lost when calling removeFromSuperview)
+            [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[searchField]-8-[listTypeSelector]"
+                                                                              options:0
+                                                                              metrics:nil
+                                                                                views:NSDictionaryOfVariableBindings(searchField, listTypeSelector)]];
+            [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[listTypeSelector]-8-[tabbar]"
+                                                                              options:0
+                                                                              metrics:nil
+                                                                                views:NSDictionaryOfVariableBindings(listTypeSelector, tabbar)]];
+            [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-20-[listTypeSelector]-20-|"
+                                                                              options:0
+                                                                              metrics:nil
+                                                                                views:NSDictionaryOfVariableBindings(listTypeSelector)]];
+            selectorIsPresent = true;
+        }
     }
 
+    [smartView reloadData];
+
     if (!selectedUid_.empty() && model_ != nil) {
         auto it = getConversationFromUid(selectedUid_, *model_);
         if (it != model_->allFilteredConversations().end()) {
@@ -155,11 +180,11 @@
     if (model_ != conversationModel) {
         model_ = conversationModel;
         selectedUid_.clear(); // Clear selected conversation as the selected account is being changed
-        [self reloadData];
         QObject::disconnect(modelSortedConnection_);
         QObject::disconnect(filterChangedConnection_);
         QObject::disconnect(newConversationConnection_);
         QObject::disconnect(conversationRemovedConnection_);
+        [self reloadData];
         if (model_ != nil) {
             modelSortedConnection_ = QObject::connect(model_, &lrc::api::ConversationModel::modelSorted,
                                                       [self] (){