Merge pull request #1342 from wutschel/rework_rightmenu

Maintenance: Internal rework around remote screen and custom buttons
Improvement: Proper use of cell dequeuing of custom buttons
Bugfix: Fixes custom buttons with on/off switches after another custom button was moved above them

Author: kambala-decapitator

Kodi Remote.xcodeproj/project.pbxproj

@@ -60,6 +60,7 @@
 		C7106D7B2D33EEE000A96C93 /* ProgressBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = C7106D7A2D33EEE000A96C93 /* ProgressBarView.m */; };
 		C7106D842D33FBCE00A96C93 /* PlaylistProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = C7106D832D33FBCE00A96C93 /* PlaylistProgressView.m */; };
 		C72CDAF22DD27AB800AFB2FA /* LocalNetworkAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72CDAF12DD27AB800AFB2FA /* LocalNetworkAlert.swift */; };
+		C74B9CB22E979E2F0029B27E /* CustomButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C74B9CB12E979E2F0029B27E /* CustomButtonCell.m */; };
 		C753585F2DE9A25F00952F0D /* LocalNetworkAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = C753585E2DE9A25F00952F0D /* LocalNetworkAccess.m */; };
 		C76451CE29C51221000AE949 /* UIImageView+HighlightedWebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = C76451AD29C51220000AE949 /* UIImageView+HighlightedWebCache.m */; };
 		C76451CF29C51221000AE949 /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = C76451B129C51220000AE949 /* UIImage+WebP.m */; };
@@ -80,7 +81,6 @@
 		C76594A02C5E871100B93A2A /* cellViewIPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F6234E9192809B70024FEFA /* cellViewIPad.xib */; };
 		C76594A12C5E871400B93A2A /* ViewControllerIPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F175F23154D5C3600C1C61F /* ViewControllerIPad.xib */; };
 		C76594A22C5E871600B93A2A /* cellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F6234E7192808120024FEFA /* cellView.xib */; };
-		C76594A32C5E871900B93A2A /* rightCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F6234EB19280B120024FEFA /* rightCellView.xib */; };
 		C76594A42C5E871C00B93A2A /* jsonDataCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0FB16163151F156A001BA2D4 /* jsonDataCell.xib */; };
 		C76594A52C5E872000B93A2A /* playlistCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F44E2D41527A9DF00D5958F /* playlistCellView.xib */; };
 		C76594A62C5E872200B93A2A /* serverListCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F487B5915399716004530C1 /* serverListCellView.xib */; };
@@ -196,7 +196,6 @@
 		0F61E198153C828300A89BB1 /* AppInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfoViewController.m; sourceTree = "<group>"; };
 		0F6234E7192808120024FEFA /* cellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = cellView.xib; sourceTree = "<group>"; };
 		0F6234E9192809B70024FEFA /* cellViewIPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = cellViewIPad.xib; sourceTree = "<group>"; };
-		0F6234EB19280B120024FEFA /* rightCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = rightCellView.xib; sourceTree = "<group>"; };
 		0F6234ED19280D9B0024FEFA /* DetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetailViewController.xib; sourceTree = "<group>"; };
 		0F6234EF192811150024FEFA /* NowPlaying.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NowPlaying.xib; sourceTree = "<group>"; };
 		0F680CB717103DB60092298A /* ClearCacheView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClearCacheView.h; sourceTree = "<group>"; };
@@ -287,6 +286,8 @@
 		C746406927E6209C00F6AD47 /* ko-KR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ko-KR"; path = "ko-KR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		C746406A27E6209C00F6AD47 /* ko-KR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ko-KR"; path = "ko-KR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		C7478BF8257258E700161C1E /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
+		C74B9CB12E979E2F0029B27E /* CustomButtonCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomButtonCell.m; sourceTree = "<group>"; };
+		C74B9CB32E979E480029B27E /* CustomButtonCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomButtonCell.h; sourceTree = "<group>"; };
 		C753585E2DE9A25F00952F0D /* LocalNetworkAccess.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocalNetworkAccess.m; sourceTree = "<group>"; };
 		C75358602DE9A27100952F0D /* LocalNetworkAccess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalNetworkAccess.h; sourceTree = "<group>"; };
 		C76451AD29C51220000AE949 /* UIImageView+HighlightedWebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+HighlightedWebCache.m"; path = "SDWebImage/UIImageView+HighlightedWebCache.m"; sourceTree = "<group>"; };
@@ -420,6 +421,8 @@
 				0F7F3DA9164AAD0F0080A14A /* InitialSlidingViewController.m */,
 				0F40F5A4164D5FA000AF9DE9 /* RightMenuViewController.h */,
 				0F40F5A5164D5FA000AF9DE9 /* RightMenuViewController.m */,
