From 42fd1fdb3cd774a1af7d1e7557a9dacaa95dcded Mon Sep 17 00:00:00 2001
From: panostr <panost10@gmail.com>
Date: Tue, 4 Mar 2025 17:42:06 +0200
Subject: [PATCH] magenta colors ui changes
---
warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponShareActivity.java | 9 +++++++--
warply_android_sdk/src/main/res/drawable/shape_cos_counter_magenta.xml | 7 +++++++
warply_android_sdk/src/main/res/drawable/shape_indicator.xml | 2 +-
warply_android_sdk/src/main/res/drawable/shape_indicator_grey.xml | 12 ++++++++++++
warply_android_sdk/src/main/res/layout/fragment_my_rewards.xml | 8 ++++----
warply_android_sdk/src/main/res/layout/tile_active_box.xml | 4 ++--
warply_android_sdk/src/main/res/layout/tile_active_coupons.xml | 4 ++--
warply_android_sdk/src/main/res/layout/tile_active_dfy.xml | 4 ++--
warply_android_sdk/src/main/res/layout/tile_active_unified.xml | 4 ++--
warply_android_sdk/src/main/res/values/colors.xml | 2 ++
10 files changed, 41 insertions(+), 15 deletions(-)
create mode 100644 warply_android_sdk/src/main/res/drawable/shape_cos_counter_magenta.xml
create mode 100644 warply_android_sdk/src/main/res/drawable/shape_indicator_grey.xml
diff --git a/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponShareActivity.java b/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponShareActivity.java
index d0f72f7..c76fa85 100644
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponShareActivity.java
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponShareActivity.java
@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -253,7 +252,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
.setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
dialogPositive.dismiss();
if (mIsFromWallet) {
- setResult(RESULT_OK, new Intent());
+ setResult(RESULT_OK);
+ onBackPressed();
+ }
+ })
+ .setOnDismissListener(dialog -> {
+ if (mIsFromWallet) {
+ setResult(RESULT_OK);
onBackPressed();
}
})
diff --git a/warply_android_sdk/src/main/res/drawable/shape_cos_counter_magenta.xml b/warply_android_sdk/src/main/res/drawable/shape_cos_counter_magenta.xml
new file mode 100644
index 0000000..266e89f
--- /dev/null
+++ b/warply_android_sdk/src/main/res/drawable/shape_cos_counter_magenta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="4dp" />
+
+ <solid android:color="@color/cos_magenta" />
+</shape>
\ No newline at end of file
diff --git a/warply_android_sdk/src/main/res/drawable/shape_indicator.xml b/warply_android_sdk/src/main/res/drawable/shape_indicator.xml
index dabbdbe..a482ef9 100644
--- a/warply_android_sdk/src/main/res/drawable/shape_indicator.xml
+++ b/warply_android_sdk/src/main/res/drawable/shape_indicator.xml
@@ -4,7 +4,7 @@
android:shape="oval">
<solid
- android:color="@color/cos_light_blue"/>
+ android:color="@color/cos_magenta"/>
<size
android:width="24dp"
diff --git a/warply_android_sdk/src/main/res/drawable/shape_indicator_grey.xml b/warply_android_sdk/src/main/res/drawable/shape_indicator_grey.xml
new file mode 100644
index 0000000..72cfa64
--- /dev/null
+++ b/warply_android_sdk/src/main/res/drawable/shape_indicator_grey.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+
+ <solid
+ android:color="@color/cos_grey11"/>
+
+ <size
+ android:width="24dp"
+ android:height="24dp"/>
+</shape>
\ No newline at end of file
diff --git a/warply_android_sdk/src/main/res/layout/fragment_my_rewards.xml b/warply_android_sdk/src/main/res/layout/fragment_my_rewards.xml
index 1d2d2e6..561938c 100644
--- a/warply_android_sdk/src/main/res/layout/fragment_my_rewards.xml
+++ b/warply_android_sdk/src/main/res/layout/fragment_my_rewards.xml
@@ -421,7 +421,7 @@
android:id="@+id/v_first_end"
android:layout_width="8dp"
android:layout_height="8dp"
- android:background="@drawable/shape_indicator"
+ android:background="@drawable/shape_indicator_grey"
android:visibility="gone" />
<View
@@ -440,7 +440,7 @@
android:id="@+id/v_second_end"
android:layout_width="8dp"
android:layout_height="8dp"
- android:background="@drawable/shape_indicator" />
+ android:background="@drawable/shape_indicator_grey" />
</LinearLayout>
<LinearLayout
@@ -812,7 +812,7 @@
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
- android:background="@drawable/shape_cos_counter_orange"
+ android:background="@drawable/shape_cos_counter_magenta"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
@@ -826,7 +826,7 @@
android:includeFontPadding="false"
android:maxLines="1"
android:text="0"
- android:textColor="@color/cos_light_black"
+ android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/warply_android_sdk/src/main/res/layout/tile_active_box.xml b/warply_android_sdk/src/main/res/layout/tile_active_box.xml
index a330193..cefdca8 100644
--- a/warply_android_sdk/src/main/res/layout/tile_active_box.xml
+++ b/warply_android_sdk/src/main/res/layout/tile_active_box.xml
@@ -64,7 +64,7 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
- android:background="@drawable/shape_cos_counter_orange"
+ android:background="@drawable/shape_cos_counter_magenta"
android:gravity="center"
android:orientation="vertical"
android:translationZ="2dp"
@@ -78,7 +78,7 @@
android:layout_height="16dp"
android:includeFontPadding="false"
android:maxLines="1"
- android:textColor="@color/cos_light_black"
+ android:textColor="@color/white"
android:textSize="12sp"
tools:text="6" />
</LinearLayout>
diff --git a/warply_android_sdk/src/main/res/layout/tile_active_coupons.xml b/warply_android_sdk/src/main/res/layout/tile_active_coupons.xml
index 3744732..5c50da3 100644
--- a/warply_android_sdk/src/main/res/layout/tile_active_coupons.xml
+++ b/warply_android_sdk/src/main/res/layout/tile_active_coupons.xml
@@ -64,7 +64,7 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
- android:background="@drawable/shape_cos_counter_orange"
+ android:background="@drawable/shape_cos_counter_magenta"
android:gravity="center"
android:orientation="vertical"
android:translationZ="2dp"
@@ -77,7 +77,7 @@
android:layout_height="16dp"
android:includeFontPadding="false"
android:maxLines="1"
- android:textColor="@color/cos_light_black"
+ android:textColor="@color/white"
android:textSize="12sp"
tools:text="6" />
</LinearLayout>
diff --git a/warply_android_sdk/src/main/res/layout/tile_active_dfy.xml b/warply_android_sdk/src/main/res/layout/tile_active_dfy.xml
index 1ef04ac..f13c58b 100644
--- a/warply_android_sdk/src/main/res/layout/tile_active_dfy.xml
+++ b/warply_android_sdk/src/main/res/layout/tile_active_dfy.xml
@@ -64,7 +64,7 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
- android:background="@drawable/shape_cos_counter_orange"
+ android:background="@drawable/shape_cos_counter_magenta"
android:gravity="center"
android:orientation="vertical"
android:translationZ="2dp"
@@ -77,7 +77,7 @@
android:layout_height="16dp"
android:includeFontPadding="false"
android:maxLines="1"
- android:textColor="@color/cos_light_black"
+ android:textColor="@color/white"
android:textSize="12sp"
tools:text="6" />
</LinearLayout>
diff --git a/warply_android_sdk/src/main/res/layout/tile_active_unified.xml b/warply_android_sdk/src/main/res/layout/tile_active_unified.xml
index 375d539..68b96df 100644
--- a/warply_android_sdk/src/main/res/layout/tile_active_unified.xml
+++ b/warply_android_sdk/src/main/res/layout/tile_active_unified.xml
@@ -64,7 +64,7 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
- android:background="@drawable/shape_cos_counter_orange"
+ android:background="@drawable/shape_cos_counter_magenta"
android:gravity="center"
android:orientation="vertical"
android:translationZ="2dp"
@@ -77,7 +77,7 @@
android:layout_height="16dp"
android:includeFontPadding="false"
android:maxLines="1"
- android:textColor="@color/cos_light_black"
+ android:textColor="@color/white"
android:textSize="12sp"
tools:text="6" />
</LinearLayout>
diff --git a/warply_android_sdk/src/main/res/values/colors.xml b/warply_android_sdk/src/main/res/values/colors.xml
index 0e2f58a..b75d936 100644
--- a/warply_android_sdk/src/main/res/values/colors.xml
+++ b/warply_android_sdk/src/main/res/values/colors.xml
@@ -85,4 +85,6 @@
<color name="cos_light_grey4">#DADDE4</color>
<color name="cos_green14">#006D26</color>
<color name="cos_green14_tr">#66006D26</color>
+ <color name="cos_magenta">#E20074</color>
+ <color name="cos_grey11">#767676</color>
</resources>
\ No newline at end of file
--
libgit2 0.24.0