Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications

Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m

@@ -104,6 +104,8 @@
 
 @property(nonatomic, strong) UserVerificationCoordinatorBridgePresenter *userVerificationCoordinatorBridgePresenter;
 
+@property(nonatomic) AnalyticsScreenTimer *screenTimer;
+
 @end
 
 @implementation RoomMemberDetailsViewController
@@ -139,6 +141,8 @@
     
     // Keep visible the status bar by default.
     isStatusBarHidden = NO;
+    
+    self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenUser];
 }
 
 - (void)viewDidLoad
@@ -239,9 +243,6 @@
 {
     [super viewWillAppear:animated];
 
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomMemberDetails"];
-
     [self userInterfaceThemeDidChange];
 
     // Hide the bottom border of the navigation bar to display the expander header
@@ -264,6 +265,18 @@
     self.bottomImageView.hidden = YES;
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.screenTimer start];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];

Riot/Modules/Room/Members/RoomParticipantsViewController.h

@@ -92,6 +92,11 @@
  */
 @property (nonatomic, weak) id<RoomParticipantsViewControllerDelegate> delegate;
 
+/**
+ The screen timer used for analytics if they've been enabled. The default value is nil.
+ */
+@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+
 /**
  Returns the `UINib` object initialized for a `RoomParticipantsViewController`.
  

Riot/Modules/Room/Members/RoomParticipantsViewController.m

@@ -245,9 +245,6 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-
-    // Screen tracking
-    [[Analytics sharedInstance] trackScreen:@"RoomParticipants"];
     
     // Refresh display
     [self refreshTableView];
@@ -268,6 +265,8 @@
         [contactsPickerViewController destroy];
         contactsPickerViewController = nil;
     }
+    
+    [self.screenTimer start];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -284,6 +283,12 @@
     [self searchBarCancelButtonClicked:_searchBarView];
 }
 
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [self.screenTimer stop];
+}
+
 - (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
 {
     // Check whether the current view controller is displayed inside a segmented view controller in order to withdraw the right item