Panagiotis Triantafyllou

test commit

...@@ -38,85 +38,122 @@ ...@@ -38,85 +38,122 @@
38 android:layout_height="match_parent" 38 android:layout_height="match_parent"
39 android:layout_below="@+id/cl_loyalty_wallet_header" 39 android:layout_below="@+id/cl_loyalty_wallet_header"
40 android:background="@color/cos_green"> 40 android:background="@color/cos_green">
41 - <!-- android:paddingBottom="24dp"--> 41 +
42 <androidx.constraintlayout.widget.ConstraintLayout 42 <androidx.constraintlayout.widget.ConstraintLayout
43 android:layout_width="match_parent" 43 android:layout_width="match_parent"
44 android:layout_height="wrap_content" 44 android:layout_height="wrap_content"
45 - android:background="@drawable/shape_cos_loyalty"> 45 + android:background="@drawable/shape_cos_loyalty"
46 + android:paddingBottom="24dp">
46 47
47 - <androidx.constraintlayout.widget.ConstraintLayout 48 + <include
48 - android:layout_width="match_parent" 49 + android:id="@+id/cl_loyalty_info_banner"
49 - android:layout_height="150dp" 50 + layout="@layout/loyalty_banner"
50 - android:paddingHorizontal="20dp"
51 - android:paddingVertical="8dp"
52 - android:layout_marginHorizontal="32dp"
53 - android:background="@drawable/shape_cos_gradient2"
54 app:layout_constraintEnd_toEndOf="parent" 51 app:layout_constraintEnd_toEndOf="parent"
55 - app:layout_constraintStart_toStartOf="parent"> 52 + app:layout_constraintStart_toStartOf="parent" />
56 53
57 - <LinearLayout 54 + <RelativeLayout
58 - android:id="@+id/ll_loyalty_banner_info" 55 + android:id="@+id/rl_gifts_row"
59 android:layout_width="match_parent" 56 android:layout_width="match_parent"
60 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
61 - android:gravity="center_vertical" 58 + android:background="@color/cos_cyan"
62 - android:orientation="horizontal" 59 + app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner">
63 - android:weightSum="1"
64 - app:layout_constraintEnd_toEndOf="parent"
65 - app:layout_constraintStart_toStartOf="parent"
66 - app:layout_constraintTop_toTopOf="parent">
67 60
68 - <RelativeLayout 61 + <TextView
62 + android:id="@+id/tv_gifts_loyalty_title"
69 android:layout_width="wrap_content" 63 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
71 - android:layout_weight="0.8" 65 + android:text="@string/cos_gifts_loyalty_title"
72 - android:gravity="start"> 66 + android:textColor="@color/grey"
67 + android:textSize="18sp"
68 + android:textStyle="bold" />
73 69
74 - <ImageView 70 + <HorizontalScrollView
75 - android:id="@+id/iv_loyalty_type" 71 + android:id="@+id/ll_add"
76 - android:layout_width="60dp" 72 + android:layout_width="match_parent"
77 - android:layout_height="40dp" 73 + android:layout_height="wrap_content"
78 - android:src="@drawable/ic_traveller_white" /> 74 + android:layout_below="@id/tv_gifts_loyalty_title"
75 + android:background="@android:color/white"
76 + android:scrollbars="none">
79 77
80 - <TextView 78 + <androidx.constraintlayout.widget.ConstraintLayout
79 + android:layout_width="400dp"
80 + android:layout_height="200dp"
81 + android:layout_marginStart="10dp">
82 +
83 + <androidx.constraintlayout.widget.Guideline
84 + android:id="@+id/gl_horizontal_80_guideline"
81 android:layout_width="wrap_content" 85 android:layout_width="wrap_content"
82 android:layout_height="wrap_content" 86 android:layout_height="wrap_content"
83 - android:layout_below="@+id/iv_loyalty_type" 87 + android:orientation="horizontal"
84 - android:text="@string/cos_profile_loyalty_name" 88 + app:layout_constraintGuide_percent="0.8" />
85 - android:textColor="@android:color/white"
86 - android:textFontWeight="600"
87 - android:textSize="18sp" />
88 - </RelativeLayout>
89 89
90 - <RelativeLayout 90 + <androidx.constraintlayout.widget.Guideline
91 + android:id="@+id/gl_horizontal_55_guideline"
91 android:layout_width="wrap_content" 92 android:layout_width="wrap_content"
92 android:layout_height="wrap_content" 93 android:layout_height="wrap_content"
93 - android:layout_weight="0.2" 94 + android:orientation="horizontal"
94 - android:gravity="end"> 95 + app:layout_constraintGuide_percent="0.55" />
95 96
96 - <de.hdodenhof.circleimageview.CircleImageView 97 + <ImageView
97 - android:id="@+id/iv_profile_photo" 98 + android:id="@+id/iv_gift_item_logo"
98 - android:layout_width="50dp" 99 + android:layout_width="match_parent"
99 - android:layout_height="50dp" 100 + android:layout_height="0dp"
100 - android:src="@drawable/profile_photo" 101 + android:scaleType="centerCrop"
101 - app:layout_constraintBottom_toBottomOf="parent" 102 + android:src="@drawable/ic_banner_gift"
102 - app:layout_constraintLeft_toLeftOf="parent" 103 + app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_80_guideline"
104 + app:layout_constraintEnd_toEndOf="parent"
105 + app:layout_constraintStart_toStartOf="parent"
103 app:layout_constraintTop_toTopOf="parent" /> 106 app:layout_constraintTop_toTopOf="parent" />
104 - </RelativeLayout> 107 +
108 + <RelativeLayout
109 + android:layout_width="0dp"
110 + android:layout_height="0dp"
111 + android:background="@color/cos_cyan"
112 + app:layout_constraintBottom_toBottomOf="parent"
113 + app:layout_constraintEnd_toEndOf="parent"
114 + app:layout_constraintStart_toStartOf="parent"
115 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_55_guideline">
116 +
117 + <LinearLayout
118 + android:id="@+id/ll_loyalty_item1"
119 + android:layout_width="match_parent"
120 + android:layout_height="wrap_content"
121 + android:background="@color/white_tr3"
122 + android:paddingVertical="4dp">
123 +
124 + <TextView
125 + android:layout_width="wrap_content"
126 + android:layout_height="wrap_content"
127 + android:text="Αποκλειστικά για σένα"
128 + android:textColor="@color/grey"
129 + android:textStyle="bold" />
105 </LinearLayout> 130 </LinearLayout>
106 131
132 + <LinearLayout
133 + android:layout_width="match_parent"
134 + android:layout_height="match_parent"
135 + android:layout_below="@+id/ll_loyalty_item1"
136 + android:background="@android:color/white"
137 + android:orientation="vertical">
138 +
139 + <TextView
140 + android:layout_width="match_parent"
141 + android:layout_height="wrap_content"
142 + android:maxLines="2"
143 + android:text="2 ώρες δωρεάν απεριόριστα data όποτε θέλεις εσύ, κάθε μήνα!" />
144 +
107 <TextView 145 <TextView
108 android:layout_width="wrap_content" 146 android:layout_width="wrap_content"
109 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
110 - android:background="@drawable/round_border_tr" 148 + android:background="@drawable/shape_cos_gradient2"
111 - android:paddingHorizontal="8dp" 149 + android:text="Πάρε το δώρο σου"
112 - android:paddingVertical="4dp"
113 - android:text="@string/cos_questionnaire"
114 android:textColor="@android:color/white" 150 android:textColor="@android:color/white"
115 - android:textFontWeight="600" 151 + android:textFontWeight="600" />
116 - android:textSize="15sp" 152 + </LinearLayout>
117 - app:layout_constraintBottom_toBottomOf="parent" 153 + </RelativeLayout>
118 - app:layout_constraintStart_toStartOf="parent" />
119 </androidx.constraintlayout.widget.ConstraintLayout> 154 </androidx.constraintlayout.widget.ConstraintLayout>
155 + </HorizontalScrollView>
156 + </RelativeLayout>
120 </androidx.constraintlayout.widget.ConstraintLayout> 157 </androidx.constraintlayout.widget.ConstraintLayout>
121 </ScrollView> 158 </ScrollView>
122 </RelativeLayout> 159 </RelativeLayout>
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +
3 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
4 + xmlns:app="http://schemas.android.com/apk/res-auto"
5 + android:layout_width="match_parent"
6 + android:layout_height="150dp"
7 + android:layout_marginHorizontal="32dp"
8 + android:background="@drawable/shape_cos_gradient2"
9 + android:paddingHorizontal="20dp"
10 + android:paddingVertical="8dp"
11 + app:layout_constraintEnd_toEndOf="parent"
12 + app:layout_constraintStart_toStartOf="parent">
13 +
14 + <LinearLayout
15 + android:id="@+id/ll_loyalty_banner_info"
16 + android:layout_width="match_parent"
17 + android:layout_height="wrap_content"
18 + android:gravity="center_vertical"
19 + android:orientation="horizontal"
20 + android:weightSum="1"
21 + app:layout_constraintEnd_toEndOf="parent"
22 + app:layout_constraintStart_toStartOf="parent"
23 + app:layout_constraintTop_toTopOf="parent">
24 +
25 + <RelativeLayout
26 + android:layout_width="wrap_content"
27 + android:layout_height="wrap_content"
28 + android:layout_weight="0.8"
29 + android:gravity="start">
30 +
31 + <ImageView
32 + android:id="@+id/iv_loyalty_type"
33 + android:layout_width="60dp"
34 + android:layout_height="40dp"
35 + android:src="@drawable/ic_traveller_white" />
36 +
37 + <TextView
38 + android:layout_width="wrap_content"
39 + android:layout_height="wrap_content"
40 + android:layout_below="@+id/iv_loyalty_type"
41 + android:text="@string/cos_profile_loyalty_name"
42 + android:textColor="@android:color/white"
43 + android:textFontWeight="600"
44 + android:textSize="18sp" />
45 + </RelativeLayout>
46 +
47 + <RelativeLayout
48 + android:layout_width="wrap_content"
49 + android:layout_height="wrap_content"
50 + android:layout_weight="0.2"
51 + android:gravity="end">
52 +
53 + <de.hdodenhof.circleimageview.CircleImageView
54 + android:id="@+id/iv_profile_photo"
55 + android:layout_width="50dp"
56 + android:layout_height="50dp"
57 + android:src="@drawable/profile_photo"
58 + app:layout_constraintBottom_toBottomOf="parent"
59 + app:layout_constraintLeft_toLeftOf="parent"
60 + app:layout_constraintTop_toTopOf="parent" />
61 + </RelativeLayout>
62 + </LinearLayout>
63 +
64 + <TextView
65 + android:layout_width="wrap_content"
66 + android:layout_height="wrap_content"
67 + android:background="@drawable/round_border_tr"
68 + android:paddingHorizontal="8dp"
69 + android:paddingVertical="4dp"
70 + android:text="@string/cos_questionnaire"
71 + android:textColor="@android:color/white"
72 + android:textFontWeight="600"
73 + android:textSize="15sp"
74 + app:layout_constraintBottom_toBottomOf="parent"
75 + app:layout_constraintStart_toStartOf="parent" />
76 +</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -15,4 +15,5 @@ ...@@ -15,4 +15,5 @@
15 <color name="green_dark">#1DA87A</color> 15 <color name="green_dark">#1DA87A</color>
16 <color name="cos_blue2">#0478BE</color> 16 <color name="cos_blue2">#0478BE</color>
17 <color name="white_tr2">#77FFFFFF</color> 17 <color name="white_tr2">#77FFFFFF</color>
18 + <color name="white_tr3">#77FFFFFF</color>
18 </resources> 19 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -22,4 +22,5 @@ ...@@ -22,4 +22,5 @@
22 <string name="menu_profile">Προφίλ</string> 22 <string name="menu_profile">Προφίλ</string>
23 <string name="cos_profile_loyalty_name">Γιώργος Γεωργίου</string> 23 <string name="cos_profile_loyalty_name">Γιώργος Γεωργίου</string>
24 <string name="cos_questionnaire">Ερωτηματολόγιο</string> 24 <string name="cos_questionnaire">Ερωτηματολόγιο</string>
25 + <string name="cos_gifts_loyalty_title">Τα δώρα μου</string>
25 </resources> 26 </resources>
...\ No newline at end of file ...\ No newline at end of file
......