open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
e86947ed 1 parent 5db7ba6f

ui fixes

Inline Side-by-side
Showing 5 changed files with 13 additions and 13 deletions
...@@ -146,9 +146,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -146,9 +146,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
146 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen") 146 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
147 .concat(":") 147 .concat(":")
148 .concat("TabExpired")); 148 .concat("TabExpired"));
149 - mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 149 + mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
150 TextView expiredTab = findViewById(R.id.tv_expired_tab); 150 TextView expiredTab = findViewById(R.id.tv_expired_tab);
151 - expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 151 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
152 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 152 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
153 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 153 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
154 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 154 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
...@@ -170,9 +170,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -170,9 +170,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
170 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen") 170 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
171 .concat(":") 171 .concat(":")
172 .concat("TabShared")); 172 .concat("TabShared"));
173 - mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 173 + mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
174 TextView sharedTab = findViewById(R.id.tv_shared_tab); 174 TextView sharedTab = findViewById(R.id.tv_shared_tab);
175 - sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 175 + sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
176 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 176 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
177 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 177 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
178 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 178 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
...@@ -219,9 +219,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -219,9 +219,9 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
219 mLlSharedTab.setOnClickListener(this); 219 mLlSharedTab.setOnClickListener(this);
220 mLlShowMoreExpired.setOnClickListener(this); 220 mLlShowMoreExpired.setOnClickListener(this);
221 mLlShowMoreShared.setOnClickListener(this); 221 mLlShowMoreShared.setOnClickListener(this);
222 - mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 222 + mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
223 TextView expiredTab = findViewById(R.id.tv_expired_tab); 223 TextView expiredTab = findViewById(R.id.tv_expired_tab);
224 - expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 224 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
225 CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 225 CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
226 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 226 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
227 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 227 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
......
...@@ -252,14 +252,14 @@ ...@@ -252,14 +252,14 @@
252 252
253 <TextView 253 <TextView
254 android:id="@+id/tv_shared_empty" 254 android:id="@+id/tv_shared_empty"
255 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 255 + fontPath="fonts/PeridotPE-Regular.ttf"
256 android:layout_width="wrap_content" 256 android:layout_width="wrap_content"
257 android:layout_height="wrap_content" 257 android:layout_height="wrap_content"
258 android:layout_below="@+id/tv_shared_title" 258 android:layout_below="@+id/tv_shared_title"
259 android:layout_centerHorizontal="true" 259 android:layout_centerHorizontal="true"
260 android:layout_marginTop="56dp" 260 android:layout_marginTop="56dp"
261 android:text="@string/cos_empty_shared_coupons" 261 android:text="@string/cos_empty_shared_coupons"
262 - android:textColor="@color/cos_light_grey2" 262 + android:textColor="@color/cos_light_black"
263 android:textSize="16sp" 263 android:textSize="16sp"
264 android:visibility="gone" /> 264 android:visibility="gone" />
265 </RelativeLayout> 265 </RelativeLayout>
......
...@@ -252,14 +252,14 @@ ...@@ -252,14 +252,14 @@
252 252
253 <TextView 253 <TextView
254 android:id="@+id/tv_shared_empty" 254 android:id="@+id/tv_shared_empty"
255 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 255 + fontPath="fonts/PeridotPE-Regular.ttf"
256 android:layout_width="wrap_content" 256 android:layout_width="wrap_content"
257 android:layout_height="wrap_content" 257 android:layout_height="wrap_content"
258 android:layout_below="@+id/tv_shared_title" 258 android:layout_below="@+id/tv_shared_title"
259 android:layout_centerHorizontal="true" 259 android:layout_centerHorizontal="true"
260 android:layout_marginTop="56dp" 260 android:layout_marginTop="56dp"
261 android:text="@string/cos_empty_shared_coupons" 261 android:text="@string/cos_empty_shared_coupons"
262 - android:textColor="@color/cos_light_grey2" 262 + android:textColor="@color/cos_light_black"
263 android:textSize="16sp" 263 android:textSize="16sp"
264 android:visibility="gone" /> 264 android:visibility="gone" />
265 </RelativeLayout> 265 </RelativeLayout>
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
71 android:layout_below="@+id/ll_expired_info_view" 71 android:layout_below="@+id/ll_expired_info_view"
72 android:text="@string/cos_expired_coupon_label" 72 android:text="@string/cos_expired_coupon_label"
73 - android:textColor="@color/cos_gray" 73 + android:textColor="@color/cos_light_black"
74 android:textSize="15sp" /> 74 android:textSize="15sp" />
75 </LinearLayout> 75 </LinearLayout>
76 </LinearLayout> 76 </LinearLayout>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 fontPath="fonts/PeridotPE-Regular.ttf" 68 fontPath="fonts/PeridotPE-Regular.ttf"
69 android:layout_width="wrap_content" 69 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
71 - android:textColor="@color/cos_gray" 71 + android:textColor="@color/cos_light_black"
72 android:textSize="15sp" 72 android:textSize="15sp"
73 tools:text="@string/cos_expired_coupon_label" /> 73 tools:text="@string/cos_expired_coupon_label" />
74 74
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 fontPath="fonts/PeridotPE-Regular.ttf" 77 fontPath="fonts/PeridotPE-Regular.ttf"
78 android:layout_width="wrap_content" 78 android:layout_width="wrap_content"
79 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
80 - android:textColor="@color/cos_gray" 80 + android:textColor="@color/cos_light_black"
81 android:textSize="15sp" 81 android:textSize="15sp"
82 tools:text="@string/cos_expired_coupon_label" /> 82 tools:text="@string/cos_expired_coupon_label" />
83 </LinearLayout> 83 </LinearLayout>
......