open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
3369e245 1 parent e1cfdcd2

redesign part3

Inline Side-by-side
Showing 8 changed files with 260 additions and 176 deletions
package ly.warp.sdk.views;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.View;
import ly.warp.sdk.R;
/**
* Created by Panagiotis Triantafyllou on 13/Απρ/2023.
* @ https://stackoverflow.com/questions/20583298/creating-horizontal-and-vertical-dotted-lines-in-android
*/
public class DividerView extends View {
static public int ORIENTATION_HORIZONTAL = 0;
static public int ORIENTATION_VERTICAL = 1;
private Paint mPaint;
private int orientation;
public DividerView(Context context, AttributeSet attrs) {
super(context, attrs);
int dashGap, dashLength, dashThickness;
int color;
TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DividerView, 0, 0);
try {
dashGap = a.getDimensionPixelSize(R.styleable.DividerView_dashGap, 5);
dashLength = a.getDimensionPixelSize(R.styleable.DividerView_dashLength, 5);
dashThickness = a.getDimensionPixelSize(R.styleable.DividerView_dashThickness, 3);
color = a.getColor(R.styleable.DividerView_color, 0xff000000);
orientation = a.getInt(R.styleable.DividerView_orientation, ORIENTATION_HORIZONTAL);
} finally {
a.recycle();
}
mPaint = new Paint();
mPaint.setAntiAlias(true);
mPaint.setColor(color);
mPaint.setStyle(Paint.Style.STROKE);
mPaint.setStrokeWidth(dashThickness);
mPaint.setPathEffect(new DashPathEffect(new float[]{dashLength, dashGap,}, 0));
}
public DividerView(Context context) {
this(context, null);
}
@Override
protected void onDraw(Canvas canvas) {
if (orientation == ORIENTATION_HORIZONTAL) {
float center = getHeight() * .5f;
canvas.drawLine(0, center, getWidth(), center, mPaint);
} else {
float center = getWidth() * .5f;
canvas.drawLine(center, 0, center, getHeight(), mPaint);
}
}
}
\ 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"
xmlns:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginVertical="6dp"
android:layout_marginHorizontal="4dp"
android:layout_marginVertical="6dp"
android:background="@drawable/ic_coupon_background_new2">
<androidx.constraintlayout.widget.Guideline
......@@ -25,16 +26,21 @@
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_gifts_for_you" />
<View
<ly.warp.sdk.views.DividerView
android:id="@+id/v_separator"
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layerType="software"
android:layout_marginVertical="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/shape_dashed_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_active_coupon"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
custom:color="@color/cos_gray"
custom:dashGap="10dp"
custom:dashLength="10dp"
custom:dashThickness="1dp"
custom:orientation="vertical" />
<LinearLayout
android:id="@+id/ll_coupon_info"
......@@ -49,41 +55,41 @@
<TextView
android:id="@+id/tv_active_coupons_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/cos_light_black"
fontPath="fonts/BTCosmo-Bold.ttf"
android:textSize="16sp"
tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" />
<TextView
android:id="@+id/tv_active_coupons_value"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
android:textSize="42sp"
fontPath="fonts/BTCosmo-Bold.ttf"
tools:text="10$" />
<TextView
android:id="@+id/tv_active_coupons_date"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_gray"
fontPath="fonts/PeridotPE-Regular.ttf"
android:textSize="12sp"
tools:text="@string/cos_active_coupon_date" />
</LinearLayout>
<TextView
android:id="@+id/tv_active_coupons_description"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="32dp"
fontPath="fonts/PeridotPE-Regular.ttf"
android:maxLines="4"
android:textColor="@color/cos_gray"
android:textSize="12sp"
......
......@@ -42,7 +42,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_loyalty_analysis_header"
android:layout_marginBottom="24dp"
android:background="@color/white"
android:gravity="center_horizontal"
android:paddingHorizontal="12dp"
......@@ -56,86 +55,173 @@
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView
android:id="@+id/iv_gift_circle_logo"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_below="@+id/ll_tab_coupon_analysis"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_gift_circle" />
<RelativeLayout
android:id="@+id/rl_expired_view"
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_gift_circle_logo"
android:layout_marginTop="32dp"
tools:visibility="gone">
android:layout_below="@+id/ll_tab_coupon_analysis"
android:overScrollMode="never"
android:scrollbars="none">
<LinearLayout
android:id="@+id/ll_expired_coupons_title"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:background="@drawable/shape_cos_white_border"
android:paddingVertical="16dp">
android:paddingVertical="24dp">
<ImageView
android:id="@+id/iv_gift_circle_logo"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_gift_circle" />
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/rl_expired_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginVertical="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
tools:text="@string/cos_deals_win_title" />
</LinearLayout>
android:layout_below="@+id/iv_gift_circle_logo"
android:layout_marginTop="32dp"
tools:visibility="gone">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_coupons_title"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white_border"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<LinearLayout
android:id="@+id/ll_expired_coupons_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:background="@drawable/shape_cos_white_border"
android:paddingVertical="16dp">
<TextView
android:id="@+id/tv_expired_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginVertical="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
tools:text="@string/cos_deals_win_title" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_coupons_title"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white_border"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<TextView
android:id="@+id/tv_expired_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_marginTop="32dp"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_expired_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:overScrollMode="never" />
<LinearLayout
android:id="@+id/ll_show_more_expired"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
<ScrollView
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_expired_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/tv_expired_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="56dp"
android:text="@string/cos_empty_expired_coupons"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_shared_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_below="@+id/iv_gift_circle_logo"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="32dp"
android:scrollbars="none"
android:overScrollMode="never">
android:background="@drawable/shape_cos_white_border"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_shared_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
android:layout_marginTop="24dp"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_expired_coupons"
android:id="@+id/rv_shared_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:overScrollMode="never" />
<LinearLayout
android:id="@+id/ll_show_more_expired"
android:id="@+id/ll_show_more_shared"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -146,7 +232,7 @@
tools:visibility="visible">
<TextView
android:id="@+id/tv_expired_more"
android:id="@+id/tv_shared_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -155,7 +241,7 @@
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_expired_more_arrow"
android:id="@+id/iv_shared_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
......@@ -163,106 +249,20 @@
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>
<TextView
android:id="@+id/tv_expired_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="56dp"
android:text="@string/cos_empty_expired_coupons"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_shared_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_cos_white_border"
android:layout_below="@+id/iv_gift_circle_logo"
android:layout_marginTop="32dp"
android:layout_marginHorizontal="12dp"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_shared_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
android:layout_marginTop="24dp"
android:scrollbars="none"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_shared_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:overScrollMode="never" />
<LinearLayout
android:id="@+id/ll_show_more_shared"
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_shared_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_shared_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="3dp"
android:layout_marginStart="6dp"
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="56dp"
android:text="@string/cos_empty_shared_coupons"
android:textColor="@color/cos_light_grey2"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
android:layout_below="@+id/tv_shared_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="56dp"
android:text="@string/cos_empty_shared_coupons"
android:textColor="@color/cos_light_grey2"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
......
......@@ -82,7 +82,7 @@
<LinearLayout
android:id="@+id/ll_user_badge"
android:layout_width="180dp"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:background="@drawable/selector_button_green_border"
android:gravity="center"
......@@ -97,7 +97,8 @@
android:includeFontPadding="false"
android:textColor="@color/cos_green12"
android:textSize="16sp"
tools:text="@string/cos_profile_type" />
android:layout_marginHorizontal="20dp"
tools:text="@string/cos_profile_preferences_placeholder" />
</LinearLayout>
<LinearLayout
......@@ -179,7 +180,7 @@
android:includeFontPadding="false"
android:text="@string/cos_deals_win_title_cos"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_16_cos"
......@@ -188,8 +189,8 @@
<ImageView
android:id="@+id/iv_deals_logo"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="76dp"
android:layout_height="76dp"
android:layout_marginVertical="4dp"
android:src="@drawable/ic_deals_polygon_new"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -258,7 +259,7 @@
android:includeFontPadding="false"
android:text="@string/cos_deals_win_title"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_16"
......@@ -267,8 +268,8 @@
<ImageView
android:id="@+id/iv_gifts_logo"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="76dp"
android:layout_height="76dp"
android:layout_marginVertical="4dp"
android:src="@drawable/ic_gifts_polygon_new"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -301,7 +302,7 @@
<ImageView
android:id="@+id/dfy_logo"
android:layout_width="220dp"
android:layout_width="200dp"
android:layout_height="30dp"
android:layout_gravity="start"
android:layout_marginHorizontal="16dp"
......
......@@ -48,7 +48,7 @@
android:layout_weight="0.5"
android:maxLines="2"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
android:textSize="16sp"
tools:text="Box" />
<TextView
......
......@@ -48,7 +48,7 @@
android:layout_weight="0.5"
android:maxLines="2"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
android:textSize="16sp"
tools:text="Box" />
<TextView
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="DividerView">
<attr name="color" format="color" />
<attr name="dashLength" format="dimension" />
<attr name="dashGap" format="dimension" />
<attr name="dashThickness" format="dimension" />
<attr name="orientation" format="enum">
<enum name="horizontal" value="0" />
<enum name="vertical" value="1" />
</attr>
</declare-styleable>
</resources>
\ No newline at end of file
......@@ -149,6 +149,7 @@
<string name="cos_dlg_no_map">Το πρόγραμμα Χάρτες Petal λείπει.</string>
<string name="cos_dlg_no_shops_title">Καταστήματα συνεργάτη</string>
<string name="cos_dlg_no_shops_positive">Δες το eshop</string>
<string name="cos_profile_preferences_placeholder">Οι προτιμήσεις μου</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......