Panagiotis Triantafyllou

Merge remote-tracking branch 'origin/cosmote' into cosmote

<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#C4F187"
android:startColor="#8EF593" />
</shape>
</item>
<item android:bottom="4dp">
<shape android:shape="rectangle">
<solid android:color="#F3F3F3" />
</shape>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="@android:color/transparent"
android:startColor="@android:color/transparent" />
</shape>
</item>
<item android:bottom="4dp">
<shape android:shape="rectangle">
<solid android:color="#F3F3F3" />
</shape>
</item>
</layer-list>
\ No newline at end of file
......@@ -49,14 +49,26 @@
tools:layout_editor_absoluteX="-2dp">
<include
android:id="@+id/cl_tab_analysis"
layout="@layout/tab_analysis_grey_bg"
android:layout_width="323dp"
android:layout_height="25dp"
android:layout_marginTop="40dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.511"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/cl_transaction"
layout="@layout/coupon_transaction"
android:layout_width="381dp"
android:layout_width="324dp"
android:layout_height="117dp"
android:layout_marginTop="44dp"
android:layout_marginTop="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.533"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/cl_tab_analysis" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
\ No newline at end of file
......
......@@ -8,15 +8,30 @@
android:paddingVertical="5dp"
android:background="@drawable/banner_border_white">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_5_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.05" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_95_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.95" />
<TextView
android:id="@+id/tv_transaction_title"
android:layout_width="282dp"
android:layout_height="24dp"
android:layout_height="0dp"
android:layout_marginStart="20dp"
android:layout_marginTop="8dp"
android:lines="1"
android:text="Κουπόνι"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="#355168"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_95_percent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/view2"
app:layout_constraintTop_toTopOf="parent" />
......@@ -26,9 +41,12 @@
android:layout_width="286dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!"
android:lines="2"
app:layout_constraintEnd_toEndOf="parent"
android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!"
android:textColor="#355168"
android:textFontWeight="1000"
android:textSize="15dp"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_95_percent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/tv_transaction_title"
app:layout_constraintTop_toBottomOf="@+id/tv_transaction_title" />
......@@ -39,6 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="26-11-2021"
android:textColor="#82355168"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.952"
app:layout_constraintStart_toStartOf="parent"
......@@ -48,9 +67,18 @@
android:id="@+id/view2"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:background="@drawable/banner_border_grey_bg2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_5_percent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="23dp"
android:layout_height="23dp"
android:src="@drawable/cosmote_logo_small"
app:layout_constraintBottom_toBottomOf="@+id/view2"
app:layout_constraintEnd_toEndOf="@+id/view2"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_5_percent"
app:layout_constraintTop_toTopOf="@+id/view2" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bottom_border_gradient_grey_bg"
android:text="ΜΗΝΙΑΙΑ"
android:textColor="@color/grey"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_six_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bottom_border_grey_transparent"
android:text="6ΜΗΝΟ"
android:textColor="@color/grey"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_twelve_month"
app:layout_constraintStart_toEndOf="@+id/tv_month"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_twelve_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bottom_border_grey_transparent"
android:text="12ΜΗΝΟ"
android:textColor="@color/grey"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file