Panagiotis Triantafyllou

minor fixes

<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1.5dp"
android:color="@color/white_tr2" />
<corners android:radius="1000dp" />
</shape>
\ No newline at end of file
......@@ -12,8 +12,8 @@
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_profile_reward"
android:textColor="@color/grey"
android:textSize="16sp"
android:textSize="17sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -45,12 +45,77 @@
android:background="@drawable/shape_cos_loyalty">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp"
android:layout_height="200dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_width="match_parent"
android:layout_height="150dp"
android:paddingHorizontal="20dp"
android:paddingVertical="8dp"
android:layout_marginHorizontal="32dp"
android:background="@drawable/shape_cos_gradient2"
app:layout_constraintEnd_toEndOf="parent"
android:background="@drawable/shape_cos_gradient2">
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/ll_loyalty_banner_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:gravity="start">
<ImageView
android:id="@+id/iv_loyalty_type"
android:layout_width="60dp"
android:layout_height="40dp"
android:src="@drawable/ic_traveller_white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_loyalty_type"
android:text="@string/cos_profile_loyalty_name"
android:textColor="@android:color/white"
android:textFontWeight="600"
android:textSize="18sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:gravity="end">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/iv_profile_photo"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/profile_photo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/round_border_tr"
android:paddingHorizontal="8dp"
android:paddingVertical="4dp"
android:text="@string/cos_questionnaire"
android:textColor="@android:color/white"
android:textFontWeight="600"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
......
......@@ -3,13 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="215dp"
android:layout_height="240dp"
android:background="@drawable/bottom_border">
<LinearLayout
android:id="@+id/ll_carousel_icon"
android:layout_width="match_parent"
android:layout_height="150dp">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="170dp">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
......@@ -22,10 +25,13 @@
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_height="wrap_content"
android:paddingHorizontal="15dp"
android:paddingVertical="10dp"
android:textSize="15sp"
android:textStyle="bold"
android:textColor="@color/grey"
android:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!"
app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon"
tools:layout_editor_absoluteX="-15dp" />
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#77B9AB">
android:background="@color/cos_cyan">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="50dp">
android:paddingBottom="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rl_header"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="horizontal"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
......@@ -27,13 +24,14 @@
android:id="@+id/user_img"
android:layout_width="60dp"
android:layout_height="60dp"
android:src="@drawable/banner1" />
android:src="@drawable/profile_photo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:id="@+id/rl_user_info"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_toRightOf="@+id/user_img"
android:orientation="vertical"
android:paddingLeft="10dp"
app:layout_constraintStart_toEndOf="@+id/user_img"
......@@ -86,9 +84,7 @@
android:layout_height="25dp"
android:src="@drawable/filters_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.663"
app:layout_constraintStart_toEndOf="@+id/rl_user_info"
tools:layout_editor_absoluteY="-1dp" />
app:layout_constraintTop_toTopOf="@+id/user_img" />
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
......@@ -96,7 +92,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/rl_header"
android:paddingHorizontal="12dp">
android:layout_marginTop="16dp"
android:paddingHorizontal="16dp">
<include layout="@layout/carousel_item" />
</RelativeLayout>
......@@ -108,15 +105,15 @@
android:layout_below="@id/rl_home_campaigns"
android:layout_marginVertical="25dp"
android:paddingHorizontal="15dp">
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_home_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_home_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- />-->
<include layout="@layout/coupon_layout" />
</LinearLayout>
......@@ -226,5 +223,4 @@
</LinearLayout>
</HorizontalScrollView>
</RelativeLayout>
</ScrollView>
</RelativeLayout>
</ScrollView>
......
......@@ -14,4 +14,5 @@
<color name="cos_green2">#52DF5A</color>
<color name="green_dark">#1DA87A</color>
<color name="cos_blue2">#0478BE</color>
<color name="white_tr2">#77FFFFFF</color>
</resources>
\ No newline at end of file
......
......@@ -20,4 +20,6 @@
<string name="menu_shop">Shop</string>
<string name="menu_loyalty">Loyalty</string>
<string name="menu_profile">Προφίλ</string>
<string name="cos_profile_loyalty_name">Γιώργος Γεωργίου</string>
<string name="cos_questionnaire">Ερωτηματολόγιο</string>
</resources>
\ No newline at end of file
......