Minor fixes in localization and docktile

insidegui · insidegui · commit fee57a573805 · 2018-09-08T19:32:45.000-03:00
diff --git a/Apple Events.xcodeproj/project.pbxproj b/Apple Events.xcodeproj/project.pbxproj
@@ -33,6 +33,8 @@
 		DD27D2F021447AC500CD5F6C /* SwiftProtobuf.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD27D2E121447AA300CD5F6C /* SwiftProtobuf.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DD27D2FD21447AE000CD5F6C /* ChromeCastCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD27D2FC21447AD700CD5F6C /* ChromeCastCore.framework */; };
 		DD27D2FE21447AE400CD5F6C /* ChromeCastCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD27D2FC21447AD700CD5F6C /* ChromeCastCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		DD27D3022144837400CD5F6C /* Environment.plist in Resources */ = {isa = PBXBuildFile; fileRef = DD27D3012144837400CD5F6C /* Environment.plist */; };
+		DD27D303214483EE00CD5F6C /* Environment.plist in Resources */ = {isa = PBXBuildFile; fileRef = DD27D3012144837400CD5F6C /* Environment.plist */; };
 		DD2ACCD7214474ED000E8D7A /* EventsUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD2ACCCE214472C0000E8D7A /* EventsUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DD2ACCD8214474FC000E8D7A /* EventsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2ACCCE214472C0000E8D7A /* EventsUI.framework */; };
 		DD4514501DBD30C7001464B0 /* EVTChromecastViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD45144F1DBD30C7001464B0 /* EVTChromecastViewController.m */; };
@@ -178,6 +180,7 @@
 		DD27D2D321447A8D00CD5F6C /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		DD27D2D621447AA300CD5F6C /* SwiftProtobuf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftProtobuf.xcodeproj; path = "swift-protobuf/SwiftProtobuf.xcodeproj"; sourceTree = "<group>"; };
 		DD27D2F721447AD700CD5F6C /* ChromeCastCore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ChromeCastCore.xcodeproj; path = "swift-protobuf/../ChromeCastCore/ChromeCastCore.xcodeproj"; sourceTree = "<group>"; };
+		DD27D3012144837400CD5F6C /* Environment.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Environment.plist; sourceTree = "<group>"; };
 		DD45144E1DBD30C7001464B0 /* EVTChromecastViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EVTChromecastViewController.h; sourceTree = "<group>"; };
 		DD45144F1DBD30C7001464B0 /* EVTChromecastViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EVTChromecastViewController.m; sourceTree = "<group>"; };
 		DD9CEB0F1D8069BD00DE15D5 /* EVTVerboseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EVTVerboseLogger.h; sourceTree = "<group>"; };
@@ -385,6 +388,7 @@
 		DDF00EED1D7D9FB100418830 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				DD27D3012144837400CD5F6C /* Environment.plist */,
 				DDF00EE51D7D9F9E00418830 /* Info.plist */,
 				DDF00EE21D7D9F9E00418830 /* Main.storyboard */,
 				DDF00EE01D7D9F9D00418830 /* Assets.xcassets */,
@@ -592,6 +596,7 @@
 				DD00F2BD1D7E6EF7001049E6 /* IconMask.png in Resources */,
 				DD00F2BA1D7E6EF7001049E6 /* DefaultIcon.png in Resources */,
 				DD00F2BC1D7E6EF7001049E6 /* DefaultIcon@3x.png in Resources */,
+				DD27D303214483EE00CD5F6C /* Environment.plist in Resources */,
 				DD00F2BE1D7E6EF7001049E6 /* IconMask@2x.png in Resources */,
 				DD00F2BF1D7E6EF7001049E6 /* IconMask@3x.png in Resources */,
 				DD00F2BB1D7E6EF7001049E6 /* DefaultIcon@2x.png in Resources */,
@@ -603,6 +608,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DDF00EE11D7D9F9D00418830 /* Assets.xcassets in Resources */,
+				DD27D3022144837400CD5F6C /* Environment.plist in Resources */,
 				DDF00EE41D7D9F9E00418830 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Apple Events/EVTEnvironment.m b/Apple Events/EVTEnvironment.m
@@ -8,6 +8,8 @@
 
 #import "EVTEnvironment.h"
 
+@import os.log;
+
 @interface EVTEnvironment ()
 
 @property (nonatomic, copy) NSURL *baseURL;
@@ -45,16 +47,30 @@ + (instancetype)testEnvironment
     return testEnv;
 }
 
