Merge pull request #1356 from wutschel/app_settings

kambala-decapitator · web-flow · commit 9e980a3b88de · 2025-11-10T02:17:00.000+05:00
Feature: Add shortcut to app settings to main menu (iPhone) or bottom toolbar (iPad)
diff --git a/XBMC Remote/BaseMasterViewController.h b/XBMC Remote/BaseMasterViewController.h
@@ -16,6 +16,7 @@
 - (void)changeServerStatus:(BOOL)status infoText:(NSString*)infoText icon:(NSString*)iconName;
 - (void)handleXBMCServerHasChanged:(NSNotification*)sender;
 - (void)connectionStatus:(NSNotification*)note;
+- (void)enterAppSettings;
 - (void)startClearAppDiskCache:(ClearCacheView*)clearView;
 
 @property (strong, nonatomic) tcpJSONRPC *tcpJSONRPCconnection;
diff --git a/XBMC Remote/BaseMasterViewController.m b/XBMC Remote/BaseMasterViewController.m
@@ -145,6 +145,11 @@ - (void)connectionStatus:(NSNotification*)note {
     [Utilities setWebImageAuthorizationOnSuccessNotification:note];
 }
 
+- (void)enterAppSettings {
+    NSURL *url = [[NSURL alloc] initWithString:UIApplicationOpenSettingsURLString];
+    [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
+}
+
 #pragma mark - App clear disk cache methods
 
 - (void)startClearAppDiskCache:(ClearCacheView*)clearView {
diff --git a/XBMC Remote/DetailViewController.m b/XBMC Remote/DetailViewController.m
@@ -5341,7 +5341,7 @@ - (void)displayData {
     NSDictionary *parameters = menuItem.mainParameters[chosenTab];
     
     BOOL mainLabelChanged = menuItem.mainLabel.length && menuItem.type == TypeNone;
-    BOOL useMainLabel = mainLabelChanged && !(menuItem.type == TypeSettings || menuItem.type == TypeCustomButtonEntry);
+    BOOL useMainLabel = mainLabelChanged && !(menuItem.type == TypeKodiSettings || menuItem.type == TypeCustomButtonEntry);
     NSString *labelText = useMainLabel ? menuItem.mainLabel : parameters[@"label"];
     self.navigationItem.backButtonTitle = labelText;
     if (!albumView) {
diff --git a/XBMC Remote/MasterViewController.m b/XBMC Remote/MasterViewController.m
@@ -40,7 +40,7 @@ @implementation MasterViewController
 - (void)changeServerStatus:(BOOL)status infoText:(NSString*)infoText icon:(NSString*)iconName {
     [super changeServerStatus:status infoText:infoText icon:iconName];
     itemIsActive = NO;
-    [Utilities setStyleOfMenuItems:menuList active:status];
+    [Utilities setStyleOfMenuItems:menuList active:status menu:self.mainMenu];
 }
 
 #pragma mark - Table view methods & data source
@@ -54,7 +54,8 @@ - (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)
 }
 
 - (void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath {
-    [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine || indexPath.row == 0];
+    mainMenu *menuItem = self.mainMenu[indexPath.row];
+    [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine menuType:menuItem.type];
 }
 
 - (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSIndexPath*)indexPath {
@@ -100,11 +101,15 @@ - (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSI
 
 - (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath*)indexPath {
     mainMenu *item = self.mainMenu[indexPath.row];
-    if (!AppDelegate.instance.serverOnLine && item.family != FamilyServer) {
+    if (item.family == FamilyAppSettings) {
+        [self enterAppSettings];
+        return;
+    }
+    else if (!AppDelegate.instance.serverOnLine && item.family != FamilyServer) {
         [menuList selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:indexPath.section] animated:YES scrollPosition:UITableViewScrollPositionNone];
         return;
     }
-    if (itemIsActive) {
+    else if (itemIsActive) {
         return;
     }
     
diff --git a/XBMC Remote/Utilities.h b/XBMC Remote/Utilities.h
@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <SafariServices/SafariServices.h>
 #import "MessagesView.h"
+#import "mainMenu.h"
 #import "DSJSONRPC.h"
 
 typedef NS_ENUM(NSInteger, JewelType) {
@@ -100,8 +101,8 @@ typedef NS_ENUM(NSInteger, LogoBackgroundType) {
 + (NSString*)getConnectionStatusIconName;
 + (NSString*)getConnectionStatusServerName;
 + (void)addShadowsToView:(UIView*)view viewFrame:(CGRect)frame;
-+ (void)setStyleOfMenuItemCell:(UITableViewCell*)cell active:(BOOL)active;
-+ (void)setStyleOfMenuItems:(UITableView*)tableView active:(BOOL)active;
++ (void)setStyleOfMenuItemCell:(UITableViewCell*)cell active:(BOOL)active menuType:(MenuItemType)type;
++ (void)setStyleOfMenuItems:(UITableView*)tableView active:(BOOL)active menu:(NSArray*)menuList;
 + (NSIndexPath*)getIndexPathForDefaultController:(NSArray*)menuItems;
 + (void)enableDefaultController:(id<UITableViewDelegate>)viewController tableView:(UITableView*)tableView menuItems:(NSArray*)menuItems;
 + (id)unarchivePath:(NSString*)path file:(NSString*)filename;
diff --git a/XBMC Remote/Utilities.m b/XBMC Remote/Utilities.m
@@ -1103,24 +1103,23 @@ + (void)addShadowsToView:(UIView*)view viewFrame:(CGRect)frame {
     }
 }
 
-+ (void)setStyleOfMenuItemCell:(UITableViewCell*)cell active:(BOOL)active {
++ (void)setStyleOfMenuItemCell:(UITableViewCell*)cell active:(BOOL)active menuType:(MenuItemType)type {
+    // Connection status and App settings are always visible. Those should not be faded/unfaded.
+    active = active || type == TypeServer || type == TypeAppSettings;
     CGFloat alpha = active ? 1.0 : 0.3;
     UIImageView *icon = (UIImageView*)[cell viewWithTag:XIB_MAIN_MENU_CELL_ICON];
     UILabel *title = (UILabel*)[cell viewWithTag:XIB_MAIN_MENU_CELL_TITLE];
     icon.alpha = alpha;
     title.alpha = alpha;
 }
 
-+ (void)setStyleOfMenuItems:(UITableView*)tableView active:(BOOL)active {
++ (void)setStyleOfMenuItems:(UITableView*)tableView active:(BOOL)active menu:(NSArray*)menuList {
     for (NSIndexPath *indexPath in tableView.indexPathsForVisibleRows) {
-        // The iPhone uses the top most cell as connection status. This should not be faded/unfaded.
-        if (IS_IPHONE && indexPath.row == 0 && indexPath.section == 0) {
-            continue;
-        }
+        mainMenu *menuItem = menuList[indexPath.row];
         UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
         [UIView animateWithDuration:0.3
                          animations:^{
-                            [Utilities setStyleOfMenuItemCell:cell active:active];
+                            [Utilities setStyleOfMenuItemCell:cell active:active menuType:menuItem.type];
                          }];
     }
 }
@@ -1146,7 +1145,7 @@ + (NSIndexPath*)getIndexPathForDefaultController:(NSArray*)menuItems {
         @"start_menu_search": @(TypeGlobalSearch),
         @"start_menu_files": @(TypeFiles),
         @"start_menu_addons": @(TypeAddons),
-        @"start_menu_settings": @(TypeSettings),
+        @"start_menu_settings": @(TypeKodiSettings),
     };
     MenuItemType startMenuType = [defaultMenus[startId] intValue];
     
diff --git a/XBMC Remote/ViewControllerIPad.h b/XBMC Remote/ViewControllerIPad.h
@@ -33,6 +33,7 @@
     UIButton *xbmcLogo;
     UIButton *xbmcInfo;
     UIButton *powerButton;
+    UIButton *settingsButton;
     UIImageView *connectionStatus;
     VolumeSliderView *volumeSliderView;
     BOOL didTouchLeftMenu;
diff --git a/XBMC Remote/ViewControllerIPad.m b/XBMC Remote/ViewControllerIPad.m
@@ -21,13 +21,15 @@
 #import "RemoteController.h"
 
 #define CONNECTION_TIMEOUT 240.0
-#define VIEW_PADDING 10 /* separation between toolbar views */
+#define INFO_PADDING 10
+#define BUTTON_PADDING 5
 #define TOOLBAR_HEIGHT 44
-#define XBMCLOGO_WIDTH 30
+#define XBMCLOGO_WIDTH 42
 #define POWERBUTTON_WIDTH 42
+#define SETTINGSBUTTON_WIDTH 42
 #define REMOTE_ICON_SIZE 30
 #define CONNECTION_ICON_SIZE 18
-#define CONNECTION_PADDING 20
+#define CONNECTION_PADDING 10
 #define REMOTE_PADDING 15
 #define DESKTOP_PADDING 25
 #define PLAYLIST_HEADER_HEIGHT 24
@@ -97,7 +99,7 @@ - (void)changeServerStatus:(BOOL)status infoText:(NSString*)infoText icon:(NSStr
         }
     }
     [xbmcInfo setTitle:infoText forState:UIControlStateNormal];
-    [Utilities setStyleOfMenuItems:menuViewController.tableView active:status];
+    [Utilities setStyleOfMenuItems:menuViewController.tableView active:status menu:mainMenu];
 }
 
 - (void)offStackView {
@@ -397,7 +399,7 @@ - (void)viewDidLoad {
     [self.view addSubview:showDesktopButton];
     
     // right most element
-    connectionStatus = [[UIImageView alloc] initWithFrame:CGRectMake(self.view.frame.size.width - CONNECTION_ICON_SIZE - VIEW_PADDING, self.view.frame.size.height - (TOOLBAR_HEIGHT + CONNECTION_ICON_SIZE) / 2 - [Utilities getBottomPadding], CONNECTION_ICON_SIZE, CONNECTION_ICON_SIZE)];
+    connectionStatus = [[UIImageView alloc] initWithFrame:CGRectMake(self.view.frame.size.width - CONNECTION_ICON_SIZE - CONNECTION_PADDING, self.view.frame.size.height - (TOOLBAR_HEIGHT + CONNECTION_ICON_SIZE) / 2 - [Utilities getBottomPadding], CONNECTION_ICON_SIZE, CONNECTION_ICON_SIZE)];
     connectionStatus.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
     [self.view addSubview:connectionStatus];
     
@@ -413,17 +415,27 @@ - (void)viewDidLoad {
     [self.view addSubview:xbmcLogo];
     
     // 3rd right most element
+    image = [UIImage imageNamed:@"icon_menu_settings"];
+    image = [Utilities colorizeImage:image withColor:UIColor.lightGrayColor];
+    settingsButton = [[UIButton alloc] initWithFrame:CGRectMake(xbmcLogo.frame.origin.x - SETTINGSBUTTON_WIDTH - BUTTON_PADDING, self.view.frame.size.height - TOOLBAR_HEIGHT, SETTINGSBUTTON_WIDTH, TOOLBAR_HEIGHT)];
+    [settingsButton setImage:image forState:UIControlStateNormal];
+    [settingsButton setImage:image forState:UIControlStateHighlighted];
+    settingsButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
+    [settingsButton addTarget:self action:@selector(enterAppSettings) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:settingsButton];
+    
+    // 4th right most element
     image = [UIImage imageNamed:@"icon_power"];
     image = [Utilities colorizeImage:image withColor:UIColor.lightGrayColor];
-    powerButton = [[UIButton alloc] initWithFrame:CGRectMake(xbmcLogo.frame.origin.x - POWERBUTTON_WIDTH - VIEW_PADDING, self.view.frame.size.height - TOOLBAR_HEIGHT, POWERBUTTON_WIDTH, TOOLBAR_HEIGHT)];
+    powerButton = [[UIButton alloc] initWithFrame:CGRectMake(settingsButton.frame.origin.x - POWERBUTTON_WIDTH - BUTTON_PADDING, self.view.frame.size.height - TOOLBAR_HEIGHT, POWERBUTTON_WIDTH, TOOLBAR_HEIGHT)];
     [powerButton setImage:image forState:UIControlStateNormal];
     [powerButton setImage:image forState:UIControlStateHighlighted];
     powerButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
     [powerButton addTarget:self action:@selector(powerControl) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:powerButton];
     
     // element between left most and 2nd right most uses up free space
-    CGFloat infoPadding = self.view.frame.size.width - CGRectGetMinX(powerButton.frame) + 2 * VIEW_PADDING;
+    CGFloat infoPadding = self.view.frame.size.width - CGRectGetMinX(powerButton.frame) + 2 * INFO_PADDING;
     CGFloat infoStart = PAD_MENU_TABLE_WIDTH + infoPadding;
     CGFloat infoWidth = self.view.frame.size.width - PAD_MENU_TABLE_WIDTH - 2 * infoPadding;
     xbmcInfo = [[UIButton alloc] initWithFrame:CGRectMake(infoStart, self.view.frame.size.height - TOOLBAR_HEIGHT, infoWidth, TOOLBAR_HEIGHT)];
@@ -457,6 +469,10 @@ - (void)viewDidLoad {
         frame.origin.y -= bottomPadding;
         powerButton.frame = frame;
         
+        frame = settingsButton.frame;
+        frame.origin.y -= bottomPadding;
+        settingsButton.frame = frame;
+        
         frame = xbmcInfo.frame;
         frame.origin.y -= bottomPadding;
         xbmcInfo.frame = frame;
diff --git a/XBMC Remote/en.lproj/Localizable.strings b/XBMC Remote/en.lproj/Localizable.strings
@@ -193,6 +193,7 @@
 
 "Programs" = "Programs";
 "XBMC Settings" = "Kodi Settings";
+"App Settings" = "App Settings";
 
 "Custom button" = "Custom button";
 "Modify label:" = "Modify label:";
diff --git a/XBMC Remote/iPad/MenuViewController.m b/XBMC Remote/iPad/MenuViewController.m
@@ -132,7 +132,8 @@ - (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)
 }
 
 - (void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath {
-    [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine];
+    mainMenu *menuItem = mainMenuItems[indexPath.row];
+    [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine menuType:menuItem.type];
     cell.backgroundColor = UIColor.clearColor;
 }
 
diff --git a/XBMC Remote/mainMenu.h b/XBMC Remote/mainMenu.h
@@ -13,6 +13,7 @@ typedef NS_ENUM(NSInteger, MenuItemFamily) {
     FamilyNowPlaying,
     FamilyRemote,
     FamilyServer,
+    FamilyAppSettings,
 };
 
 typedef NS_ENUM(NSInteger, MenuItemType) {
@@ -31,8 +32,9 @@ typedef NS_ENUM(NSInteger, MenuItemType) {
     TypeGlobalSearch,
     TypeFiles,
     TypeAddons,
-    TypeSettings,
+    TypeKodiSettings,
     TypeCustomButtonEntry,
+    TypeAppSettings,
 };
 
 typedef NS_ENUM(NSInteger, ViewModes) {
diff --git a/XBMC Remote/mainMenu.m b/XBMC Remote/mainMenu.m
@@ -6220,11 +6220,18 @@ + (NSMutableArray*)generateMenus {
         @[],
     ];
     
+#pragma mark - App Settings
+    __auto_type menu_AppSettings = [mainMenu new];
+    menu_AppSettings.mainLabel = LOCALIZED_STR(@"App Settings");
+    menu_AppSettings.icon = @"icon_menu_settings";
+    menu_AppSettings.type = TypeAppSettings;
+    menu_AppSettings.family = FamilyAppSettings;
+    
 #pragma mark - Kodi Settings
     __auto_type menu_Settings = [mainMenu new];
     menu_Settings.mainLabel = LOCALIZED_STR(@"XBMC Settings");
-    menu_Settings.icon = @"icon_menu_settings";
-    menu_Settings.type = TypeSettings;
+    menu_Settings.icon = @"st_kodi_action";
+    menu_Settings.type = TypeKodiSettings;
     menu_Settings.family = FamilyDetailView;
     menu_Settings.enableSection = YES;
     menu_Settings.rowHeight = SETTINGS_ROW_HEIGHT;
@@ -6832,6 +6839,9 @@ + (NSMutableArray*)generateMenus {
     if ([self isMenuEntryEnabled:@"menu_settings"]) {
         [mainMenuItems addObject:menu_Settings];
     }
+    if (IS_IPHONE) {
+        [mainMenuItems addObject:menu_AppSettings];
+    }
     
 #pragma mark - Build and Initialize Global Search Lookup
     

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ - (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`- (void)tableView:(UITableView)tableView willDisplayCell:(UITableViewCell)cell forRowAtIndexPath:(NSIndexPath*)indexPath {`
`135`		`- [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine];`
	`135`	`+ mainMenu *menuItem = mainMenuItems[indexPath.row];`
	`136`	`+ [Utilities setStyleOfMenuItemCell:cell active:AppDelegate.instance.serverOnLine menuType:menuItem.type];`
`136`	`137`	`cell.backgroundColor = UIColor.clearColor;`
`137`	`138`	`}`
`138`	`139`