Panagiotis Triantafyllou

mfy redesign

......@@ -78,6 +78,7 @@
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_no_border.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_white.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_mfy_rounded.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_gradient.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_image.xml" value="0.2965" />
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:bottomRightRadius="0dp"
android:topLeftRadius="20dp"
android:topRightRadius="45dp"
android:bottomLeftRadius="20dp"/>
<stroke android:width="1dp" android:color="@color/cos_grey2" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
......@@ -3,9 +3,9 @@
android:width="318.547dp"
android:height="237dp"
android:viewportWidth="318.547"
android:viewportHeight="237">
android:viewportHeight="242">
<path
android:fillColor="#fff"
android:pathData="M318.546,237H5a5.006,5.006,0,0,1-5-5V5A5.006,5.006,0,0,1,5,0H212.609A73.158,73.158,0,0,1,268.8,66h0.2V187a49.958,49.958,0,0,0,49.546,50Z" />
android:pathData="M279.314,242 L20,242 A20,20,0,0,1,0,222 L0,20 A20,20,0,0,1,20,0 L231.651,0 L231.651,193.9 A48.246,48.246,0,0,0,279.314,242 Z M352.088,0.286 C350.479,0.113,348.83,0.018,347.188,0.002 A45.174,45.174,0,0,1,352.088,0.284 Z" />
</vector>
\ No newline at end of file
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cos_grey5"
android:background="@color/cos_light_grey3"
android:fillViewport="true"
android:orientation="vertical">
......@@ -12,15 +12,13 @@
android:id="@+id/cl_more_header"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="@drawable/ic_background_transparent_shadow"
android:translationZ="10dp">
android:background="@color/white">
<ImageView
android:id="@+id/iv_list_close"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
android:scaleType="centerInside"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -29,14 +27,13 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/cos_more_title"
android:textColor="@color/grey"
android:textSize="17sp"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -45,16 +42,14 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="-18dp"
android:orientation="vertical">
android:layout_height="match_parent">
<ScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fillViewport="true"
android:scrollbars="none"
android:overScrollMode="never">
android:overScrollMode="never"
android:scrollbars="none">
<RelativeLayout
android:layout_width="match_parent"
......@@ -114,11 +109,11 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:clipToPadding="false"
android:scrollbars="none"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingTop="44dp"
android:paddingBottom="24dp"
android:scrollbars="none"
android:visibility="gone" />
<LinearLayout
......@@ -126,17 +121,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="44dp"
android:overScrollMode="never"
android:layout_marginTop="16dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_research_section"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="14sp"
tools:text="ΕΡΕΥΝΑ" />
<androidx.recyclerview.widget.RecyclerView
......@@ -144,11 +140,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:scrollbars="none"
android:clipToPadding="false"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingBottom="4dp" />
android:paddingBottom="4dp"
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
......@@ -157,16 +153,17 @@
android:layout_height="wrap_content"
android:layout_below="@+id/ll_research_items"
android:orientation="vertical"
android:layout_marginTop="12dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_exclusive_section"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="14sp"
tools:text="ΕΡΕΥΝΑ" />
<androidx.recyclerview.widget.RecyclerView
......@@ -175,10 +172,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:clipToPadding="false"
android:scrollbars="none"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingBottom="4dp" />
android:paddingBottom="4dp"
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
......@@ -187,16 +184,17 @@
android:layout_height="wrap_content"
android:layout_below="@+id/ll_exclusive_items"
android:orientation="vertical"
android:layout_marginTop="12dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_contest_section"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="14sp"
tools:text="ΕΡΕΥΝΑ" />
<androidx.recyclerview.widget.RecyclerView
......@@ -204,11 +202,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:scrollbars="none"
android:clipToPadding="false"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingBottom="4dp" />
android:paddingBottom="4dp"
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
......@@ -217,16 +215,17 @@
android:layout_height="wrap_content"
android:layout_below="@+id/ll_contest_items"
android:orientation="vertical"
android:layout_marginTop="12dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_contextual_section"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="14sp"
tools:text="ΕΡΕΥΝΑ" />
<androidx.recyclerview.widget.RecyclerView
......@@ -234,13 +233,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:scrollbars="none"
android:clipToPadding="false"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingBottom="4dp" />
android:paddingBottom="4dp"
android:scrollbars="none" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
......
......@@ -7,17 +7,11 @@
android:layout_marginBottom="16dp"
android:background="@android:color/transparent">
<androidx.cardview.widget.CardView
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="240dp"
android:layout_marginHorizontal="16dp"
android:background="@android:color/transparent"
app:cardCornerRadius="5dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/selector_cos_campaign">
android:background="@drawable/shape_cos_mfy_rounded">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_54_percent"
......@@ -33,11 +27,13 @@
android:orientation="vertical"
app:layout_constraintGuide_percent="0.8" />
<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_campaign_logo"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerInside"
android:layout_margin="1dp"
app:shapeAppearanceOverlay="@style/ShapeAppearanceMfyImage"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/gl_vertical_54_percent"
......@@ -49,6 +45,7 @@
android:layout_height="match_parent"
android:background="@drawable/svg_background_more"
android:orientation="vertical"
android:layout_margin="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent"
app:layout_constraintStart_toStartOf="parent"
......@@ -59,18 +56,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.8" />
app:layout_constraintGuide_percent="0.76" />
<TextView
android:id="@+id/tv_campaign_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="20dp"
android:layout_marginTop="16dp"
android:maxLines="4"
android:textColor="@color/blue_dark"
android:textSize="18sp"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
......@@ -78,14 +75,14 @@
<TextView
android:id="@+id/tv_campaign_subtitle"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="6dp"
android:layout_marginTop="4dp"
android:maxLines="4"
android:textColor="@color/blue_dark"
android:textSize="16sp"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_campaign_title"
......@@ -93,34 +90,31 @@
<TextView
android:id="@+id/tv_campaign_message"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="16dp"
android:maxLines="4"
android:textColor="@color/blue_dark"
android:textSize="16sp"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
app:layout_constraintStart_toStartOf="parent"
tools:text="Σπάσε την πινιάτα και κέρδισε μοναδικά δώρα εσύ και το ταίρι σου!" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<ImageView
android:id="@+id/iv_campaign_new"
android:layout_width="56dp"
android:layout_height="24dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="8dp"
android:layout_marginTop="36dp"
android:layout_marginEnd="12dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_new_icon"
android:translationZ="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</RelativeLayout>
\ No newline at end of file
......
......@@ -46,4 +46,24 @@
<item name="cornerSizeBottomRight">19dp</item>
</style>
<style name="CustomCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
<item name="shapeAppearanceOverlay">@style/CardCustomCorners</item>
</style>
<style name="CardCustomCorners" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">45dp</item>
<item name="cornerSizeTopLeft">20dp</item>
<item name="cornerSizeBottomRight">0dp</item>
<item name="cornerSizeBottomLeft">20dp</item>
</style>
<style name="ShapeAppearanceMfyImage" parent="">
<item name="cornerFamilyTopRight">rounded</item>
<item name="cornerFamilyBottomRight">rounded</item>
<item name="cornerSizeTopRight">45dp</item>
<item name="cornerSizeBottomRight">0dp</item>
</style>
</resources>
\ No newline at end of file
......