++ (NSURL *)__configurationFileURL
+{
+    return [[NSBundle bundleForClass:[self class]] URLForResource:@"Environment" withExtension:@"plist"];
+}
+
++ (NSDictionary *)__environmentDictionary
+{
+    return [NSDictionary dictionaryWithContentsOfURL:[self __configurationFileURL]];
+}
+
 + (instancetype)productionEnvironment
 {
     static EVTEnvironment *prodEnv;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         prodEnv = [[EVTEnvironment alloc] init];
 
-        NSString *eventHash = [NSBundle mainBundle].infoDictionary[@"EVTCurrentEventHash"];
+        NSDictionary *config = [self __environmentDictionary];
+        NSString *eventHash = config[@"EVTCurrentEventHash"];
         NSString *urlString = [NSString stringWithFormat:@"https://itunesevents.apple.com/%@/data/", eventHash];
 
+        os_log_t log = os_log_create("AppleEventsApp", "EVTEnvironment");
+        os_log_info(log, "Current event hash: %{public}@", eventHash);
+
         prodEnv.baseURL = [NSURL URLWithString:urlString];
 
         prodEnv.stateCheckInterval = 60.0;
diff --git a/Apple Events/EVTEvent+Dictionary.m b/Apple Events/EVTEvent+Dictionary.m
@@ -29,6 +29,7 @@
 #define kDatePlaceholder @"@@DATE@@"
 #define kYearPlaceholder @"@@YEAR@@"
 #define kMonthPlaceholder @"@@MONTH@@"
+#define kSyntaxMonthPlaceholder @"@@SYNTAX_MONTH@@"
 #define kLocationPlaceholder @"@@LOCATION@@"
 
 #define kButtonComingSoonFormat @"APPLE_EVENTS.BUTTON_COMING_SOON"
@@ -196,6 +197,7 @@ + (NSString *)description:(NSString *)desc withDateTimePlaceholdersFilledWithDat
     output = [output stringByReplacingOccurrencesOfString:kDatePlaceholder withString:day];
     output = [output stringByReplacingOccurrencesOfString:kDatePlaceholder withString:day];
     output = [output stringByReplacingOccurrencesOfString:kMonthPlaceholder withString:month];
+    output = [output stringByReplacingOccurrencesOfString:kSyntaxMonthPlaceholder withString:month];
     output = [output stringByReplacingOccurrencesOfString:kHour24Placeholder withString:hour24];
     output = [output stringByReplacingOccurrencesOfString:kHour12Placeholder withString:hour12];
     output = [output stringByReplacingOccurrencesOfString:kMinutePlaceholder withString:minute];
diff --git a/Apple Events/EVTEventsFetcher.m b/Apple Events/EVTEventsFetcher.m
@@ -186,10 +186,10 @@ - (void)fetchCurrentEventIdentifierCompletionHandler:(void (^)(NSError *, NSStri
                 }
                 
                 NSArray *identifiers = [eventsDict keysSortedByValueUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-                    if ([[obj1 objectForKey:@"order"] integerValue] > [[obj2 objectForKey:@"order"] integerValue]) {
-                        return NSOrderedDescending;
-                    } else {
+                    if ([[obj1 objectForKey:@"live"] boolValue]) {
                         return NSOrderedAscending;
+                    } else {
+                        return NSOrderedDescending;
                     }
                 }];
                 
diff --git a/Apple Events/EVTEventsViewController.m b/Apple Events/EVTEventsViewController.m
@@ -59,7 +59,7 @@ - (void)viewDidLoad
     self.eventsCache = [EVTEventsCache cache];
     self.fetcher = [[EVTEventsFetcher alloc] initWithEnvironment:[EVTEnvironment currentEnvironment] cache:self.eventsCache];
     self.stateProvider = [[EVTEventStateProvider alloc] initWithEnvironment:[EVTEnvironment currentEnvironment]];
-    
+
     [self __configureAndInstallChildViewControllers];
     
     [self loadEventsWithProgress:YES];
diff --git a/Apple Events/Environment.plist b/Apple Events/Environment.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>EVTCurrentEventHash</key>
+	<string>c7c808b8426b5211088e00be67754024e0c3d171</string>
+</dict>
+</plist>
diff --git a/Apple Events/Info.plist b/Apple Events/Info.plist
@@ -20,8 +20,6 @@
 	<string>1.2</string>
 	<key>CFBundleVersion</key>
 	<string>30</string>
-	<key>EVTCurrentEventHash</key>
-	<string>c7c808b8426b5211088e00be67754024e0c3d171</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSAppTransportSecurity</key>

Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,10 @@ - (void)fetchCurrentEventIdentifierCompletionHandler:(void (^)(NSError *, NSStri`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`NSArray *identifiers = [eventsDict keysSortedByValueUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) {`
`189`		`- if ([[obj1 objectForKey:@"order"] integerValue] > [[obj2 objectForKey:@"order"] integerValue]) {`
`190`		`- return NSOrderedDescending;`
`191`		`- } else {`
	`189`	`+ if ([[obj1 objectForKey:@"live"] boolValue]) {`
`192`	`190`	`return NSOrderedAscending;`
	`191`	`+ } else {`
	`192`	`+ return NSOrderedDescending;`
`193`	`193`	`}`
`194`	`194`	`}];`
`195`	`195`