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

Expand all
Inline Side-by-side
Showing 7 changed files with 23 additions and 18 deletions
...@@ -12,6 +12,7 @@ import android.widget.LinearLayout; ...@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
12 import android.widget.RelativeLayout; 12 import android.widget.RelativeLayout;
13 import android.widget.TextView; 13 import android.widget.TextView;
14 14
15 +import androidx.cardview.widget.CardView;
15 import androidx.core.content.ContextCompat; 16 import androidx.core.content.ContextCompat;
16 import androidx.recyclerview.widget.LinearLayoutManager; 17 import androidx.recyclerview.widget.LinearLayoutManager;
17 import androidx.recyclerview.widget.RecyclerView; 18 import androidx.recyclerview.widget.RecyclerView;
...@@ -53,7 +54,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -53,7 +54,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
53 private ExpiredCouponAdapter mAdapterExpiredCoupons; 54 private ExpiredCouponAdapter mAdapterExpiredCoupons;
54 private SharedCouponAdapter mAdapterSharedCoupons; 55 private SharedCouponAdapter mAdapterSharedCoupons;
55 private LinearLayout mLlExpiredTab, mLlSharedTab, mLlShowMoreExpired, mLlShowMoreShared; 56 private LinearLayout mLlExpiredTab, mLlSharedTab, mLlShowMoreExpired, mLlShowMoreShared;
56 - private RelativeLayout mRlExpiredView, mRlSharedView; 57 + private RelativeLayout mRlExpiredView;
58 + private CardView mRlSharedView;
57 private SharingList mSharedCoupons = new SharingList(); 59 private SharingList mSharedCoupons = new SharingList();
58 private int mTimer = 0; 60 private int mTimer = 0;
59 private Handler mSecondsHandler; 61 private Handler mSecondsHandler;
......
...@@ -18,6 +18,7 @@ import android.widget.ScrollView; ...@@ -18,6 +18,7 @@ import android.widget.ScrollView;
18 import android.widget.TextView; 18 import android.widget.TextView;
19 19
20 import androidx.appcompat.app.AlertDialog; 20 import androidx.appcompat.app.AlertDialog;
21 +import androidx.cardview.widget.CardView;
21 import androidx.constraintlayout.widget.ConstraintLayout; 22 import androidx.constraintlayout.widget.ConstraintLayout;
22 import androidx.core.content.ContextCompat; 23 import androidx.core.content.ContextCompat;
23 import androidx.core.widget.NestedScrollView; 24 import androidx.core.widget.NestedScrollView;
...@@ -81,7 +82,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -81,7 +82,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
81 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate, 82 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
82 mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll; 83 mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll;
83 private ConstraintLayout mClDealsBanner, mClDealsView, 84 private ConstraintLayout mClDealsBanner, mClDealsView,
84 - mClGiftsBanner, mClToolbar, mClExp, mClMarket; 85 + mClGiftsBanner, mClToolbar, mClMarket;
85 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts, 86 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts,
86 mLlMarketView; 87 mLlMarketView;
87 private FlowLayout mLlActiveCodesView; 88 private FlowLayout mLlActiveCodesView;
...@@ -99,6 +100,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -99,6 +100,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
99 private MarketCouponAdapter mAdapterMarketCoupons; 100 private MarketCouponAdapter mAdapterMarketCoupons;
100 private ExpandableLayout mElGifts; 101 private ExpandableLayout mElGifts;
101 private boolean mIsStayCollapsed = true; 102 private boolean mIsStayCollapsed = true;
103 + private CardView mClExp;
102 104
103 // =========================================================== 105 // ===========================================================
104 // Methods for/from SuperClass/Interfaces 106 // Methods for/from SuperClass/Interfaces
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 android:layout_marginTop="24dp" 106 android:layout_marginTop="24dp"
107 android:text="Κωδικός Κουπονιού" 107 android:text="Κωδικός Κουπονιού"
108 android:textColor="@color/cos_light_black" 108 android:textColor="@color/cos_light_black"
109 - android:textSize="16sp" /> 109 + android:textSize="18sp" />
110 110
111 <TextView 111 <TextView
112 android:id="@+id/textView16" 112 android:id="@+id/textView16"
...@@ -210,9 +210,9 @@ ...@@ -210,9 +210,9 @@
210 android:layout_width="wrap_content" 210 android:layout_width="wrap_content"
211 android:layout_height="wrap_content" 211 android:layout_height="wrap_content"
212 android:layout_gravity="center" 212 android:layout_gravity="center"
213 - android:layout_marginTop="24dp" 213 + android:layout_marginTop="16dp"
214 android:textColor="@color/cos_light_black" 214 android:textColor="@color/cos_light_black"
215 - android:textSize="15sp" 215 + android:textSize="16sp"
216 tools:text="@string/cos_coupon_date" /> 216 tools:text="@string/cos_coupon_date" />
217 217
218 <LinearLayout 218 <LinearLayout
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
31 - android:textSize="21sp" 31 + android:textSize="19sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <ImageView 56 <ImageView
57 android:id="@+id/imageView6" 57 android:id="@+id/imageView6"
58 android:layout_width="match_parent" 58 android:layout_width="match_parent"
59 - android:layout_height="295dp" 59 + android:layout_height="255dp"
60 android:scaleType="centerCrop" 60 android:scaleType="centerCrop"
61 android:src="@drawable/unified_coupon_banner" /> 61 android:src="@drawable/unified_coupon_banner" />
62 62
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 android:layout_height="wrap_content" 189 android:layout_height="wrap_content"
190 android:text="@string/cos_hide_market_coupons" 190 android:text="@string/cos_hide_market_coupons"
191 android:textColor="@color/cos_light_black" 191 android:textColor="@color/cos_light_black"
192 - android:textSize="16sp" /> 192 + android:textSize="15sp" />
193 193
194 <ImageView 194 <ImageView
195 android:id="@+id/iv_market_expand" 195 android:id="@+id/iv_market_expand"
...@@ -283,7 +283,8 @@ ...@@ -283,7 +283,8 @@
283 android:layout_marginHorizontal="32dp" 283 android:layout_marginHorizontal="32dp"
284 android:layout_marginTop="16dp" 284 android:layout_marginTop="16dp"
285 android:text="@string/cos_market_terms" 285 android:text="@string/cos_market_terms"
286 - android:textColor="@color/cos_gray" 286 + android:textColor="@color/cos_light_black"
287 + android:textSize="14sp"
287 android:visibility="gone" 288 android:visibility="gone"
288 tools:visibility="visible"/> 289 tools:visibility="visible"/>
289 </RelativeLayout> 290 </RelativeLayout>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
5 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
6 android:id="@+id/cl_custom_layout" 6 android:id="@+id/cl_custom_layout"
7 android:layout_width="match_parent" 7 android:layout_width="match_parent"
8 - android:layout_height="150dp" 8 + android:layout_height="145dp"
9 - android:layout_marginHorizontal="4dp" 9 + android:layout_marginHorizontal="6dp"
10 - android:layout_marginVertical="4dp" 10 + android:layout_marginBottom="4dp"
11 - android:background="@drawable/ic_coupon_background_new2"> 11 + android:background="@drawable/ic_coupon_background_new3">
12 12
13 <ImageView 13 <ImageView
14 android:id="@+id/iv_active_coupon" 14 android:id="@+id/iv_active_coupon"
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
4 xmlns:custom="http://schemas.android.com/apk/res-auto" 4 xmlns:custom="http://schemas.android.com/apk/res-auto"
5 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="150dp" 7 + android:layout_height="145dp"
8 - android:layout_marginHorizontal="4dp" 8 + android:layout_marginHorizontal="6dp"
9 - android:layout_marginVertical="4dp" 9 + android:layout_marginBottom="3dp"
10 - android:background="@drawable/ic_coupon_background_new2"> 10 + android:background="@drawable/ic_coupon_background_new3">
11 11
12 <androidx.constraintlayout.widget.Guideline 12 <androidx.constraintlayout.widget.Guideline
13 android:id="@+id/gl_vertical_72_percent" 13 android:id="@+id/gl_vertical_72_percent"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <ly.warp.sdk.views.DividerView 30 <ly.warp.sdk.views.DividerView
31 android:id="@+id/v_separator" 31 android:id="@+id/v_separator"
32 android:layout_width="1dp" 32 android:layout_width="1dp"
33 - android:layout_height="match_parent" 33 + android:layout_height="0dp"
34 android:layout_marginVertical="16dp" 34 android:layout_marginVertical="16dp"
35 android:layout_marginStart="16dp" 35 android:layout_marginStart="16dp"
36 android:layerType="software" 36 android:layerType="software"
......