Daniel Zlotin преди 6 години
родител
ревизия
7cd03b33f3
променени са 3 файла, в които са добавени 8 реда и са изтрити 13 реда
  1. 4
    4
      lib/ios/RNNControllerFactory.m
  2. 2
    3
      lib/ios/RNNLayoutNode.h
  3. 2
    6
      lib/ios/RNNLayoutNode.m

+ 4
- 4
lib/ios/RNNControllerFactory.m Целия файл

@@ -44,12 +44,12 @@
44 44
 	
45 45
 	UIViewController<RNNRootViewProtocol> *result;
46 46
 	
47
-	if ( node.isContainer || node.isTopTab) {
47
+	if ( node.isComponent) {
48 48
 		result = [self createContainer:node];
49 49
 	}
50 50
 	
51
-	else if (node.isContainerStack)	{
52
-		result = [self createContainerStack:node];
51
+	else if (node.isStack)	{
52
+		result = [self createStack:node];
53 53
 	}
54 54
 	
55 55
 	else if (node.isTabs) {
@@ -97,7 +97,7 @@
97 97
 	return container;
98 98
 }
99 99
 
100
-- (UIViewController<RNNRootViewProtocol> *)createContainerStack:(RNNLayoutNode*)node {
100
+- (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
101 101
 	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
102 102
 	
103 103
 	NSMutableArray* controllers = [NSMutableArray new];

+ 2
- 3
lib/ios/RNNLayoutNode.h Целия файл

@@ -11,11 +11,10 @@
11 11
 
12 12
 +(instancetype)create:(NSDictionary *)json;
13 13
 
14
--(BOOL)isContainer;
15
--(BOOL)isContainerStack;
14
+-(BOOL)isComponent;
15
+-(BOOL)isStack;
16 16
 -(BOOL)isTabs;
17 17
 -(BOOL)isTopTabs;
18
--(BOOL)isTopTab;
19 18
 -(BOOL)isSideMenuRoot;
20 19
 -(BOOL)isSideMenuLeft;
21 20
 -(BOOL)isSideMenuRight;

+ 2
- 6
lib/ios/RNNLayoutNode.m Целия файл

@@ -13,11 +13,11 @@
13 13
 	return node;
14 14
 }
15 15
 
16
--(BOOL)isContainer
16
+-(BOOL)isComponent
17 17
 {
18 18
 	return [self.type isEqualToString:@"Component"];
19 19
 }
20
--(BOOL)isContainerStack
20
+-(BOOL)isStack
21 21
 {
22 22
 	return [self.type isEqualToString:@"Stack"];
23 23
 }
@@ -29,10 +29,6 @@
29 29
 {
30 30
 	return [self.type isEqualToString:@"TopTabs"];
31 31
 }
32
--(BOOL)isTopTab
33
-{
34
-	return [self.type isEqualToString:@"TopTab"];
35
-}
36 32
 -(BOOL)isSideMenuRoot
37 33
 {
38 34
 	return [self.type isEqualToString:@"SideMenuRoot"];