Panagiotis Triantafyllou

minor changes, rerevert myrewards colors

...@@ -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.4p6' 8 + PUBLISH_VERSION = '4.5.5.4p7'
9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
10 } 10 }
11 11
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="2dp" android:color="@color/cos_green15" />
5 + <corners android:radius="10dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="2dp" android:color="@color/cos_green15_tr" />
5 + <corners android:radius="10dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item android:drawable="@drawable/round_border_green5_tr" android:state_pressed="true" />
4 + <item android:drawable="@drawable/round_border_green5" android:state_pressed="false" />
5 +</selector>
...\ 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 +<vector android:height="34.133335dp" android:viewportHeight="16"
2 + android:viewportWidth="15" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="#0E8004" android:fillType="evenOdd" android:pathData="M8.722,6.775V1.028C8.722,0.827 8.562,0.664 8.382,0.664H6.617C6.43,0.664 6.278,0.815 6.278,1.028V6.775H0.53C0.329,6.775 0.167,6.936 0.167,7.115V8.88C0.167,9.067 0.318,9.22 0.53,9.22H6.278V14.967C6.278,15.168 6.438,15.331 6.617,15.331H8.382C8.57,15.331 8.722,15.18 8.722,14.967V9.22H14.469C14.67,9.22 14.833,9.059 14.833,8.88V7.115C14.833,6.927 14.682,6.775 14.469,6.775H8.722Z"/>
4 +</vector>
...@@ -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
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
478 android:layout_gravity="start" 478 android:layout_gravity="start"
479 android:layout_marginHorizontal="14dp" 479 android:layout_marginHorizontal="14dp"
480 android:layout_marginTop="20dp" 480 android:layout_marginTop="20dp"
481 - android:background="@drawable/selector_button_green_border2" 481 + android:background="@drawable/selector_button_green_border4"
482 android:elevation="1dp" 482 android:elevation="1dp"
483 android:gravity="center" 483 android:gravity="center"
484 android:paddingHorizontal="16dp" 484 android:paddingHorizontal="16dp"
...@@ -490,7 +490,7 @@ ...@@ -490,7 +490,7 @@
490 android:layout_width="wrap_content" 490 android:layout_width="wrap_content"
491 android:layout_height="wrap_content" 491 android:layout_height="wrap_content"
492 android:includeFontPadding="false" 492 android:includeFontPadding="false"
493 - android:textColor="@color/cos_green12" 493 + android:textColor="@color/cos_green15"
494 android:textSize="14sp" 494 android:textSize="14sp"
495 app:layout_constraintBottom_toBottomOf="parent" 495 app:layout_constraintBottom_toBottomOf="parent"
496 app:layout_constraintEnd_toEndOf="parent" 496 app:layout_constraintEnd_toEndOf="parent"
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
506 android:layout_gravity="center_horizontal" 506 android:layout_gravity="center_horizontal"
507 android:layout_marginHorizontal="14dp" 507 android:layout_marginHorizontal="14dp"
508 android:layout_marginTop="20dp" 508 android:layout_marginTop="20dp"
509 - android:background="@drawable/selector_button_green_border2" 509 + android:background="@drawable/selector_button_green_border4"
510 android:elevation="1dp" 510 android:elevation="1dp"
511 android:gravity="center" 511 android:gravity="center"
512 android:paddingHorizontal="16dp" 512 android:paddingHorizontal="16dp"
...@@ -518,7 +518,7 @@ ...@@ -518,7 +518,7 @@
518 android:layout_width="wrap_content" 518 android:layout_width="wrap_content"
519 android:layout_height="wrap_content" 519 android:layout_height="wrap_content"
520 android:includeFontPadding="false" 520 android:includeFontPadding="false"
521 - android:textColor="@color/cos_green12" 521 + android:textColor="@color/cos_green15"
522 android:textSize="14sp" 522 android:textSize="14sp"
523 app:layout_constraintBottom_toBottomOf="parent" 523 app:layout_constraintBottom_toBottomOf="parent"
524 app:layout_constraintEnd_toEndOf="parent" 524 app:layout_constraintEnd_toEndOf="parent"
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
534 android:layout_gravity="start" 534 android:layout_gravity="start"
535 android:layout_marginHorizontal="14dp" 535 android:layout_marginHorizontal="14dp"
536 android:layout_marginTop="20dp" 536 android:layout_marginTop="20dp"
537 - android:background="@drawable/selector_button_green_border2" 537 + android:background="@drawable/selector_button_green_border4"
538 android:elevation="1dp" 538 android:elevation="1dp"
539 android:gravity="center" 539 android:gravity="center"
540 android:paddingHorizontal="16dp" 540 android:paddingHorizontal="16dp"
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
545 android:id="@+id/iv_plus_questionnaire" 545 android:id="@+id/iv_plus_questionnaire"
546 android:layout_width="20dp" 546 android:layout_width="20dp"
547 android:layout_height="20dp" 547 android:layout_height="20dp"
548 - android:src="@drawable/sv_plus_sign_green" 548 + android:src="@drawable/sv_plus_sign_green2"
549 app:layout_constraintBottom_toBottomOf="parent" 549 app:layout_constraintBottom_toBottomOf="parent"
550 app:layout_constraintStart_toStartOf="parent" 550 app:layout_constraintStart_toStartOf="parent"
551 app:layout_constraintTop_toTopOf="parent" /> 551 app:layout_constraintTop_toTopOf="parent" />
...@@ -557,7 +557,7 @@ ...@@ -557,7 +557,7 @@
557 android:layout_marginStart="8dp" 557 android:layout_marginStart="8dp"
558 android:includeFontPadding="false" 558 android:includeFontPadding="false"
559 android:text="@string/cos_profile_preferences" 559 android:text="@string/cos_profile_preferences"
560 - android:textColor="@color/cos_green12" 560 + android:textColor="@color/cos_green15"
561 android:textSize="14sp" 561 android:textSize="14sp"
562 app:layout_constraintBottom_toBottomOf="parent" 562 app:layout_constraintBottom_toBottomOf="parent"
563 app:layout_constraintEnd_toEndOf="parent" 563 app:layout_constraintEnd_toEndOf="parent"
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
572 android:layout_gravity="center_horizontal" 572 android:layout_gravity="center_horizontal"
573 android:layout_marginHorizontal="14dp" 573 android:layout_marginHorizontal="14dp"
574 android:layout_marginTop="20dp" 574 android:layout_marginTop="20dp"
575 - android:background="@drawable/selector_button_green_border2" 575 + android:background="@drawable/selector_button_green_border4"
576 android:elevation="1dp" 576 android:elevation="1dp"
577 android:gravity="center" 577 android:gravity="center"
578 android:paddingHorizontal="16dp" 578 android:paddingHorizontal="16dp"
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
583 android:id="@+id/iv_plus_questionnaire_centered" 583 android:id="@+id/iv_plus_questionnaire_centered"
584 android:layout_width="20dp" 584 android:layout_width="20dp"
585 android:layout_height="20dp" 585 android:layout_height="20dp"
586 - android:src="@drawable/sv_plus_sign_green" 586 + android:src="@drawable/sv_plus_sign_green2"
587 app:layout_constraintBottom_toBottomOf="parent" 587 app:layout_constraintBottom_toBottomOf="parent"
588 app:layout_constraintStart_toStartOf="parent" 588 app:layout_constraintStart_toStartOf="parent"
589 app:layout_constraintTop_toTopOf="parent" /> 589 app:layout_constraintTop_toTopOf="parent" />
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
595 android:layout_marginStart="8dp" 595 android:layout_marginStart="8dp"
596 android:includeFontPadding="false" 596 android:includeFontPadding="false"
597 android:text="@string/cos_profile_preferences" 597 android:text="@string/cos_profile_preferences"
598 - android:textColor="@color/cos_green12" 598 + android:textColor="@color/cos_green15"
599 android:textSize="14sp" 599 android:textSize="14sp"
600 app:layout_constraintBottom_toBottomOf="parent" 600 app:layout_constraintBottom_toBottomOf="parent"
601 app:layout_constraintEnd_toEndOf="parent" 601 app:layout_constraintEnd_toEndOf="parent"
...@@ -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>
......
...@@ -87,4 +87,6 @@ ...@@ -87,4 +87,6 @@
87 <color name="cos_green14_tr">#66006D26</color> 87 <color name="cos_green14_tr">#66006D26</color>
88 <color name="cos_magenta">#E20074</color> 88 <color name="cos_magenta">#E20074</color>
89 <color name="cos_grey11">#767676</color> 89 <color name="cos_grey11">#767676</color>
90 + <color name="cos_green15">#0E8004</color>
91 + <color name="cos_green15_tr">#660E8004</color>
90 </resources> 92 </resources>
...\ No newline at end of file ...\ No newline at end of file
......