Skip to content

Commit 06cc061

Browse files
author
Fabio G
committed
CATTY-442 Copy Brick with nested Bricks
set private methods Pr changes
1 parent 70764d4 commit 06cc061

File tree

9 files changed

+559
-102
lines changed

9 files changed

+559
-102
lines changed

src/Catty.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,7 @@
17441744
E4C5C1122143A3150054F236 /* SearchStoreDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4C5C1112143A3150054F236 /* SearchStoreDataSourceTests.swift */; };
17451745
E4E5599820FCD6AD004B4A08 /* StoreProject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4E5599620FCD6AD004B4A08 /* StoreProject.swift */; };
17461746
E5103DEE25CAE67300A32DF8 /* StagePresenterSideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5103DED25CAE67300A32DF8 /* StagePresenterSideMenuView.swift */; };
1747+
E5635D8625FFB118001E4297 /* BrickCopyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5635D8525FFB118001E4297 /* BrickCopyTests.swift */; };
17471748
E564EBE1255D60F5001F0CD0 /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E564EBE0255D60F4001F0CD0 /* PlayButton.swift */; };
17481749
E577F0462563C5A400368C18 /* BrickCategoryOverviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E577F0452563C5A400368C18 /* BrickCategoryOverviewController.swift */; };
17491750
E577F04A2563E8F200368C18 /* BrickCategoryOverviewCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E577F0492563E8F200368C18 /* BrickCategoryOverviewCollectionViewCell.swift */; };
@@ -4186,6 +4187,7 @@
41864187
E4E5599620FCD6AD004B4A08 /* StoreProject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoreProject.swift; sourceTree = "<group>"; };
41874188
E5103DED25CAE67300A32DF8 /* StagePresenterSideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StagePresenterSideMenuView.swift; sourceTree = "<group>"; };
41884189
E5505707FE2839B02A26E338 /* en-AU */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = "en-AU"; path = "en-AU.lproj/Localizable.strings"; sourceTree = "<group>"; };
4190+
E5635D8525FFB118001E4297 /* BrickCopyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrickCopyTests.swift; sourceTree = "<group>"; };
41894191
E564EBE0255D60F4001F0CD0 /* PlayButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = "<group>"; };
41904192
E57396A397CC08132F593B32 /* en */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
41914193
E577F0452563C5A400368C18 /* BrickCategoryOverviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrickCategoryOverviewController.swift; sourceTree = "<group>"; };
@@ -5697,6 +5699,7 @@
56975699
isa = PBXGroup;
56985700
children = (
56995701
4C38B3732371522200F33721 /* BrickManagerTests.swift */,
5702+
E5635D8525FFB118001E4297 /* BrickCopyTests.swift */,
57005703
);
57015704
path = BrickManager;
57025705
sourceTree = "<group>";
@@ -11711,6 +11714,7 @@
1171111714
4C822659213FA7A400F3D750 /* AudioManagerMock.swift in Sources */,
1171211715
9E4D238C232AF688009D0C3C /* SetColorBrickTests.swift in Sources */,
1171311716
6F9CF123246E8767008CED1C /* UserListTest.swift in Sources */,
11717+
E5635D8625FFB118001E4297 /* BrickCopyTests.swift in Sources */,
1171411718
D3C6E3A824C8134A00A9E186 /* GoToBrickTests.swift in Sources */,
1171511719
4CD27AAA21B5765C00DDADB5 /* FeatureMock.swift in Sources */,
1171611720
4CEB22501B95E47500B3BE2F /* BrickMoveManagerLogicTests.m in Sources */,

src/Catty/DataModel/Bricks/Control/LoopBeginBrick.m

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,22 @@
2525

2626
@implementation LoopBeginBrick
2727

28+
- (kBrickCategoryType)category
29+
{
30+
return kControlBrick;
31+
}
32+
2833
- (BOOL)isLoopBrick
2934
{
3035
return YES;
3136
}
3237

