open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
07a98603 1 parent f0cc099d

magenta colors ui changes

Inline Side-by-side
Showing 10 changed files with 42 additions and 14 deletions
...@@ -2,6 +2,7 @@ package ly.warp.sdk.activities; ...@@ -2,6 +2,7 @@ package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.content.Context; 4 import android.content.Context;
5 +import android.content.DialogInterface;
5 import android.content.Intent; 6 import android.content.Intent;
6 import android.os.Bundle; 7 import android.os.Bundle;
7 import android.text.TextUtils; 8 import android.text.TextUtils;
...@@ -331,7 +332,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -331,7 +332,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
331 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> { 332 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
332 dialogPositive.dismiss(); 333 dialogPositive.dismiss();
333 if (mIsFromWallet) { 334 if (mIsFromWallet) {
334 - setResult(RESULT_OK, new Intent()); 335 + setResult(RESULT_OK);
336 + onBackPressed();
337 + }
338 + })
339 + .setOnDismissListener(dialog -> {
340 + if (mIsFromWallet) {
341 + setResult(RESULT_OK);
335 onBackPressed(); 342 onBackPressed();
336 } 343 }
337 }) 344 })
......
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="4dp" />
5 +
6 + <solid android:color="@color/cos_magenta" />
7 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 android:shape="oval"> 4 android:shape="oval">
5 5
6 <solid 6 <solid
7 - android:color="@color/cos_light_blue"/> 7 + android:color="@color/cos_magenta"/>
8 8
9 <size 9 <size
10 android:width="24dp" 10 android:width="24dp"
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape
3 + xmlns:android="http://schemas.android.com/apk/res/android"
4 + android:shape="oval">
5 +
6 + <solid
7 + android:color="@color/cos_grey11"/>
8 +
9 + <size
10 + android:width="24dp"
11 + android:height="24dp"/>
12 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
431 android:id="@+id/v_first_end" 431 android:id="@+id/v_first_end"
432 android:layout_width="8dp" 432 android:layout_width="8dp"
433 android:layout_height="8dp" 433 android:layout_height="8dp"
434 - android:background="@drawable/shape_indicator" 434 + android:background="@drawable/shape_indicator_grey"
435 android:visibility="gone" /> 435 android:visibility="gone" />
436 436
437 <View 437 <View
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
450 android:id="@+id/v_second_end" 450 android:id="@+id/v_second_end"
451 android:layout_width="8dp" 451 android:layout_width="8dp"
452 android:layout_height="8dp" 452 android:layout_height="8dp"
453 - android:background="@drawable/shape_indicator" /> 453 + android:background="@drawable/shape_indicator_grey" />
454 </LinearLayout> 454 </LinearLayout>
455 455
456 <LinearLayout 456 <LinearLayout
...@@ -824,7 +824,7 @@ ...@@ -824,7 +824,7 @@
824 android:layout_width="16dp" 824 android:layout_width="16dp"
825 android:layout_height="16dp" 825 android:layout_height="16dp"
826 android:layout_marginStart="2dp" 826 android:layout_marginStart="2dp"
827 - android:background="@drawable/shape_cos_counter_orange" 827 + android:background="@drawable/shape_cos_counter_magenta"
828 android:gravity="center" 828 android:gravity="center"
829 android:orientation="vertical" 829 android:orientation="vertical"
830 app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled" 830 app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
...@@ -838,7 +838,7 @@ ...@@ -838,7 +838,7 @@
838 android:includeFontPadding="false" 838 android:includeFontPadding="false"
839 android:maxLines="1" 839 android:maxLines="1"
840 android:text="0" 840 android:text="0"
841 - android:textColor="@color/cos_light_black" 841 + android:textColor="@color/white"
842 android:textSize="12sp" /> 842 android:textSize="12sp" />
843 </LinearLayout> 843 </LinearLayout>
844 </androidx.constraintlayout.widget.ConstraintLayout> 844 </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 android:layout_alignParentEnd="true" 64 android:layout_alignParentEnd="true"
65 android:layout_marginTop="4dp" 65 android:layout_marginTop="4dp"
66 android:layout_marginEnd="1dp" 66 android:layout_marginEnd="1dp"
67 - android:background="@drawable/shape_cos_counter_orange" 67 + android:background="@drawable/shape_cos_counter_magenta"
68 android:gravity="center" 68 android:gravity="center"
69 android:orientation="vertical" 69 android:orientation="vertical"
70 android:translationZ="2dp" 70 android:translationZ="2dp"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 android:layout_height="16dp" 78 android:layout_height="16dp"
79 android:includeFontPadding="false" 79 android:includeFontPadding="false"
80 android:maxLines="1" 80 android:maxLines="1"
81 - android:textColor="@color/cos_light_black" 81 + android:textColor="@color/white"
82 android:textSize="12sp" 82 android:textSize="12sp"
83 tools:text="6" /> 83 tools:text="6" />
84 </LinearLayout> 84 </LinearLayout>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 android:layout_alignParentEnd="true" 64 android:layout_alignParentEnd="true"
65 android:layout_marginTop="4dp" 65 android:layout_marginTop="4dp"
66 android:layout_marginEnd="1dp" 66 android:layout_marginEnd="1dp"
67 - android:background="@drawable/shape_cos_counter_orange" 67 + android:background="@drawable/shape_cos_counter_magenta"
68 android:gravity="center" 68 android:gravity="center"
69 android:orientation="vertical" 69 android:orientation="vertical"
70 android:translationZ="2dp" 70 android:translationZ="2dp"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 android:layout_height="16dp" 77 android:layout_height="16dp"
78 android:includeFontPadding="false" 78 android:includeFontPadding="false"
79 android:maxLines="1" 79 android:maxLines="1"
80 - android:textColor="@color/cos_light_black" 80 + android:textColor="@color/white"
81 android:textSize="12sp" 81 android:textSize="12sp"
82 tools:text="6" /> 82 tools:text="6" />
83 </LinearLayout> 83 </LinearLayout>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 android:layout_alignParentEnd="true" 64 android:layout_alignParentEnd="true"
65 android:layout_marginTop="4dp" 65 android:layout_marginTop="4dp"
66 android:layout_marginEnd="1dp" 66 android:layout_marginEnd="1dp"
67 - android:background="@drawable/shape_cos_counter_orange" 67 + android:background="@drawable/shape_cos_counter_magenta"
68 android:gravity="center" 68 android:gravity="center"
69 android:orientation="vertical" 69 android:orientation="vertical"
70 android:translationZ="2dp" 70 android:translationZ="2dp"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 android:layout_height="16dp" 77 android:layout_height="16dp"
78 android:includeFontPadding="false" 78 android:includeFontPadding="false"
79 android:maxLines="1" 79 android:maxLines="1"
80 - android:textColor="@color/cos_light_black" 80 + android:textColor="@color/white"
81 android:textSize="12sp" 81 android:textSize="12sp"
82 tools:text="6" /> 82 tools:text="6" />
83 </LinearLayout> 83 </LinearLayout>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 android:layout_alignParentEnd="true" 64 android:layout_alignParentEnd="true"
65 android:layout_marginTop="4dp" 65 android:layout_marginTop="4dp"
66 android:layout_marginEnd="1dp" 66 android:layout_marginEnd="1dp"
67 - android:background="@drawable/shape_cos_counter_orange" 67 + android:background="@drawable/shape_cos_counter_magenta"
68 android:gravity="center" 68 android:gravity="center"
69 android:orientation="vertical" 69 android:orientation="vertical"
70 android:translationZ="2dp" 70 android:translationZ="2dp"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 android:layout_height="16dp" 77 android:layout_height="16dp"
78 android:includeFontPadding="false" 78 android:includeFontPadding="false"
79 android:maxLines="1" 79 android:maxLines="1"
80 - android:textColor="@color/cos_light_black" 80 + android:textColor="@color/white"
81 android:textSize="12sp" 81 android:textSize="12sp"
82 tools:text="6" /> 82 tools:text="6" />
83 </LinearLayout> 83 </LinearLayout>
......
...@@ -85,4 +85,6 @@ ...@@ -85,4 +85,6 @@
85 <color name="cos_light_grey4">#DADDE4</color> 85 <color name="cos_light_grey4">#DADDE4</color>
86 <color name="cos_green14">#006D26</color> 86 <color name="cos_green14">#006D26</color>
87 <color name="cos_green14_tr">#66006D26</color> 87 <color name="cos_green14_tr">#66006D26</color>
88 + <color name="cos_magenta">#E20074</color>
89 + <color name="cos_grey11">#767676</color>
88 </resources> 90 </resources>
...\ No newline at end of file ...\ No newline at end of file
......