+				C74B9CB32E979E480029B27E /* CustomButtonCell.h */,
+				C74B9CB12E979E2F0029B27E /* CustomButtonCell.m */,
 				0FEAE76616EA632800387DED /* ActorCell.h */,
 				0FEAE76716EA632800387DED /* ActorCell.m */,
 				0F284A5316F6419700AFC1EF /* PosterCell.h */,
@@ -438,7 +441,6 @@
 			isa = PBXGroup;
 			children = (
 				0F6234E7192808120024FEFA /* cellView.xib */,
-				0F6234EB19280B120024FEFA /* rightCellView.xib */,
 				0FB16163151F156A001BA2D4 /* jsonDataCell.xib */,
 				0F44E2D41527A9DF00D5958F /* playlistCellView.xib */,
 				0F487B5915399716004530C1 /* serverListCellView.xib */,
@@ -833,7 +835,6 @@
 				C76594A02C5E871100B93A2A /* cellViewIPad.xib in Resources */,
 				C76594A12C5E871400B93A2A /* ViewControllerIPad.xib in Resources */,
 				C76594A22C5E871600B93A2A /* cellView.xib in Resources */,
-				C76594A32C5E871900B93A2A /* rightCellView.xib in Resources */,
 				C76594A42C5E871C00B93A2A /* jsonDataCell.xib in Resources */,
 				C76594A52C5E872000B93A2A /* playlistCellView.xib in Resources */,
 				C76594A62C5E872200B93A2A /* serverListCellView.xib in Resources */,
@@ -868,6 +869,7 @@
 				0F554907151D1187007E633F /* main.m in Sources */,
 				0F55490B151D1187007E633F /* AppDelegate.m in Sources */,
 				0F55490E151D1187007E633F /* MasterViewController.m in Sources */,
+				C74B9CB22E979E2F0029B27E /* CustomButtonCell.m in Sources */,
 				C76451D129C51221000AE949 /* NSData+ImageContentType.m in Sources */,
 				0F554911151D1187007E633F /* DetailViewController.m in Sources */,
 				C7106D842D33FBCE00A96C93 /* PlaylistProgressView.m in Sources */,

XBMC Remote/AppDelegate.h

@@ -101,8 +101,6 @@
 @property (nonatomic, strong) mainMenu *playlistTvShows;
 @property (nonatomic, strong) mainMenu *playlistPVR;
 @property (nonatomic, strong) NSArray *globalSearchMenuLookup;
-@property (nonatomic, strong) NSArray *nowPlayingMenuItems;
-@property (nonatomic, strong) NSArray *remoteControlMenuItems;
 @property (nonatomic, assign) BOOL serverOnLine;
 @property (nonatomic, assign) BOOL serverTCPConnectionOpen;
 @property (nonatomic, assign) int serverVersion;

XBMC Remote/AppDelegate.m

@@ -39,9 +39,7 @@ @implementation AppDelegate
 @synthesize playlistPVR;
 @synthesize globalSearchMenuLookup;
 @synthesize serverName;
-@synthesize nowPlayingMenuItems;
 @synthesize serverVolume;
-@synthesize remoteControlMenuItems;
 
 + (AppDelegate*)instance {
 	return (AppDelegate*)UIApplication.sharedApplication.delegate;

XBMC Remote/ConvenienceMacros.h

@@ -28,7 +28,7 @@
 #define TOOLBAR_TINT_COLOR [Utilities getGrayColor:38 alpha:0.95]
 #define NAVBAR_TINT_COLOR [Utilities getGrayColor:38 alpha:1.0]
 #define KODI_BLUE_COLOR [Utilities getKodiBlue]
-#define CUSTOM_BUTTON_BACKGROUND [Utilities getGrayColor:36 alpha:1]
+#define CUSTOM_BUTTON_BACKGROUND [Utilities getGrayColor:25 alpha:1] // Gray:25 is same as the other remote buttons
 #define GRIDVIEW_SECTION_COLOR [Utilities getGrayColor:44 alpha:1.0]
 #define SYSTEMGRAY6_DARKMODE [Utilities getGrayColor:28 alpha:1] // Gray:28 is similar to systemGray6 in Dark Mode
 #define SYSTEMGRAY6_LIGHTMODE [Utilities getGrayColor:242 alpha:1] // Gray:242 is similar to systemGray6 in Light Mode

XBMC Remote/CustomButtonCell.h

@@ -0,0 +1,20 @@
+//
+//  CustomButtonCell.h
+//  Kodi Remote
+//
+//  Created by Buschmann on 09.10.25.
+//  Copyright © 2025 Team Kodi. All rights reserved.
+//
+
+@import UIKit;
+
+#define CUSTOM_BUTTON_ITEM_HEIGHT 50.0
+
+@interface CustomButtonCell : UITableViewCell
+
+@property (nonatomic, strong) UILabel *buttonLabel;
+@property (nonatomic, strong) UIImageView *buttonIcon;
+@property (nonatomic, strong) UISwitch *onoffSwitch;
+@property (nonatomic, strong) UIActivityIndicatorView *busyView;
+
+@end

XBMC Remote/CustomButtonCell.m

@@ -0,0 +1,93 @@
+//
+//  CustomButtonCell.m
+//  Kodi Remote
+//
+//  Created by Buschmann on 09.10.25.
+//  Copyright © 2025 Team Kodi. All rights reserved.
+//
+
+#import "CustomButtonCell.h"
+#import "Utilities.h"
+
+#define CUSTOM_BUTTON_ITEM_SPACING 4.0
+#define CUSTOM_BUTTON_LABEL_PADDING 4.0
+#define CUSTOM_BUTTON_BACKGROUND_INSET 2.0
+
+@implementation CustomButtonCell
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)reuseIdentifier {
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        // Background view to better match a button style
+        UIView *buttonBackground = [UIView new];
+        buttonBackground.frame = CGRectInset(self.frame, CUSTOM_BUTTON_BACKGROUND_INSET, CUSTOM_BUTTON_BACKGROUND_INSET);
+        buttonBackground.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        buttonBackground.layer.cornerRadius = 8;
+        buttonBackground.backgroundColor = CUSTOM_BUTTON_BACKGROUND;
+        [self insertSubview:buttonBackground belowSubview:self.contentView];
+        
+        // OnOff switch is placed right aligned in the content view
+        UISwitch *onoff = [UISwitch new];
+        CGRect frame = onoff.frame;
+        frame.origin = CGPointMake(CGRectGetWidth(self.contentView.frame) - CGRectGetWidth(onoff.frame) - CUSTOM_BUTTON_ITEM_SPACING,
+                                   (CUSTOM_BUTTON_ITEM_HEIGHT - CGRectGetHeight(onoff.frame)) / 2);
+        onoff.frame = frame;
+        onoff.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+        onoff.hidden = YES;
+        onoff.alpha = 0.9;
+        [self.contentView addSubview:onoff];
+        self.onoffSwitch = onoff;
+        
+        // Icon frame follows onoffSwitch size
+        CGFloat iconSize = CGRectGetHeight(self.onoffSwitch.frame);
+        UIImageView *icon = [UIImageView new];
+        icon.frame = CGRectMake(CGRectGetWidth(self.contentView.frame) - (CGRectGetWidth(self.onoffSwitch.frame) + iconSize) / 2 - CUSTOM_BUTTON_ITEM_SPACING,
+                                (CGRectGetHeight(self.contentView.frame) - iconSize) / 2,
+                                iconSize,
+                                iconSize);
+        icon.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+        icon.alpha = 0.9;
+        [self.contentView addSubview:icon];
+        self.buttonIcon = icon;
+        
+        // Label follows onoffSwitch/icon size
+        UILabel *title = [UILabel new];
+        title.frame = CGRectMake(CUSTOM_BUTTON_LABEL_PADDING,
+                                 CUSTOM_BUTTON_ITEM_SPACING,
+                                 CGRectGetWidth(self.contentView.frame) - CGRectGetWidth(self.onoffSwitch.frame) - CUSTOM_BUTTON_LABEL_PADDING * 3,
+                                 CUSTOM_BUTTON_ITEM_HEIGHT - CUSTOM_BUTTON_ITEM_SPACING * 2);
+        title.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        title.textAlignment = NSTextAlignmentRight;
+        title.numberOfLines = 2;
+        title.font = [UIFont fontWithName:@"Roboto-Regular" size:20];
+        title.adjustsFontSizeToFitWidth = YES;
+        title.minimumScaleFactor = FONT_SCALING_MIN;
+        title.textColor = UIColor.lightGrayColor;
+        title.highlightedTextColor = UIColor.grayColor;
+        [self.contentView addSubview:title];
+        self.buttonLabel = title;
+        
+        // Activity indicator is placed on top of onoff switch
+        UIActivityIndicatorView *busyView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
+        busyView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+        busyView.hidesWhenStopped = YES;
+        busyView.center = onoff.center;
+        [self.contentView addSubview:busyView];
+        self.busyView = busyView;
+    }
+    return self;
+}
+
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated {
+    [super setEditing:editing animated:animated];
+    if (editing) {
+        self.onoffSwitch.enabled = NO;
+        self.buttonIcon.alpha = 0.5;
+    }
+    else {
+        self.onoffSwitch.enabled = YES;
+        self.buttonIcon.alpha = 0.9;
+    }
+}
+
+@end

