Panagiotis Triantafyllou

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

1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item>
4 + <shape android:shape="rectangle">
5 + <gradient
6 + android:angle="90"
7 + android:endColor="#C4F187"
8 + android:startColor="#8EF593" />
9 +
10 + </shape>
11 + </item>
12 +
13 + <item android:bottom="4dp">
14 + <shape android:shape="rectangle">
15 + <solid android:color="#F3F3F3" />
16 + </shape>
17 + </item>
18 +
19 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item>
4 + <shape android:shape="rectangle">
5 + <gradient
6 + android:angle="90"
7 + android:endColor="@android:color/transparent"
8 + android:startColor="@android:color/transparent" />
9 +
10 + </shape>
11 + </item>
12 +
13 + <item android:bottom="4dp">
14 + <shape android:shape="rectangle">
15 + <solid android:color="#F3F3F3" />
16 + </shape>
17 + </item>
18 +
19 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
...@@ -49,14 +49,26 @@ ...@@ -49,14 +49,26 @@
49 tools:layout_editor_absoluteX="-2dp"> 49 tools:layout_editor_absoluteX="-2dp">
50 50
51 <include 51 <include
52 + android:id="@+id/cl_tab_analysis"
53 + layout="@layout/tab_analysis_grey_bg"
54 + android:layout_width="323dp"
55 + android:layout_height="25dp"
56 + android:layout_marginTop="40dp"
57 + app:layout_constraintEnd_toEndOf="parent"
58 + app:layout_constraintHorizontal_bias="0.511"
59 + app:layout_constraintStart_toStartOf="parent"
60 + app:layout_constraintTop_toTopOf="parent" />
61 +
62 + <include
52 android:id="@+id/cl_transaction" 63 android:id="@+id/cl_transaction"
53 layout="@layout/coupon_transaction" 64 layout="@layout/coupon_transaction"
54 - android:layout_width="381dp" 65 + android:layout_width="324dp"
55 android:layout_height="117dp" 66 android:layout_height="117dp"
56 - android:layout_marginTop="44dp" 67 + android:layout_marginTop="48dp"
57 app:layout_constraintEnd_toEndOf="parent" 68 app:layout_constraintEnd_toEndOf="parent"
58 - app:layout_constraintHorizontal_bias="0.533"
59 app:layout_constraintStart_toStartOf="parent" 69 app:layout_constraintStart_toStartOf="parent"
60 - app:layout_constraintTop_toTopOf="parent" /> 70 + app:layout_constraintTop_toBottomOf="@+id/cl_tab_analysis" />
71 +
61 </androidx.constraintlayout.widget.ConstraintLayout> 72 </androidx.constraintlayout.widget.ConstraintLayout>
73 +
62 </RelativeLayout> 74 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,15 +8,30 @@ ...@@ -8,15 +8,30 @@
8 android:paddingVertical="5dp" 8 android:paddingVertical="5dp"
9 android:background="@drawable/banner_border_white"> 9 android:background="@drawable/banner_border_white">
10 10
11 + <androidx.constraintlayout.widget.Guideline
12 + android:id="@+id/gl_vertical_5_percent"
13 + android:layout_width="wrap_content"
14 + android:layout_height="wrap_content"
15 + android:orientation="vertical"
16 + app:layout_constraintGuide_percent="0.05" />
17 +
18 + <androidx.constraintlayout.widget.Guideline
19 + android:id="@+id/gl_vertical_95_percent"
20 + android:layout_width="wrap_content"
21 + android:layout_height="wrap_content"
22 + android:orientation="vertical"
23 + app:layout_constraintGuide_percent="0.95" />
24 +
11 <TextView 25 <TextView
12 android:id="@+id/tv_transaction_title" 26 android:id="@+id/tv_transaction_title"
13 android:layout_width="282dp" 27 android:layout_width="282dp"
14 - android:layout_height="24dp" 28 + android:layout_height="0dp"
15 android:layout_marginStart="20dp" 29 android:layout_marginStart="20dp"
16 android:layout_marginTop="8dp" 30 android:layout_marginTop="8dp"
17 android:lines="1" 31 android:lines="1"
18 android:text="Κουπόνι" 32 android:text="Κουπόνι"
19 - app:layout_constraintEnd_toEndOf="parent" 33 + android:textColor="#355168"
34 + app:layout_constraintEnd_toStartOf="@+id/gl_vertical_95_percent"
20 app:layout_constraintHorizontal_bias="0.0" 35 app:layout_constraintHorizontal_bias="0.0"
21 app:layout_constraintStart_toEndOf="@+id/view2" 36 app:layout_constraintStart_toEndOf="@+id/view2"
22 app:layout_constraintTop_toTopOf="parent" /> 37 app:layout_constraintTop_toTopOf="parent" />
...@@ -26,9 +41,12 @@ ...@@ -26,9 +41,12 @@
26 android:layout_width="286dp" 41 android:layout_width="286dp"
27 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
28 android:layout_marginTop="4dp" 43 android:layout_marginTop="4dp"
29 - android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!"
30 android:lines="2" 44 android:lines="2"
31 - app:layout_constraintEnd_toEndOf="parent" 45 + android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!"
46 + android:textColor="#355168"
47 + android:textFontWeight="1000"
48 + android:textSize="15dp"
49 + app:layout_constraintEnd_toStartOf="@+id/gl_vertical_95_percent"
32 app:layout_constraintHorizontal_bias="0.0" 50 app:layout_constraintHorizontal_bias="0.0"
33 app:layout_constraintStart_toStartOf="@+id/tv_transaction_title" 51 app:layout_constraintStart_toStartOf="@+id/tv_transaction_title"
34 app:layout_constraintTop_toBottomOf="@+id/tv_transaction_title" /> 52 app:layout_constraintTop_toBottomOf="@+id/tv_transaction_title" />
...@@ -39,6 +57,7 @@ ...@@ -39,6 +57,7 @@
39 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
40 android:layout_marginTop="12dp" 58 android:layout_marginTop="12dp"
41 android:text="26-11-2021" 59 android:text="26-11-2021"
60 + android:textColor="#82355168"
42 app:layout_constraintEnd_toEndOf="parent" 61 app:layout_constraintEnd_toEndOf="parent"
43 app:layout_constraintHorizontal_bias="0.952" 62 app:layout_constraintHorizontal_bias="0.952"
44 app:layout_constraintStart_toStartOf="parent" 63 app:layout_constraintStart_toStartOf="parent"
...@@ -48,9 +67,18 @@ ...@@ -48,9 +67,18 @@
48 android:id="@+id/view2" 67 android:id="@+id/view2"
49 android:layout_width="45dp" 68 android:layout_width="45dp"
50 android:layout_height="45dp" 69 android:layout_height="45dp"
51 - android:layout_marginStart="16dp"
52 android:layout_marginTop="8dp" 70 android:layout_marginTop="8dp"
53 android:background="@drawable/banner_border_grey_bg2" 71 android:background="@drawable/banner_border_grey_bg2"
54 - app:layout_constraintStart_toStartOf="parent" 72 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_5_percent"
55 app:layout_constraintTop_toTopOf="parent" /> 73 app:layout_constraintTop_toTopOf="parent" />
74 +
75 + <ImageView
76 + android:id="@+id/imageView5"
77 + android:layout_width="23dp"
78 + android:layout_height="23dp"
79 + android:src="@drawable/cosmote_logo_small"
80 + app:layout_constraintBottom_toBottomOf="@+id/view2"
81 + app:layout_constraintEnd_toEndOf="@+id/view2"
82 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_5_percent"
83 + app:layout_constraintTop_toTopOf="@+id/view2" />
56 </androidx.constraintlayout.widget.ConstraintLayout> 84 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + android:layout_width="match_parent"
5 + android:layout_height="wrap_content">
6 +
7 + <TextView
8 + android:id="@+id/tv_month"
9 + android:layout_width="wrap_content"
10 + android:layout_height="wrap_content"
11 + android:background="@drawable/bottom_border_gradient_grey_bg"
12 + android:text="ΜΗΝΙΑΙΑ"
13 + android:textColor="@color/grey"
14 + android:textSize="18sp"
15 + android:textStyle="bold"
16 + app:layout_constraintBottom_toBottomOf="parent"
17 + app:layout_constraintHorizontal_bias="0.0"
18 + app:layout_constraintStart_toStartOf="parent"
19 + app:layout_constraintTop_toTopOf="parent" />
20 +
21 + <TextView
22 + android:id="@+id/tv_six_month"
23 + android:layout_width="wrap_content"
24 + android:layout_height="wrap_content"
25 + android:background="@drawable/bottom_border_grey_transparent"
26 + android:text="6ΜΗΝΟ"
27 + android:textColor="@color/grey"
28 + android:textSize="18sp"
29 + android:textStyle="bold"
30 + app:layout_constraintBottom_toBottomOf="parent"
31 + app:layout_constraintEnd_toStartOf="@+id/tv_twelve_month"
32 + app:layout_constraintStart_toEndOf="@+id/tv_month"
33 + app:layout_constraintTop_toTopOf="parent" />
34 +
35 + <TextView
36 + android:id="@+id/tv_twelve_month"
37 + android:layout_width="wrap_content"
38 + android:layout_height="wrap_content"
39 + android:background="@drawable/bottom_border_grey_transparent"
40 + android:text="12ΜΗΝΟ"
41 + android:textColor="@color/grey"
42 + android:textSize="18sp"
43 + android:textStyle="bold"
44 + app:layout_constraintBottom_toBottomOf="parent"
45 + app:layout_constraintEnd_toEndOf="parent"
46 + app:layout_constraintTop_toTopOf="parent" />
47 +</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file