open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
daf11762 1 parent 5fce6aa1

map marker view part1

Inline Side-by-side
Showing 8 changed files with 271 additions and 78 deletions
...@@ -5,7 +5,7 @@ android.buildFeatures.buildConfig = true ...@@ -5,7 +5,7 @@ android.buildFeatures.buildConfig = true
5 5
6 ext { 6 ext {
7 PUBLISH_GROUP_ID = 'ly.warp' 7 PUBLISH_GROUP_ID = 'ly.warp'
8 - PUBLISH_VERSION = '4.5.5.6deh5' 8 + PUBLISH_VERSION = '4.5.5.6deh6'
9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
10 } 10 }
11 11
......
...@@ -12,7 +12,6 @@ import android.graphics.drawable.Drawable; ...@@ -12,7 +12,6 @@ import android.graphics.drawable.Drawable;
12 import android.net.Uri; 12 import android.net.Uri;
13 import android.os.Bundle; 13 import android.os.Bundle;
14 import android.text.TextUtils; 14 import android.text.TextUtils;
15 -import android.util.Log;
16 import android.view.View; 15 import android.view.View;
17 import android.widget.ImageView; 16 import android.widget.ImageView;
18 import android.widget.LinearLayout; 17 import android.widget.LinearLayout;
...@@ -50,10 +49,7 @@ import ly.warp.sdk.io.callbacks.CallbackReceiver; ...@@ -50,10 +49,7 @@ import ly.warp.sdk.io.callbacks.CallbackReceiver;
50 import ly.warp.sdk.io.models.Coupon; 49 import ly.warp.sdk.io.models.Coupon;
51 import ly.warp.sdk.io.models.Merchant; 50 import ly.warp.sdk.io.models.Merchant;
52 import ly.warp.sdk.utils.WarpUtils; 51 import ly.warp.sdk.utils.WarpUtils;
53 -import ly.warp.sdk.utils.WarplyManagerHelper;
54 -import ly.warp.sdk.utils.WarplyProperty;
55 import ly.warp.sdk.utils.constants.WarpConstants; 52 import ly.warp.sdk.utils.constants.WarpConstants;
56 -import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
57 import ly.warp.sdk.utils.managers.WarplyManager; 53 import ly.warp.sdk.utils.managers.WarplyManager;
58 54
59 public class ShopsActivity extends FragmentActivity implements View.OnClickListener, 55 public class ShopsActivity extends FragmentActivity implements View.OnClickListener,
...@@ -168,8 +164,8 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -168,8 +164,8 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
168 //// mMap.setOnMarkerClickListener(/*mClusterManager*/this); 164 //// mMap.setOnMarkerClickListener(/*mClusterManager*/this);
169 // } 165 // }
170 166
171 - if (!TextUtils.isEmpty(mMerchantUuid)) { 167 + if (!TextUtils.isEmpty(mMerchantUuid)) { // "86eba6980cf746cbbcca5c6446700121" test merchant for pins
172 - WarplyManager.getStores("86eba6980cf746cbbcca5c6446700121", mStoresCallback); 168 + WarplyManager.getStores(mMerchantUuid, mStoresCallback);
173 } 169 }
174 } 170 }
175 171
...@@ -188,59 +184,69 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -188,59 +184,69 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
188 184
189 @Override 185 @Override
190 public boolean onMarkerClick(@NonNull Marker marker) { 186 public boolean onMarkerClick(@NonNull Marker marker) {
191 -// for (Merchant merch : mMerchantList) { 187 +// Merchant merch = (Merchant) marker.getTag();
192 -// if (merch.getUuid().equals(marker.getSnippet())) { 188 +// if (merch == null) return false;
193 -// final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog); 189 +//
194 -// bottomSheetDialog.setContentView(R.layout.dl_map_pin); 190 +// final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
195 -// ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_map_pin_close); 191 +// bottomSheetDialog.setContentView(R.layout.demo_marker_view);
196 -// dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss()); 192 +//
197 -// TextView pinTitle = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_title); 193 +// ImageView dialogClose = bottomSheetDialog.findViewById(R.id.iv_map_pin_close);
198 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_bold, pinTitle); 194 +// if (dialogClose != null) dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
199 -// if (mMerchantParentList != null && mMerchantParentList.size() > 0) { 195 +//
200 -// for (Merchant parentMerch : mMerchantParentList) { 196 +// ImageView pinLogo = bottomSheetDialog.findViewById(R.id.iv_pin_logo);
201 -// if (parentMerch.getUuid().equals(merch.getParent())) { 197 +// if (pinLogo != null && !TextUtils.isEmpty(merch.getImgPreview())) {
202 -// pinTitle.setText(parentMerch.getAdminName()); 198 +// Glide.with(this)
203 -// break; 199 +// .load(merch.getImgPreview())
204 -// } 200 +// .diskCacheStrategy(DiskCacheStrategy.DATA)
205 -// } 201 +// .into(pinLogo);
206 -// } 202 +// }
207 -// ImageView pinLogo = (ImageView) bottomSheetDialog.findViewById(R.id.iv_pin_logo); 203 +//
208 -// if (!TextUtils.isEmpty(merch.getImgPreview())) { 204 +// TextView pinTitle = bottomSheetDialog.findViewById(R.id.tv_pin_title);
209 -// Glide.with(this) 205 +// if (pinTitle != null) {
210 -//// .setDefaultRequestOptions( 206 +// WarpUtils.renderCustomFont(this, R.font.ping_lcg_bold, pinTitle);
211 -//// RequestOptions 207 +// pinTitle.setText(!TextUtils.isEmpty(merch.getAdminName()) ? merch.getAdminName() : merch.getName());
212 -//// .placeholderOf(R.drawable.ic_default_contact_photo) 208 +// }
213 -//// .error(R.drawable.ic_default_contact_photo)) 209 +//
214 -// .load(merch.getImgPreview()) 210 +// TextView pinName = bottomSheetDialog.findViewById(R.id.tv_pin_name);
215 -// .diskCacheStrategy(DiskCacheStrategy.DATA) 211 +// if (pinName != null) {
216 -// .into(pinLogo); 212 +// WarpUtils.renderCustomFont(this, R.font.ping_lcg_regular, pinName);
217 -// } 213 +// pinName.setText(!TextUtils.isEmpty(merch.getName()) ? merch.getName() : "");
218 -// TextView pinName = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_name); 214 +// }
219 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinName); 215 +//
220 -// pinName.setText(merch.getName()); 216 +// TextView pinAddress = bottomSheetDialog.findViewById(R.id.tv_pin_address);
221 -// TextView pinDays = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_days); 217 +// if (pinAddress != null) {
222 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_regular, pinDays); 218 +// WarpUtils.renderCustomFont(this, R.font.ping_lcg_regular, pinAddress);
223 -// pinDays.setText(merch.getSnippet()); //TODO: wrong getter 219 +// pinAddress.setText(!TextUtils.isEmpty(merch.getAddress()) ? merch.getAddress() : "");
224 -// TextView pinTel = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_tel); 220 +// }
225 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinTel); 221 +//
226 -// pinTel.setText(merch.getTelephone()); 222 +// TextView pinTel = bottomSheetDialog.findViewById(R.id.tv_pin_tel);
227 -// TextView pinAddress = (TextView) bottomSheetDialog.findViewById(R.id.tv_pin_address); 223 +// if (pinTel != null) {
228 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinAddress); 224 +// WarpUtils.renderCustomFont(this, R.font.ping_lcg_regular, pinTel);
229 -// pinAddress.setText(merch.getAddress()); 225 +// pinTel.setText(!TextUtils.isEmpty(merch.getTelephone()) ? merch.getTelephone() : "");
230 -// TextView pinDirectionsText = (TextView) bottomSheetDialog.findViewById(R.id.tv_directions); 226 +// }
231 -// WarpUtils.renderCustomFont(ShopsActivity.this, R.font.pf_square_sans_pro_medium, pinDirectionsText); 227 +//
232 -// LinearLayout pinDirections = (LinearLayout) bottomSheetDialog.findViewById(R.id.ll_directions); 228 +// TextView pinDirectionsText = bottomSheetDialog.findViewById(R.id.tv_directions);
233 -// pinDirections.setOnClickListener(view -> { 229 +// if (pinDirectionsText != null) {
234 -// Uri gmmIntentUri = Uri.parse("google.navigation:q=" + merch.getLatitude() + "," + merch.getLongitude()/* + "&mode=w"*/); 230 +// WarpUtils.renderCustomFont(this, R.font.ping_lcg_bold, pinDirectionsText);
235 -// Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri); 231 +// }
236 -// mapIntent.setPackage("com.google.android.apps.maps"); 232 +//
233 +// LinearLayout pinDirections = bottomSheetDialog.findViewById(R.id.ll_directions);
234 +// if (pinDirections != null) {
235 +// pinDirections.setOnClickListener(view -> {
236 +// Uri gmmIntentUri = Uri.parse("google.navigation:q=" + merch.getLatitude() + "," + merch.getLongitude());
237 +// Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
238 +// mapIntent.setPackage("com.google.android.apps.maps");
239 +// try {
237 // startActivity(mapIntent); 240 // startActivity(mapIntent);
238 -// }); 241 +// } catch (ActivityNotFoundException e) {
239 -// bottomSheetDialog.show(); 242 +// Uri browserUri = Uri.parse("https://maps.google.com/?q=" + merch.getLatitude() + "," + merch.getLongitude());
240 -// return false; 243 +// startActivity(new Intent(Intent.ACTION_VIEW, browserUri));
241 -// } 244 +// }
245 +// });
242 // } 246 // }
243 - return false; 247 +//
248 +// bottomSheetDialog.show();
249 + return true;
244 } 250 }
245 251
246 // =========================================================== 252 // ===========================================================
...@@ -321,53 +327,57 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -321,53 +327,57 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
321 .into(new CustomTarget<Bitmap>() { 327 .into(new CustomTarget<Bitmap>() {
322 @Override 328 @Override
323 public void onResourceReady(@NonNull Bitmap staticImage, @Nullable Transition<? super Bitmap> transition) { 329 public void onResourceReady(@NonNull Bitmap staticImage, @Nullable Transition<? super Bitmap> transition) {
330 + Bitmap scaledPin = Bitmap.createScaledBitmap(staticImage,
331 + (int) (staticImage.getWidth() * 0.75f),
332 + (int) (staticImage.getHeight() * 0.75f),
333 + true);
324 if (!TextUtils.isEmpty(merch.getImgPreview())) { 334 if (!TextUtils.isEmpty(merch.getImgPreview())) {
325 Glide.with(ShopsActivity.this) 335 Glide.with(ShopsActivity.this)
326 .asBitmap() 336 .asBitmap()
327 .load(merch.getImgPreview()) 337 .load(merch.getImgPreview())
328 .diskCacheStrategy(DiskCacheStrategy.DATA) 338 .diskCacheStrategy(DiskCacheStrategy.DATA)
329 .into(new CustomTarget<Bitmap>() { 339 .into(new CustomTarget<Bitmap>() {
330 - @Override 340 + @Override
331 public void onResourceReady(@NonNull Bitmap poiImage, @Nullable Transition<? super Bitmap> transition) { 341 public void onResourceReady(@NonNull Bitmap poiImage, @Nullable Transition<? super Bitmap> transition) {
332 - Bitmap combinedBitmap = overlayBitmaps(staticImage, poiImage, 48, 48, 0); 342 + Bitmap combinedBitmap = overlayBitmaps(scaledPin, poiImage, 48, 48, 0);
333 if (mMap != null) { 343 if (mMap != null) {
334 - mMap.addMarker(new MarkerOptions() 344 + Marker m = mMap.addMarker(new MarkerOptions()
335 .position(new LatLng(merch.getLatitude(), merch.getLongitude())) 345 .position(new LatLng(merch.getLatitude(), merch.getLongitude()))
336 .icon(BitmapDescriptorFactory.fromBitmap(combinedBitmap)) 346 .icon(BitmapDescriptorFactory.fromBitmap(combinedBitmap))
337 - .anchor(0.5f, 1.0f) 347 + .anchor(0.5f, 1.0f));
338 - .snippet(merch.getUuid())); 348 + if (m != null) m.setTag(merch);
339 } 349 }
340 } 350 }
341 351
342 @Override 352 @Override
343 public void onLoadCleared(@Nullable Drawable placeholder) { 353 public void onLoadCleared(@Nullable Drawable placeholder) {
344 if (mMap != null) { 354 if (mMap != null) {
345 - mMap.addMarker(new MarkerOptions() 355 + Marker m = mMap.addMarker(new MarkerOptions()
346 .position(new LatLng(merch.getLatitude(), merch.getLongitude())) 356 .position(new LatLng(merch.getLatitude(), merch.getLongitude()))
347 - .icon(BitmapDescriptorFactory.fromBitmap(staticImage)) 357 + .icon(BitmapDescriptorFactory.fromBitmap(scaledPin))
348 - .anchor(0.5f, 1.0f) 358 + .anchor(0.5f, 1.0f));
349 - .snippet(merch.getUuid())); 359 + if (m != null) m.setTag(merch);
350 } 360 }
351 } 361 }
352 362
353 @Override 363 @Override
354 public void onLoadFailed(@Nullable Drawable errorDrawable) { 364 public void onLoadFailed(@Nullable Drawable errorDrawable) {
355 if (mMap != null) { 365 if (mMap != null) {
356 - mMap.addMarker(new MarkerOptions() 366 + Marker m = mMap.addMarker(new MarkerOptions()
357 .position(new LatLng(merch.getLatitude(), merch.getLongitude())) 367 .position(new LatLng(merch.getLatitude(), merch.getLongitude()))
358 - .icon(BitmapDescriptorFactory.fromBitmap(staticImage)) 368 + .icon(BitmapDescriptorFactory.fromBitmap(scaledPin))
359 - .anchor(0.5f, 1.0f) 369 + .anchor(0.5f, 1.0f));
360 - .snippet(merch.getUuid())); 370 + if (m != null) m.setTag(merch);
361 } 371 }
362 } 372 }
363 }); 373 });
364 } else { 374 } else {
365 if (mMap != null) { 375 if (mMap != null) {
366 - mMap.addMarker(new MarkerOptions() 376 + Marker m = mMap.addMarker(new MarkerOptions()
367 .position(new LatLng(merch.getLatitude(), merch.getLongitude())) 377 .position(new LatLng(merch.getLatitude(), merch.getLongitude()))
368 - .icon(BitmapDescriptorFactory.fromBitmap(staticImage)) 378 + .icon(BitmapDescriptorFactory.fromBitmap(scaledPin))
369 - .anchor(0.5f, 1.0f) 379 + .anchor(0.5f, 1.0f));
370 - .snippet(merch.getUuid())); 380 + if (m != null) m.setTag(merch);
371 } 381 }
372 } 382 }
373 } 383 }
...@@ -375,10 +385,10 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -375,10 +385,10 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
375 @Override 385 @Override
376 public void onLoadCleared(@Nullable Drawable placeholder) { 386 public void onLoadCleared(@Nullable Drawable placeholder) {
377 if (mMap != null) { 387 if (mMap != null) {
378 - mMap.addMarker(new MarkerOptions() 388 + Marker m = mMap.addMarker(new MarkerOptions()
379 .position(new LatLng(merch.getLatitude(), merch.getLongitude())) 389 .position(new LatLng(merch.getLatitude(), merch.getLongitude()))
380 - .anchor(0.5f, 1.0f) 390 + .anchor(0.5f, 1.0f));
381 - .snippet(merch.getUuid())); 391 + if (m != null) m.setTag(merch);
382 } 392 }
383 } 393 }
384 }); 394 });
......
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 android:radius="2.5dp" />
5 +
6 + <solid
7 + android:width="0dp"
8 + android:color="@color/custom_grey10" />
9 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:layout_width="match_parent"
4 + android:layout_height="wrap_content"
5 + xmlns:app="http://schemas.android.com/apk/res-auto"
6 + android:background="@color/white"
7 + android:paddingHorizontal="24dp"
8 + android:paddingVertical="8dp">
9 +
10 + <View
11 + android:id="@+id/sheet_view"
12 + android:layout_width="48dp"
13 + android:layout_height="5dp"
14 + android:layout_centerHorizontal="true"
15 + android:background="@drawable/shape_rectangle_rounded_corners_grey" />
16 +
17 + <ImageView
18 + android:id="@+id/iv_map_pin_close"
19 + android:layout_width="36dp"
20 + android:layout_height="36dp"
21 + android:layout_alignParentTop="true"
22 + android:layout_alignParentEnd="true"
23 + android:background="@drawable/shape_rectangle_rounded_grey"
24 + android:padding="12dp"
25 + android:src="@drawable/demo_close" />
26 +
27 + <androidx.constraintlayout.widget.ConstraintLayout
28 + android:layout_width="match_parent"
29 + android:layout_height="wrap_content"
30 + android:layout_below="@+id/iv_map_pin_close">
31 + <ImageView
32 + android:id="@+id/iv_pin_logo"
33 + android:layout_width="102dp"
34 + android:layout_height="102dp"
35 + android:scaleType="centerCrop"
36 + android:background="@drawable/shape_rectangle_rounded_grey"
37 + app:layout_constraintTop_toTopOf="parent"
38 + app:layout_constraintBottom_toBottomOf="parent"
39 + app:layout_constraintStart_toStartOf="parent"/>
40 + </androidx.constraintlayout.widget.ConstraintLayout>
41 +
42 + <!-- <RelativeLayout-->
43 + <!-- android:layout_width="match_parent"-->
44 + <!-- android:layout_height="wrap_content">-->
45 +
46 +
47 +
48 + <!-- <LinearLayout-->
49 + <!-- android:layout_width="match_parent"-->
50 + <!-- android:layout_height="wrap_content"-->
51 + <!-- android:layout_toEndOf="@id/iv_pin_logo"-->
52 + <!-- android:layout_toStartOf="@id/iv_map_pin_close"-->
53 + <!-- android:layout_centerVertical="true"-->
54 + <!-- android:orientation="vertical"-->
55 + <!-- android:paddingStart="12dp"-->
56 + <!-- android:paddingEnd="8dp">-->
57 +
58 + <!-- <TextView-->
59 + <!-- android:id="@+id/tv_pin_title"-->
60 + <!-- android:layout_width="wrap_content"-->
61 + <!-- android:layout_height="wrap_content"-->
62 + <!-- android:includeFontPadding="false"-->
63 + <!-- android:textColor="@color/custom_black6"-->
64 + <!-- android:textSize="16sp"-->
65 + <!-- android:textStyle="bold" />-->
66 +
67 + <!-- <TextView-->
68 + <!-- android:id="@+id/tv_pin_name"-->
69 + <!-- android:layout_width="wrap_content"-->
70 + <!-- android:layout_height="wrap_content"-->
71 + <!-- android:layout_marginTop="2dp"-->
72 + <!-- android:includeFontPadding="false"-->
73 + <!-- android:textColor="@color/custom_grey3"-->
74 + <!-- android:textSize="13sp" />-->
75 +
76 + <!-- </LinearLayout>-->
77 + <!-- </RelativeLayout>-->
78 +
79 + <!-- <View-->
80 + <!-- android:layout_width="match_parent"-->
81 + <!-- android:layout_height="1dp"-->
82 + <!-- android:layout_marginTop="16dp"-->
83 + <!-- android:layout_marginBottom="16dp"-->
84 + <!-- android:background="@color/custom_grey4" />-->
85 +
86 + <!-- <LinearLayout-->
87 + <!-- android:layout_width="match_parent"-->
88 + <!-- android:layout_height="wrap_content"-->
89 + <!-- android:gravity="center_vertical"-->
90 + <!-- android:orientation="horizontal">-->
91 +
92 + <!-- <ImageView-->
93 + <!-- android:layout_width="16dp"-->
94 + <!-- android:layout_height="16dp"-->
95 + <!-- android:src="@android:drawable/ic_dialog_map"-->
96 + <!-- android:tint="@color/custom_grey3" />-->
97 +
98 + <!-- <TextView-->
99 + <!-- android:id="@+id/tv_pin_address"-->
100 + <!-- android:layout_width="0dp"-->
101 + <!-- android:layout_height="wrap_content"-->
102 + <!-- android:layout_marginStart="8dp"-->
103 + <!-- android:layout_weight="1"-->
104 + <!-- android:includeFontPadding="false"-->
105 + <!-- android:textColor="@color/custom_grey3"-->
106 + <!-- android:textSize="13sp" />-->
107 +
108 + <!-- </LinearLayout>-->
109 +
110 + <!-- <LinearLayout-->
111 + <!-- android:layout_width="match_parent"-->
112 + <!-- android:layout_height="wrap_content"-->
113 + <!-- android:layout_marginTop="8dp"-->
114 + <!-- android:gravity="center_vertical"-->
115 + <!-- android:orientation="horizontal">-->
116 +
117 + <!-- <ImageView-->
118 + <!-- android:layout_width="16dp"-->
119 + <!-- android:layout_height="16dp"-->
120 + <!-- android:src="@android:drawable/ic_menu_call"-->
121 + <!-- android:tint="@color/custom_grey3" />-->
122 +
123 + <!-- <TextView-->
124 + <!-- android:id="@+id/tv_pin_tel"-->
125 + <!-- android:layout_width="0dp"-->
126 + <!-- android:layout_height="wrap_content"-->
127 + <!-- android:layout_marginStart="8dp"-->
128 + <!-- android:layout_weight="1"-->
129 + <!-- android:includeFontPadding="false"-->
130 + <!-- android:textColor="@color/custom_grey3"-->
131 + <!-- android:textSize="13sp" />-->
132 +
133 + <!-- </LinearLayout>-->
134 +
135 + <!-- <LinearLayout-->
136 + <!-- android:id="@+id/ll_directions"-->
137 + <!-- android:layout_width="match_parent"-->
138 + <!-- android:layout_height="48dp"-->
139 + <!-- android:layout_marginTop="20dp"-->
140 + <!-- android:background="@drawable/shape_rectangle_rounded_black2"-->
141 + <!-- android:gravity="center"-->
142 + <!-- android:orientation="horizontal">-->
143 +
144 + <!-- <TextView-->
145 + <!-- android:id="@+id/tv_directions"-->
146 + <!-- android:layout_width="wrap_content"-->
147 + <!-- android:layout_height="wrap_content"-->
148 + <!-- android:includeFontPadding="false"-->
149 + <!-- android:text="@string/lbl_directions"-->
150 + <!-- android:textColor="@color/white"-->
151 + <!-- android:textSize="14sp" />-->
152 +
153 + <!-- </LinearLayout>-->
154 +
155 +</RelativeLayout>
...@@ -41,4 +41,5 @@ ...@@ -41,4 +41,5 @@
41 <color name="custom_yellow2">#FFEABA</color> 41 <color name="custom_yellow2">#FFEABA</color>
42 <color name="custom_gold">#573300</color> 42 <color name="custom_gold">#573300</color>
43 <color name="custom_grey9">#ADB3B8</color> 43 <color name="custom_grey9">#ADB3B8</color>
44 + <color name="custom_grey10">#ECEDEF</color>
44 </resources> 45 </resources>
......
...@@ -41,4 +41,5 @@ ...@@ -41,4 +41,5 @@
41 <string name="demo_coupon_expired">Expired</string> 41 <string name="demo_coupon_expired">Expired</string>
42 <string name="demo_partners_title">Partner businesses</string> 42 <string name="demo_partners_title">Partner businesses</string>
43 <string name="demo_search_title">Αναζήτηση</string> 43 <string name="demo_search_title">Αναζήτηση</string>
44 + <string name="lbl_directions">Οδηγίες</string>
44 </resources> 45 </resources>
......
...@@ -30,4 +30,21 @@ ...@@ -30,4 +30,21 @@
30 <style name="progressBarBlue" parent="@style/Theme.AppCompat"> 30 <style name="progressBarBlue" parent="@style/Theme.AppCompat">
31 <item name="colorAccent">@color/custom_light_blue</item> 31 <item name="colorAccent">@color/custom_light_blue</item>
32 </style> 32 </style>
33 +
34 + <style name="BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
35 + <item name="android:windowIsFloating">false</item>
36 + <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
37 + </style>
38 +
39 + <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
40 + <item name="shapeAppearanceOverlay">@style/BottomSheetShapeAppearance</item>
41 + </style>
42 +
43 + <style name="BottomSheetShapeAppearance" parent="">
44 + <item name="cornerFamily">rounded</item>
45 + <item name="cornerSizeTopLeft">16dp</item>
46 + <item name="cornerSizeTopRight">16dp</item>
47 + <item name="cornerSizeBottomLeft">0dp</item>
48 + <item name="cornerSizeBottomRight">0dp</item>
49 + </style>
33 </resources> 50 </resources>
......