open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Vasilis
a3b25da8 1 parent 4a8a012b

changes to couponsView

Inline Side-by-side
Showing 2 changed files with 12 additions and 19 deletions
...@@ -104,12 +104,10 @@ extension CouponsView { ...@@ -104,12 +104,10 @@ extension CouponsView {
104 HStack { 104 HStack {
105 Image("ic_back", bundle: Bundle(for: MyEmptyClass.self)) 105 Image("ic_back", bundle: Bundle(for: MyEmptyClass.self))
106 .resizable() 106 .resizable()
107 - .frame(width: self.uiscreen.width * 0.025, height: self.uiscreen.height * 0.02) 107 + .frame(width: self.uiscreen.height * 0.03, height: self.uiscreen.height * 0.02)
108 .offset(y: self.uiscreen.height * 0.02) 108 .offset(y: self.uiscreen.height * 0.02)
109 } 109 }
110 } 110 }
111 -// .frame(width: self.uiscreen.width * 0.025, height: self.uiscreen.height * 0.02)
112 -// .offset(x: -self.uiscreen.width / 2 + self.uiscreen.width * 0.05, y: self.uiscreen.height * 0.04)
113 Text("Όλα τα κουπόνια μου") 111 Text("Όλα τα κουπόνια μου")
114 .frame(width: self.uiscreen.width * 0.8, height: self.uiscreen.height * 0.025, alignment: .center) 112 .frame(width: self.uiscreen.width * 0.8, height: self.uiscreen.height * 0.025, alignment: .center)
115 .offset( y: self.uiscreen.height * 0.02) 113 .offset( y: self.uiscreen.height * 0.02)
...@@ -140,37 +138,32 @@ extension CouponsView { ...@@ -140,37 +138,32 @@ extension CouponsView {
140 Spacer() 138 Spacer()
141 VStack { 139 VStack {
142 Text(CouponsView.couponView.localizedWithParameter(parameter: result["admin_name"] as? String ?? "")) 140 Text(CouponsView.couponView.localizedWithParameter(parameter: result["admin_name"] as? String ?? ""))
143 - .frame(maxWidth: self.uiscreen.width * 0.3, maxHeight: .infinity, alignment: .leading) 141 + .frame(maxWidth: self.uiscreen.width * 0.35, maxHeight: .infinity, alignment: .leading)
144 - .font(.system(size: 18)) 142 + .font(.system(size: 15))
145 Text(CouponsView.couponView.localizedWithParameter(parameter: result["discount"] as? String ?? "")) 143 Text(CouponsView.couponView.localizedWithParameter(parameter: result["discount"] as? String ?? ""))
146 - .frame(maxWidth: self.uiscreen.width * 0.3, maxHeight: self.uiscreen.height * 0.05, alignment: .leading) 144 + .frame(maxWidth: self.uiscreen.width * 0.35, maxHeight: self.uiscreen.height * 0.05, alignment: .leading)
147 - .font(.system(size: 53)) 145 + .font(.system(size: 47))
148 Text(CouponsView.couponView.localizedWithParameter(parameter: "Ισχύει εώς " + (result["expiration"] as? String ?? "").components(separatedBy: [" "]).filter({!$0.isEmpty})[0])) 146 Text(CouponsView.couponView.localizedWithParameter(parameter: "Ισχύει εώς " + (result["expiration"] as? String ?? "").components(separatedBy: [" "]).filter({!$0.isEmpty})[0]))
149 - .frame(maxWidth: self.uiscreen.width * 0.3, maxHeight: .infinity, alignment: .leading) 147 + .frame(maxWidth: self.uiscreen.width * 0.35, maxHeight: .infinity, alignment: .leading)
150 - .font(.system(size: 13)) 148 + .font(.system(size: 10))
151 } 149 }
152 .frame(maxHeight: .infinity) 150 .frame(maxHeight: .infinity)
153 .padding(.top, self.uiscreen.height * 0.03) 151 .padding(.top, self.uiscreen.height * 0.03)
154 .padding(.bottom, self.uiscreen.height * 0.03) 152 .padding(.bottom, self.uiscreen.height * 0.03)
155 - Spacer()
156 VStack { 153 VStack {
157 Text(CouponsView.couponView.localizedWithParameter(parameter: result["short_description"] as! String)) 154 Text(CouponsView.couponView.localizedWithParameter(parameter: result["short_description"] as! String))
158 - .frame(maxWidth: self.uiscreen.width * 0.15, maxHeight: self.uiscreen.height * 0.10) 155 + .frame(maxWidth: self.uiscreen.width * 0.22, maxHeight: self.uiscreen.height * 0.10)
159 - .font(.system(size: 13)) 156 + .font(.system(size: 10))
160 } 157 }
161 .frame(maxWidth: self.uiscreen.width * 0.25, maxHeight: .infinity) 158 .frame(maxWidth: self.uiscreen.width * 0.25, maxHeight: .infinity)
162 Spacer() 159 Spacer()
163 -
164 } 160 }
161 + }
162 + .padding(.top, self.uiscreen.height * 0.05)
163 + .frame(width: self.uiscreen.width * 0.95, height: self.uiscreen.height * 0.13)
165 .background( 164 .background(
166 Image("coupons_container", bundle: Bundle(for: MyEmptyClass.self)) 165 Image("coupons_container", bundle: Bundle(for: MyEmptyClass.self))
167 ) 166 )
168 - .frame(width: self.uiscreen.width * 0.95, height: self.uiscreen.height * 0.13)
169 - .background(Color.purple)
170 -
171 -
172 - }
173 - .padding(.top, self.uiscreen.height * 0.05)
174 167
175 } 168 }
176 } 169 }
......