CATTY-718 Support Bricks in multiple categories

Assigned Bricks to multiple categories like already implemented in the android version
Catrobat · Jul 12, 2023 · 4749e10 · 4749e10
1 parent 8fb9597
commit 4749e10
Show file tree

Hide file tree

Showing 104 changed files with 6 additions and 427 deletions.
diff --git a/src/Catty.xcodeproj/project.pbxproj b/src/Catty.xcodeproj/project.pbxproj
@@ -1751,7 +1751,6 @@
 		AAF6D9DE1BC0C1F300686849 /* PlaceAtBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9DD1BC0C1F300686849 /* PlaceAtBrick+Instruction.swift */; };
 		AAF6D9E01BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9DF1BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift */; };
 		AAF6D9E21BC0C48300686849 /* PointToBrick+Instruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF6D9E11BC0C48300686849 /* PointToBrick+Instruction.swift */; };
-		B0A14DCC2A5C03A800F812A6 /* BrickCategoryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0A14DCB2A5C03A800F812A6 /* BrickCategoryProtocol.swift */; };
 		BA1FA9981F02AD770084184D /* InsertItemIntoUserListBrick+CBXMLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA9971F02AD770084184D /* InsertItemIntoUserListBrick+CBXMLHandler.m */; };
 		BA1FA99D1F02AEDC0084184D /* InsertItemIntoUserListBrick.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA99C1F02AEDC0084184D /* InsertItemIntoUserListBrick.m */; };
 		BA1FA9A01F02B0020084184D /* InsertItemIntoUserListBrickCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1FA99F1F02B0020084184D /* InsertItemIntoUserListBrickCell.m */; };
@@ -4396,7 +4395,6 @@
 		AAF6D9DF1BC0C2AA00686849 /* PointInDirectionBrick+Instruction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "PointInDirectionBrick+Instruction.swift"; path = "PlayerEngine/Instructions/Motion/PointInDirectionBrick+Instruction.swift"; sourceTree = "<group>"; };
 		AAF6D9E11BC0C48300686849 /* PointToBrick+Instruction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "PointToBrick+Instruction.swift"; path = "PlayerEngine/Instructions/Motion/PointToBrick+Instruction.swift"; sourceTree = "<group>"; };
 		ABD74577198FBC2984BDDE56 /* hu */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B0A14DCB2A5C03A800F812A6 /* BrickCategoryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrickCategoryProtocol.swift; sourceTree = "<group>"; };
 		B11EA657D0D5E2E348790671 /* ta */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = ta; path = ta.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B46B270517703F9400172837 /* CattyTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CattyTests-Info.plist"; sourceTree = "<group>"; };
 		B46B270717703F9400172837 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -6522,7 +6520,6 @@
 				4C5517C41ABC300800A52FF4 /* BrickCellProtocol.h */,
 				4C3AE2991B03526C005E1F57 /* BrickCellDataProtocol.h */,
 				4C5517C61ABC300800A52FF4 /* BrickProtocol.h */,
-				B0A14DCB2A5C03A800F812A6 /* BrickCategoryProtocol.swift */,
 			);
 			path = Bricks;
 			sourceTree = "<group>";
@@ -13299,7 +13296,6 @@
 				AA74EF001BC057C900D1E954 /* ShowBrick+CBXMLHandler.m in Sources */,
 				AA74EFE41BC05B5F00D1E954 /* IfLogicBeginBrick.m in Sources */,
 				9218B20E1CC4AB75007B4C60 /* LineTool.m in Sources */,
-				B0A14DCC2A5C03A800F812A6 /* BrickCategoryProtocol.swift in Sources */,
 				AAAF22841BC0CA0F0076F11E /* SetXBrick+Instruction.swift in Sources */,
 				97D015912553392A00B6967D /* RoundedImageView.swift in Sources */,
 				4C5076D22578DBDC00650440 /* SetInstrumentBrick+CBXMLHandler.swift in Sources */,

