Panagiotis Triantafyllou

ui fixes

......@@ -146,9 +146,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
.concat(":")
.concat("TabExpired"));
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
......@@ -170,9 +170,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
.concat(":")
.concat("TabShared"));
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
......@@ -219,9 +219,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
mLlSharedTab.setOnClickListener(this);
mLlShowMoreExpired.setOnClickListener(this);
mLlShowMoreShared.setOnClickListener(this);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
......
......@@ -252,14 +252,14 @@
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-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:textColor="@color/cos_light_black"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
......
......@@ -252,14 +252,14 @@
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-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:textColor="@color/cos_light_black"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
......
......@@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_info_view"
android:text="@string/cos_expired_coupon_label"
android:textColor="@color/cos_gray"
android:textColor="@color/cos_light_black"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
......
......@@ -68,7 +68,7 @@
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_gray"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
tools:text="@string/cos_expired_coupon_label" />
......@@ -77,7 +77,7 @@
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_gray"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
tools:text="@string/cos_expired_coupon_label" />
</LinearLayout>
......