Fixes + design tweaks

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.4.0.10
+
+New:
+
+* Alarm tab icon is now a generic sounds icon
+* Sleep sounds player now shows an animated playing state
+* Sleep sound options that have changed will now stick / saved + reloaded
+
+Fixes:
+
+* Sounds tab will now update within same session if sleep sounds is feature flipped on
+* Prevent sounds sub nav tabs from being activated simulatenously, causing both UI to load
+* Saving alarms will now properly refresh the view
+* No connect / error state in sleep sounds will properly be displayed
+
 ## 1.4.0.9
 
 New:

SenseWidget/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0.9</string>
+	<string>1.4.0.10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

SleepModel/HEMAlarmListViewController.h

@@ -3,10 +3,11 @@
 #import "HEMBaseController.h"
 
 @class HEMDeviceService;
+@class HEMSubNavigationView;
 
 @interface HEMAlarmListViewController : HEMBaseController
 
-@property (nonatomic, assign) BOOL hasSubNav;
+@property (nonatomic, weak) HEMSubNavigationView* subNav;
 @property (nonatomic, strong) HEMDeviceService* deviceService;
 
 - (IBAction)addNewAlarm:(id)sender;

SleepModel/HEMAlarmListViewController.m

@@ -22,6 +22,7 @@
 #import "HEMNoAlarmCell.h"
 #import "HEMActivityIndicatorView.h"
 #import "HEMBaseController+Protected.h"
+#import "HEMSubNavigationView.h"
 
 NS_ENUM(NSUInteger) {
     LoadingStateRowCount = 0,
@@ -166,8 +167,8 @@ - (void)reloadData {
     if ([self.alarms isEqualToArray:cachedAlarms]) {
         if ([self isLoading]) {
             self.loading = NO;
-            [self.collectionView reloadData];
         }
+        [self.collectionView reloadData];
         return;
     }
 
@@ -471,8 +472,11 @@ - (CGSize)collectionView:(UICollectionView *)collectionView
 }
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    if (![self hasSubNav]) {
-        [[self shadowView] updateVisibilityWithContentOffset:[scrollView contentOffset].y];
+    CGFloat yOffset = [scrollView contentOffset].y;
+    if (![[self subNav] hasControls]) {
+        [[self shadowView] updateVisibilityWithContentOffset:yOffset];
+    } else {
+        [[[self subNav] shadowView] updateVisibilityWithContentOffset:yOffset];
     }
 }
 

SleepModel/HEMSleepSoundPlayerPresenter.m

@@ -193,6 +193,7 @@ - (void)loadData {
 
     [self setLoading:YES];
     [self setPlayerState:HEMSleepSoundPlayerStateWaiting];
+    [[self collectionView] reloadData];
 
     dispatch_group_t dataGroup = dispatch_group_create();
 
@@ -211,8 +212,8 @@ - (void)loadData {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         [strongSelf setLoading:NO];
         [strongSelf configurePlayerStateFromStatus:[[strongSelf soundState] status]];
-        [[strongSelf collectionView] reloadData];
         [strongSelf startMonitoring];
+        [[strongSelf collectionView] reloadData];
     });
 }
 
