open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
c8c44162 1 parent 04b8fa6f

redesign part1

Expand all
Inline Side-by-side
Showing 34 changed files with 133 additions and 151 deletions
This diff is collapsed. Click to expand it.

412 Bytes | W: | H:

384 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

369 Bytes | W: | H:

643 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

972 Bytes | W: | H:

772 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.9 KB | W: | H:

1.18 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

935 Bytes | W: | H:

533 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 - <solid android:color="@color/cos_light_grey"/> 3 + <solid android:color="@color/cos_light_grey3"/>
4 - <corners android:radius="10dp"/> 4 + <corners android:radius="16dp"/>
5 <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" /> 5 <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
6 </shape> 6 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="2dp" android:color="@color/cos_green12" />
5 + <corners android:radius="16dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="2dp" android:color="@color/cos_green6_tr" />
5 + <corners android:radius="16dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item android:drawable="@drawable/round_border_green2_tr" android:state_pressed="true" />
4 + <item android:drawable="@drawable/round_border_green2" android:state_pressed="false" />
5 +</selector>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="4dp" /> 4 + <corners android:radius="16dp" />
5 5
6 <solid android:color="@android:color/white" /> 6 <solid android:color="@android:color/white" />
7 </shape> 7 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="4dp" /> 4 + <corners android:radius="16dp" />
5 5
6 <solid android:color="@color/white_tr" /> 6 <solid android:color="@color/white_tr" />
7 </shape> 7 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="12dp" /> 4 + <corners android:radius="16dp" />
5 5
6 <solid 6 <solid
7 android:width="2dp" 7 android:width="2dp"
8 - android:color="@color/cos_green5" /> 8 + android:color="@color/cos_green12" />
9 </shape> 9 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="12dp" /> 4 + <corners android:radius="16dp" />
5 5
6 <solid 6 <solid
7 android:width="2dp" 7 android:width="2dp"
8 - android:color="@color/cos_green5_tr" /> 8 + android:color="@color/cos_green6_tr" />
9 </shape> 9 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 <corners 4 <corners
5 - android:topLeftRadius="12dp" 5 + android:topLeftRadius="16dp"
6 - android:topRightRadius="12dp" /> 6 + android:topRightRadius="16dp" />
7 7
8 - <solid android:color="@android:color/white" /> 8 + <solid android:color="@color/white" />
9 </shape> 9 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="48dp" 11 + android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_contextual_back" 15 android:id="@+id/iv_contextual_back"
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 + fontPath="fonts/BTCosmo-Bold.ttf"
26 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
28 - android:textColor="@color/grey" 29 + android:textColor="@color/cos_light_black"
29 android:textSize="17sp" 30 android:textSize="17sp"
30 android:textStyle="bold" 31 android:textStyle="bold"
31 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
43 <androidx.constraintlayout.widget.ConstraintLayout 44 <androidx.constraintlayout.widget.ConstraintLayout
44 android:layout_width="match_parent" 45 android:layout_width="match_parent"
45 android:layout_height="match_parent" 46 android:layout_height="match_parent"
46 - android:background="@android:color/white"> 47 + android:background="@color/white">
47 48
48 <!-- android:background="@drawable/shape_cos_loyalty_white"--> 49 <!-- android:background="@drawable/shape_cos_loyalty_white"-->
49 <androidx.constraintlayout.widget.ConstraintLayout 50 <androidx.constraintlayout.widget.ConstraintLayout
...@@ -59,30 +60,20 @@ ...@@ -59,30 +60,20 @@
59 android:id="@+id/imageView6" 60 android:id="@+id/imageView6"
60 android:layout_width="match_parent" 61 android:layout_width="match_parent"
61 android:layout_height="253dp" 62 android:layout_height="253dp"
62 - android:layout_marginTop="0.5dp"
63 android:scaleType="centerCrop" 63 android:scaleType="centerCrop"
64 app:layout_constraintStart_toStartOf="parent" 64 app:layout_constraintStart_toStartOf="parent"
65 app:layout_constraintTop_toTopOf="parent" 65 app:layout_constraintTop_toTopOf="parent"
66 tools:src="@drawable/carousel_banner" /> 66 tools:src="@drawable/carousel_banner" />
67 67
68 - <LinearLayout
69 - android:layout_width="match_parent"
70 - android:layout_height="wrap_content"
71 - android:background="@drawable/ic_line"
72 - app:layout_constraintStart_toStartOf="parent"
73 - app:layout_constraintEnd_toEndOf="parent"
74 - app:layout_constraintTop_toTopOf="@+id/imageView6">
75 -
76 - </LinearLayout>
77 -
78 <TextView 68 <TextView
69 + fontPath="fonts/BTCosmo-Bold.ttf"
79 android:id="@+id/textView13" 70 android:id="@+id/textView13"
80 android:layout_width="match_parent" 71 android:layout_width="match_parent"
81 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
82 android:layout_marginTop="32dp" 73 android:layout_marginTop="32dp"
83 android:gravity="center" 74 android:gravity="center"
84 android:paddingHorizontal="32dp" 75 android:paddingHorizontal="32dp"
85 - android:textColor="#415564" 76 + android:textColor="@color/cos_light_black"
86 android:textSize="18sp" 77 android:textSize="18sp"
87 android:textStyle="bold" 78 android:textStyle="bold"
88 app:layout_constraintEnd_toEndOf="parent" 79 app:layout_constraintEnd_toEndOf="parent"
...@@ -92,13 +83,14 @@ ...@@ -92,13 +83,14 @@
92 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 83 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
93 84
94 <TextView 85 <TextView
86 + fontPath="fonts/PeridotPE-Regular.ttf"
95 android:id="@+id/textView14" 87 android:id="@+id/textView14"
96 android:layout_width="match_parent" 88 android:layout_width="match_parent"
97 android:layout_height="wrap_content" 89 android:layout_height="wrap_content"
98 android:layout_marginTop="16dp" 90 android:layout_marginTop="16dp"
99 android:gravity="center" 91 android:gravity="center"
100 android:paddingHorizontal="32dp" 92 android:paddingHorizontal="32dp"
101 - android:textColor="#415564" 93 + android:textColor="@color/cos_light_black"
102 android:textSize="16sp" 94 android:textSize="16sp"
103 tools:text="test test" 95 tools:text="test test"
104 app:layout_constraintEnd_toEndOf="parent" 96 app:layout_constraintEnd_toEndOf="parent"
...@@ -107,26 +99,24 @@ ...@@ -107,26 +99,24 @@
107 99
108 <LinearLayout 100 <LinearLayout
109 android:id="@+id/ll_activate_button" 101 android:id="@+id/ll_activate_button"
110 - android:layout_width="wrap_content" 102 + android:layout_width="160dp"
111 - android:layout_height="wrap_content" 103 + android:layout_height="50dp"
112 - android:layout_marginHorizontal="32dp"
113 android:background="@drawable/selector_button_green" 104 android:background="@drawable/selector_button_green"
114 android:gravity="center" 105 android:gravity="center"
115 android:orientation="horizontal" 106 android:orientation="horizontal"
116 - android:paddingHorizontal="16dp"
117 - android:paddingVertical="8dp"
118 app:layout_constraintBottom_toBottomOf="parent" 107 app:layout_constraintBottom_toBottomOf="parent"
119 app:layout_constraintEnd_toEndOf="parent" 108 app:layout_constraintEnd_toEndOf="parent"
120 app:layout_constraintStart_toStartOf="parent"> 109 app:layout_constraintStart_toStartOf="parent">
121 110
122 <TextView 111 <TextView
112 + fontPath="fonts/PeridotPE-SemiBold.ttf"
123 android:layout_width="wrap_content" 113 android:layout_width="wrap_content"
124 android:layout_height="wrap_content" 114 android:layout_height="wrap_content"
125 android:gravity="center" 115 android:gravity="center"
116 + android:includeFontPadding="false"
126 android:text="@string/cos_dlg_positive_button" 117 android:text="@string/cos_dlg_positive_button"
127 android:textColor="@color/white" 118 android:textColor="@color/white"
128 - android:textFontWeight="600" 119 + android:textSize="16sp" />
129 - android:textSize="17dp" />
130 </LinearLayout> 120 </LinearLayout>
131 121
132 </androidx.constraintlayout.widget.ConstraintLayout> 122 </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="48dp" 11 + android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_share_back" 15 android:id="@+id/iv_coupon_share_back"
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
26 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_gift" 28 android:text="@string/cos_coupon_gift"
29 - android:textColor="@color/grey" 29 + android:textColor="@color/cos_light_black"
30 android:textSize="17sp" 30 android:textSize="17sp"
31 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 31 + fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <androidx.constraintlayout.widget.ConstraintLayout 43 <androidx.constraintlayout.widget.ConstraintLayout
44 android:layout_width="match_parent" 44 android:layout_width="match_parent"
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 - android:background="@android:color/white"> 46 + android:background="@color/white">
47 47
48 <!-- android:background="@drawable/shape_cos_loyalty_white"--> 48 <!-- android:background="@drawable/shape_cos_loyalty_white"-->
49 <androidx.constraintlayout.widget.ConstraintLayout 49 <androidx.constraintlayout.widget.ConstraintLayout
...@@ -59,22 +59,11 @@ ...@@ -59,22 +59,11 @@
59 android:id="@+id/imageView6" 59 android:id="@+id/imageView6"
60 android:layout_width="match_parent" 60 android:layout_width="match_parent"
61 android:layout_height="253dp" 61 android:layout_height="253dp"
62 - android:layout_marginTop="0.5dp"
63 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
64 app:layout_constraintStart_toStartOf="parent" 63 app:layout_constraintStart_toStartOf="parent"
65 app:layout_constraintTop_toTopOf="parent" 64 app:layout_constraintTop_toTopOf="parent"
66 tools:src="@drawable/carousel_banner" /> 65 tools:src="@drawable/carousel_banner" />
67 66
68 - <LinearLayout
69 - android:layout_width="match_parent"
70 - android:layout_height="wrap_content"
71 - android:background="@drawable/ic_line"
72 - app:layout_constraintStart_toStartOf="parent"
73 - app:layout_constraintEnd_toEndOf="parent"
74 - app:layout_constraintTop_toTopOf="@+id/imageView6">
75 -
76 - </LinearLayout>
77 -
78 <TextView 67 <TextView
79 android:id="@+id/textView13" 68 android:id="@+id/textView13"
80 android:layout_width="match_parent" 69 android:layout_width="match_parent"
...@@ -82,11 +71,10 @@ ...@@ -82,11 +71,10 @@
82 android:layout_marginTop="32dp" 71 android:layout_marginTop="32dp"
83 android:gravity="center" 72 android:gravity="center"
84 android:paddingHorizontal="32dp" 73 android:paddingHorizontal="32dp"
85 - android:textColor="#415564" 74 + android:textColor="@color/cos_light_black"
86 android:textSize="18sp" 75 android:textSize="18sp"
87 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 76 + fontPath="fonts/BTCosmo-Bold.ttf"
88 app:layout_constraintEnd_toEndOf="parent" 77 app:layout_constraintEnd_toEndOf="parent"
89 - app:layout_constraintHorizontal_bias="0.509"
90 app:layout_constraintStart_toStartOf="parent" 78 app:layout_constraintStart_toStartOf="parent"
91 app:layout_constraintTop_toBottomOf="@+id/imageView6" 79 app:layout_constraintTop_toBottomOf="@+id/imageView6"
92 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 80 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
...@@ -99,9 +87,9 @@ ...@@ -99,9 +87,9 @@
99 android:gravity="center" 87 android:gravity="center"
100 android:paddingHorizontal="32dp" 88 android:paddingHorizontal="32dp"
101 android:text="@string/cos_coupon_share_gift_title" 89 android:text="@string/cos_coupon_share_gift_title"
102 - android:textColor="#415564" 90 + android:textColor="@color/cos_light_black"
103 android:textSize="16sp" 91 android:textSize="16sp"
104 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 92 + fontPath="fonts/PeridotPE-Regular.ttf"
105 app:layout_constraintEnd_toEndOf="parent" 93 app:layout_constraintEnd_toEndOf="parent"
106 app:layout_constraintStart_toStartOf="parent" 94 app:layout_constraintStart_toStartOf="parent"
107 app:layout_constraintTop_toBottomOf="@+id/textView13" /> 95 app:layout_constraintTop_toBottomOf="@+id/textView13" />
...@@ -123,8 +111,8 @@ ...@@ -123,8 +111,8 @@
123 android:layout_alignParentStart="true" 111 android:layout_alignParentStart="true"
124 android:layout_centerVertical="true" 112 android:layout_centerVertical="true"
125 android:text="@string/cos_coupon_share_sender" 113 android:text="@string/cos_coupon_share_sender"
126 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 114 + fontPath="fonts/PeridotPE-Regular.ttf"
127 - android:textColor="@color/grey" 115 + android:textColor="@color/cos_gray2"
128 android:textSize="16sp" /> 116 android:textSize="16sp" />
129 117
130 <ImageView 118 <ImageView
...@@ -165,9 +153,9 @@ ...@@ -165,9 +153,9 @@
165 android:background="@android:color/transparent" 153 android:background="@android:color/transparent"
166 android:hint="@string/cos_coupon_share_hint" 154 android:hint="@string/cos_coupon_share_hint"
167 android:inputType="phone" 155 android:inputType="phone"
168 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 156 + fontPath="fonts/PeridotPE-Regular.ttf"
169 - android:textColor="@color/grey" 157 + android:textColor="@color/cos_gray2"
170 - android:textColorHint="@color/cos_grey8" 158 + android:textColorHint="@color/cos_gray2"
171 android:textSize="16sp" /> 159 android:textSize="16sp" />
172 </RelativeLayout> 160 </RelativeLayout>
173 161
...@@ -183,15 +171,13 @@ ...@@ -183,15 +171,13 @@
183 171
184 <LinearLayout 172 <LinearLayout
185 android:id="@+id/ll_share_button" 173 android:id="@+id/ll_share_button"
186 - android:layout_width="wrap_content" 174 + android:layout_width="190dp"
187 - android:layout_height="wrap_content" 175 + android:layout_height="50dp"
188 android:layout_marginHorizontal="32dp" 176 android:layout_marginHorizontal="32dp"
189 android:layout_marginTop="64dp" 177 android:layout_marginTop="64dp"
190 android:background="@drawable/selector_button_green" 178 android:background="@drawable/selector_button_green"
191 android:gravity="center" 179 android:gravity="center"
192 android:orientation="horizontal" 180 android:orientation="horizontal"
193 - android:paddingHorizontal="16dp"
194 - android:paddingVertical="8dp"
195 app:layout_constraintEnd_toEndOf="parent" 181 app:layout_constraintEnd_toEndOf="parent"
196 app:layout_constraintStart_toStartOf="parent" 182 app:layout_constraintStart_toStartOf="parent"
197 app:layout_constraintTop_toBottomOf="@+id/v_separator2"> 183 app:layout_constraintTop_toBottomOf="@+id/v_separator2">
...@@ -200,10 +186,11 @@ ...@@ -200,10 +186,11 @@
200 android:layout_width="wrap_content" 186 android:layout_width="wrap_content"
201 android:layout_height="wrap_content" 187 android:layout_height="wrap_content"
202 android:gravity="center" 188 android:gravity="center"
189 + android:includeFontPadding="false"
203 android:text="@string/cos_coupon_share_button" 190 android:text="@string/cos_coupon_share_button"
204 android:textColor="@color/white" 191 android:textColor="@color/white"
205 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 192 + fontPath="fonts/PeridotPE-SemiBold.ttf"
206 - android:textSize="17dp" /> 193 + android:textSize="16sp" />
207 </LinearLayout> 194 </LinearLayout>
208 </androidx.constraintlayout.widget.ConstraintLayout> 195 </androidx.constraintlayout.widget.ConstraintLayout>
209 </androidx.constraintlayout.widget.ConstraintLayout> 196 </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="48dp" 11 + android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_couponset_info_back" 15 android:id="@+id/iv_couponset_info_back"
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 26 + fontPath="fonts/BTCosmo-Bold.ttf"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 - android:textColor="@color/grey" 30 + android:textColor="@color/cos_light_black"
31 android:textSize="17sp" 31 android:textSize="17sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
39 android:layout_width="match_parent" 39 android:layout_width="match_parent"
40 android:layout_height="match_parent" 40 android:layout_height="match_parent"
41 android:layout_below="@+id/cl_loyalty_wallet_header" 41 android:layout_below="@+id/cl_loyalty_wallet_header"
42 - android:background="@android:color/white" 42 + android:background="@color/white"
43 android:fillViewport="true"> 43 android:fillViewport="true">
44 44
45 <LinearLayout 45 <LinearLayout
46 android:id="@+id/cl_loyalty_info_view_inner" 46 android:id="@+id/cl_loyalty_info_view_inner"
47 android:layout_width="match_parent" 47 android:layout_width="match_parent"
48 android:layout_height="wrap_content" 48 android:layout_height="wrap_content"
49 - android:background="@android:color/white" 49 + android:background="@color/white"
50 android:gravity="center_horizontal" 50 android:gravity="center_horizontal"
51 android:orientation="vertical" 51 android:orientation="vertical"
52 android:paddingBottom="48dp"> 52 android:paddingBottom="48dp">
...@@ -55,52 +55,51 @@ ...@@ -55,52 +55,51 @@
55 android:id="@+id/imageView6" 55 android:id="@+id/imageView6"
56 android:layout_width="match_parent" 56 android:layout_width="match_parent"
57 android:layout_height="253dp" 57 android:layout_height="253dp"
58 - android:layout_marginTop="0.5dp"
59 android:scaleType="centerCrop" 58 android:scaleType="centerCrop"
60 tools:src="@drawable/carousel_banner" /> 59 tools:src="@drawable/carousel_banner" />
61 60
62 <TextView 61 <TextView
63 android:id="@+id/textView13" 62 android:id="@+id/textView13"
64 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 63 + fontPath="fonts/BTCosmo-Bold.ttf"
65 android:layout_width="match_parent" 64 android:layout_width="match_parent"
66 android:layout_height="wrap_content" 65 android:layout_height="wrap_content"
67 android:layout_marginTop="32dp" 66 android:layout_marginTop="32dp"
68 android:gravity="center" 67 android:gravity="center"
69 android:paddingHorizontal="32dp" 68 android:paddingHorizontal="32dp"
70 - android:textColor="#415564" 69 + android:textColor="@color/cos_light_black"
71 android:textSize="18sp" 70 android:textSize="18sp"
72 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 71 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
73 72
74 <TextView 73 <TextView
75 android:id="@+id/textView14" 74 android:id="@+id/textView14"
76 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 75 + fontPath="fonts/PeridotPE-Regular.ttf"
77 android:layout_width="match_parent" 76 android:layout_width="match_parent"
78 android:layout_height="wrap_content" 77 android:layout_height="wrap_content"
79 android:layout_marginTop="16dp" 78 android:layout_marginTop="16dp"
80 android:gravity="center" 79 android:gravity="center"
81 android:paddingHorizontal="32dp" 80 android:paddingHorizontal="32dp"
82 - android:textColor="#415564" 81 + android:textColor="@color/cos_light_black"
83 android:textSize="16sp" 82 android:textSize="16sp"
84 tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" /> 83 tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" />
85 84
86 <LinearLayout 85 <LinearLayout
87 android:id="@+id/ll_get_gift" 86 android:id="@+id/ll_get_gift"
88 - android:layout_width="240dp" 87 + android:layout_width="160dp"
89 android:layout_height="50dp" 88 android:layout_height="50dp"
90 - android:layout_marginHorizontal="32dp"
91 android:layout_marginTop="27dp" 89 android:layout_marginTop="27dp"
92 android:background="@drawable/selector_button_green" 90 android:background="@drawable/selector_button_green"
93 android:gravity="center" 91 android:gravity="center"
94 android:orientation="horizontal"> 92 android:orientation="horizontal">
95 93
96 <TextView 94 <TextView
97 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 95 + fontPath="fonts/PeridotPE-SemiBold.ttf"
98 android:layout_width="wrap_content" 96 android:layout_width="wrap_content"
99 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
100 android:gravity="center" 98 android:gravity="center"
99 + android:includeFontPadding="false"
101 android:text="@string/cos_redeem_coupon" 100 android:text="@string/cos_redeem_coupon"
102 android:textColor="@color/white" 101 android:textColor="@color/white"
103 - android:textSize="17dp" /> 102 + android:textSize="16sp" />
104 </LinearLayout> 103 </LinearLayout>
105 104
106 <RelativeLayout 105 <RelativeLayout
...@@ -120,45 +119,39 @@ ...@@ -120,45 +119,39 @@
120 119
121 <TextView 120 <TextView
122 android:id="@+id/tv_terms" 121 android:id="@+id/tv_terms"
123 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 122 + fontPath="fonts/PeridotPE-Bold.ttf"
124 android:layout_width="wrap_content" 123 android:layout_width="wrap_content"
125 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
126 android:text="@string/cos_coupon_terms_title" 125 android:text="@string/cos_coupon_terms_title"
127 - android:textColor="@color/grey" 126 + android:textColor="@color/cos_light_black"
128 android:textSize="16sp" /> 127 android:textSize="16sp" />
129 128
130 <ImageView 129 <ImageView
131 android:id="@+id/iv_terms_arrow" 130 android:id="@+id/iv_terms_arrow"
132 android:layout_width="14dp" 131 android:layout_width="14dp"
133 android:layout_height="14dp" 132 android:layout_height="14dp"
133 + android:layout_marginTop="3dp"
134 android:layout_marginStart="6dp" 134 android:layout_marginStart="6dp"
135 android:src="@drawable/ic_down_dark_new" /> 135 android:src="@drawable/ic_down_dark_new" />
136 </LinearLayout> 136 </LinearLayout>
137 137
138 <TextView 138 <TextView
139 android:id="@+id/tv_terms_value" 139 android:id="@+id/tv_terms_value"
140 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 140 + fontPath="fonts/PeridotPE-Regular.ttf"
141 android:layout_width="wrap_content" 141 android:layout_width="wrap_content"
142 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
143 android:layout_below="@+id/ll_terms_inner" 143 android:layout_below="@+id/ll_terms_inner"
144 android:layout_marginHorizontal="64dp" 144 android:layout_marginHorizontal="64dp"
145 android:layout_marginTop="16dp" 145 android:layout_marginTop="16dp"
146 - android:textColor="@color/grey" 146 + android:textColor="@color/cos_gray"
147 android:visibility="gone" 147 android:visibility="gone"
148 + android:textSize="16sp"
148 tools:text="@string/cos_coupon_date" 149 tools:text="@string/cos_coupon_date"
149 - tools:visibility="gone" /> 150 + tools:visibility="visible" />
150 </RelativeLayout> 151 </RelativeLayout>
151 </LinearLayout> 152 </LinearLayout>
152 </ScrollView> 153 </ScrollView>
153 154
154 - <LinearLayout
155 - android:layout_width="match_parent"
156 - android:layout_height="wrap_content"
157 - android:layout_marginTop="48dp"
158 - android:background="@drawable/ic_line">
159 -
160 - </LinearLayout>
161 -
162 <ProgressBar 155 <ProgressBar
163 android:id="@+id/pb_loading" 156 android:id="@+id/pb_loading"
164 android:layout_width="48dp" 157 android:layout_width="48dp"
......
...@@ -5,22 +5,20 @@ ...@@ -5,22 +5,20 @@
5 android:id="@+id/cl_bill_payment" 5 android:id="@+id/cl_bill_payment"
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_grey5" 8 + android:background="@color/cos_light_grey3"
9 android:orientation="vertical"> 9 android:orientation="vertical">
10 10
11 <androidx.constraintlayout.widget.ConstraintLayout 11 <androidx.constraintlayout.widget.ConstraintLayout
12 android:id="@+id/cl_bill_header" 12 android:id="@+id/cl_bill_header"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 android:layout_height="64dp" 14 android:layout_height="64dp"
15 - android:translationZ="10dp" 15 + android:background="@color/white">
16 - android:background="@drawable/ic_background_transparent_shadow">
17 16
18 <ImageView 17 <ImageView
19 android:id="@+id/iv_list_close" 18 android:id="@+id/iv_list_close"
20 android:layout_width="48dp" 19 android:layout_width="48dp"
21 android:layout_height="48dp" 20 android:layout_height="48dp"
22 android:layout_marginStart="16dp" 21 android:layout_marginStart="16dp"
23 - android:layout_marginBottom="16dp"
24 android:scaleType="centerInside" 22 android:scaleType="centerInside"
25 android:src="@drawable/ic_back" 23 android:src="@drawable/ic_back"
26 app:layout_constraintBottom_toBottomOf="parent" 24 app:layout_constraintBottom_toBottomOf="parent"
...@@ -32,10 +30,9 @@ ...@@ -32,10 +30,9 @@
32 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
33 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
34 android:gravity="center" 32 android:gravity="center"
35 - android:textColor="@color/grey" 33 + android:textColor="@color/cos_light_black"
36 android:textSize="17sp" 34 android:textSize="17sp"
37 - android:layout_marginBottom="16dp" 35 + fontPath="fonts/BTCosmo-Bold.ttf"
38 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
39 android:text="@string/cos_gifts_title" 36 android:text="@string/cos_gifts_title"
40 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
41 app:layout_constraintEnd_toEndOf="parent" 38 app:layout_constraintEnd_toEndOf="parent"
...@@ -46,7 +43,6 @@ ...@@ -46,7 +43,6 @@
46 <LinearLayout 43 <LinearLayout
47 android:layout_width="match_parent" 44 android:layout_width="match_parent"
48 android:layout_height="match_parent" 45 android:layout_height="match_parent"
49 - android:layout_marginTop="-18dp"
50 android:orientation="vertical"> 46 android:orientation="vertical">
51 47
52 <LinearLayout 48 <LinearLayout
...@@ -103,7 +99,7 @@ ...@@ -103,7 +99,7 @@
103 android:clipToPadding="false" 99 android:clipToPadding="false"
104 android:orientation="vertical" 100 android:orientation="vertical"
105 android:overScrollMode="never" 101 android:overScrollMode="never"
106 - android:paddingTop="44dp" /> 102 + android:paddingVertical="24dp" />
107 103
108 <!-- <androidx.constraintlayout.widget.ConstraintLayout--> 104 <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
109 <!-- android:id="@+id/cl_recycler_inner"--> 105 <!-- android:id="@+id/cl_recycler_inner"-->
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="48dp" 11 + android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_telco_back" 15 android:id="@+id/iv_telco_back"
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
24 24
25 <TextView 25 <TextView
26 android:id="@+id/tv_telco_header_title" 26 android:id="@+id/tv_telco_header_title"
27 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 27 + fontPath="fonts/BTCosmo-Bold.ttf"
28 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
30 - android:textColor="@color/cos_dark_blue" 30 + android:textColor="@color/cos_light_black"
31 - android:textSize="16sp" 31 + android:textSize="17sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -40,12 +40,13 @@ ...@@ -40,12 +40,13 @@
40 android:layout_width="match_parent" 40 android:layout_width="match_parent"
41 android:layout_height="match_parent" 41 android:layout_height="match_parent"
42 android:layout_below="@+id/cl_loyalty_wallet_header" 42 android:layout_below="@+id/cl_loyalty_wallet_header"
43 + android:background="@color/white"
43 android:fillViewport="true"> 44 android:fillViewport="true">
44 45
45 <androidx.constraintlayout.widget.ConstraintLayout 46 <androidx.constraintlayout.widget.ConstraintLayout
46 android:layout_width="match_parent" 47 android:layout_width="match_parent"
47 android:layout_height="match_parent" 48 android:layout_height="match_parent"
48 - android:background="@android:color/white"> 49 + android:background="@color/white">
49 50
50 <!-- android:background="@drawable/shape_cos_loyalty_white"--> 51 <!-- android:background="@drawable/shape_cos_loyalty_white"-->
51 <RelativeLayout 52 <RelativeLayout
...@@ -63,18 +64,10 @@ ...@@ -63,18 +64,10 @@
63 android:layout_width="match_parent" 64 android:layout_width="match_parent"
64 android:layout_height="253dp" 65 android:layout_height="253dp"
65 android:layout_centerHorizontal="true" 66 android:layout_centerHorizontal="true"
66 - android:layout_marginTop="0.5dp"
67 android:scaleType="centerCrop" 67 android:scaleType="centerCrop"
68 tools:src="@drawable/carousel_banner" /> 68 tools:src="@drawable/carousel_banner" />
69 69
70 <LinearLayout 70 <LinearLayout
71 - android:layout_width="match_parent"
72 - android:layout_height="wrap_content"
73 - android:background="@drawable/ic_line">
74 -
75 - </LinearLayout>
76 -
77 - <LinearLayout
78 android:id="@+id/ll_telco_gift_view" 71 android:id="@+id/ll_telco_gift_view"
79 android:layout_width="wrap_content" 72 android:layout_width="wrap_content"
80 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
...@@ -86,7 +79,7 @@ ...@@ -86,7 +79,7 @@
86 79
87 <TextView 80 <TextView
88 android:id="@+id/tv_telco_gift_value" 81 android:id="@+id/tv_telco_gift_value"
89 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 82 + fontPath="fonts/PeridotPE-SemiBold.ttf"
90 android:layout_width="64dp" 83 android:layout_width="64dp"
91 android:layout_height="64dp" 84 android:layout_height="64dp"
92 android:background="@drawable/shape_round_border_gradient" 85 android:background="@drawable/shape_round_border_gradient"
...@@ -97,11 +90,11 @@ ...@@ -97,11 +90,11 @@
97 90
98 <TextView 91 <TextView
99 android:id="@+id/tv_telco_gift_type" 92 android:id="@+id/tv_telco_gift_type"
100 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 93 + fontPath="fonts/PeridotPE-Regular.ttf"
101 android:layout_width="wrap_content" 94 android:layout_width="wrap_content"
102 android:layout_height="wrap_content" 95 android:layout_height="wrap_content"
103 android:layout_marginStart="8dp" 96 android:layout_marginStart="8dp"
104 - android:textColor="@color/grey" 97 + android:textColor="@color/cos_light_black"
105 android:textSize="15sp" 98 android:textSize="15sp"
106 tools:text="Internet" /> 99 tools:text="Internet" />
107 </LinearLayout> 100 </LinearLayout>
...@@ -125,14 +118,14 @@ ...@@ -125,14 +118,14 @@
125 118
126 <TextView 119 <TextView
127 android:id="@+id/tv_telco_gift_duration" 120 android:id="@+id/tv_telco_gift_duration"
128 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 121 + fontPath="fonts/PeridotPE-Regular.ttf"
129 android:layout_width="wrap_content" 122 android:layout_width="wrap_content"
130 android:layout_height="wrap_content" 123 android:layout_height="wrap_content"
131 android:background="@drawable/shape_round_border_gradient2" 124 android:background="@drawable/shape_round_border_gradient2"
132 android:gravity="center" 125 android:gravity="center"
133 android:paddingHorizontal="12dp" 126 android:paddingHorizontal="12dp"
134 android:paddingVertical="5dp" 127 android:paddingVertical="5dp"
135 - android:textColor="@color/grey" 128 + android:textColor="@color/cos_light_black"
136 android:textSize="16sp" 129 android:textSize="16sp"
137 app:layout_constraintBottom_toBottomOf="@+id/cl_telco_duration_view_inner" 130 app:layout_constraintBottom_toBottomOf="@+id/cl_telco_duration_view_inner"
138 app:layout_constraintEnd_toEndOf="parent" 131 app:layout_constraintEnd_toEndOf="parent"
...@@ -143,37 +136,37 @@ ...@@ -143,37 +136,37 @@
143 136
144 <TextView 137 <TextView
145 android:id="@+id/textView13" 138 android:id="@+id/textView13"
146 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 139 + fontPath="fonts/PeridotPE-Regular.ttf"
147 android:layout_width="match_parent" 140 android:layout_width="match_parent"
148 android:layout_height="wrap_content" 141 android:layout_height="wrap_content"
149 android:layout_below="@+id/cl_telco_duration_view" 142 android:layout_below="@+id/cl_telco_duration_view"
150 android:layout_marginTop="24dp" 143 android:layout_marginTop="24dp"
151 android:gravity="center" 144 android:gravity="center"
152 android:paddingHorizontal="32dp" 145 android:paddingHorizontal="32dp"
153 - android:textColor="#415564" 146 + android:textColor="@color/cos_light_black"
154 android:textSize="17sp" 147 android:textSize="17sp"
155 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 148 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
156 149
157 <LinearLayout 150 <LinearLayout
158 android:id="@+id/ll_activate_button" 151 android:id="@+id/ll_activate_button"
159 - android:layout_width="wrap_content" 152 + android:layout_width="160dp"
160 - android:layout_height="wrap_content" 153 + android:layout_height="50dp"
161 android:layout_below="@+id/textView13" 154 android:layout_below="@+id/textView13"
162 android:layout_centerHorizontal="true" 155 android:layout_centerHorizontal="true"
163 android:layout_marginTop="44dp" 156 android:layout_marginTop="44dp"
164 android:background="@drawable/selector_button_green" 157 android:background="@drawable/selector_button_green"
165 - android:orientation="horizontal" 158 + android:gravity="center"
166 - android:paddingHorizontal="36dp" 159 + android:orientation="horizontal">
167 - android:paddingVertical="8dp">
168 160
169 <TextView 161 <TextView
170 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 162 + fontPath="fonts/PeridotPE-SemiBold.ttf"
171 android:layout_width="wrap_content" 163 android:layout_width="wrap_content"
172 android:layout_height="wrap_content" 164 android:layout_height="wrap_content"
173 android:gravity="center" 165 android:gravity="center"
166 + android:includeFontPadding="false"
174 android:text="@string/cos_dlg_positive_button" 167 android:text="@string/cos_dlg_positive_button"
175 android:textColor="@color/white" 168 android:textColor="@color/white"
176 - android:textSize="16dp" /> 169 + android:textSize="16sp" />
177 </LinearLayout> 170 </LinearLayout>
178 171
179 <RelativeLayout 172 <RelativeLayout
...@@ -195,32 +188,34 @@ ...@@ -195,32 +188,34 @@
195 188
196 <TextView 189 <TextView
197 android:id="@+id/tv_see_more" 190 android:id="@+id/tv_see_more"
198 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 191 + fontPath="fonts/PeridotPE-Bold.ttf"
199 android:layout_width="wrap_content" 192 android:layout_width="wrap_content"
200 android:layout_height="wrap_content" 193 android:layout_height="wrap_content"
201 android:text="@string/cos_see_more2" 194 android:text="@string/cos_see_more2"
202 - android:textColor="@color/grey" 195 + android:textColor="@color/cos_light_black"
203 android:textSize="16sp" /> 196 android:textSize="16sp" />
204 197
205 <ImageView 198 <ImageView
206 android:id="@+id/iv_see_more_arrow" 199 android:id="@+id/iv_see_more_arrow"
207 android:layout_width="14dp" 200 android:layout_width="14dp"
208 android:layout_height="14dp" 201 android:layout_height="14dp"
202 + android:layout_marginTop="3dp"
209 android:layout_marginStart="6dp" 203 android:layout_marginStart="6dp"
210 android:src="@drawable/ic_down_dark_new" /> 204 android:src="@drawable/ic_down_dark_new" />
211 </LinearLayout> 205 </LinearLayout>
212 206
213 <TextView 207 <TextView
214 android:id="@+id/tv_see_more_value" 208 android:id="@+id/tv_see_more_value"
215 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 209 + fontPath="fonts/PeridotPE-Regular.ttf"
216 android:layout_width="wrap_content" 210 android:layout_width="wrap_content"
217 android:layout_height="wrap_content" 211 android:layout_height="wrap_content"
218 android:layout_below="@+id/ll_see_more" 212 android:layout_below="@+id/ll_see_more"
219 android:layout_marginHorizontal="32dp" 213 android:layout_marginHorizontal="32dp"
220 android:layout_marginTop="16dp" 214 android:layout_marginTop="16dp"
221 - android:textColor="@color/grey" 215 + android:textColor="@color/cos_gray"
222 - android:textSize="14sp" 216 + android:textSize="16sp"
223 android:visibility="gone" 217 android:visibility="gone"
218 + tools:visibility="visible"
224 tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " /> 219 tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " />
225 </RelativeLayout> 220 </RelativeLayout>
226 221
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
15 15
16 <TextView 16 <TextView
17 android:id="@+id/tv_sender_value" 17 android:id="@+id/tv_sender_value"
18 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 18 + fontPath="fonts/BTCosmo-Bold.ttf"
19 android:layout_width="wrap_content" 19 android:layout_width="wrap_content"
20 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
21 android:layout_alignParentStart="true" 21 android:layout_alignParentStart="true"
22 android:layout_marginStart="24dp" 22 android:layout_marginStart="24dp"
23 android:text="@string/cos_coupon_share_sender" 23 android:text="@string/cos_coupon_share_sender"
24 - android:textColor="@color/grey" 24 + android:textColor="@color/cos_light_black"
25 android:textSize="16sp" /> 25 android:textSize="16sp" />
26 26
27 <ImageView 27 <ImageView
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
9 <androidx.cardview.widget.CardView 9 <androidx.cardview.widget.CardView
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 -
13 android:layout_marginHorizontal="16dp" 12 android:layout_marginHorizontal="16dp"
14 - app:cardCornerRadius="4dp"> 13 + app:cardElevation="0dp"
14 + app:cardCornerRadius="16dp">
15 15
16 <androidx.constraintlayout.widget.ConstraintLayout 16 <androidx.constraintlayout.widget.ConstraintLayout
17 android:layout_width="match_parent" 17 android:layout_width="match_parent"
...@@ -31,11 +31,9 @@ ...@@ -31,11 +31,9 @@
31 android:layout_height="0dp" 31 android:layout_height="0dp"
32 android:scaleType="centerCrop" 32 android:scaleType="centerCrop"
33 app:layout_constraintBottom_toBottomOf="parent" 33 app:layout_constraintBottom_toBottomOf="parent"
34 - app:layout_constraintHorizontal_bias="0.0"
35 app:layout_constraintLeft_toLeftOf="parent" 34 app:layout_constraintLeft_toLeftOf="parent"
36 app:layout_constraintRight_toLeftOf="@+id/gl_vertical_60_percent" 35 app:layout_constraintRight_toLeftOf="@+id/gl_vertical_60_percent"
37 app:layout_constraintTop_toTopOf="parent" 36 app:layout_constraintTop_toTopOf="parent"
38 - app:layout_constraintVertical_bias="0.0"
39 tools:src="@drawable/ic_cosmote_logo_horizontal_grey" /> 37 tools:src="@drawable/ic_cosmote_logo_horizontal_grey" />
40 38
41 <TextView 39 <TextView
...@@ -46,7 +44,7 @@ ...@@ -46,7 +44,7 @@
46 android:gravity="center" 44 android:gravity="center"
47 android:maxLines="4" 45 android:maxLines="4"
48 android:textColor="@color/grey" 46 android:textColor="@color/grey"
49 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 47 + fontPath="fonts/PeridotPE-Regular.ttf"
50 app:layout_constraintBottom_toBottomOf="parent" 48 app:layout_constraintBottom_toBottomOf="parent"
51 app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent" 49 app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent"
52 app:layout_constraintRight_toRightOf="parent" 50 app:layout_constraintRight_toRightOf="parent"
......
...@@ -10,18 +10,18 @@ ...@@ -10,18 +10,18 @@
10 android:id="@+id/ll_share_view2" 10 android:id="@+id/ll_share_view2"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 - android:layout_marginHorizontal="24dp" 13 + android:layout_marginHorizontal="12dp"
14 android:layout_marginTop="16dp"> 14 android:layout_marginTop="16dp">
15 15
16 <TextView 16 <TextView
17 android:id="@+id/tv_phone_share" 17 android:id="@+id/tv_phone_share"
18 + fontPath="fonts/PeridotPE-Regular.ttf"
18 android:layout_width="match_parent" 19 android:layout_width="match_parent"
19 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
20 android:layout_alignParentStart="true" 21 android:layout_alignParentStart="true"
21 android:layout_centerVertical="true" 22 android:layout_centerVertical="true"
22 android:background="@android:color/transparent" 23 android:background="@android:color/transparent"
23 - android:textColor="@color/grey" 24 + android:textColor="@color/cos_light_black"
24 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
25 android:textSize="16sp" 25 android:textSize="16sp"
26 tools:text="6987654322" /> 26 tools:text="6987654322" />
27 </RelativeLayout> 27 </RelativeLayout>
......
...@@ -64,4 +64,10 @@ ...@@ -64,4 +64,10 @@
64 <color name="cos_grey10">#53626E</color> 64 <color name="cos_grey10">#53626E</color>
65 <color name="cos_green11">#78BE6D</color> 65 <color name="cos_green11">#78BE6D</color>
66 <color name="cos_skyblue3">#0FABD6</color> 66 <color name="cos_skyblue3">#0FABD6</color>
67 + <color name="cos_light_grey3">#F2F2F3</color>
68 + <color name="cos_light_black">#212121</color>
69 + <color name="cos_green12">#0EA600</color>
70 + <color name="cos_green6_tr">#660EA600</color>
71 + <color name="cos_gray">#9D9D9C</color>
72 + <color name="cos_gray2">#848484</color>
67 </resources> 73 </resources>
...\ No newline at end of file ...\ No newline at end of file
......