diff --git a/src/Catty/DataModel/Bricks/Arduino/ArduinoSendDigitalValueBrick.m b/src/Catty/DataModel/Bricks/Arduino/ArduinoSendDigitalValueBrick.m
@@ -25,10 +25,6 @@
 
 @implementation ArduinoSendDigitalValueBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kArduinoBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kArduinoBrick)];

diff --git a/src/Catty/DataModel/Bricks/Arduino/ArduinoSendPWMValueBrick.m b/src/Catty/DataModel/Bricks/Arduino/ArduinoSendPWMValueBrick.m
@@ -25,10 +25,6 @@
 
 @implementation ArduinoSendPWMValueBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kArduinoBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kArduinoBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/BroadcastBrick.m b/src/Catty/DataModel/Bricks/Control/BroadcastBrick.m
@@ -26,13 +26,9 @@
 
 @implementation BroadcastBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kEventBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
-    return @[@(kEventBrick)];
+    return @[@(kControlBrick),@(kEventBrick)];
 }
 
 - (id)initWithMessage:(NSString *)message

diff --git a/src/Catty/DataModel/Bricks/Control/BroadcastWaitBrick.m b/src/Catty/DataModel/Bricks/Control/BroadcastWaitBrick.m
@@ -26,13 +26,9 @@
 
 @implementation BroadcastWaitBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kEventBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
-    return @[@(kEventBrick)];
+    return @[@(kControlBrick),@(kEventBrick)];
 }
 
 - (id)initWithMessage:(NSString*)message

diff --git a/src/Catty/DataModel/Bricks/Control/ForeverBrick.m b/src/Catty/DataModel/Bricks/Control/ForeverBrick.m
@@ -24,10 +24,6 @@
 
 @implementation ForeverBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/IfLogicBeginBrick.m b/src/Catty/DataModel/Bricks/Control/IfLogicBeginBrick.m
@@ -28,10 +28,6 @@
 
 @implementation IfLogicBeginBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/IfLogicElseBrick.m b/src/Catty/DataModel/Bricks/Control/IfLogicElseBrick.m
@@ -27,10 +27,6 @@
 
 @implementation IfLogicElseBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/IfLogicEndBrick.m b/src/Catty/DataModel/Bricks/Control/IfLogicEndBrick.m
@@ -28,10 +28,6 @@
 
 @implementation IfLogicEndBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/IfThenLogicBeginBrick.m b/src/Catty/DataModel/Bricks/Control/IfThenLogicBeginBrick.m
@@ -27,10 +27,6 @@
 
 @implementation IfThenLogicBeginBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/IfThenLogicEndBrick.m b/src/Catty/DataModel/Bricks/Control/IfThenLogicEndBrick.m
@@ -27,10 +27,6 @@
 
 @implementation IfThenLogicEndBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/LoopEndBrick.m b/src/Catty/DataModel/Bricks/Control/LoopEndBrick.m
@@ -27,10 +27,6 @@
 
 @implementation LoopEndBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/NoteBrick.m b/src/Catty/DataModel/Bricks/Control/NoteBrick.m
@@ -24,10 +24,6 @@
 
 @implementation NoteBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/RepeatBrick.m b/src/Catty/DataModel/Bricks/Control/RepeatBrick.m
@@ -26,10 +26,6 @@
 
 @implementation RepeatBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/RepeatUntilBrick.m b/src/Catty/DataModel/Bricks/Control/RepeatUntilBrick.m
@@ -28,10 +28,6 @@ @interface RepeatUntilBrick()
 
 @implementation RepeatUntilBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/WaitBrick.m b/src/Catty/DataModel/Bricks/Control/WaitBrick.m
@@ -26,10 +26,6 @@
 
 @implementation WaitBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Control/WaitUntilBrick.m b/src/Catty/DataModel/Bricks/Control/WaitUntilBrick.m
@@ -28,10 +28,6 @@ @interface WaitUntilBrick()
 
 @implementation WaitUntilBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kControlBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kControlBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/AddItemToUserListBrick.m b/src/Catty/DataModel/Bricks/Data/AddItemToUserListBrick.m
@@ -65,10 +65,6 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
     }
 }
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/ChangeVariableBrick.m b/src/Catty/DataModel/Bricks/Data/ChangeVariableBrick.m
@@ -25,10 +25,6 @@
 
 @implementation ChangeVariableBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/DeleteItemOfUserListBrick.m b/src/Catty/DataModel/Bricks/Data/DeleteItemOfUserListBrick.m
@@ -28,10 +28,6 @@
 
 @implementation DeleteItemOfUserListBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/HideTextBrick.m b/src/Catty/DataModel/Bricks/Data/HideTextBrick.m
@@ -26,10 +26,6 @@
 
 @implementation HideTextBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/InsertItemIntoUserListBrick.m b/src/Catty/DataModel/Bricks/Data/InsertItemIntoUserListBrick.m
@@ -74,10 +74,6 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
     }
 }
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/ReplaceItemInUserListBrick.m b/src/Catty/DataModel/Bricks/Data/ReplaceItemInUserListBrick.m
@@ -74,10 +74,6 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
     }
 }
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/SetVariableBrick.m b/src/Catty/DataModel/Bricks/Data/SetVariableBrick.m
@@ -63,10 +63,6 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
     }
 }
 
-//- (kBrickCategoryType)category
-//{
-//    return kDataBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kDataBrick)];

diff --git a/src/Catty/DataModel/Bricks/Data/ShowTextBrick.m b/src/Catty/DataModel/Bricks/Data/ShowTextBrick.m
@@ -78,7 +78,7 @@ - (BOOL)allowsStringFormula{
 
 - (NSArray<NSNumber *> *)category
 {
-    return @[@(kDataBrick)];
+    return @[@(kDataBrick),@(kLookBrick)];
 }
 
 #pragma mark - Description

diff --git a/src/Catty/DataModel/Bricks/Data/WebRequestBrick.swift b/src/Catty/DataModel/Bricks/Data/WebRequestBrick.swift
@@ -41,9 +41,6 @@
         self.script = script
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.dataBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.dataBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/SewUpBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/SewUpBrick.swift
@@ -23,14 +23,10 @@
 @objc(SewUpBrick)
 @objcMembers class SewUpBrick: Brick, BrickProtocol {
 
-
     override required init() {
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber] {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StartRunningStitchBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StartRunningStitchBrick.swift
@@ -32,9 +32,6 @@ import Foundation
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StartTripleStitchBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StartTripleStitchBrick.swift
@@ -32,9 +32,6 @@ import Foundation
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StartZigzagStitchBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StartZigzagStitchBrick.swift
@@ -34,9 +34,6 @@ import Foundation
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StitchBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StitchBrick.swift
@@ -27,9 +27,6 @@
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StitchThreadColorBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StitchThreadColorBrick.swift
@@ -38,9 +38,6 @@
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/Embroidery/StopCurrentStitchBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/StopCurrentStitchBrick.swift
@@ -29,9 +29,6 @@ import Foundation
         super.init()
     }
 
-//    func category() -> kBrickCategoryType {
-//        kBrickCategoryType.embroideryBrick
-//    }
     func category() -> [NSNumber]! {
         [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }

diff --git a/src/Catty/DataModel/Bricks/IO/FlashBrick.m b/src/Catty/DataModel/Bricks/IO/FlashBrick.m
@@ -24,10 +24,6 @@
 
 @implementation FlashBrick
 
-//- (kBrickCategoryType)category
-//{
-//    return kLookBrick;
-//}
 - (NSArray<NSNumber *> *)category
 {
     return @[@(kLookBrick)];