Make the app start without the old vertical category layout.

alloy · Mar 8, 2013 · 40f7e90 · 40f7e90
1 parent ee3a933
commit 40f7e90
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 48 deletions.
diff --git a/Gemist/App/Controllers/UZGAppliance.m b/Gemist/App/Controllers/UZGAppliance.m
@@ -9,42 +9,38 @@
 static NSString * const kUitzendingGemistName = @"Gemist";
 static NSString * const kUZGBookmarksCategoryIdentifier = @"Favorites";
 
-@interface BRBaseAppliance (UpdatedAPI)
-- (id)initWithApplianceInfo:(id)applianceInfo;
+@interface UZGApplianceInfo : BRApplianceInfo
 @end
 
-@interface BRApplianceManager (UpdatedAPI)
-- (id)applianceInfoForApplianceIdentifier:(id)applianceIdentifier;
-@end
-
-//@interface UZGApplianceInfo : BRApplianceInfo
+@implementation UZGApplianceInfo
 
-//- (NSDictionary *)info;
-//{
-  //return [UZGBundle infoDictionary];
-//}
+- (NSDictionary *)info;
+{
+  return [UZGBundle infoDictionary];
+}
 
-//- (NSString *)key;
-//{
-  //return self.info[kCFBundleIdentifierKey];
-//}
+- (NSString *)key;
+{
+  return self.info[(id)kCFBundleIdentifierKey];
+}
 
-//- (NSString *)name;
-//{
-  //return self.info[kCFBundleNameKey];
-//}
+- (NSString *)name;
+{
+  return self.info[(id)kCFBundleNameKey];
+}
 
-//- (float)preferredOrder;
-//{
-  //return 0.0;
-//}
+- (float)preferredOrder;
+{
+  return 0.0;
+}
 
-//- (id)localizedStringsFileName;
-//{
-  //return @"NitoTVLocalizable";
-//}
+- (id)localizedStringsFileName;
+{
+  // return @"NitoTVLocalizable";
+  return nil;
+}
 
-//@end
+@end
 
 // TODO not in actual release!!
 // Only needed for beta testing.
@@ -72,26 +68,12 @@ - (void)dealloc;
   // TODO disable crash reporter?
 }
 
-- (BRApplianceInfo *)applianceInfo;
+- (id)init;
 {
-  //id original = [super applianceInfo];
-  //id info = [original valueForKey:@"_info"];
-  //NSLog(@"applianceInfo: %@ - %@", original, info);
-  //return original;
-
-  // BRApplianceInfo *info = [BRApplianceInfo infoForApplianceDescription:UZGBundle];
-  BRApplianceInfo *info = [[BRApplianceManager singleton] applianceInfoForApplianceIdentifier:UZGBundleIdentifier];
-  NSLog(@"%@", info);
-  NSLog(@"%@", info.key);
-  NSLog(@"%@", info.name);
-  NSLog(@"%f", info.preferredOrder);
-  return info;
-}
+  if ((self = [super init])) {
+    NSLog(@"[Gemist] Start appliance");
+    self.applianceInfo = [UZGApplianceInfo new];
 
-- (id)initWithApplianceInfo:(id)applianceInfo;
-{
-  NSLog(@"INIT WITH APPLIANCE INFO: %@", applianceInfo);
-  if ((self = [super initWithApplianceInfo:applianceInfo])) {
     NSMutableArray *categories = [NSMutableArray array];
     [categories addObject:[BRApplianceCategory categoryWithName:UZGLocalizedString(kUZGBookmarksCategoryIdentifier)
                                                      identifier:kUZGBookmarksCategoryIdentifier

diff --git a/Gemist/Gemist-Info.plist b/Gemist/Gemist-Info.plist
@@ -6,6 +6,8 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>Gemist</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.frontrow.appliance.Gemist</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git a/UitzendingGemist.xcodeproj/project.pbxproj b/UitzendingGemist.xcodeproj/project.pbxproj
@@ -719,7 +719,7 @@
 				ARCHS = armv7;
 				ATV_ADDRESS = "apple-tv.local";
 				ATV_APPLIANCE_INSTALL_PATH = /Applications/AppleTV.app/Appliances;
-				ATV_DEPLOY_TO_DEVICE = NO;
+				ATV_DEPLOY_TO_DEVICE = YES;
 				ATV_SSH_USER = root;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
@@ -767,7 +767,7 @@
 				ARCHS = armv7;
 				ATV_ADDRESS = "apple-tv.local";
 				ATV_APPLIANCE_INSTALL_PATH = /Applications/AppleTV.app/Appliances;
-				ATV_DEPLOY_TO_DEVICE = NO;
+				ATV_DEPLOY_TO_DEVICE = YES;
 				ATV_SSH_USER = root;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;