XBMC Remote/DetailViewController.m

@@ -30,6 +30,7 @@
 #import "customButton.h"
 #import "VersionCheck.h"
 #import "SharingActivityItemSource.h"
+#import "RemoteController.h"
 
 #import "GeneratedAssetSymbols.h"
 

XBMC Remote/NowPlaying.m

@@ -2679,10 +2679,9 @@ - (void)viewDidAppear:(BOOL)animated {
     [self startNowPlayingUpdates];
     fromItself = NO;
     if (IS_IPHONE) {
-        self.slidingViewController.underRightViewController = nil;
-        RightMenuViewController *rightMenuViewController = [[RightMenuViewController alloc] initWithNibName:@"RightMenuViewController" bundle:nil];
-        rightMenuViewController.rightMenuItems = AppDelegate.instance.nowPlayingMenuItems;
-        self.slidingViewController.underRightViewController = rightMenuViewController;
+        RemoteController *remoteController = [[RemoteController alloc] initWithNibName:@"RemoteController" withEmbedded:YES bundle:nil];
+        self.slidingViewController.underRightViewController = remoteController;
+        self.slidingViewController.anchorLeftPeekAmount = ANCHOR_RIGHT_PEEK;
     }
 }
 

XBMC Remote/RemoteController.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DSJSONRPC.h"
+#import "VolumeSliderView.h"
 
 typedef NS_ENUM(NSInteger, RemotePositionType) {
     RemoteAtTop,
@@ -38,8 +39,7 @@ typedef NS_ENUM(NSInteger, RemotePositionType) {
     RemotePositionType positionMode;
     UIView *remoteToolbar;
     UIButton *positionButton;
-    CGFloat embeddedShift;
-    CGFloat topRemoteOffset;
+    VolumeSliderView *volumeSliderView;
     __weak IBOutlet UIView *TransitionalView;
     __weak IBOutlet UIImageView *gestureZoneImageView;
     UIImage *gestureImage;
@@ -51,7 +51,6 @@ typedef NS_ENUM(NSInteger, RemotePositionType) {
 }
 
 - (IBAction)startVibrate:(id)sender;
-- (void)setEmbeddedView;
 - (id)initWithNibName:(NSString*)nibNameOrNil withEmbedded:(BOOL)withEmbedded bundle:(NSBundle*)nibBundleOrNil;
 
 @property (strong, nonatomic) id detailItem;