open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
17d4ae6b 1 parent 9a959169

ui changes and fixes

Inline Side-by-side
Showing 7 changed files with 76 additions and 40 deletions
......@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -53,7 +54,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
private ExpiredCouponAdapter mAdapterExpiredCoupons;
private SharedCouponAdapter mAdapterSharedCoupons;
private LinearLayout mLlExpiredTab, mLlSharedTab, mLlShowMoreExpired, mLlShowMoreShared;
private RelativeLayout mRlExpiredView, mRlSharedView;
private RelativeLayout mRlExpiredView;
private CardView mRlSharedView;
private SharingList mSharedCoupons = new SharingList();
private int mTimer = 0;
private Handler mSecondsHandler;
......
......@@ -18,6 +18,7 @@ import android.widget.ScrollView;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.cardview.widget.CardView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.core.widget.NestedScrollView;
......@@ -81,7 +82,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll;
private ConstraintLayout mClDealsBanner, mClDealsView,
mClGiftsBanner, mClToolbar, mClExp, mClMarket;
mClGiftsBanner, mClToolbar, mClMarket;
private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts,
mLlMarketView;
private FlowLayout mLlActiveCodesView;
......@@ -99,6 +100,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
private MarketCouponAdapter mAdapterMarketCoupons;
private ExpandableLayout mElGifts;
private boolean mIsStayCollapsed = true;
private CardView mClExp;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......
......@@ -106,7 +106,7 @@
android:layout_marginTop="24dp"
android:text="Κωδικός Κουπονιού"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/textView16"
......@@ -210,9 +210,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="24dp"
android:layout_marginTop="16dp"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
android:textSize="16sp"
tools:text="@string/cos_coupon_date" />
<LinearLayout
......
......@@ -136,18 +136,24 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.cardview.widget.CardView
android:id="@+id/cl_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp"
android:layout_marginHorizontal="11dp"
android:layout_marginTop="24dp"
android:background="@drawable/shape_cos_white_border"
android:paddingHorizontal="14dp"
android:paddingVertical="14dp"
android:visibility="gone"
app:cardCornerRadius="16dp"
app:cardElevation="2dp"
tools:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingHorizontal="14dp"
android:paddingVertical="14dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_64_exp"
android:layout_width="wrap_content"
......@@ -203,6 +209,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<net.cachapa.expandablelayout.ExpandableLayout
android:id="@+id/el_exp"
......@@ -216,13 +223,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner_cos"
<androidx.cardview.widget.CardView
android:id="@+id/cv_deals_win_inner_cos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="6dp"
android:background="@drawable/shape_cos_white_border"
app:cardCornerRadius="16dp"
app:cardElevation="2dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner_cos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingHorizontal="6dp"
android:paddingVertical="4dp">
......@@ -270,15 +284,23 @@
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
tools:text="18.00€" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner"
<androidx.cardview.widget.CardView
android:id="@+id/cv_deals_win_inner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_deals_win_inner_cos"
android:layout_below="@+id/cv_deals_win_inner_cos"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="6dp"
android:background="@drawable/shape_cos_white_border"
app:cardCornerRadius="16dp"
app:cardElevation="2dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingHorizontal="6dp"
android:paddingVertical="4dp">
......@@ -326,15 +348,24 @@
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
tools:text="20.00€" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_market_inner"
<androidx.cardview.widget.CardView
android:id="@+id/cv_market_inner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_deals_win_inner"
android:layout_below="@+id/cv_deals_win_inner"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="6dp"
android:background="@drawable/shape_cos_white_border"
android:layout_marginBottom="6dp"
app:cardCornerRadius="16dp"
app:cardElevation="2dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_market_inner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingHorizontal="6dp"
android:paddingVertical="4dp">
......@@ -382,6 +413,7 @@
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_market"
tools:text="20.00€" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
</net.cachapa.expandablelayout.ExpandableLayout>
......@@ -389,7 +421,7 @@
android:id="@+id/ll_market_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginTop="20dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
......@@ -446,15 +478,14 @@
android:id="@+id/cl_mygifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp"
android:background="@color/white"
android:paddingVertical="10dp">
android:paddingVertical="8dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="20dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle"
......@@ -514,7 +545,7 @@
android:layout_width="86dp"
android:layout_height="86dp"
android:layout_marginVertical="4dp"
android:layout_marginEnd="32dp"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_deals_new"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
android:textSize="19sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -56,7 +56,7 @@
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="295dp"
android:layout_height="255dp"
android:scaleType="centerCrop"
android:src="@drawable/unified_coupon_banner" />
......@@ -189,7 +189,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_hide_market_coupons"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_market_expand"
......@@ -283,7 +283,8 @@
android:layout_marginHorizontal="32dp"
android:layout_marginTop="16dp"
android:text="@string/cos_market_terms"
android:textColor="@color/cos_gray"
android:textColor="@color/cos_light_black"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible"/>
</RelativeLayout>
......
......@@ -5,10 +5,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_custom_layout"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginHorizontal="4dp"
android:layout_marginVertical="4dp"
android:background="@drawable/ic_coupon_background_new2">
android:layout_height="145dp"
android:layout_marginHorizontal="6dp"
android:layout_marginBottom="4dp"
android:background="@drawable/ic_coupon_background_new3">
<ImageView
android:id="@+id/iv_active_coupon"
......
......@@ -4,10 +4,10 @@
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_marginHorizontal="4dp"
android:layout_marginVertical="4dp"
android:background="@drawable/ic_coupon_background_new2">
android:layout_height="145dp"
android:layout_marginHorizontal="6dp"
android:layout_marginBottom="3dp"
android:background="@drawable/ic_coupon_background_new3">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_72_percent"
......@@ -30,7 +30,7 @@
<ly.warp.sdk.views.DividerView
android:id="@+id/v_separator"
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_marginVertical="16dp"
android:layout_marginStart="16dp"
android:layerType="software"
......