open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
42fd1fdb 1 parent 09a23712

magenta colors ui changes

Inline Side-by-side
Showing 10 changed files with 41 additions and 15 deletions
...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities; ...@@ -2,7 +2,6 @@ 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.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.text.TextUtils; 6 import android.text.TextUtils;
8 import android.util.Log; 7 import android.util.Log;
...@@ -253,7 +252,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -253,7 +252,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
253 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> { 252 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
254 dialogPositive.dismiss(); 253 dialogPositive.dismiss();
255 if (mIsFromWallet) { 254 if (mIsFromWallet) {
256 - setResult(RESULT_OK, new Intent()); 255 + setResult(RESULT_OK);
256 + onBackPressed();
257 + }
258 + })
259 + .setOnDismissListener(dialog -> {
260 + if (mIsFromWallet) {
261 + setResult(RESULT_OK);
257 onBackPressed(); 262 onBackPressed();
258 } 263 }
259 }) 264 })
......
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
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
421 android:id="@+id/v_first_end" 421 android:id="@+id/v_first_end"
422 android:layout_width="8dp" 422 android:layout_width="8dp"
423 android:layout_height="8dp" 423 android:layout_height="8dp"
424 - android:background="@drawable/shape_indicator" 424 + android:background="@drawable/shape_indicator_grey"
425 android:visibility="gone" /> 425 android:visibility="gone" />
426 426
427 <View 427 <View
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
440 android:id="@+id/v_second_end" 440 android:id="@+id/v_second_end"
441 android:layout_width="8dp" 441 android:layout_width="8dp"
442 android:layout_height="8dp" 442 android:layout_height="8dp"
443 - android:background="@drawable/shape_indicator" /> 443 + android:background="@drawable/shape_indicator_grey" />
444 </LinearLayout> 444 </LinearLayout>
445 445
446 <LinearLayout 446 <LinearLayout
...@@ -812,7 +812,7 @@ ...@@ -812,7 +812,7 @@
812 android:layout_width="16dp" 812 android:layout_width="16dp"
813 android:layout_height="16dp" 813 android:layout_height="16dp"
814 android:layout_marginStart="2dp" 814 android:layout_marginStart="2dp"
815 - android:background="@drawable/shape_cos_counter_orange" 815 + android:background="@drawable/shape_cos_counter_magenta"
816 android:gravity="center" 816 android:gravity="center"
817 android:orientation="vertical" 817 android:orientation="vertical"
818 app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled" 818 app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
...@@ -826,7 +826,7 @@ ...@@ -826,7 +826,7 @@
826 android:includeFontPadding="false" 826 android:includeFontPadding="false"
827 android:maxLines="1" 827 android:maxLines="1"
828 android:text="0" 828 android:text="0"
829 - android:textColor="@color/cos_light_black" 829 + android:textColor="@color/white"
830 android:textSize="12sp" /> 830 android:textSize="12sp" />
831 </LinearLayout> 831 </LinearLayout>
832 </androidx.constraintlayout.widget.ConstraintLayout> 832 </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
......