Panagiotis Triantafyllou

Merge remote-tracking branch 'origin/cosmote' into cosmote

1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <gradient
5 + android:startColor="@color/cos_green3"
6 + android:centerColor="@color/cos_cyan"
7 + android:type="linear"/>
8 +<!-- <corners-->
9 +<!-- android:radius="9dp"/>-->
10 +
11 +<!-- <stroke android:width="2dp"-->
12 +<!-- android:color="@color/white_tr"/>-->
13 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="@dimen/width_full" 5 android:layout_width="@dimen/width_full"
6 - android:layout_height="240dp" 6 + android:layout_height="@dimen/height_carousel"
7 android:layout_marginLeft="10dp" 7 android:layout_marginLeft="10dp"
8 android:background="@drawable/bottom_border"> 8 android:background="@drawable/bottom_border">
9 9
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
4 xmlns:app="http://schemas.android.com/apk/res-auto" 4 xmlns:app="http://schemas.android.com/apk/res-auto"
5 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="match_parent" 7 + android:layout_height="match_parent">
8 - android:background="@color/cos_cyan">
9 8
10 <RelativeLayout 9 <RelativeLayout
11 android:layout_width="match_parent" 10 android:layout_width="match_parent"
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
18 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
19 android:background="@android:color/white" 18 android:background="@android:color/white"
20 android:paddingHorizontal="16dp" 19 android:paddingHorizontal="16dp"
21 - android:paddingVertical="16dp"> 20 + android:paddingTop="16dp">
22 21
23 <de.hdodenhof.circleimageview.CircleImageView 22 <de.hdodenhof.circleimageview.CircleImageView
24 android:id="@+id/user_img" 23 android:id="@+id/user_img"
...@@ -94,142 +93,150 @@ ...@@ -94,142 +93,150 @@
94 </androidx.constraintlayout.widget.ConstraintLayout> 93 </androidx.constraintlayout.widget.ConstraintLayout>
95 94
96 <RelativeLayout 95 <RelativeLayout
97 - android:id="@+id/rl_home_campaigns" 96 + android:layout_width="wrap_content"
98 - android:layout_width="match_parent"
99 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
100 - android:layout_below="@id/rl_header" 98 + android:layout_below="@+id/rl_header"
101 - android:layout_marginTop="16dp"> 99 + android:background="@drawable/home_bg">
102 100
103 - <androidx.recyclerview.widget.RecyclerView 101 + <RelativeLayout
104 - android:id="@+id/rv_home_campaigns" 102 + android:id="@+id/rl_home_campaigns"
105 android:layout_width="match_parent" 103 android:layout_width="match_parent"
106 android:layout_height="wrap_content" 104 android:layout_height="wrap_content"
107 - android:layout_marginBottom="8dp" 105 + android:layout_marginTop="50dp">
108 - android:clipToPadding="false"
109 - android:orientation="horizontal"
110 - android:paddingStart="10dp"
111 - android:paddingEnd="10dp" />
112 - </RelativeLayout>
113 106
114 - <LinearLayout 107 + <androidx.recyclerview.widget.RecyclerView
115 - android:id="@+id/rl_home_coupons" 108 + android:id="@+id/rv_home_campaigns"
116 - android:layout_width="match_parent" 109 + android:layout_width="match_parent"
117 - android:layout_height="wrap_content" 110 + android:layout_height="wrap_content"
118 - android:layout_below="@id/rl_home_campaigns"> 111 + android:layout_marginBottom="8dp"
112 + android:background="#80FFFFFF"
113 + android:clipToPadding="false"
114 + android:orientation="horizontal"
115 + android:paddingVertical="15dp"
116 + android:paddingStart="10dp"
117 + android:paddingEnd="10dp" />
118 + </RelativeLayout>
119 119
120 - <androidx.recyclerview.widget.RecyclerView 120 + <LinearLayout
121 - android:id="@+id/rv_home_coupons" 121 + android:id="@+id/rl_home_coupons"
122 android:layout_width="match_parent" 122 android:layout_width="match_parent"
123 android:layout_height="wrap_content" 123 android:layout_height="wrap_content"
124 - android:layout_marginBottom="8dp" 124 + android:layout_below="@id/rl_home_campaigns"
125 - android:clipToPadding="false" 125 + android:background="@drawable/shape_cos_gradient_coupons_bg">
126 - android:orientation="horizontal"
127 - android:paddingStart="10dp"
128 - android:paddingEnd="10dp" />
129 - </LinearLayout>
130 -
131 - <include
132 - android:id="@+id/rl_home_info_widget"
133 - layout="@layout/info_widget"
134 - android:layout_width="match_parent"
135 - android:layout_height="wrap_content"
136 - android:layout_below="@id/rl_home_coupons"
137 - android:layout_marginHorizontal="8dp" />
138 126
139 - <TextView 127 + <androidx.recyclerview.widget.RecyclerView
140 - android:id="@+id/hsv_title" 128 + android:id="@+id/rv_home_coupons"
141 - android:layout_width="match_parent" 129 + android:layout_width="match_parent"
142 - android:layout_height="40dp" 130 + android:layout_height="wrap_content"
143 - android:layout_below="@+id/rl_home_info_widget" 131 + android:clipToPadding="false"
144 - android:layout_marginTop="20dp" 132 + android:orientation="horizontal"
145 - android:background="@android:color/white" 133 + android:paddingStart="10dp"
146 - android:paddingHorizontal="25dp" 134 + android:paddingEnd="10dp" />
147 - android:paddingTop="10dp" 135 + </LinearLayout>
148 - android:text="Βρες γρήγορα"
149 - android:textColor="#3C464F" />
150 136
151 - <HorizontalScrollView 137 + <include
152 - android:id="@+id/ll_add" 138 + android:id="@+id/rl_home_info_widget"
153 - android:layout_width="match_parent" 139 + layout="@layout/info_widget"
154 - android:layout_height="110dp" 140 + android:layout_width="match_parent"
155 - android:layout_below="@id/hsv_title" 141 + android:layout_height="wrap_content"
156 - android:background="@android:color/white" 142 + android:layout_below="@id/rl_home_coupons"
157 - android:paddingBottom="10dp" 143 + android:layout_marginHorizontal="8dp" />
158 - android:scrollbars="none">
159 144
160 - <LinearLayout 145 + <TextView
146 + android:id="@+id/hsv_title"
161 android:layout_width="match_parent" 147 android:layout_width="match_parent"
162 - android:layout_height="match_parent" 148 + android:layout_height="40dp"
163 - android:divider="@drawable/divider" 149 + android:layout_below="@+id/rl_home_info_widget"
164 - android:showDividers="middle"> 150 + android:layout_marginTop="25dp"
151 + android:background="@android:color/white"
152 + android:paddingHorizontal="25dp"
153 + android:paddingTop="10dp"
154 + android:text="Βρες γρήγορα"
155 + android:textColor="#3C464F" />
156 +
157 + <HorizontalScrollView
158 + android:id="@+id/ll_add"
159 + android:layout_width="match_parent"
160 + android:layout_height="110dp"
161 + android:layout_below="@id/hsv_title"
162 + android:background="@android:color/white"
163 + android:paddingBottom="10dp"
164 + android:scrollbars="none">
165 165
166 <LinearLayout 166 <LinearLayout
167 - android:id="@+id/ll_bill_payment" 167 + android:layout_width="match_parent"
168 - android:layout_width="150dp"
169 android:layout_height="match_parent" 168 android:layout_height="match_parent"
170 - android:gravity="center" 169 + android:divider="@drawable/divider"
171 - android:orientation="vertical" 170 + android:showDividers="middle">
172 - android:paddingHorizontal="10dp">
173 -
174 - <ImageView
175 - android:layout_width="50dp"
176 - android:layout_height="50dp"
177 - android:src="@drawable/doc" />
178 -
179 - <TextView
180 - android:layout_width="match_parent"
181 - android:layout_height="40dp"
182 - android:gravity="center"
183 - android:scrollHorizontally="true"
184 - android:text="Πληρωμή λογαριασμού"
185 - android:textAlignment="center"
186 - android:textColor="#3C464F" />
187 - </LinearLayout>
188 171
189 - <LinearLayout 172 + <LinearLayout
190 - android:layout_width="150dp" 173 + android:id="@+id/ll_bill_payment"
191 - android:layout_height="match_parent" 174 + android:layout_width="150dp"
192 - android:gravity="center" 175 + android:layout_height="match_parent"
193 - android:orientation="vertical"
194 - android:paddingHorizontal="10dp">
195 -
196 - <ImageView
197 - android:layout_width="50dp"
198 - android:layout_height="50dp"
199 - android:src="@drawable/message" />
200 -
201 - <TextView
202 - android:layout_width="match_parent"
203 - android:layout_height="40dp"
204 android:gravity="center" 176 android:gravity="center"
205 - android:scrollHorizontally="true" 177 + android:orientation="vertical"
206 - android:text="Υποστήριξη" 178 + android:paddingHorizontal="10dp">
207 - android:textAlignment="center" 179 +
208 - android:textColor="#3C464F" /> 180 + <ImageView
209 - </LinearLayout> 181 + android:layout_width="50dp"
210 - 182 + android:layout_height="50dp"
211 - <LinearLayout 183 + android:src="@drawable/doc" />
212 - android:layout_width="150dp" 184 +
213 - android:layout_height="match_parent" 185 + <TextView
214 - android:gravity="center" 186 + android:layout_width="match_parent"
215 - android:orientation="vertical" 187 + android:layout_height="40dp"
216 - android:paddingHorizontal="10dp"> 188 + android:gravity="center"
217 - 189 + android:scrollHorizontally="true"
218 - <ImageView 190 + android:text="Πληρωμή λογαριασμού"
219 - android:layout_width="50dp" 191 + android:textAlignment="center"
220 - android:layout_height="50dp" 192 + android:textColor="#3C464F" />
221 - android:src="@drawable/doc" /> 193 + </LinearLayout>
222 - 194 +
223 - <TextView 195 + <LinearLayout
224 - android:layout_width="match_parent" 196 + android:layout_width="150dp"
225 - android:layout_height="40dp" 197 + android:layout_height="match_parent"
198 + android:gravity="center"
199 + android:orientation="vertical"
200 + android:paddingHorizontal="10dp">
201 +
202 + <ImageView
203 + android:layout_width="50dp"
204 + android:layout_height="50dp"
205 + android:src="@drawable/message" />
206 +
207 + <TextView
208 + android:layout_width="match_parent"
209 + android:layout_height="40dp"
210 + android:gravity="center"
211 + android:scrollHorizontally="true"
212 + android:text="Υποστήριξη"
213 + android:textAlignment="center"
214 + android:textColor="#3C464F" />
215 + </LinearLayout>
216 +
217 + <LinearLayout
218 + android:layout_width="150dp"
219 + android:layout_height="match_parent"
226 android:gravity="center" 220 android:gravity="center"
227 - android:scrollHorizontally="true" 221 + android:orientation="vertical"
228 - android:text="Πληρωμή λογαριασμού" 222 + android:paddingHorizontal="10dp">
229 - android:textAlignment="center" 223 +
230 - android:textColor="#3C464F" /> 224 + <ImageView
225 + android:layout_width="50dp"
226 + android:layout_height="50dp"
227 + android:src="@drawable/doc" />
228 +
229 + <TextView
230 + android:layout_width="match_parent"
231 + android:layout_height="40dp"
232 + android:gravity="center"
233 + android:scrollHorizontally="true"
234 + android:text="Πληρωμή λογαριασμού"
235 + android:textAlignment="center"
236 + android:textColor="#3C464F" />
237 + </LinearLayout>
231 </LinearLayout> 238 </LinearLayout>
232 - </LinearLayout> 239 + </HorizontalScrollView>
233 - </HorizontalScrollView> 240 + </RelativeLayout>
234 </RelativeLayout> 241 </RelativeLayout>
235 </ScrollView> 242 </ScrollView>
......
1 <resources> 1 <resources>
2 <dimen name="width_full">360dp</dimen> 2 <dimen name="width_full">360dp</dimen>
3 + <dimen name="height_carousel">240dp</dimen>
3 4
4 5
5 </resources> 6 </resources>
......
1 <resources> 1 <resources>
2 <dimen name="width_full">320dp</dimen> 2 <dimen name="width_full">320dp</dimen>
3 + <dimen name="height_carousel">220dp</dimen>
3 </resources> 4 </resources>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 <color name="cos_cyan">#A3F2DA</color> 13 <color name="cos_cyan">#A3F2DA</color>
14 <color name="grey_light">#f1f1f2</color> 14 <color name="grey_light">#f1f1f2</color>
15 <color name="cos_green2">#52DF5A</color> 15 <color name="cos_green2">#52DF5A</color>
16 + <color name="cos_green3">#68BB7E</color>
16 <color name="green_dark">#1DA87A</color> 17 <color name="green_dark">#1DA87A</color>
17 <color name="cos_blue2">#0478BE</color> 18 <color name="cos_blue2">#0478BE</color>
18 <color name="white_tr2">#77FFFFFF</color> 19 <color name="white_tr2">#77FFFFFF</color>
......