CATTY-718 Support Bricks in multiple categories

Adjusted first bricks to changed Protocol to allow a brick to be in multiple categories. CATTY-718 Support Bricks in multiple categories Assigned Bricks to multiple categories like already implemented in the android version CATTY-718 Support Bricks in multiple categories Assigning blocks to multiple categories now possible. Todo assign them to the right categories.
Catrobat · Sep 12, 2023 · 3c769ec · 3c769ec
1 parent e488257
commit 3c769ec
Show file tree

Hide file tree

Showing 106 changed files with 213 additions and 206 deletions.
diff --git a/src/Catty/DataModel/Bricks/Arduino/ArduinoSendDigitalValueBrick.m b/src/Catty/DataModel/Bricks/Arduino/ArduinoSendDigitalValueBrick.m
@@ -25,9 +25,9 @@
 
 @implementation ArduinoSendDigitalValueBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kArduinoBrick;
+    return @[@(kArduinoBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

diff --git a/src/Catty/DataModel/Bricks/Arduino/ArduinoSendPWMValueBrick.m b/src/Catty/DataModel/Bricks/Arduino/ArduinoSendPWMValueBrick.m
@@ -25,9 +25,9 @@
 
 @implementation ArduinoSendPWMValueBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kArduinoBrick;
+    return @[@(kArduinoBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

diff --git a/src/Catty/DataModel/Bricks/Control/BroadcastBrick.m b/src/Catty/DataModel/Bricks/Control/BroadcastBrick.m
@@ -26,9 +26,9 @@
 
 @implementation BroadcastBrick
 
-- (kBrickCategoryType)category
+- (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,9 +26,9 @@
 
 @implementation BroadcastWaitBrick
 
-- (kBrickCategoryType)category
+- (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,9 +24,9 @@
 
 @implementation ForeverBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kControlBrick;
+    return @[@(kControlBrick)];
 }
 
 - (BOOL)isAnimateable

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

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

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

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

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

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

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

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

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

diff --git a/src/Catty/DataModel/Bricks/Control/WaitBrick.m b/src/Catty/DataModel/Bricks/Control/WaitBrick.m
@@ -26,9 +26,9 @@
 
 @implementation WaitBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kControlBrick;
+    return @[@(kControlBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

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

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

diff --git a/src/Catty/DataModel/Bricks/Data/ChangeVariableBrick.m b/src/Catty/DataModel/Bricks/Data/ChangeVariableBrick.m
@@ -25,9 +25,9 @@
 
 @implementation ChangeVariableBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kDataBrick;
+    return @[@(kDataBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

diff --git a/src/Catty/DataModel/Bricks/Data/DeleteItemOfUserListBrick.m b/src/Catty/DataModel/Bricks/Data/DeleteItemOfUserListBrick.m
@@ -28,9 +28,9 @@
 
 @implementation DeleteItemOfUserListBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kDataBrick;
+    return @[@(kDataBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

diff --git a/src/Catty/DataModel/Bricks/Data/HideTextBrick.m b/src/Catty/DataModel/Bricks/Data/HideTextBrick.m
@@ -26,9 +26,9 @@
 
 @implementation HideTextBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kDataBrick;
+    return @[@(kDataBrick)];
 }
 
 - (UserVariable*)variableForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber

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

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

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

diff --git a/src/Catty/DataModel/Bricks/Data/ShowTextBrick.m b/src/Catty/DataModel/Bricks/Data/ShowTextBrick.m
@@ -76,9 +76,9 @@ - (BOOL)allowsStringFormula{
     return NO;
 }
 
-- (kBrickCategoryType)category
+- (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,8 +41,8 @@
         self.script = script
     }
 
-    func category() -> kBrickCategoryType {
-        kBrickCategoryType.dataBrick
+    func category() -> [NSNumber]! {
+        [NSNumber(value: kBrickCategoryType.dataBrick.rawValue)]
     }
 
     override class func description() -> String {

diff --git a/src/Catty/DataModel/Bricks/Embroidery/SewUpBrick.swift b/src/Catty/DataModel/Bricks/Embroidery/SewUpBrick.swift
@@ -27,8 +27,8 @@
         super.init()
     }
 
-    func category() -> kBrickCategoryType {
-        kBrickCategoryType.embroideryBrick
+    func category() -> [NSNumber] {
+        [NSNumber(value: kBrickCategoryType.embroideryBrick.rawValue)]
     }
 
     override class func description() -> String {

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

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

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

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

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

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

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

diff --git a/src/Catty/DataModel/Bricks/IO/VibrationBrick.m b/src/Catty/DataModel/Bricks/IO/VibrationBrick.m
@@ -25,9 +25,9 @@
 
 @implementation VibrationBrick
 
-- (kBrickCategoryType)category
+- (NSArray<NSNumber *> *)category
 {
-    return kMotionBrick;
+    return @[@(kMotionBrick)];
 }
 
 - (Formula*)formulaForLineNumber:(NSInteger)lineNumber andParameterNumber:(NSInteger)paramNumber