38+
#pragma mark - Description
39+
- (NSString*)description
40+
{
41+
return [NSString stringWithFormat:@"Loop Begin Brick"];
42+
}
43+
3344
#pragma mark - Compare
3445
- (BOOL)isEqualToBrick:(Brick*)brick
3546
{

src/Catty/DataModel/Bricks/Control/LoopEndBrick.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ - (void)performFromScript:(Script*)script
5555
#pragma mark - Description
5656
- (NSString*)description
5757
{
58-
return [NSString stringWithFormat:@"EndLoop"];
58+
return [NSString stringWithFormat:@"Loop End Brick"];
5959
}
6060

6161
#pragma mark - Compare

src/Catty/Resources/Localization/en.lproj/Localizable.strings

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@
169169
/* No comment provided by engineer. */
170170
"Before you can start coding, please read and accept our Privacy Policy to use the app:" = "Before you can start coding, please read and accept our Privacy Policy to use the app:";
171171

172-
/* No comment provided by engineer. */
173-
"blue" = "blue";
174-
175172
/* paint */
176173
"Blue" = "Blue";
177174

175+
/* No comment provided by engineer. */
176+
"blue" = "blue";
177+
178178
/* No comment provided by engineer. */
179179
"Bluetooth is not available. Either your device does not support Bluetooth 4.0 or your Bluetooth chip is damaged. Please check it by connection to another Bluetooth device in the Settings." = "Bluetooth is not available. Either your device does not support Bluetooth 4.0 or your Bluetooth chip is damaged. Please check it by connection to another Bluetooth device in the Settings.";
180180

@@ -763,12 +763,12 @@
763763
/* No comment provided by engineer. */
764764
"Go to front" = "Go to front";
765765

766-
/* No comment provided by engineer. */
767-
"green" = "green";
768-
769766
/* paint */
770767
"Green" = "Green";
771768

769+
/* No comment provided by engineer. */
770+
"green" = "green";
771+
772772
/* No comment provided by engineer. */
773773
"Guitar" = "Guitar";
774774

@@ -905,10 +905,10 @@
905905
"left-right only" = "left-right only";
906906

907907
/* No comment provided by engineer. */
908-
"length" = "length";
908+
"Length" = "Length";
909909

910910
/* No comment provided by engineer. */
911-
"Length" = "Length";
911+
"length" = "length";
912912

913913
/* No comment provided by engineer. */
914914
"letter" = "letter";
@@ -958,12 +958,12 @@
958958
/* No comment provided by engineer. */
959959
"longitude" = "longitude";
960960

961-
/* LOOK */
962-
"look" = "look";
963-
964961
/* No comment provided by engineer. */
965962
"Look" = "Look";
966963

964+
/* LOOK */
965+
"look" = "look";
966+
967967
/* No comment provided by engineer. */
968968
"look name" = "look name";
969969

@@ -1381,12 +1381,12 @@
13811381
/* paint */
13821382
"Rectangle / Square" = "Rectangle / Square";
13831383

1384-
/* paint */
1385-
"Red" = "Red";
1386-
13871384
/* No comment provided by engineer. */
13881385
"red" = "red";
13891386

1387+
/* paint */
1388+
"Red" = "Red";
1389+
13901390
/* No comment provided by engineer. */
13911391
"Register" = "Register";
13921392

src/Catty/ViewController/Continue&New/MaintainObject/MaintainScript/BrickManager/BrickManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
- (NSInteger)checkEndLoopBrickTypeForDrawing:(BrickCell*)cell;
4141
- (NSArray*)animateWithIndexPath:(NSIndexPath*)path Script:(Script*)script andBrick:(Brick*)brick;
4242
- (NSArray*)scriptCollectionCopyBrickWithIndexPath:(NSIndexPath*)indexPath andBrick:(Brick*)brick;
43+
4344
- (NSArray*)getIndexPathsForRemovingBricks:(NSIndexPath*)indexPath andBrick:(Brick*)brick;
4445

4546
@end

0 commit comments

Comments
 (0)