Commit d49eadf6765750d159f6790c806bff7ae6d5fb32
1 parent
c2691027
--no commit message
Showing
16 changed files
with
141 additions
and
7 deletions
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
... | ... | @@ -402,9 +402,10 @@ |
402 | 402 | GCC_WARN_UNINITIALIZED_AUTOS = YES; |
403 | 403 | GCC_WARN_UNUSED_FUNCTION = YES; |
404 | 404 | GCC_WARN_UNUSED_VARIABLE = YES; |
405 | - IPHONEOS_DEPLOYMENT_TARGET = 7.0; | |
405 | + IPHONEOS_DEPLOYMENT_TARGET = 7.1; | |
406 | 406 | ONLY_ACTIVE_ARCH = YES; |
407 | 407 | SDKROOT = iphoneos; |
408 | + TARGETED_DEVICE_FAMILY = "1,2"; | |
408 | 409 | }; |
409 | 410 | name = Debug; |
410 | 411 | }; |
... | ... | @@ -435,8 +436,9 @@ |
435 | 436 | GCC_WARN_UNINITIALIZED_AUTOS = YES; |
436 | 437 | GCC_WARN_UNUSED_FUNCTION = YES; |
437 | 438 | GCC_WARN_UNUSED_VARIABLE = YES; |
438 | - IPHONEOS_DEPLOYMENT_TARGET = 7.0; | |
439 | + IPHONEOS_DEPLOYMENT_TARGET = 7.1; | |
439 | 440 | SDKROOT = iphoneos; |
441 | + TARGETED_DEVICE_FAMILY = "1,2"; | |
440 | 442 | VALIDATE_PRODUCT = YES; |
441 | 443 | }; |
442 | 444 | name = Release; | ... | ... |
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
DUREX Vendor Control/FirstAppExample/Images.xcassets/AppIcon.appiconset/120 - App Icon@2x.png
DUREX Vendor Control/FirstAppExample/Images.xcassets/AppIcon.appiconset/29 - App Icon@2x.png
DUREX Vendor Control/FirstAppExample/Images.xcassets/AppIcon.appiconset/40 - App Icon@2x.png
DUREX Vendor Control/FirstAppExample/Images.xcassets/AppIcon.appiconset/Contents.json
1 | 1 | { |
2 | 2 | "images" : [ |
3 | 3 | { |
4 | + "idiom" : "iphone", | |
5 | + "size" : "29x29", | |
6 | + "scale" : "1x" | |
7 | + }, | |
8 | + { | |
4 | 9 | "size" : "29x29", |
5 | 10 | "idiom" : "iphone", |
6 | 11 | "filename" : "29 - App Icon@2x.png", |
... | ... | @@ -13,10 +18,72 @@ |
13 | 18 | "scale" : "2x" |
14 | 19 | }, |
15 | 20 | { |
21 | + "idiom" : "iphone", | |
22 | + "size" : "57x57", | |
23 | + "scale" : "1x" | |
24 | + }, | |
25 | + { | |
26 | + "idiom" : "iphone", | |
27 | + "size" : "57x57", | |
28 | + "scale" : "2x" | |
29 | + }, | |
30 | + { | |
16 | 31 | "size" : "60x60", |
17 | 32 | "idiom" : "iphone", |
18 | 33 | "filename" : "120 - App Icon@2x.png", |
19 | 34 | "scale" : "2x" |
35 | + }, | |
36 | + { | |
37 | + "idiom" : "ipad", | |
38 | + "size" : "29x29", | |
39 | + "scale" : "1x" | |
40 | + }, | |
41 | + { | |
42 | + "idiom" : "ipad", | |
43 | + "size" : "29x29", | |
44 | + "scale" : "2x" | |
45 | + }, | |
46 | + { | |
47 | + "idiom" : "ipad", | |
48 | + "size" : "40x40", | |
49 | + "scale" : "1x" | |
50 | + }, | |
51 | + { | |
52 | + "idiom" : "ipad", | |
53 | + "size" : "40x40", | |
54 | + "scale" : "2x" | |
55 | + }, | |
56 | + { | |
57 | + "idiom" : "ipad", | |
58 | + "size" : "50x50", | |
59 | + "scale" : "1x" | |
60 | + }, | |
61 | + { | |
62 | + "idiom" : "ipad", | |
63 | + "size" : "50x50", | |
64 | + "scale" : "2x" | |
65 | + }, | |
66 | + { | |
67 | + "idiom" : "ipad", | |
68 | + "size" : "72x72", | |
69 | + "scale" : "1x" | |
70 | + }, | |
71 | + { | |
72 | + "idiom" : "ipad", | |
73 | + "size" : "72x72", | |
74 | + "scale" : "2x" | |
75 | + }, | |
76 | + { | |
77 | + "size" : "76x76", | |
78 | + "idiom" : "ipad", | |
79 | + "filename" : "76 - App Icon@1x.png", | |
80 | + "scale" : "1x" | |
81 | + }, | |
82 | + { | |
83 | + "size" : "76x76", | |
84 | + "idiom" : "ipad", | |
85 | + "filename" : "76 - App Icon@2x.png", | |
86 | + "scale" : "2x" | |
20 | 87 | } |
21 | 88 | ], |
22 | 89 | "info" : { | ... | ... |
DUREX Vendor Control/MenuTableViewController.m
... | ... | @@ -119,7 +119,7 @@ |
119 | 119 | |
120 | 120 | - (void) backButtonPressed: (id) sender |
121 | 121 | { |
122 | - NSLog(@"[MenuTableViewController.m]: Navigation Stack has %ld remaining levels",[[self parentLayout] count]); | |
122 | + NSLog(@"[MenuTableViewController.m]: Navigation Stack has %d remaining levels",[[self parentLayout] count]); | |
123 | 123 | if([[self parentLayout] count] > 0) |
124 | 124 | { |
125 | 125 | NSLog(@"[MenuTableViewController.m]: Falling to previous navigation level"); | ... | ... |
DUREX Vendor Control/back_arrow.png
DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
DUREX tests/FirstAppExample/Images.xcassets/AppIcon.appiconset/120 - App Icon@2x.png deleted
5.51 KB
DUREX tests/FirstAppExample/Images.xcassets/AppIcon.appiconset/29 - App Icon@2x.png deleted
3 KB
DUREX tests/FirstAppExample/Images.xcassets/AppIcon.appiconset/40 - App Icon@2x.png deleted
3.98 KB
DUREX tests/FirstAppExample/Images.xcassets/AppIcon.appiconset/76 - App Icon@1x.png
0 โ 100644
5.96 KB
DUREX tests/FirstAppExample/Images.xcassets/AppIcon.appiconset/Contents.json
1 | 1 | { |
2 | 2 | "images" : [ |
3 | 3 | { |
4 | + "idiom" : "iphone", | |
5 | + "size" : "29x29", | |
6 | + "scale" : "1x" | |
7 | + }, | |
8 | + { | |
4 | 9 | "size" : "29x29", |
5 | 10 | "idiom" : "iphone", |
6 | 11 | "filename" : "29 - App Icon@2x.png", |
... | ... | @@ -13,10 +18,72 @@ |
13 | 18 | "scale" : "2x" |
14 | 19 | }, |
15 | 20 | { |
21 | + "idiom" : "iphone", | |
22 | + "size" : "57x57", | |
23 | + "scale" : "1x" | |
24 | + }, | |
25 | + { | |
26 | + "idiom" : "iphone", | |
27 | + "size" : "57x57", | |
28 | + "scale" : "2x" | |
29 | + }, | |
30 | + { | |
16 | 31 | "size" : "60x60", |
17 | 32 | "idiom" : "iphone", |
18 | 33 | "filename" : "120 - App Icon@2x.png", |
19 | 34 | "scale" : "2x" |
35 | + }, | |
36 | + { | |
37 | + "idiom" : "ipad", | |
38 | + "size" : "29x29", | |
39 | + "scale" : "1x" | |
40 | + }, | |
41 | + { | |
42 | + "idiom" : "ipad", | |
43 | + "size" : "29x29", | |
44 | + "scale" : "2x" | |
45 | + }, | |
46 | + { | |
47 | + "idiom" : "ipad", | |
48 | + "size" : "40x40", | |
49 | + "scale" : "1x" | |
50 | + }, | |
51 | + { | |
52 | + "idiom" : "ipad", | |
53 | + "size" : "40x40", | |
54 | + "scale" : "2x" | |
55 | + }, | |
56 | + { | |
57 | + "idiom" : "ipad", | |
58 | + "size" : "50x50", | |
59 | + "scale" : "1x" | |
60 | + }, | |
61 | + { | |
62 | + "idiom" : "ipad", | |
63 | + "size" : "50x50", | |
64 | + "scale" : "2x" | |
65 | + }, | |
66 | + { | |
67 | + "idiom" : "ipad", | |
68 | + "size" : "72x72", | |
69 | + "scale" : "1x" | |
70 | + }, | |
71 | + { | |
72 | + "idiom" : "ipad", | |
73 | + "size" : "72x72", | |
74 | + "scale" : "2x" | |
75 | + }, | |
76 | + { | |
77 | + "size" : "76x76", | |
78 | + "idiom" : "ipad", | |
79 | + "filename" : "76 - App Icon@1x.png", | |
80 | + "scale" : "1x" | |
81 | + }, | |
82 | + { | |
83 | + "size" : "76x76", | |
84 | + "idiom" : "ipad", | |
85 | + "filename" : "76 - App Icon@2x.png", | |
86 | + "scale" : "2x" | |
20 | 87 | } |
21 | 88 | ], |
22 | 89 | "info" : { | ... | ... |
DUREX tests/MenuTableViewController.m
... | ... | @@ -144,12 +144,10 @@ |
144 | 144 | UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; |
145 | 145 | backButton.frame = CGRectMake(0, 0, backImage.size.width/2, backImage.size.height/2); |
146 | 146 | |
147 | - [backButton setImage:backImage forState:UIControlStateNormal]; | |
148 | - [backButton setTitle:@"Back" forState:UIControlStateNormal]; | |
147 | + [backButton setBackgroundImage:backImage forState:UIControlStateNormal]; | |
149 | 148 | [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; |
150 | - | |
151 | 149 | UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; |
152 | - | |
150 | + | |
153 | 151 | self.navigationItem.hidesBackButton = YES; |
154 | 152 | self.navigationItem.leftBarButtonItem = backBarButtonItem; |
155 | 153 | ... | ... |
DUREX tests/back_arrow.png