This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ArtistDescriptionCollectionViewCell |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/Catalina/CatalinaUI/MainLayer/en.lproj/Storyboard.storyboard | |
+++ b/Catalina/CatalinaUI/MainLayer/en.lproj/Storyboard.storyboard | |
@@ -1462,7 +1462,7 @@ | |
<constraints> | |
<constraint firstAttribute="trailingMargin" secondItem="cAk-3d-7qV" secondAttribute="trailing" id="34Q-Ae-Cla"/> | |
<constraint firstItem="65T-3f-NDJ" firstAttribute="top" secondItem="cAk-3d-7qV" secondAttribute="top" id="9il-dr-fcL"/> | |
- <constraint firstItem="cAk-3d-7qV" firstAttribute="leading" secondItem="Ied-y3-bOS" secondAttribute="leadingMargin" constant="-16" id="BW2-yN-rVA"/> | |
+ <constraint firstItem="cAk-3d-7qV" firstAttribute="leading" secondItem="Ied-y3-bOS" secondAttribute="leading" id="BW2-yN-rVA"/> | |
<constraint firstItem="hCr-Xg-Pgv" firstAttribute="centerY" secondItem="tYR-Sv-idI" secondAttribute="centerY" id="Cv1-vb-Rek"/> | |
<constraint first |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-(RACSignal *)clusterMapSignal | |
{ | |
return [[self deviceUpdates] map:^NSMutableDictionary *(TuneDevice * device) | |
{ | |
return device.clusterMap; | |
}]; | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PlayThis |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SecondViewController *tutorial = [SecondViewController doSomeThingsThenOnDoneTapped:^{ | |
[blockSelf performSegueWithIdentifier:@"unwindToRootGateViewController" sender:blockSelf]; | |
}]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* */ | |
- (BOOL)isPlaying | |
{ | |
NSLog(@"Session ERROR method should not be called"); | |
return NO; | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On branch roderic-development | |
Changes to be committed: | |
(use "git reset HEAD <file>..." to unstage) | |
modified: AetherCommon/AetherObjects/MorseUser.m | |
modified: AetherCommon/ServerAPIs/AetherAPIClient.m | |
deleted: Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.h | |
deleted: Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.m | |
deleted: Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.h | |
deleted: Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On branch roderic-development | |
Changes to be committed: | |
(use "git reset HEAD <file>..." to unstage) | |
modified: AetherCommon/AetherObjects/MorseUser.m | |
modified: AetherCommon/ServerAPIs/AetherAPIClient.m | |
deleted: Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.h | |
deleted: Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.m | |
deleted: Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.h | |
deleted: Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+++ b/Catalina/CatalinaUI/provisioning/ProvisioningController.m | |
@@ -14,6 +14,7 @@ | |
#import <Crashlytics/Crashlytics.h> | |
#import "AetherCache.h" | |
#import "MorseUser.h" | |
+#import "TuneDevice.h" | |
@interface ProvisioningController () | |
@@ -166,8 +167,9 @@ static ProvisioningController *provisioningController = nil; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
01:35:51 (5a81d4c...|BISECTING) ~/dev/ClientIOS$ git bisect bad | |
5a81d4c3724cc67d05189a26bf481e0b11d22704 is the first bad commit | |
commit 5a81d4c3724cc67d05189a26bf481e0b11d22704 | |
Author: Roderic Campbell <[email protected]> | |
Date: Mon Nov 24 16:49:14 2014 -0800 | |
TUNE-4954 Got the animations working. | |
Still needs some cleanup. I'll have to redesign those cells as | |
there seems to be an issue with the animation easing in and out |