Panagiotis Triantafyllou

minor changes, rerevert myrewards colors

......@@ -5,7 +5,7 @@ android.buildFeatures.buildConfig = true
ext {
PUBLISH_GROUP_ID = 'ly.warp'
PUBLISH_VERSION = '4.5.5.4p6'
PUBLISH_VERSION = '4.5.5.4p7'
PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
}
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke android:width="2dp" android:color="@color/cos_green15" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke android:width="2dp" android:color="@color/cos_green15_tr" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/round_border_green5_tr" android:state_pressed="true" />
<item android:drawable="@drawable/round_border_green5" android:state_pressed="false" />
</selector>
\ 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"
......
<vector android:height="34.133335dp" android:viewportHeight="16"
android:viewportWidth="15" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
<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"/>
</vector>
......@@ -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
......@@ -478,7 +478,7 @@
android:layout_gravity="start"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:background="@drawable/selector_button_green_border4"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
......@@ -490,7 +490,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/cos_green12"
android:textColor="@color/cos_green15"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -506,7 +506,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:background="@drawable/selector_button_green_border4"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
......@@ -518,7 +518,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/cos_green12"
android:textColor="@color/cos_green15"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -534,7 +534,7 @@
android:layout_gravity="start"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:background="@drawable/selector_button_green_border4"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
......@@ -545,7 +545,7 @@
android:id="@+id/iv_plus_questionnaire"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/sv_plus_sign_green"
android:src="@drawable/sv_plus_sign_green2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -557,7 +557,7 @@
android:layout_marginStart="8dp"
android:includeFontPadding="false"
android:text="@string/cos_profile_preferences"
android:textColor="@color/cos_green12"
android:textColor="@color/cos_green15"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -572,7 +572,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:background="@drawable/selector_button_green_border4"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
......@@ -583,7 +583,7 @@
android:id="@+id/iv_plus_questionnaire_centered"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/sv_plus_sign_green"
android:src="@drawable/sv_plus_sign_green2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -595,7 +595,7 @@
android:layout_marginStart="8dp"
android:includeFontPadding="false"
android:text="@string/cos_profile_preferences"
android:textColor="@color/cos_green12"
android:textColor="@color/cos_green15"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -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>
......
......@@ -87,4 +87,6 @@
<color name="cos_green14_tr">#66006D26</color>
<color name="cos_magenta">#E20074</color>
<color name="cos_grey11">#767676</color>
<color name="cos_green15">#0E8004</color>
<color name="cos_green15_tr">#660E8004</color>
</resources>
\ No newline at end of file
......