@@ -225,7 +226,9 @@ - (void)loadState:(void(^)(void))completion {
 }
 
 - (void)configurePlayerStateFromStatus:(SENSleepSoundStatus*)status {
-    if ([self isSenseOffline]) {
+    if (!status) {
+        [self setPlayerState:HEMSleepSoundPlayerStateError];
+    } else if ([self isSenseOffline]) {
         [self reloadDataWithPlayerState:HEMSleepSoundPlayerStateSenseOffline];
     } else if (![[self service] isEnabled:[self soundState]]) {
         [self reloadDataWithPlayerState:HEMSleepSoundPlayerStatePrereqNotMet];

SleepModel/HEMSleepSoundViewController.h

@@ -11,10 +11,12 @@
 
 @class SENSleepSounds;
 @class HEMDeviceService;
+@class HEMSubNavigationView;
 
 @interface HEMSleepSoundViewController : HEMBaseController
 
 @property (nonatomic, assign, getter=isCancellable) BOOL cancellable;
 @property (nonatomic, strong) HEMDeviceService* deviceService;
+@property (nonatomic, weak) HEMSubNavigationView* subNav;
 
 @end

SleepModel/HEMSleepSoundViewController.m

@@ -18,6 +18,7 @@
 #import "HEMSleepSoundDurationsPresenter.h"
 #import "HEMSleepSoundVolumePresenter.h"
 #import "HEMAudioService.h"
+#import "HEMSubNavigationView.h"
 
 @interface HEMSleepSoundViewController () <HEMSleepSoundPlayerDelegate, HEMListDelegate>
 
@@ -61,6 +62,9 @@ - (void)viewWillAppear:(BOOL)animated {
                                                                     action:@selector(dismiss)];
         [[self navigationItem] setLeftBarButtonItem:cancelItem];
     }
+    if ([[self subNav] hasControls]) {
+        [[self playerPresenter] bindWithShadowView:[[self subNav] shadowView]];
+    }
 }
 
 #pragma mark - Actions

SleepModel/HEMSoundsContainerViewController.m

@@ -105,12 +105,16 @@ - (void)pairWithSenseFrom:(HEMSoundsContentPresenter*)presenter {
     [self presentViewController:nav animated:YES completion:nil];
 }
 
-- (void)loadAlarmsFrom:(__unused HEMSoundsContentPresenter *)presenter thenLaunchNewAlarm:(BOOL)showNewAlarm {
+- (void)loadAlarmsFrom:(__unused HEMSoundsContentPresenter *)presenter
+    thenLaunchNewAlarm:(BOOL)showNewAlarm {
     DDLogVerbose(@"show alarms view");
     if (![self alarmVC]) {
         HEMAlarmListViewController* alarmVC = [HEMMainStoryboard instantiateAlarmListViewController];
         [self setAlarmVC:alarmVC];
     }
+
+    [[self alarmVC] setSubNav:[self subNav]];
+
     [self showSoundViewOf:[self alarmVC] completion:^{
         if (showNewAlarm) {
             [[self alarmVC] addNewAlarm:nil];
@@ -122,6 +126,7 @@ - (void)loadSleepSounds:(__unused SENSleepSounds *)sleepSounds from:(__unused HE
     DDLogVerbose(@"show sleep sounds view");
     HEMSleepSoundViewController* soundVC = [HEMMainStoryboard instantiateSleepSoundViewController];
     [soundVC setDeviceService:[self deviceService]];
+    [soundVC setSubNav:[self subNav]];
     [self showSoundViewOf:soundVC completion:nil];
 }
 

SleepModel/HEMSoundsContentPresenter.m

@@ -110,18 +110,24 @@ - (void)listenForDeviceChanges {
                  object:nil];
 }
 
+- (BOOL)shouldReload {
+    return [self deviceError]
+        || ![[[self deviceService] devices] hasPairedSense]
+        || ![self availableSleepSounds];
+}
+
 #pragma mark - Presenter events
 
 - (void)didAppear {
     [super didAppear];
-    if ([self deviceError] || ![[[self deviceService] devices] hasPairedSense]) {
+    if ([self shouldReload]) {
         [self reload];
     }
 }
 
 - (void)didComeBackFromBackground {
     [super didComeBackFromBackground];
-    if ([self deviceError] || ![[[self deviceService] devices] hasPairedSense]) {
+    if ([self shouldReload]) {
         [self reload];
     }
 }
@@ -276,6 +282,7 @@ - (void)reload {
 
 - (void)displayDeviceError {
     if (![[self subNav] hasControls]) {
+        [[self delegate] unloadContentControllersFrom:self];
         [[self errorCollectionView] setHidden:NO];
         [[self errorCollectionView] setDelegate:self];
         [[self errorCollectionView] setDataSource:self];

SleepModel/HEMSubNavigationView.m

@@ -105,6 +105,7 @@ - (void)reset {
 - (void)addControl:(UIControl*)control {
     id existingControl = [self viewWithTag:[control tag]];
     if (!existingControl) {
+        [control setExclusiveTouch:YES];
         [control addTarget:self action:@selector(select:) forControlEvents:UIControlEventTouchUpInside];
         [self setControlCount:[self controlCount] + 1];
         [self addSubview:control];

SleepModel/Sense-Info.plist

@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.0.9</string>
+	<string>1.4.0.10</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>