open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
e9abfb56 1 parent 68d6f0d3

mfy redesign

Expand all
Inline Side-by-side
Showing 6 changed files with 73 additions and 40 deletions
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
78 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty.xml" value="0.2705" /> 78 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty.xml" value="0.2705" />
79 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_no_border.xml" value="0.2965" /> 79 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_no_border.xml" value="0.2965" />
80 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_white.xml" value="0.2965" /> 80 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_white.xml" value="0.2965" />
81 + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_mfy_rounded.xml" value="0.2965" />
81 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile.xml" value="0.2705" /> 82 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile.xml" value="0.2705" />
82 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_gradient.xml" value="0.2705" /> 83 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_gradient.xml" value="0.2705" />
83 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_image.xml" value="0.2965" /> 84 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_image.xml" value="0.2965" />
......
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:bottomRightRadius="0dp"
6 + android:topLeftRadius="20dp"
7 + android:topRightRadius="45dp"
8 + android:bottomLeftRadius="20dp"/>
9 +
10 + <stroke android:width="1dp" android:color="@color/cos_grey2" />
11 +
12 + <solid android:color="@color/white" />
13 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
3 android:width="318.547dp" 3 android:width="318.547dp"
4 android:height="237dp" 4 android:height="237dp"
5 android:viewportWidth="318.547" 5 android:viewportWidth="318.547"
6 - android:viewportHeight="237"> 6 + android:viewportHeight="242">
7 7
8 <path 8 <path
9 android:fillColor="#fff" 9 android:fillColor="#fff"
10 - android:pathData="M318.546,237H5a5.006,5.006,0,0,1-5-5V5A5.006,5.006,0,0,1,5,0H212.609A73.158,73.158,0,0,1,268.8,66h0.2V187a49.958,49.958,0,0,0,49.546,50Z" /> 10 + android:pathData="M279.314,242 L20,242 A20,20,0,0,1,0,222 L0,20 A20,20,0,0,1,20,0 L231.651,0 L231.651,193.9 A48.246,48.246,0,0,0,279.314,242 Z M352.088,0.286 C350.479,0.113,348.83,0.018,347.188,0.002 A45.174,45.174,0,0,1,352.088,0.284 Z" />
11 </vector> 11 </vector>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - android:background="@color/cos_grey5" 7 + android:background="@color/cos_light_grey3"
8 android:fillViewport="true" 8 android:fillViewport="true"
9 android:orientation="vertical"> 9 android:orientation="vertical">
10 10
...@@ -12,15 +12,13 @@ ...@@ -12,15 +12,13 @@
12 android:id="@+id/cl_more_header" 12 android:id="@+id/cl_more_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:background="@drawable/ic_background_transparent_shadow" 15 + android:background="@color/white">
16 - android:translationZ="10dp">
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"
...@@ -29,14 +27,13 @@ ...@@ -29,14 +27,13 @@
29 27
30 <TextView 28 <TextView
31 android:id="@+id/textView3" 29 android:id="@+id/textView3"
32 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 30 + fontPath="fonts/BTCosmo-Bold.ttf"
33 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
34 android:layout_height="wrap_content" 32 android:layout_height="wrap_content"
35 - android:layout_marginBottom="16dp"
36 android:gravity="center" 33 android:gravity="center"
37 android:text="@string/cos_more_title" 34 android:text="@string/cos_more_title"
38 - android:textColor="@color/grey" 35 + android:textColor="@color/cos_light_black"
39 - android:textSize="17sp" 36 + android:textSize="21sp"
40 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
41 app:layout_constraintEnd_toEndOf="parent" 38 app:layout_constraintEnd_toEndOf="parent"
42 app:layout_constraintStart_toStartOf="parent" 39 app:layout_constraintStart_toStartOf="parent"
...@@ -45,16 +42,14 @@ ...@@ -45,16 +42,14 @@
45 42
46 <RelativeLayout 43 <RelativeLayout
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">
51 46
52 - <ScrollView 47 + <androidx.core.widget.NestedScrollView
53 android:layout_width="match_parent" 48 android:layout_width="match_parent"
54 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
55 android:fillViewport="true" 50 android:fillViewport="true"
56 - android:scrollbars="none" 51 + android:overScrollMode="never"
57 - android:overScrollMode="never"> 52 + android:scrollbars="none">
58 53
59 <RelativeLayout 54 <RelativeLayout
60 android:layout_width="match_parent" 55 android:layout_width="match_parent"
...@@ -114,11 +109,11 @@ ...@@ -114,11 +109,11 @@
114 android:layout_height="wrap_content" 109 android:layout_height="wrap_content"
115 android:layout_marginTop="4dp" 110 android:layout_marginTop="4dp"
116 android:clipToPadding="false" 111 android:clipToPadding="false"
117 - android:scrollbars="none"
118 android:orientation="vertical" 112 android:orientation="vertical"
119 android:overScrollMode="never" 113 android:overScrollMode="never"
120 android:paddingTop="44dp" 114 android:paddingTop="44dp"
121 android:paddingBottom="24dp" 115 android:paddingBottom="24dp"
116 + android:scrollbars="none"
122 android:visibility="gone" /> 117 android:visibility="gone" />
123 118
124 <LinearLayout 119 <LinearLayout
...@@ -126,17 +121,18 @@ ...@@ -126,17 +121,18 @@
126 android:layout_width="match_parent" 121 android:layout_width="match_parent"
127 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
128 android:orientation="vertical" 123 android:orientation="vertical"
129 - android:paddingTop="44dp" 124 + android:overScrollMode="never"
125 + android:layout_marginTop="16dp"
130 android:visibility="gone"> 126 android:visibility="gone">
131 127
132 <TextView 128 <TextView
133 android:id="@+id/tv_research_section" 129 android:id="@+id/tv_research_section"
134 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 130 + fontPath="fonts/BTCosmo-Bold.ttf"
135 android:layout_width="wrap_content" 131 android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 132 android:layout_height="wrap_content"
137 android:layout_marginHorizontal="16dp" 133 android:layout_marginHorizontal="16dp"
138 - android:textColor="@android:color/white" 134 + android:textColor="@color/cos_light_black"
139 - android:textSize="16sp" 135 + android:textSize="14sp"
140 tools:text="ΕΡΕΥΝΑ" /> 136 tools:text="ΕΡΕΥΝΑ" />
141 137
142 <androidx.recyclerview.widget.RecyclerView 138 <androidx.recyclerview.widget.RecyclerView
...@@ -144,11 +140,11 @@ ...@@ -144,11 +140,11 @@
144 android:layout_width="match_parent" 140 android:layout_width="match_parent"
145 android:layout_height="wrap_content" 141 android:layout_height="wrap_content"
146 android:layout_marginTop="4dp" 142 android:layout_marginTop="4dp"
147 - android:scrollbars="none"
148 android:clipToPadding="false" 143 android:clipToPadding="false"
149 android:orientation="vertical" 144 android:orientation="vertical"
150 android:overScrollMode="never" 145 android:overScrollMode="never"
151 - android:paddingBottom="4dp" /> 146 + android:paddingBottom="4dp"
147 + android:scrollbars="none" />
152 </LinearLayout> 148 </LinearLayout>
153 149
154 <LinearLayout 150 <LinearLayout
...@@ -157,16 +153,17 @@ ...@@ -157,16 +153,17 @@
157 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
158 android:layout_below="@+id/ll_research_items" 154 android:layout_below="@+id/ll_research_items"
159 android:orientation="vertical" 155 android:orientation="vertical"
156 + android:layout_marginTop="12dp"
160 android:visibility="gone"> 157 android:visibility="gone">
161 158
162 <TextView 159 <TextView
163 android:id="@+id/tv_exclusive_section" 160 android:id="@+id/tv_exclusive_section"
164 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 161 + fontPath="fonts/BTCosmo-Bold.ttf"
165 android:layout_width="wrap_content" 162 android:layout_width="wrap_content"
166 android:layout_height="wrap_content" 163 android:layout_height="wrap_content"
167 android:layout_marginHorizontal="16dp" 164 android:layout_marginHorizontal="16dp"
168 - android:textColor="@android:color/white" 165 + android:textColor="@color/cos_light_black"
169 - android:textSize="16sp" 166 + android:textSize="14sp"
170 tools:text="ΕΡΕΥΝΑ" /> 167 tools:text="ΕΡΕΥΝΑ" />
171 168
172 <androidx.recyclerview.widget.RecyclerView 169 <androidx.recyclerview.widget.RecyclerView
...@@ -175,10 +172,10 @@ ...@@ -175,10 +172,10 @@
175 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
176 android:layout_marginTop="4dp" 173 android:layout_marginTop="4dp"
177 android:clipToPadding="false" 174 android:clipToPadding="false"
178 - android:scrollbars="none"
179 android:orientation="vertical" 175 android:orientation="vertical"
180 android:overScrollMode="never" 176 android:overScrollMode="never"
181 - android:paddingBottom="4dp" /> 177 + android:paddingBottom="4dp"
178 + android:scrollbars="none" />
182 </LinearLayout> 179 </LinearLayout>
183 180
184 <LinearLayout 181 <LinearLayout
...@@ -187,16 +184,17 @@ ...@@ -187,16 +184,17 @@
187 android:layout_height="wrap_content" 184 android:layout_height="wrap_content"
188 android:layout_below="@+id/ll_exclusive_items" 185 android:layout_below="@+id/ll_exclusive_items"
189 android:orientation="vertical" 186 android:orientation="vertical"
187 + android:layout_marginTop="12dp"
190 android:visibility="gone"> 188 android:visibility="gone">
191 189
192 <TextView 190 <TextView
193 android:id="@+id/tv_contest_section" 191 android:id="@+id/tv_contest_section"
194 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 192 + fontPath="fonts/BTCosmo-Bold.ttf"
195 android:layout_width="wrap_content" 193 android:layout_width="wrap_content"
196 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
197 android:layout_marginHorizontal="16dp" 195 android:layout_marginHorizontal="16dp"
198 - android:textColor="@android:color/white" 196 + android:textColor="@color/cos_light_black"
199 - android:textSize="16sp" 197 + android:textSize="14sp"
200 tools:text="ΕΡΕΥΝΑ" /> 198 tools:text="ΕΡΕΥΝΑ" />
201 199
202 <androidx.recyclerview.widget.RecyclerView 200 <androidx.recyclerview.widget.RecyclerView
...@@ -204,11 +202,11 @@ ...@@ -204,11 +202,11 @@
204 android:layout_width="match_parent" 202 android:layout_width="match_parent"
205 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
206 android:layout_marginTop="4dp" 204 android:layout_marginTop="4dp"
207 - android:scrollbars="none"
208 android:clipToPadding="false" 205 android:clipToPadding="false"
209 android:orientation="vertical" 206 android:orientation="vertical"
210 android:overScrollMode="never" 207 android:overScrollMode="never"
211 - android:paddingBottom="4dp" /> 208 + android:paddingBottom="4dp"
209 + android:scrollbars="none" />
212 </LinearLayout> 210 </LinearLayout>
213 211
214 <LinearLayout 212 <LinearLayout
...@@ -217,16 +215,17 @@ ...@@ -217,16 +215,17 @@
217 android:layout_height="wrap_content" 215 android:layout_height="wrap_content"
218 android:layout_below="@+id/ll_contest_items" 216 android:layout_below="@+id/ll_contest_items"
219 android:orientation="vertical" 217 android:orientation="vertical"
218 + android:layout_marginTop="12dp"
220 android:visibility="gone"> 219 android:visibility="gone">
221 220
222 <TextView 221 <TextView
223 android:id="@+id/tv_contextual_section" 222 android:id="@+id/tv_contextual_section"
224 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 223 + fontPath="fonts/BTCosmo-Bold.ttf"
225 android:layout_width="wrap_content" 224 android:layout_width="wrap_content"
226 android:layout_height="wrap_content" 225 android:layout_height="wrap_content"
227 android:layout_marginHorizontal="16dp" 226 android:layout_marginHorizontal="16dp"
228 - android:textColor="@android:color/white" 227 + android:textColor="@color/cos_light_black"
229 - android:textSize="16sp" 228 + android:textSize="14sp"
230 tools:text="ΕΡΕΥΝΑ" /> 229 tools:text="ΕΡΕΥΝΑ" />
231 230
232 <androidx.recyclerview.widget.RecyclerView 231 <androidx.recyclerview.widget.RecyclerView
...@@ -234,13 +233,13 @@ ...@@ -234,13 +233,13 @@
234 android:layout_width="match_parent" 233 android:layout_width="match_parent"
235 android:layout_height="wrap_content" 234 android:layout_height="wrap_content"
236 android:layout_marginTop="4dp" 235 android:layout_marginTop="4dp"
237 - android:scrollbars="none"
238 android:clipToPadding="false" 236 android:clipToPadding="false"
239 android:orientation="vertical" 237 android:orientation="vertical"
240 android:overScrollMode="never" 238 android:overScrollMode="never"
241 - android:paddingBottom="4dp" /> 239 + android:paddingBottom="4dp"
240 + android:scrollbars="none" />
242 </LinearLayout> 241 </LinearLayout>
243 </RelativeLayout> 242 </RelativeLayout>
244 - </ScrollView> 243 + </androidx.core.widget.NestedScrollView>
245 </RelativeLayout> 244 </RelativeLayout>
246 </LinearLayout> 245 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <item name="windowActionBar">false</item> 38 <item name="windowActionBar">false</item>
39 <item name="windowNoTitle">true</item> 39 <item name="windowNoTitle">true</item>
40 </style> 40 </style>
41 - 41 +
42 <style name="ShapeAppearanceProfileImage" parent=""> 42 <style name="ShapeAppearanceProfileImage" parent="">
43 <item name="cornerFamilyTopLeft">rounded</item> 43 <item name="cornerFamilyTopLeft">rounded</item>
44 <item name="cornerFamilyBottomRight">rounded</item> 44 <item name="cornerFamilyBottomRight">rounded</item>
...@@ -46,4 +46,24 @@ ...@@ -46,4 +46,24 @@
46 <item name="cornerSizeBottomRight">19dp</item> 46 <item name="cornerSizeBottomRight">19dp</item>
47 </style> 47 </style>
48 48
49 + <style name="CustomCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
50 + <item name="shapeAppearanceOverlay">@style/CardCustomCorners</item>
51 + </style>
52 +
53 +
54 + <style name="CardCustomCorners" parent="">
55 + <item name="cornerFamily">rounded</item>
56 + <item name="cornerSizeTopRight">45dp</item>
57 + <item name="cornerSizeTopLeft">20dp</item>
58 + <item name="cornerSizeBottomRight">0dp</item>
59 + <item name="cornerSizeBottomLeft">20dp</item>
60 + </style>
61 +
62 + <style name="ShapeAppearanceMfyImage" parent="">
63 + <item name="cornerFamilyTopRight">rounded</item>
64 + <item name="cornerFamilyBottomRight">rounded</item>
65 + <item name="cornerSizeTopRight">45dp</item>
66 + <item name="cornerSizeBottomRight">0dp</item>
67 + </style>
68 +
49 </resources> 69 </resources>
...\ No newline at end of file ...\ No newline at end of file
......