Merge branch 'cosmote' of https://git.warp.ly/open-source/warply_android_sdk_mav…
…en_plugin into cosmote
Showing
4 changed files
with
118 additions
and
82 deletions
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:shape="rectangle"> | ||
4 | + <corners | ||
5 | + android:radius="19dp"/> | ||
6 | + | ||
7 | + <solid android:color="@android:color/holo_red_dark" /> | ||
8 | +</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -78,7 +78,6 @@ | ... | @@ -78,7 +78,6 @@ |
78 | android:id="@+id/rv_loyalty_coupons" | 78 | android:id="@+id/rv_loyalty_coupons" |
79 | android:layout_width="match_parent" | 79 | android:layout_width="match_parent" |
80 | android:layout_height="wrap_content" | 80 | android:layout_height="wrap_content" |
81 | - android:layout_marginBottom="8dp" | ||
82 | android:clipToPadding="false" | 81 | android:clipToPadding="false" |
83 | android:orientation="horizontal" | 82 | android:orientation="horizontal" |
84 | android:paddingEnd="10dp" /> | 83 | android:paddingEnd="10dp" /> |
... | @@ -89,7 +88,7 @@ | ... | @@ -89,7 +88,7 @@ |
89 | android:id="@+id/rl_gifts_row" | 88 | android:id="@+id/rl_gifts_row" |
90 | android:layout_width="match_parent" | 89 | android:layout_width="match_parent" |
91 | android:layout_height="wrap_content" | 90 | android:layout_height="wrap_content" |
92 | - android:background="@color/cos_cyan" | 91 | + android:layout_marginTop="32dp" |
93 | app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row"> | 92 | app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row"> |
94 | 93 | ||
95 | <TextView | 94 | <TextView |
... | @@ -107,87 +106,25 @@ | ... | @@ -107,87 +106,25 @@ |
107 | android:layout_width="match_parent" | 106 | android:layout_width="match_parent" |
108 | android:layout_height="wrap_content" | 107 | android:layout_height="wrap_content" |
109 | android:layout_below="@id/tv_gifts_loyalty_title" | 108 | android:layout_below="@id/tv_gifts_loyalty_title" |
110 | - android:background="@android:color/white" | 109 | + android:layout_marginTop="32dp" |
111 | android:scrollbars="none"> | 110 | android:scrollbars="none"> |
112 | 111 | ||
113 | - <RelativeLayout | 112 | + <LinearLayout |
114 | - android:layout_width="360dp" | 113 | + android:layout_width="match_parent" |
115 | - android:layout_height="200dp" | 114 | + android:layout_height="match_parent"> |
116 | - android:layout_marginStart="10dp" | 115 | + |
117 | - android:background="@color/cos_cyan"> | 116 | + <include |
118 | - | 117 | + android:id="@+id/cl_loyalty_gift_item" |
119 | - <!-- <androidx.constraintlayout.widget.Guideline--> | 118 | + layout="@layout/gift_layout" |
120 | - <!-- android:id="@+id/gl_horizontal_80_guideline"--> | 119 | + app:layout_constraintEnd_toEndOf="parent" |
121 | - <!-- android:layout_width="wrap_content"--> | 120 | + app:layout_constraintStart_toStartOf="parent" /> |
122 | - <!-- android:layout_height="wrap_content"--> | 121 | + |
123 | - <!-- android:orientation="horizontal"--> | 122 | + <include |
124 | - <!-- app:layout_constraintGuide_percent="0.8" />--> | 123 | + android:id="@+id/cl_loyalty_gift_item2" |
125 | - | 124 | + layout="@layout/gift_layout" |
126 | - <!-- <androidx.constraintlayout.widget.Guideline--> | 125 | + app:layout_constraintEnd_toEndOf="parent" |
127 | - <!-- android:id="@+id/gl_horizontal_55_guideline"--> | 126 | + app:layout_constraintStart_toStartOf="parent" /> |
128 | - <!-- android:layout_width="wrap_content"--> | 127 | + </LinearLayout> |
129 | - <!-- android:layout_height="wrap_content"--> | ||
130 | - <!-- android:orientation="horizontal"--> | ||
131 | - <!-- app:layout_constraintGuide_percent="0.55" />--> | ||
132 | - | ||
133 | - <!-- <ImageView--> | ||
134 | - <!-- android:id="@+id/iv_gift_item_logo"--> | ||
135 | - <!-- android:layout_width="match_parent"--> | ||
136 | - <!-- android:layout_height="0dp"--> | ||
137 | - <!-- android:scaleType="centerCrop"--> | ||
138 | - <!-- android:src="@drawable/ic_banner_gift"--> | ||
139 | - <!-- app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_80_guideline"--> | ||
140 | - <!-- app:layout_constraintEnd_toEndOf="parent"--> | ||
141 | - <!-- app:layout_constraintStart_toStartOf="parent"--> | ||
142 | - <!-- app:layout_constraintTop_toTopOf="parent" />--> | ||
143 | - | ||
144 | - <!-- <RelativeLayout--> | ||
145 | - <!-- android:layout_width="0dp"--> | ||
146 | - <!-- android:layout_height="0dp"--> | ||
147 | - <!-- android:background="@color/cos_cyan"--> | ||
148 | - <!-- app:layout_constraintBottom_toBottomOf="parent"--> | ||
149 | - <!-- app:layout_constraintEnd_toEndOf="parent"--> | ||
150 | - <!-- app:layout_constraintStart_toStartOf="parent"--> | ||
151 | - <!-- app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_55_guideline">--> | ||
152 | - | ||
153 | - <!-- <LinearLayout--> | ||
154 | - <!-- android:id="@+id/ll_loyalty_item1"--> | ||
155 | - <!-- android:layout_width="match_parent"--> | ||
156 | - <!-- android:layout_height="wrap_content"--> | ||
157 | - <!-- android:background="@color/white_tr3"--> | ||
158 | - <!-- android:paddingVertical="4dp">--> | ||
159 | - | ||
160 | - <!-- <TextView--> | ||
161 | - <!-- android:layout_width="wrap_content"--> | ||
162 | - <!-- android:layout_height="wrap_content"--> | ||
163 | - <!-- android:text="Αποκλειστικά για σένα"--> | ||
164 | - <!-- android:textColor="@color/grey"--> | ||
165 | - <!-- android:textStyle="bold" />--> | ||
166 | - <!-- </LinearLayout>--> | ||
167 | - | ||
168 | - <!-- <LinearLayout--> | ||
169 | - <!-- android:layout_width="match_parent"--> | ||
170 | - <!-- android:layout_height="match_parent"--> | ||
171 | - <!-- android:layout_below="@+id/ll_loyalty_item1"--> | ||
172 | - <!-- android:background="@android:color/white"--> | ||
173 | - <!-- android:orientation="vertical">--> | ||
174 | - | ||
175 | - <!-- <TextView--> | ||
176 | - <!-- android:layout_width="match_parent"--> | ||
177 | - <!-- android:layout_height="wrap_content"--> | ||
178 | - <!-- android:maxLines="2"--> | ||
179 | - <!-- android:text="2 ώρες δωρεάν απεριόριστα data όποτε θέλεις εσύ, κάθε μήνα!" />--> | ||
180 | - | ||
181 | - <!-- <TextView--> | ||
182 | - <!-- android:layout_width="wrap_content"--> | ||
183 | - <!-- android:layout_height="wrap_content"--> | ||
184 | - <!-- android:background="@drawable/shape_cos_gradient2"--> | ||
185 | - <!-- android:text="Πάρε το δώρο σου"--> | ||
186 | - <!-- android:textColor="@android:color/white"--> | ||
187 | - <!-- android:textFontWeight="600" />--> | ||
188 | - <!-- </LinearLayout>--> | ||
189 | - <!-- </RelativeLayout>--> | ||
190 | - </RelativeLayout> | ||
191 | </HorizontalScrollView> | 128 | </HorizontalScrollView> |
192 | </RelativeLayout> | 129 | </RelativeLayout> |
193 | </androidx.constraintlayout.widget.ConstraintLayout> | 130 | </androidx.constraintlayout.widget.ConstraintLayout> | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
4 | + android:layout_width="360dp" | ||
5 | + android:layout_height="200dp" | ||
6 | + android:layout_marginStart="10dp" | ||
7 | + android:background="@drawable/shape_cos_transparent"> | ||
8 | + | ||
9 | + <androidx.constraintlayout.widget.ConstraintLayout | ||
10 | + android:layout_width="360dp" | ||
11 | + android:layout_height="200dp"> | ||
12 | + | ||
13 | + <androidx.constraintlayout.widget.Guideline | ||
14 | + android:id="@+id/gl_horizontal_80_guideline" | ||
15 | + android:layout_width="wrap_content" | ||
16 | + android:layout_height="wrap_content" | ||
17 | + android:orientation="horizontal" | ||
18 | + app:layout_constraintGuide_percent="0.75" /> | ||
19 | + | ||
20 | + <androidx.constraintlayout.widget.Guideline | ||
21 | + android:id="@+id/gl_horizontal_75_guideline" | ||
22 | + android:layout_width="wrap_content" | ||
23 | + android:layout_height="wrap_content" | ||
24 | + android:orientation="horizontal" | ||
25 | + app:layout_constraintGuide_percent="0.55" /> | ||
26 | + | ||
27 | + <ImageView | ||
28 | + android:id="@+id/iv_gift_item_logo" | ||
29 | + android:layout_width="match_parent" | ||
30 | + android:layout_height="0dp" | ||
31 | + android:scaleType="centerCrop" | ||
32 | + android:src="@drawable/ic_banner_gift" | ||
33 | + app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_80_guideline" | ||
34 | + app:layout_constraintEnd_toEndOf="parent" | ||
35 | + app:layout_constraintStart_toStartOf="parent" | ||
36 | + app:layout_constraintTop_toTopOf="parent" /> | ||
37 | + | ||
38 | + <RelativeLayout | ||
39 | + android:layout_width="0dp" | ||
40 | + android:layout_height="0dp" | ||
41 | + app:layout_constraintBottom_toBottomOf="parent" | ||
42 | + app:layout_constraintEnd_toEndOf="parent" | ||
43 | + app:layout_constraintStart_toStartOf="parent" | ||
44 | + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_75_guideline"> | ||
45 | + | ||
46 | + <LinearLayout | ||
47 | + android:id="@+id/ll_loyalty_item1" | ||
48 | + android:layout_width="match_parent" | ||
49 | + android:layout_height="wrap_content" | ||
50 | + android:background="@color/white_tr3" | ||
51 | + android:paddingVertical="4dp"> | ||
52 | + | ||
53 | + <TextView | ||
54 | + android:layout_width="wrap_content" | ||
55 | + android:layout_height="wrap_content" | ||
56 | + android:text="Αποκλειστικά για σένα" | ||
57 | + android:textColor="@color/grey" | ||
58 | + android:textSize="16sp" | ||
59 | + android:textStyle="bold" /> | ||
60 | + </LinearLayout> | ||
61 | + | ||
62 | + <LinearLayout | ||
63 | + android:layout_width="match_parent" | ||
64 | + android:layout_height="match_parent" | ||
65 | + android:layout_below="@+id/ll_loyalty_item1" | ||
66 | + android:background="@android:color/white" | ||
67 | + android:orientation="vertical"> | ||
68 | + | ||
69 | + <TextView | ||
70 | + android:layout_width="match_parent" | ||
71 | + android:layout_height="wrap_content" | ||
72 | + android:maxLines="2" | ||
73 | + android:text="2 ώρες δωρεάν απεριόριστα data όποτε θέλεις εσύ, κάθε μήνα!" | ||
74 | + android:textColor="@color/grey" | ||
75 | + android:textSize="14sp" /> | ||
76 | + | ||
77 | + <TextView | ||
78 | + android:layout_width="wrap_content" | ||
79 | + android:layout_height="wrap_content" | ||
80 | + android:layout_gravity="end" | ||
81 | + android:background="@drawable/shape_cos_gradient2" | ||
82 | + android:paddingEnd="8dp" | ||
83 | + android:paddingBottom="8dp" | ||
84 | + android:text="Πάρε το δώρο σου" | ||
85 | + android:textColor="@android:color/white" | ||
86 | + android:textFontWeight="600" | ||
87 | + android:textSize="16sp" /> | ||
88 | + </LinearLayout> | ||
89 | + </RelativeLayout> | ||
90 | + </androidx.constraintlayout.widget.ConstraintLayout> | ||
91 | +</RelativeLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -16,5 +16,5 @@ | ... | @@ -16,5 +16,5 @@ |
16 | <color name="green_dark">#1DA87A</color> | 16 | <color name="green_dark">#1DA87A</color> |
17 | <color name="cos_blue2">#0478BE</color> | 17 | <color name="cos_blue2">#0478BE</color> |
18 | <color name="white_tr2">#77FFFFFF</color> | 18 | <color name="white_tr2">#77FFFFFF</color> |
19 | - <color name="white_tr3">#77FFFFFF</color> | 19 | + <color name="white_tr3">#CCFFFFFF</color> |
20 | </resources> | 20 | </resources> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment