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;
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();
}
})
......
<?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
......@@ -4,7 +4,7 @@
android:shape="oval">
<solid
android:color="@color/cos_light_blue"/>
android:color="@color/cos_magenta"/>
<size
android:width="24dp"
......
<?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
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......