Manos Chorianopoulos

finish GiftsView

Showing 23 changed files with 99 additions and 10 deletions
1 +{
2 + "images" : [
3 + {
4 + "filename" : "coupon_bg.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "coupon_bg-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "coupon_bg-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "filters_btn.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "filters_btn-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "filters_btn-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "location_icon.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "location_icon-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "location_icon-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "search_icon.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "search_icon-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "search_icon-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-WarplySDKFrameworkIOS.xcscheme_^#shared#^_</key> 7 <key>Pods-WarplySDKFrameworkIOS.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>WarplySDKFrameworkIOS.xcscheme_^#shared#^_</key> 7 <key>WarplySDKFrameworkIOS.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -11,8 +11,8 @@ import SwiftUI ...@@ -11,8 +11,8 @@ import SwiftUI
11 @available(iOS 13.0.0, *) 11 @available(iOS 13.0.0, *)
12 @objc public class GiftsViewInterface : NSObject { 12 @objc public class GiftsViewInterface : NSObject {
13 13
14 - @objc static public func giftsViewController() -> UIViewController { 14 + @objc(giftsViewController:) static public func giftsViewController(parentView: UIView?) -> UIViewController {
15 - return UIHostingController(rootView: GiftsView()) 15 + return UIHostingController(rootView: GiftsView(parentView: parentView!))
16 } 16 }
17 17
18 } 18 }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 - (void) setToStage; 16 - (void) setToStage;
17 - (void) setLang:(NSString*) lang; 17 - (void) setLang:(NSString*) lang;
18 - (UIViewController *) openCoupons:(UIView*) parentView; 18 - (UIViewController *) openCoupons:(UIView*) parentView;
19 -- (UIViewController *) openGifts; 19 +- (UIViewController *) openGifts:(UIView*) parentView;
20 - (void) applicationDidEnterBackground:(UIApplication *)application; 20 - (void) applicationDidEnterBackground:(UIApplication *)application;
21 - (void) applicationWillEnterForeground:(UIApplication *)application; 21 - (void) applicationWillEnterForeground:(UIApplication *)application;
22 - (void) applicationDidBecomeActive:(UIApplication *)application; 22 - (void) applicationDidBecomeActive:(UIApplication *)application;
......
...@@ -52,12 +52,9 @@ NSString *LANG; ...@@ -52,12 +52,9 @@ NSString *LANG;
52 return couponsViewController; 52 return couponsViewController;
53 } 53 }
54 54
55 -- (UIViewController *) openGifts{ 55 +- (UIViewController *) openGifts:(UIView*) parentView{
56 56
57 - UIViewController *giftsViewController = [GiftsViewInterface giftsViewController]; 57 + UIViewController *giftsViewController = [GiftsViewInterface giftsViewController:parentView];
58 -// controller = [[UINavigationController alloc]initWithRootViewController:profileViewController];
59 -
60 -// [window makeKeyAndVisible];
61 return giftsViewController; 58 return giftsViewController;
62 } 59 }
63 60
......