feat: allow alternative control layout in app bundle, port v8

Author: khanhduytran0

Natives/customcontrols/ControlJoystick.m

@@ -180,6 +180,13 @@ - (void)callbackMoveX:(CGFloat)xValue Y:(CGFloat)yValue {
 }
 
 - (void)setFrame:(CGRect)frame {
+    // Keep the frame square
+    if (self.frame.size.width != frame.size.width) {
+        frame.size.height = frame.size.width;
+    } else if (self.frame.size.height != frame.size.height) {
+        frame.size.width = frame.size.height;
+    }
+    
     [super setFrame:frame];
     self.mCenter = CGPointMake(frame.size.width/2, frame.size.height/2);
     CGFloat minSize = MIN(frame.size.width, frame.size.height);

Natives/customcontrols/CustomControlsUtils.m

@@ -64,6 +64,21 @@ static int computeStrokeWidth(float widthInPercent, float width, float height) {
     return (int) ((maxSize / 2) * (widthInPercent / 100));
 }
 
+// Normalize the layout to v8 from v6/7
+void convertV6_7Layout(NSMutableDictionary* dict) {
+    for (NSMutableDictionary *data in (NSMutableArray *)dict[@"mJoystickDataList"]) {
+        if ([data[@"height"] floatValue] > [data[@"width"] floatValue]) {
+            // Make the size square, adjust the dynamic position related to height
+            CGFloat ratio = [data[@"height"] floatValue] / [data[@"width"] floatValue];
+            data[@"dynamicX"] = [data[@"dynamicX"] stringByReplacingOccurrencesOfString:@"${height}" withString:[NSString stringWithFormat:@"(%f * ${height})", ratio]];
+            data[@"dynamicY"] = [data[@"dynamicY"] stringByReplacingOccurrencesOfString:@"${height}" withString:[NSString stringWithFormat:@"(%f * ${height})", ratio]];
+            data[@"height"] = data[@"width"];
+        }
+    }
+    
+    dict[@"version"] = @(8);
+}
+
 void convertV3_4Layout(NSMutableDictionary* dict) {
     // Convert the layout stroke width to the V5 form
     for (NSMutableDictionary *button in (NSMutableArray *)dict[@"mControlDataList"]) {
@@ -185,6 +200,8 @@ BOOL convertLayoutIfNecessary(NSMutableDictionary* dict) {
             break;
         case 6:
         case 7:
+            convertV6_7Layout(dict);
+        case 8:
             break;
         default:
             showDialog(localize(@"custom_controls.control_menu.save.error.json", nil), [NSString stringWithFormat:localize(@"custom_controls.error.incompatible", nil), version]);
@@ -199,6 +216,13 @@ void generateAndSaveDefaultControl() {
         return;
     }
 
+    // New layout is expected to be placed in the app bundle. If not found, use fallback layout
+    NSString *builtinPath = [NSBundle.mainBundle pathForResource:@"default" ofType:@"json"];
+    if (builtinPath) {
+        [NSFileManager.defaultManager copyItemAtPath:builtinPath toPath:defaultPath error:nil];
+        return;
+    }
+
     // Generate a v2.7 control
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     dict[@"version"] = @(5);