redesign supermarket part4

@@ -274,7 +274,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
             return;
             return;
         }
         }
         if (view.getId() == R.id.cl_market_inner) {
         if (view.getId() == R.id.cl_market_inner) {
-            if (countValue > 0) {
+//            if (countValue > 0) {
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
                         .concat(":")
                         .concat(":")
                         .concat("MarketBanner"));
                         .concat("MarketBanner"));
@@ -284,7 +284,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
                 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
                 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
                 Intent intent = new Intent(LoyaltyWallet.this, LoyaltyMarketAnalysisActivity.class);
                 Intent intent = new Intent(LoyaltyWallet.this, LoyaltyMarketAnalysisActivity.class);
                 startActivity(intent);
                 startActivity(intent);
-            }
+//            }
             return;
             return;
         }
         }
         if (view.getId() == R.id.cl_mygifts) {
         if (view.getId() == R.id.cl_mygifts) {
@@ -391,7 +391,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
         if (mUnifiedCoupons != null && mUnifiedCoupons.size() > 0) {
         if (mUnifiedCoupons != null && mUnifiedCoupons.size() > 0) {
             ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>();
             ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>();
             for (UnifiedCoupon unicpn : mUnifiedCoupons) {
             for (UnifiedCoupon unicpn : mUnifiedCoupons) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                 Date newDate = new Date();
                 Date newDate = new Date();
                 try {
                 try {
                     newDate = simpleDateFormat.parse(unicpn.getCreated());
                     newDate = simpleDateFormat.parse(unicpn.getCreated());
@@ -644,7 +644,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
                 mUnifiedCouponsAll = result;
                 mUnifiedCouponsAll = result;
                 ArrayList<UnifiedCoupon> cpnlist = new ArrayList<UnifiedCoupon>();
                 ArrayList<UnifiedCoupon> cpnlist = new ArrayList<UnifiedCoupon>();
                 for (UnifiedCoupon cpn : result) {
                 for (UnifiedCoupon cpn : result) {
-                    if (cpn.getStatus().equals("active")) {
+                    if (cpn.getStatus().trim().equals("active")) {
                         cpnlist.add(cpn);
                         cpnlist.add(cpn);
                     }
                     }
                 }
                 }

@@ -95,7 +95,7 @@ public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapte
                 for (Coupon item : couponItem.getCoupons()) {
                 for (Coupon item : couponItem.getCoupons()) {
                     if (item.getStatus() == 1) {
                     if (item.getStatus() == 1) {
                         count++;
                         count++;
-                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                         Date newDate = new Date();
                         Date newDate = new Date();
                         try {
                         try {
                             newDate = simpleDateFormat.parse(item.getExpiration());
                             newDate = simpleDateFormat.parse(item.getExpiration());
@@ -110,7 +110,7 @@ public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapte
                 Collections.sort(couponList, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
                 Collections.sort(couponList, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
 
 
                 if (couponList != null && couponList.size() > 0) {
                 if (couponList != null && couponList.size() > 0) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                     Date newDate = new Date();
                     Date newDate = new Date();
                     try {
                     try {
                         newDate = simpleDateFormat.parse(couponList.get(0).getExpiration());
                         newDate = simpleDateFormat.parse(couponList.get(0).getExpiration());

@@ -93,6 +93,7 @@
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="3"
                 android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/cos_light_black"
                 android:textColor="@color/cos_light_black"
                 android:textSize="12sp"
                 android:textSize="12sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"

@@ -87,6 +87,7 @@
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="3"
                 android:maxLines="3"
+                android:ellipsize="end"
                 android:textColor="@color/cos_light_black"
                 android:textColor="@color/cos_light_black"
                 android:textSize="12sp"
                 android:textSize="12sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"

@@ -91,6 +91,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginEnd="16dp"
         android:maxLines="3"
         android:maxLines="3"
+        android:ellipsize="end"
         android:textColor="@color/cos_light_black"
         android:textColor="@color/cos_light_black"
         android:textSize="12sp"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

@@ -169,6 +169,7 @@
     <string name="cos_coupon_date_limit2">%1$s</string>
     <string name="cos_coupon_date_limit2">%1$s</string>
     <string name="cos_for_you_all">Μέχρι τώρα έχεις κερδίσει&#160;%1$s€&#160;στο For You!</string>
     <string name="cos_for_you_all">Μέχρι τώρα έχεις κερδίσει&#160;%1$s€&#160;στο For You!</string>
     <string name="cos_supermarket_win">Έχεις κερδίσει&#160;%1$s€&#160;με τα\nSuperMarket Deals!</string>
     <string name="cos_supermarket_win">Έχεις κερδίσει&#160;%1$s€&#160;με τα\nSuperMarket Deals!</string>
+    <string name="cos_supermarket_history">Μέχρι τώρα έχεις κερδίσει %1$s€ σε προσφορές από %2$s κουπόνια!</string>
 
 
     <string-array name="coupons_array">
     <string-array name="coupons_array">
         <item>Κουπόνια</item>
         <item>Κουπόνια</item>