Panagiotis Triantafyllou

minor changes, rerevert myrewards colors

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>
...@@ -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
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
488 android:layout_gravity="start" 488 android:layout_gravity="start"
489 android:layout_marginHorizontal="14dp" 489 android:layout_marginHorizontal="14dp"
490 android:layout_marginTop="20dp" 490 android:layout_marginTop="20dp"
491 - android:background="@drawable/selector_button_green_border2" 491 + android:background="@drawable/selector_button_green_border4"
492 android:elevation="1dp" 492 android:elevation="1dp"
493 android:gravity="center" 493 android:gravity="center"
494 android:paddingHorizontal="16dp" 494 android:paddingHorizontal="16dp"
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
500 android:layout_width="wrap_content" 500 android:layout_width="wrap_content"
501 android:layout_height="wrap_content" 501 android:layout_height="wrap_content"
502 android:includeFontPadding="false" 502 android:includeFontPadding="false"
503 - android:textColor="@color/cos_green12" 503 + android:textColor="@color/cos_green15"
504 android:textSize="14sp" 504 android:textSize="14sp"
505 app:layout_constraintBottom_toBottomOf="parent" 505 app:layout_constraintBottom_toBottomOf="parent"
506 app:layout_constraintEnd_toEndOf="parent" 506 app:layout_constraintEnd_toEndOf="parent"
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
516 android:layout_gravity="center_horizontal" 516 android:layout_gravity="center_horizontal"
517 android:layout_marginHorizontal="14dp" 517 android:layout_marginHorizontal="14dp"
518 android:layout_marginTop="20dp" 518 android:layout_marginTop="20dp"
519 - android:background="@drawable/selector_button_green_border2" 519 + android:background="@drawable/selector_button_green_border4"
520 android:elevation="1dp" 520 android:elevation="1dp"
521 android:gravity="center" 521 android:gravity="center"
522 android:paddingHorizontal="16dp" 522 android:paddingHorizontal="16dp"
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
528 android:layout_width="wrap_content" 528 android:layout_width="wrap_content"
529 android:layout_height="wrap_content" 529 android:layout_height="wrap_content"
530 android:includeFontPadding="false" 530 android:includeFontPadding="false"
531 - android:textColor="@color/cos_green12" 531 + android:textColor="@color/cos_green15"
532 android:textSize="14sp" 532 android:textSize="14sp"
533 app:layout_constraintBottom_toBottomOf="parent" 533 app:layout_constraintBottom_toBottomOf="parent"
534 app:layout_constraintEnd_toEndOf="parent" 534 app:layout_constraintEnd_toEndOf="parent"
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
544 android:layout_gravity="start" 544 android:layout_gravity="start"
545 android:layout_marginHorizontal="14dp" 545 android:layout_marginHorizontal="14dp"
546 android:layout_marginTop="20dp" 546 android:layout_marginTop="20dp"
547 - android:background="@drawable/selector_button_green_border2" 547 + android:background="@drawable/selector_button_green_border4"
548 android:elevation="1dp" 548 android:elevation="1dp"
549 android:gravity="center" 549 android:gravity="center"
550 android:paddingHorizontal="16dp" 550 android:paddingHorizontal="16dp"
...@@ -555,7 +555,7 @@ ...@@ -555,7 +555,7 @@
555 android:id="@+id/iv_plus_questionnaire" 555 android:id="@+id/iv_plus_questionnaire"
556 android:layout_width="20dp" 556 android:layout_width="20dp"
557 android:layout_height="20dp" 557 android:layout_height="20dp"
558 - android:src="@drawable/sv_plus_sign_green" 558 + android:src="@drawable/sv_plus_sign_green2"
559 app:layout_constraintBottom_toBottomOf="parent" 559 app:layout_constraintBottom_toBottomOf="parent"
560 app:layout_constraintStart_toStartOf="parent" 560 app:layout_constraintStart_toStartOf="parent"
561 app:layout_constraintTop_toTopOf="parent" /> 561 app:layout_constraintTop_toTopOf="parent" />
...@@ -567,7 +567,7 @@ ...@@ -567,7 +567,7 @@
567 android:layout_marginStart="8dp" 567 android:layout_marginStart="8dp"
568 android:includeFontPadding="false" 568 android:includeFontPadding="false"
569 android:text="@string/cos_profile_preferences" 569 android:text="@string/cos_profile_preferences"
570 - android:textColor="@color/cos_green12" 570 + android:textColor="@color/cos_green15"
571 android:textSize="14sp" 571 android:textSize="14sp"
572 app:layout_constraintBottom_toBottomOf="parent" 572 app:layout_constraintBottom_toBottomOf="parent"
573 app:layout_constraintEnd_toEndOf="parent" 573 app:layout_constraintEnd_toEndOf="parent"
...@@ -582,7 +582,7 @@ ...@@ -582,7 +582,7 @@
582 android:layout_gravity="center_horizontal" 582 android:layout_gravity="center_horizontal"
583 android:layout_marginHorizontal="14dp" 583 android:layout_marginHorizontal="14dp"
584 android:layout_marginTop="20dp" 584 android:layout_marginTop="20dp"
585 - android:background="@drawable/selector_button_green_border2" 585 + android:background="@drawable/selector_button_green_border4"
586 android:elevation="1dp" 586 android:elevation="1dp"
587 android:gravity="center" 587 android:gravity="center"
588 android:paddingHorizontal="16dp" 588 android:paddingHorizontal="16dp"
...@@ -593,7 +593,7 @@ ...@@ -593,7 +593,7 @@
593 android:id="@+id/iv_plus_questionnaire_centered" 593 android:id="@+id/iv_plus_questionnaire_centered"
594 android:layout_width="20dp" 594 android:layout_width="20dp"
595 android:layout_height="20dp" 595 android:layout_height="20dp"
596 - android:src="@drawable/sv_plus_sign_green" 596 + android:src="@drawable/sv_plus_sign_green2"
597 app:layout_constraintBottom_toBottomOf="parent" 597 app:layout_constraintBottom_toBottomOf="parent"
598 app:layout_constraintStart_toStartOf="parent" 598 app:layout_constraintStart_toStartOf="parent"
599 app:layout_constraintTop_toTopOf="parent" /> 599 app:layout_constraintTop_toTopOf="parent" />
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
605 android:layout_marginStart="8dp" 605 android:layout_marginStart="8dp"
606 android:includeFontPadding="false" 606 android:includeFontPadding="false"
607 android:text="@string/cos_profile_preferences" 607 android:text="@string/cos_profile_preferences"
608 - android:textColor="@color/cos_green12" 608 + android:textColor="@color/cos_green15"
609 android:textSize="14sp" 609 android:textSize="14sp"
610 app:layout_constraintBottom_toBottomOf="parent" 610 app:layout_constraintBottom_toBottomOf="parent"
611 app:layout_constraintEnd_toEndOf="parent" 611 app:layout_constraintEnd_toEndOf="parent"
......
...@@ -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
......