同步赛程、更换字体

TMessagesProj/src/main/AndroidManifest.xml

@@ -737,31 +737,31 @@
 
         <activity
             android:name="org.telegram.onecric.ui.activity.CricketDetailActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.CricketInnerActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.CricketTeamsActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.PlayerProfileActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.CricketStatsActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.PlayerStatsActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <activity
             android:name="org.telegram.onecric.ui.activity.TeamComparisonActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/ThemeMatch" />
 
         <service android:name="org.telegram.cricdit.service.SyncDataService" />
 

TMessagesProj/src/main/java/org/telegram/cricdit/adapter/RankListTopAdapter.java

@@ -25,6 +25,7 @@ import org.telegram.cricdit.bean.Base;
 import org.telegram.cricdit.bean.RankListBean;
 import org.telegram.cricdit.ui.RankDetailActivity;
 import org.telegram.cricdit.utils.ColorUtil;
+import org.telegram.cricdit.utils.DrawableUtil;
 import org.telegram.cricdit.utils.UIUtil;
 import org.telegram.messenger.R;
 
@@ -40,7 +41,7 @@ public class RankListTopAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View item =View.inflate(mContext,R.layout.item_rank_list_hot2,null);
+        View item =View.inflate(mContext,R.layout.item_rank_list_hot,null);
         return new TopViewHolder(item);
     }
 
@@ -55,13 +56,11 @@ public class RankListTopAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         mHolder.tvHotNum.setTextColor(ColorUtil.COLOR_BLACK_TEXT);
         RankListBean.TitleBean titleBean = mList.get(position);
 
-        GradientDrawable gd = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[]{ColorUtil.COLOR_WHITE});
+/*        GradientDrawable gd = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[]{ColorUtil.COLOR_WHITE});
         gd.setShape(GradientDrawable.RECTANGLE);
         gd.setColor(ColorUtil.COLOR_WHITE);
         gd.setStroke(UIUtil.dip2px(mContext,1),ColorUtil.COLOR_GRAY);
-        gd.setCornerRadius(UIUtil.dip2px(mContext, 8));
-        mHolder.topContainer.setBackground(gd);
-
+        gd.setCornerRadius(UIUtil.dip2px(mContext, 8));*/
 
         mHolder.tvTitle.setText(titleBean.getTitle());
         mHolder.tvHotNum.setText(titleBean.getHeat());

TMessagesProj/src/main/java/org/telegram/cricdit/utils/TimeUtils.java

@@ -242,4 +242,60 @@ public class TimeUtils {
         Date date = new Date(currentTime);
         Log.i("lognowtime",str+" : ---- "+formatter.format(date));
     }
+
+    /**
+     * 将时间戳转化为对应的时间  日-时-分-秒
+     */
+    public static String timeConversion(long time) {
+        long day = 0;
+        long hour = 0;
+        long minutes = 0;
+        long sencond = 0;
+        long dayTimp = time % (3600 * 24);
+        long hourTimp = time % 3600;
+
+        if (time >= 86400) {
+            day = time / (3600 * 24);
+            if (dayTimp != 0) {
+                time = time - (day * 24 * 60 * 60);
+                if (time >= 3600 && time < 86400) {
+                    hour = time / 3600;
+                    if (hourTimp != 0) {
+                        if (hourTimp >= 60) {
+                            minutes = hourTimp / 60;
+                            if (hourTimp % 60 != 0) {
+                                sencond = hourTimp % 60;
+                            }
+                        } else if (hourTimp < 60) {
+                            sencond = hourTimp;
+                        }
+                    }
+                } else if (time < 3600) {
+                    minutes = time / 60;
+                    if (time % 60 != 0) {
+                        sencond = time % 60;
+                    }
+                }
+            }
+        } else if (time >= 3600 && time < 86400) {
+            hour = time / 3600;
+            if (hourTimp != 0) {
+                if (hourTimp >= 60) {
+                    minutes = hourTimp / 60;
+                    if (hourTimp % 60 != 0) {
+                        sencond = hourTimp % 60;
+                    }
+                } else if (hourTimp < 60) {
+                    sencond = hourTimp;
+                }
+            }
+        } else if (time < 3600) {
+            minutes = time / 60;
+            if (time % 60 != 0) {
+                sencond = time % 60;
+            }
+        }
+//        return ((hour != 0 ? ((hour + "h ")): "")) + (minutes < 10 ? ("0" + minutes) : minutes) + "m " + (sencond < 10 ? ("0" + sencond) : sencond) + "s";
+        return (hour != 0 ? ((hour + "h ")) : "") + (minutes != 0 ? (minutes + "m ") : "") + (sencond + "s");
+    }
 }

TMessagesProj/src/main/java/org/telegram/onecric/adapter/CricketAdapter.java

@@ -48,10 +48,10 @@ public class CricketAdapter extends BaseQuickAdapter<CricketTournamentBean, Base
         if (tempList != null) {
             if (tempList.size() > 3) {
                 list = tempList.subList(0, 3);
-                helper.getView(R.id.tv_see_more).setVisibility(View.VISIBLE);
+                helper.getView(R.id.tv_result).setVisibility(View.VISIBLE);
             }else {
                 list = tempList;
-                helper.getView(R.id.tv_see_more).setVisibility(View.GONE);
+                helper.getView(R.id.tv_result).setVisibility(View.GONE);
             }
         }
         CricketInnerAdapter innerAdapter = new CricketInnerAdapter(R.layout.item_cricket_inner, list);
@@ -59,8 +59,8 @@ public class CricketAdapter extends BaseQuickAdapter<CricketTournamentBean, Base
                 CricketDetailActivity.forward(mContext, innerAdapter.getItem(position).getId());
         });
         rv_inner.setAdapter(innerAdapter);
-        helper.getView(R.id.tv_see_more).setOnClickListener(v -> {
-            helper.getView(R.id.tv_see_more).setVisibility(View.GONE);
+        helper.getView(R.id.tv_result).setOnClickListener(v -> {
+            helper.getView(R.id.tv_result).setVisibility(View.GONE);
             innerAdapter.setNewData(item.getCricket_match());
         });
     }

TMessagesProj/src/main/java/org/telegram/onecric/adapter/CricketDetailAdapter.java

@@ -7,6 +7,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -30,15 +31,12 @@ public class CricketDetailAdapter extends BaseQuickAdapter<CricketMatchBean, Bas
 
     @Override
     protected void convert(@NonNull BaseViewHolder helper, CricketMatchBean item) {
+        helper.setTextColor(R.id.tv_time, mContext.getResources().getColor(R.color.c_801D2550));
         TextView resultTv = helper.getView(R.id.tv_result);
         if (item.getStatus() == 2) {//已结束
-//            resultTv.setTypeface(AndroidUtilities.getNormalTypefaceMedium());
-            resultTv.setTextColor(mContext.getResources().getColor(R.color.colorDarkBlue));
+            resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_bold));
             helper.getView(R.id.ll_alarm).setVisibility(View.GONE);
-        }else {
-//            resultTv.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-            resultTv.setTextColor(ColorUtil.COLOR_GRAY8_TEXT);
-
+        }else {resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_regular));
             helper.getView(R.id.ll_alarm).setVisibility(View.VISIBLE);
             if (item.getStatus() == 0) {//未开始
                 helper.getView(R.id.iv_alarm).setVisibility(View.VISIBLE);
@@ -48,6 +46,7 @@ public class CricketDetailAdapter extends BaseQuickAdapter<CricketMatchBean, Bas
                     helper.setText(R.id.tv_time, "");
                 }
             }else {//已开始
+                resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_semibold));
                 helper.getView(R.id.iv_alarm).setVisibility(View.GONE);
                 helper.setText(R.id.tv_time, mContext.getString(R.string.live2));
                 helper.setTextColor(R.id.tv_time, mContext.getResources().getColor(R.color.c_DC3C23));
@@ -75,6 +74,7 @@ public class CricketDetailAdapter extends BaseQuickAdapter<CricketMatchBean, Bas
             }
         } else {
             helper.setText(R.id.tv_home_score, "");
+            helper.setText(R.id.tv_home_score2, " ");
         }
         ImageView iv_away_logo = helper.getView(R.id.iv_away_logo);
         GlideUtil.loadTeamImageDefault(mContext, item.getAway_logo(), iv_away_logo);
@@ -84,16 +84,16 @@ public class CricketDetailAdapter extends BaseQuickAdapter<CricketMatchBean, Bas
             helper.setText(R.id.tv_away_name, "");
         }
         if (!TextUtils.isEmpty(item.getAway_display_score())) {
-            helper.setText(R.id.tv_away_score, item.getAway_display_score());
             if (item.getAway_display_score().contains(" ")) {
                 String[] split = item.getAway_display_score().split(" ");
                 helper.setText(R.id.tv_away_score, split[0]);
-                helper.setText(R.id.tv_away_score2," "+ split[1]);
+                helper.setText(R.id.tv_away_score2, " " + split[1]);
             } else {
                 helper.setText(R.id.tv_away_score, item.getHome_display_score());
             }
         } else {
             helper.setText(R.id.tv_away_score, "");
+            helper.setText(R.id.tv_away_score2, "");
         }
         if(!TextUtils.isEmpty(item.getMatch_result())) {
             helper.setText(R.id.tv_result, item.getMatch_result());
@@ -101,35 +101,18 @@ public class CricketDetailAdapter extends BaseQuickAdapter<CricketMatchBean, Bas
             helper.setText(R.id.tv_result, "");
         }
 
-        TextView tv_home_score = helper.getView(R.id.tv_home_score);
-        TextView tv_home_score2 = helper.getView(R.id.tv_home_score2);
-        TextView tv_away_score = helper.getView(R.id.tv_away_score);
-        TextView tv_away_score2 = helper.getView(R.id.tv_away_score2);
-
         if (item.getHome_id() == item.getWinner_id()) {
-//            tv_home_score.setTextColor(mContext.getResources().getColor(R.color.c_333333));
-            tv_home_score2.setTextColor(mContext.getResources().getColor(R.color.c_333333));
-            tv_away_score.setTextColor(mContext.getResources().getColor(R.color.c_666666));
-//            tv_away_score2.setTextColor(mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_home_score, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_home_score2, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_away_score, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_away_score2, mContext.getResources().getColor(R.color.c_666666));
+
         } else {
-//            tv_home_score2.setTextColor(mContext.getResources().getColor(R.color.c_666666));
-            tv_home_score.setTextColor(mContext.getResources().getColor(R.color.c_666666));
-            tv_away_score.setTextColor(mContext.getResources().getColor(R.color.c_333333));
-//            tv_away_score2.setTextColor(mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_home_score, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_home_score2, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_away_score, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_away_score2, mContext.getResources().getColor(R.color.c_333333));
         }
-        tv_away_score2.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-        tv_home_score2.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-
-
-        TextView homeName = helper.getView(R.id.tv_home_name);
-        TextView awayName = helper.getView(R.id.tv_away_name);
-//        homeName.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-//        awayName.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-        homeName.setTextColor(mContext.getResources().getColor(R.color.c_141414));
-        awayName.setTextColor(mContext.getResources().getColor(R.color.c_141414));
-
-        TextView date = helper.getView(R.id.tv_date);
-        date.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
 
     }
 }

TMessagesProj/src/main/java/org/telegram/onecric/adapter/CricketInnerAdapter.java

@@ -1,6 +1,7 @@
 package org.telegram.onecric.adapter;
 
 import android.graphics.Typeface;
+import android.os.CountDownTimer;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -8,11 +9,13 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 
 import org.telegram.cricdit.utils.ColorUtil;
+import org.telegram.cricdit.utils.TimeUtils;
 import org.telegram.messenger.AndroidUtilities;
 import org.telegram.messenger.R;
 import org.telegram.onecric.mvp.bean.CricketMatchBean;
@@ -37,31 +40,40 @@ public class CricketInnerAdapter extends BaseQuickAdapter<CricketMatchBean, Base
             helper.getView(R.id.line).setVisibility(View.VISIBLE);
         }
 
+        helper.setTextColor(R.id.tv_time, mContext.getResources().getColor(R.color.c_801D2550));
         TextView resultTv = helper.getView(R.id.tv_result);
-
         if (item.getStatus() == 2) {//已结束
-//            resultTv.setTypeface(AndroidUtilities.getNormalTypefaceMedium());
+            resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_bold));
             helper.getView(R.id.ll_alarm).setVisibility(View.GONE);
-            resultTv.setTextColor(mContext.getResources().getColor(R.color.colorDarkBlue));//colorDarkBlue2
         } else {
+            resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_regular));
             helper.getView(R.id.ll_alarm).setVisibility(View.VISIBLE);
-//            resultTv.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-            resultTv.setTextColor(ColorUtil.COLOR_GRAY8_TEXT);
             if (item.getStatus() == 0) {//未开始
-                helper.getView(R.id.iv_alarm).setVisibility(View.GONE);
+                helper.getView(R.id.iv_alarm).setVisibility(View.VISIBLE);
                 if (!TextUtils.isEmpty(item.getLive_time())) {
                     helper.setText(R.id.tv_time, item.getLive_time());
                     helper.getView(R.id.ll_alarm).setVisibility(View.VISIBLE);
+                    TextView tv_time = helper.getView(R.id.tv_time);
+                    new CountDownTimer(item.getLive_time_unix(), 1000) {
+                        public void onTick(long millisUntilFinished) {
+                            tv_time.setText(TimeUtils.timeConversion(millisUntilFinished / 1000));
+                        }
+
+                        public void onFinish() {
+                            item.setStatus(1);
+                            notifyItemChanged(helper.getLayoutPosition());
+                        }
+                    }.start();
+
                 } else {
-                    helper.getView(R.id.ll_alarm).setVisibility(View.GONE);
                     helper.setText(R.id.tv_time, "");
+                    helper.getView(R.id.ll_alarm).setVisibility(View.GONE);
                 }
             } else {//已开始
-                helper.getView(R.id.ll_alarm).setVisibility(View.VISIBLE);
+                resultTv.setTypeface(ResourcesCompat.getFont(mContext, R.font.noto_sans_display_semibold));
                 helper.getView(R.id.iv_alarm).setVisibility(View.GONE);
                 helper.setText(R.id.tv_time, mContext.getString(R.string.live2));
-                helper.setTextColor(R.id.tv_time, mContext.getResources().getColor(R.color.c_DC3C23));
-            }
+                helper.setTextColor(R.id.tv_time, mContext.getResources().getColor(R.color.c_DC3C23));            }
         }
         if (!TextUtils.isEmpty(item.getMatch_num())) {
             helper.setText(R.id.tv_date, item.getMatch_num());
@@ -85,6 +97,7 @@ public class CricketInnerAdapter extends BaseQuickAdapter<CricketMatchBean, Base
             }
         } else {
             helper.setText(R.id.tv_home_score, "");
+            helper.setText(R.id.tv_home_score2, " ");
         }
         ImageView iv_away_logo = helper.getView(R.id.iv_away_logo);
         GlideUtil.loadTeamImageDefault(mContext, item.getAway_logo(), iv_away_logo);
@@ -94,16 +107,16 @@ public class CricketInnerAdapter extends BaseQuickAdapter<CricketMatchBean, Base
             helper.setText(R.id.tv_away_name, "");
         }
         if (!TextUtils.isEmpty(item.getAway_display_score())) {
-            helper.setText(R.id.tv_away_score, item.getAway_display_score());
             if (item.getAway_display_score().contains(" ")) {
                 String[] split = item.getAway_display_score().split(" ");
                 helper.setText(R.id.tv_away_score, split[0]);
-                helper.setText(R.id.tv_away_score2," "+ split[1]);
+                helper.setText(R.id.tv_away_score2, " " + split[1]);
             } else {
                 helper.setText(R.id.tv_away_score, item.getHome_display_score());
             }
         } else {
             helper.setText(R.id.tv_away_score, "");
+            helper.setText(R.id.tv_away_score2, "");
         }
 
         if (!TextUtils.isEmpty(item.getMatch_result())) {
@@ -111,34 +124,18 @@ public class CricketInnerAdapter extends BaseQuickAdapter<CricketMatchBean, Base
         } else {
             helper.setText(R.id.tv_result, "");
         }
-        TextView tv_home_score = helper.getView(R.id.tv_home_score);
-        TextView tv_home_score2 = helper.getView(R.id.tv_home_score2);
-        TextView tv_away_score = helper.getView(R.id.tv_away_score);
-        TextView tv_away_score2 = helper.getView(R.id.tv_away_score2);
 
         if (item.getHome_id() == item.getWinner_id()) {
-            tv_home_score.setTextColor(mContext.getResources().getColor(R.color.c_141414));
-            tv_away_score.setTextColor(mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_home_score, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_home_score2, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_away_score, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_away_score2, mContext.getResources().getColor(R.color.c_666666));
+
         } else {
-            tv_home_score.setTextColor(mContext.getResources().getColor(R.color.c_666666));
-            tv_away_score.setTextColor(mContext.getResources().getColor(R.color.c_141414));
+            helper.setTextColor(R.id.tv_home_score, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_home_score2, mContext.getResources().getColor(R.color.c_666666));
+            helper.setTextColor(R.id.tv_away_score, mContext.getResources().getColor(R.color.c_333333));
+            helper.setTextColor(R.id.tv_away_score2, mContext.getResources().getColor(R.color.c_333333));
         }
-        tv_away_score2.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-        tv_home_score2.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-
-
-        TextView homeName = helper.getView(R.id.tv_home_name);
-        TextView awayName = helper.getView(R.id.tv_away_name);
-//        homeName.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-//        awayName.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-        homeName.setTextColor(mContext.getResources().getColor(R.color.c_141414));
-        awayName.setTextColor(mContext.getResources().getColor(R.color.c_141414));
-
-        TextView date = helper.getView(R.id.tv_date);
-
-        date.setTypeface(AndroidUtilities.getPingFangTypefaceMedium());
-
-
-
     }
 }

TMessagesProj/src/main/java/org/telegram/onecric/adapter/CricketStatsAdapter.java

@@ -51,9 +51,9 @@ public class CricketStatsAdapter extends BaseQuickAdapter<CricketStatsListBean,
         }
         helper.setText(R.id.tv_number, String.valueOf(helper.getLayoutPosition()+1));
         if (!TextUtils.isEmpty(item.getName())) {
-            helper.setText(R.id.tv_name2, item.getName());
+            helper.setText(R.id.tv_name, item.getName());
         }else {
-            helper.setText(R.id.tv_name2, "");
+            helper.setText(R.id.tv_name, "");
         }
         if (!TextUtils.isEmpty(item.getAbbreviation())) {
             helper.setText(R.id.tv_team_name, item.getAbbreviation());

TMessagesProj/src/main/java/org/telegram/onecric/adapter/PlayerBioAdapter.java

@@ -32,24 +32,28 @@ public class PlayerBioAdapter extends BaseQuickAdapter<RecentMatchesBean, BaseVi
         if (!TextUtils.isEmpty(item.getMatch_away_name())) {
             name += item.getMatch_away_name();
         }
+        helper.setText(R.id.tv_name, name);
         if (!TextUtils.isEmpty(item.getMatch_time())) {
-            name = name + "\n" + item.getMatch_time();
+            helper.setText(R.id.tv_time, item.getMatch_time());
+        }else{
+            helper.setText(R.id.tv_time, "");
         }
-        helper.setText(R.id.tv_name, name);
+
+        helper.setText(R.id.tv_time, name);
         if (!TextUtils.isEmpty(item.getBat())) {
             helper.setText(R.id.tv_bat, item.getBat());
         }else {
-            helper.setText(R.id.tv_bat, "");
+            helper.setText(R.id.tv_bat, "-");
         }
-        if (!TextUtils.isEmpty(item.getBowl())) {
+        if (!TextUtils.isEmpty(item.getBowl())&& !"()".equals(item.getBowl())) {
             helper.setText(R.id.tv_bowl, item.getBowl());
         }else {
-            helper.setText(R.id.tv_bowl, "");
+            helper.setText(R.id.tv_bowl, "-");
         }
         if (!TextUtils.isEmpty(item.getTournament_type())) {
             helper.setText(R.id.tv_type, item.getTournament_type());
         }else {
-            helper.setText(R.id.tv_type, "");
+            helper.setText(R.id.tv_type, "-");
         }
     }
 }

TMessagesProj/src/main/java/org/telegram/onecric/mvp/bean/CricketMatchBean.java

@@ -238,4 +238,14 @@ public class CricketMatchBean implements Serializable {
     public void setOpponent_name(String opponent_name) {
         this.opponent_name = opponent_name;
     }
+
+    public long getLive_time_unix() {
+        return live_time_unix;
+    }
+
+    public void setLive_time_unix(long live_time_unix) {
+        this.live_time_unix = live_time_unix;
+    }
+
+    private long live_time_unix;         //倒计时时间戳
 }

TMessagesProj/src/main/java/org/telegram/onecric/mvp/presenter/CricketDetailPresenter.java

@@ -34,12 +34,12 @@ public class CricketDetailPresenter extends BasePresenter<CricketDetailView> {
 
             @Override
             public void onFailure(String msg) {
-
+                mvpView.getDataFail(msg);
             }
 
             @Override
             public void onError(String msg) {
-
+                mvpView.getDataFail(msg);
             }
 
             @Override

TMessagesProj/src/main/java/org/telegram/onecric/mvp/presenter/CricketMatchesPresenter.java

@@ -51,12 +51,12 @@ public class CricketMatchesPresenter extends BasePresenter<CricketMatchesView> {
 
             @Override
             public void onFailure(String msg) {
-
+                mvpView.getDataFail(msg);
             }
 
             @Override
             public void onError(String msg) {
-
+                mvpView.getDataFail(msg);
             }
 
             @Override

TMessagesProj/src/main/java/org/telegram/onecric/ui/activity/CricketDetailActivity.java

@@ -22,6 +22,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
 import com.lxj.xpopup.XPopup;
 
+import org.telegram.cricdit.utils.ToastUtil;
 import org.telegram.cricdit.view.popup.ReportBottomPopup;
 import org.telegram.messenger.R;
 import org.telegram.onecric.base.MvpActivity;
@@ -377,7 +378,8 @@ public class CricketDetailActivity extends MvpActivity<CricketDetailPresenter> i
 
     @Override
     public void getDataFail(String msg) {
-
+        ToastUtil.show(mActivity,msg);
+        finish();
     }
 
     @Override

TMessagesProj/src/main/java/org/telegram/onecric/ui/activity/MatchFragment.java

@@ -2,6 +2,7 @@ package org.telegram.onecric.ui.activity;
 
 import android.content.Context;
 import android.os.Build;
+import android.os.CountDownTimer;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -26,6 +27,7 @@ import org.telegram.messenger.R;
 import org.telegram.onecric.adapter.CricketAdapter;
 import org.telegram.onecric.base.JsonBean;
 import org.telegram.onecric.dialog.TournaListDialog;
+import org.telegram.onecric.mvp.bean.CricketMatchBean;
 import org.telegram.onecric.mvp.bean.CricketTournamentBean;
 import org.telegram.onecric.mvp.presenter.MatchPresenter;
 import org.telegram.onecric.mvp.view.MatchView;
@@ -60,6 +62,7 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
     private ImageView mTourArrow;
     private LinearLayout mTourContainer;
     private TextView mTourCount;
+    private LinearLayout llStreaming;
 
 
     public MatchFragment(BaseFragment fragment, String type) {
@@ -80,10 +83,11 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
         mTourTitle = mView.findViewById(R.id.match_tournament_title);
         mTourCount = mView.findViewById(R.id.match_tournament_count);
         mTourArrow = mView.findViewById(R.id.match_tournament_arrow);
+        llStreaming = mView.findViewById(R.id.ll_streaming);
 
 //        setTourBar(0);
-
-        mView.findViewById(R.id.ll_streaming).setOnClickListener(this);
+        llStreaming.setSelected(false);
+        llStreaming.setOnClickListener(this);
     }
 
     private void initView() {
@@ -93,6 +97,9 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
         mIvStreaming = mView.findViewById(R.id.iv_streaming);
         mTvStreaming = mView.findViewById(R.id.tv_streaming);
 
+        if ("results".equals(mTimeType)) {
+            mTvStreaming.setText("Highlights");
+        }
 
         mRefreshLayout.setEnableLoadMore(false);
 
@@ -158,13 +165,13 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
                             mRefreshLayout.autoRefresh();
                         }
                         mTournaListDialog.dismiss();
-                        setTourBar(chooseCount);
+//                        setTourBar(chooseCount);
                     }
 
                     @Override
                     public void clickReset() {
                         mTournamentId = "";
-                        setTourBar(0);
+//                        setTourBar(0);
                     }
                 });
             } else {
@@ -183,17 +190,36 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
                     mStatusView.showEmpty();
                 } else {
                     mStatusView.showContent();
-                    mAdapter.addData(list);
+                    mAdapter.setNewData(list);
                 }
             } else {
-                mAdapter.addData(new ArrayList<>());
+                mAdapter.setNewData(new ArrayList<>());
                 mStatusView.showEmpty();
             }
         } else {
+            mStatusView.showContent();
             mPage++;
             if (mPage <= total) {
                 mRefreshLayout.finishLoadMore();
                 mAdapter.addData(list);
+                if (list != null && list.size() > 0) {
+                    // TODO: 2023/1/12  开启子线程倒计时 实现倒计时实时更新 不用重新调用接口  是不是会损耗性能  还待检测
+                    for (CricketTournamentBean item : list) {
+                        for (CricketMatchBean bean : item.getCricket_match()) {
+                            if (bean.getStatus() == 0) {
+                                new CountDownTimer(bean.getLive_time_unix(), 1000) {
+                                    public void onTick(long millisUntilFinished) {
+                                        bean.setLive_time_unix(millisUntilFinished);
+                                    }
+
+                                    public void onFinish() {
+                                        bean.setStatus(1);
+                                    }
+                                }.start();
+                            }
+                        }
+                    }
+                }
             } else {
                 mRefreshLayout.finishLoadMoreWithNoMoreData();
             }
@@ -238,12 +264,14 @@ public class MatchFragment implements BaseViewFragment, MatchView, View.OnClickL
             if (id == R.id.ll_streaming) {
             if (mStreaming == 1) {
                 mStreaming = 0;
+                llStreaming.setSelected(false);
                 mIvStreaming.setBackgroundTintList(ContextCompat.getColorStateList(mContext, R.color.c_CCCCCC));
                 mTvStreaming.setTextColor(mContext.getResources().getColor(R.color.c_333333));
             } else {
                 mStreaming = 1;
-                mIvStreaming.setBackgroundTintList(ContextCompat.getColorStateList(mContext, R.color.c_DC3C23));
-                mTvStreaming.setTextColor(mContext.getResources().getColor(R.color.c_DC3C23));
+                llStreaming.setSelected(true);
+                mIvStreaming.setBackgroundTintList(ContextCompat.getColorStateList(mContext, R.color.c_1D2550));
+                mTvStreaming.setTextColor(mContext.getResources().getColor(R.color.c_1D2550));
             }
             mRefreshLayout.autoRefresh();
         }

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/CricketMatchesFragment.java

@@ -145,6 +145,7 @@ public class CricketMatchesFragment extends MvpFragment<CricketMatchesPresenter>
 
     @Override
     public void getDataFail(String msg) {
-
+        smart_rl.finishRefresh();
+        smart_rl.finishLoadMore();
     }
 }

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/CricketStatsFragment.java

@@ -102,35 +102,91 @@ public class CricketStatsFragment extends BaseFragment implements View.OnClickLi
             if (!TextUtils.isEmpty(bean.getHighest_score_name())) {
                 tv_highest_score_name.setText(bean.getHighest_score_name() + " - ");
                 tv_highest_score.setText(bean.getHighest_score());
+            }else{
+                findViewById(R.id.ll_highest_individual_score).setVisibility(View.GONE);
+                findViewById(R.id.view_line1).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getMost_runs_name())) {
                 tv_most_run_name.setText(bean.getMost_runs_name() + " - ");
                 tv_most_run.setText(bean.getMost_runs());
+            }else{
+                findViewById(R.id.ll_most_runs).setVisibility(View.GONE);
+                findViewById(R.id.view_line2).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getBest_battingAv_name())) {
                 tv_best_batting_name.setText(bean.getBest_battingAv_name() + " - ");
                 tv_best_batting.setText(bean.getBest_battingAv());
+            }else{
+                findViewById(R.id.ll_best_batting_average).setVisibility(View.GONE);
+                findViewById(R.id.view_line3).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getHighest_strikeRate_name())) {
                 tv_highest_strike_name.setText(bean.getHighest_strikeRate_name() + " - ");
                 tv_highest_strike.setText(bean.getHighest_strikeRate());
+            }else{
+                findViewById(R.id.ll_highest_strike_rate).setVisibility(View.GONE);
+                findViewById(R.id.view_line4).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getMaximum_sixes_name())) {
                 tv_maximum_six_name.setText(bean.getMaximum_sixes_name() + " - ");
                 tv_maximum_six.setText(bean.getMaximum_sixes());
+            }else{
+                findViewById(R.id.ll_maximum_sixes).setVisibility(View.GONE);
+                findViewById(R.id.view_line4).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getMost_wickets_name())) {
                 tv_most_wicket_name.setText(bean.getMost_wickets_name() + " - ");
                 tv_most_wicket.setText(bean.getMost_wickets());
+            }else{
+                findViewById(R.id.ll_most_wickets).setVisibility(View.GONE);
+                findViewById(R.id.view_line5).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getBest_bowling_average_name())) {
                 tv_best_bowling_av_name.setText(bean.getBest_bowling_average_name() + " - ");
                 tv_best_bowling_av.setText(bean.getBest_bowling_average());
+            }else{
+                findViewById(R.id.ll_best_bowling_average).setVisibility(View.GONE);
+                findViewById(R.id.view_line6).setVisibility(View.GONE);
             }
+
             if (!TextUtils.isEmpty(bean.getBest_bowling_economy_name())) {
                 tv_best_bowling_ec_name.setText(bean.getBest_bowling_economy_name() + " - ");
                 tv_best_bowling_ec.setText(bean.getBest_bowling_economy());
+            }else{
+                findViewById(R.id.ll_best_bowling_economy).setVisibility(View.GONE);
+                findViewById(R.id.view_line6).setVisibility(View.GONE);
             }
+
+            if (!TextUtils.isEmpty(bean.getMost_catches_name())) {
+                tv_most_catches_name.setText(bean.getMost_catches_name() + " - ");
+                tv_most_catches.setText(bean.getMost_catches());
+            }else{
+                findViewById(R.id.ll_most_catches).setVisibility(View.GONE);
+                findViewById(R.id.view_line7).setVisibility(View.GONE);
+            }
+
+            if (!TextUtils.isEmpty(bean.getMost_run_outs_name())) {
+                tv_most_run_out_name.setText(bean.getMost_run_outs_name() + " - ");
+                tv_most_run_out.setText(bean.getMost_run_outs());
+            }else{
+                findViewById(R.id.ll_most_run_outs).setVisibility(View.GONE);
+                findViewById(R.id.view_line8).setVisibility(View.GONE);
+            }
+
+            if (!TextUtils.isEmpty(bean.getMost_stumpings_name())) {
+                tv_most_stumping_name.setText(bean.getMost_stumpings_name() + " - ");
+                tv_most_stumping.setText(bean.getMost_stumpings());
+            }else{
+                findViewById(R.id.ll_most_stumpings).setVisibility(View.GONE);
+                findViewById(R.id.view_line8).setVisibility(View.GONE);
+            }
+
         }
     }
 

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/CricketTeamsFragment.java

@@ -1,6 +1,7 @@
 package org.telegram.onecric.ui.fragment;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -52,6 +53,9 @@ public class CricketTeamsFragment extends BaseFragment {
                 CricketTeamsActivity.forward(getContext(), mAdapter.getItem(position).getName(), mAdapter.getItem(position).getId());
             }
         });
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.layout_common_empty, null, false);
+        inflate.findViewById(R.id.ll_empty).setVisibility(View.VISIBLE);
+        mAdapter.setEmptyView(inflate);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.addItemDecoration(new ItemDecoration(getContext(), getResources().getColor(R.color.c_CCCCCC), 0, 0.5f));
         recyclerView.setAdapter(mAdapter);

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/CricketUpdatesFragment.java

@@ -1,6 +1,7 @@
 package org.telegram.onecric.ui.fragment;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -52,6 +53,9 @@ public class CricketUpdatesFragment extends BaseFragment {
 //                HeadlineDetailActivity.forward(getContext(), mAdapter.getItem(position).getId());
             }
         });
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.layout_common_empty, null, false);
+        inflate.findViewById(R.id.ll_empty).setVisibility(View.VISIBLE);
+        mAdapter.setEmptyView(inflate);
         rv_updates.setLayoutManager(new LinearLayoutManager(getContext()));
         rv_updates.addItemDecoration(new ItemDecoration(getContext(), getResources().getColor(R.color.c_CCCCCC), 0, 0.5f));
         rv_updates.setAdapter(mAdapter);

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/PlayerBioFragment.java

@@ -2,6 +2,7 @@ package org.telegram.onecric.ui.fragment;
 
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -57,9 +58,18 @@ public class PlayerBioFragment extends BaseFragment {
     public void setData(String teams, List<RecentMatchesBean> list, String profile) {
         if (!TextUtils.isEmpty(teams)) {
             tv_teams.setText(teams);
+        }else{
+            findViewById(R.id.tv_1).setVisibility(View.GONE);
+            findViewById(R.id.tv_teams).setVisibility(View.GONE);
         }
         if (!TextUtils.isEmpty(profile)) {
             tv_profile.setText(profile);
         }
+        if (list == null || list.size()<=0){
+            findViewById(R.id.tv_2).setVisibility(View.GONE);
+            findViewById(R.id.ll_2).setVisibility(View.GONE);
+        }else{
+            mAdapter.setNewData(list);
+        }
     }
 }

TMessagesProj/src/main/java/org/telegram/onecric/ui/fragment/PlayerCareerFragment.java

@@ -130,8 +130,11 @@ public class PlayerCareerFragment extends BaseFragment implements View.OnClickLi
         tv_performance.setText(getString(R.string.batting));
         mPerformanceAdapter.setNewData(mBattingList);
 
-        if (list == null) {
-            list = new ArrayList<>();
+        if (list == null || list.size()<=0) {
+            tv_matches.setVisibility(View.GONE);
+            findViewById(R.id.ll_2).setVisibility(View.GONE);
+        }else{
+            mMatchesAdapter.setNewData(list);
         }
         mMatchesAdapter.setNewData(list);
     }

TMessagesProj/src/main/res/drawable-v21/ripple_6dp.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_CDCBCC">
+    <item>
+        <shape>
+            <corners android:radius="6dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</ripple>

TMessagesProj/src/main/res/drawable-v21/ripple_8dp_f5f5f5.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/c_9D9EA3">
+    <item>
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="@color/c_f5f5f5" />
+        </shape>
+    </item>
+</ripple>

TMessagesProj/src/main/res/drawable/ripple_6dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="6dp" />
+    <solid android:color="@color/colorWhite" />
+</shape>

TMessagesProj/src/main/res/drawable/ripple_8dp_f5f5f5.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/c_f5f5f5" />
+</shape>

TMessagesProj/src/main/res/drawable/shape_cccccc_5dp_rec.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners android:radius="5dp"/>
 
-    <solid android:color="@color/c_CCCCCC"/>
+    <solid android:color="@color/c_E5E5E5"/>
 </shape>

TMessagesProj/src/main/res/layout/activity_cricket_detail.xml

@@ -78,7 +78,8 @@
                         android:id="@+id/tv_home_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        style="@style/TvCapsStyle"
+                        android:textSize="@dimen/sp_15"
+                        android:lineSpacingExtra="@dimen/dp_4"
                         android:textColor="@color/white"
                         android:layout_marginBottom="@dimen/dp_4"
                         app:layout_constraintBottom_toTopOf="@id/iv_home_logo"
@@ -100,8 +101,10 @@
                         android:id="@+id/tv_home_score"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginRight="2dp"
                         android:textColor="@color/white"
                         android:textSize="18dp"
+                        android:fontFamily="@font/noto_sans_display_bold"
                         app:layout_constraintBottom_toBottomOf="@id/iv_center"
                         app:layout_constraintRight_toLeftOf="@id/tv_home_round"
                         app:layout_constraintTop_toTopOf="@id/iv_center" />
@@ -113,7 +116,7 @@
                         android:layout_marginRight="20dp"
                         android:textColor="@color/c_E5E5E5"
                         android:textSize="12dp"
-                        android:textStyle="bold"
+                        android:fontFamily="@font/noto_sans_display_bold"
                         app:layout_constraintBaseline_toBaselineOf="@id/tv_home_score"
                         app:layout_constraintRight_toLeftOf="@id/iv_center" />
 
@@ -134,7 +137,6 @@
                         android:layout_marginLeft="20dp"
                         android:textColor="@color/c_E5E5E5"
                         android:textSize="12dp"
-                        android:textStyle="bold"
                         app:layout_constraintBaseline_toBaselineOf="@id/tv_away_score"
                         app:layout_constraintLeft_toRightOf="@id/iv_center" />
 
@@ -142,8 +144,10 @@
                         android:id="@+id/tv_away_score"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="2dp"
                         android:textColor="@color/white"
                         android:textSize="18dp"
+                        android:fontFamily="@font/noto_sans_display_bold"
                         app:layout_constraintBottom_toBottomOf="@id/iv_center"
                         app:layout_constraintLeft_toRightOf="@id/tv_away_round"
                         app:layout_constraintTop_toTopOf="@id/iv_center" />
@@ -163,9 +167,10 @@
                         android:id="@+id/tv_away_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        style="@style/TvCapsStyle"
                         android:textColor="@color/white"
                         android:layout_marginBottom="@dimen/dp_4"
+                        android:textSize="16dp"
+                        android:lineSpacingExtra="@dimen/dp_4"
                         app:layout_constraintBottom_toTopOf="@id/iv_away_logo"
                         app:layout_constraintLeft_toLeftOf="@id/iv_away_logo"
                         app:layout_constraintRight_toRightOf="@id/iv_away_logo" />
@@ -175,9 +180,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="25dp"
-                        style="@style/TvNormalStyle"
                         android:textColor="@color/white"
                         android:textSize="14dp"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:maxHeight="40dp"
+                        android:maxLines="2"
+                        android:ellipsize="end"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/iv_center" />
@@ -264,8 +273,7 @@
                     android:background="@drawable/shape_80black_14dp_rec"
                     android:orientation="horizontal"
                     android:paddingLeft="20dp"
-                    android:paddingRight="20dp"
-                    style="@style/TvMainBodyStyle">
+                    android:paddingRight="20dp">
 
                     <TextView
                         android:id="@+id/tv_animation"
@@ -274,8 +282,7 @@
                         android:gravity="center_vertical"
                         android:text="@string/live_animation"
                         android:textColor="@color/white"
-                        android:textSize="16dp"
-                        style="@style/TvTagStyle"/>
+                        android:textSize="16dp"/>
 
                     <View
                         android:layout_width="1dp"
@@ -294,7 +301,6 @@
                         android:text="@string/live_video"
                         android:textColor="@color/white"
                         android:textSize="16dp"
-                        style="@style/TvTagStyle"
                         android:visibility="gone" />
                 </LinearLayout>
 

TMessagesProj/src/main/res/layout/activity_cricket_stats.xml

@@ -20,15 +20,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -37,38 +36,38 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="B"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="S/R"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="VS"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -77,8 +76,9 @@
             android:gravity="bottom|center_horizontal"
             android:paddingBottom="6dp"
             android:text="RUNS"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:fontFamily="@font/noto_sans_display_semibold"
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -88,15 +88,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -105,38 +104,38 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="INN"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="AVG"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -145,8 +144,9 @@
             android:gravity="bottom|center_horizontal"
             android:paddingBottom="6dp"
             android:text="RUNS"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:fontFamily="@font/noto_sans_display_semibold"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -156,15 +156,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -173,48 +172,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="INN"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="R"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="AVG"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -224,15 +223,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -241,48 +239,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="INN"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="R"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="S/R"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -292,15 +290,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -309,48 +306,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="INN"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="R"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="6S"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -360,15 +357,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -377,48 +373,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="O"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="AVG"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="W"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -428,15 +424,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -445,48 +440,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="O"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="W"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="AVG"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -496,15 +491,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -513,48 +507,48 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="O"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="W"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="ECO"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <LinearLayout
@@ -564,15 +558,14 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="80dp"
             android:layout_height="40dp"
-            android:layout_weight="1.5"
             android:gravity="bottom"
             android:paddingBottom="6dp"
-            android:paddingLeft="14dp"
+            android:paddingLeft="30dp"
             android:text="#"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
@@ -581,28 +574,28 @@
             android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="@string/team2"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="M"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="1"
-            android:gravity="bottom|center_horizontal"
+            android:gravity="bottom"
             android:paddingBottom="6dp"
             android:text="CT"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textSize="11sp"
+            android:textColor="@color/c_1D2550"/>
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView

TMessagesProj/src/main/res/layout/activity_cricket_teams.xml

@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/c_E5E5E5">
+    android:background="@color/white">
     <include layout="@layout/common_title_bar_two"/>
 
     <androidx.core.widget.NestedScrollView
@@ -18,9 +18,8 @@
                 android:layout_height="44dp"
                 android:gravity="center"
                 android:text="@string/full_squad_for_this_tour"
-                android:textSize="14dp"
-                android:textColor="@color/c_999999"
-                android:background="@color/white"/>
+                android:textSize="12sp"
+                android:textColor="@color/c_1D2550"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -32,7 +31,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="14dp"
                     android:text="@string/batters"
-                    style="@style/TvItemTitleStyle"/>
+                    android:textSize="16dp"
+                    android:textColor="@color/c_333333"
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <TextView
                     android:id="@+id/tv_batter"
@@ -41,14 +42,14 @@
                     android:layout_weight="1"
                     android:gravity="right"
                     android:paddingRight="14dp"
-                    android:textSize="14dp"
+                    android:textSize="13sp"
                     android:textColor="@color/c_333333"/>
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_batters"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -60,7 +61,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="14dp"
                     android:text="@string/bowlers"
-                    style="@style/TvItemTitleStyle"/>
+                    android:textSize="16dp"
+                    android:textColor="@color/c_333333"
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <TextView
                     android:id="@+id/tv_bowler"
@@ -69,7 +72,7 @@
                     android:layout_weight="1"
                     android:gravity="right"
                     android:paddingRight="14dp"
-                    android:textSize="14dp"
+                    android:textSize="13sp"
                     android:textColor="@color/c_333333"/>
             </LinearLayout>
 
@@ -88,7 +91,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="14dp"
                     android:text="@string/all_rounder"
-                    style="@style/TvItemTitleStyle"/>
+                    android:textSize="16dp"
+                    android:textColor="@color/c_333333"
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <TextView
                     android:id="@+id/tv_all_rounder"
@@ -97,7 +102,7 @@
                     android:layout_weight="1"
                     android:gravity="right"
                     android:paddingRight="14dp"
-                    android:textSize="14dp"
+                    android:textSize="13sp"
                     android:textColor="@color/c_333333"/>
             </LinearLayout>
 

TMessagesProj/src/main/res/layout/activity_me3.xml

@@ -108,7 +108,7 @@
                             android:gravity="center"
                             android:textColor="#fff"
                             android:textSize="19sp"
-                            android:textStyle="bold"
+                            android:fontFamily="@font/noto_sans_display_semibold"
                             android:visibility="gone" />
 
                     </RelativeLayout>
@@ -135,7 +135,7 @@
                             android:singleLine="true"
                             android:textColor="@color/colorBlack"
                             android:textSize="20sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
                         <!--                        <TextView-->
                         <!--                            android:id="@+id/me_tv_nickname"-->
                         <!--                            android:layout_width="wrap_content"-->
@@ -145,7 +145,7 @@
                         <!--                            android:singleLine="true"-->
                         <!--                            android:textColor="@color/colorBlack"-->
                         <!--                            android:textSize="20sp"-->
-                        <!--                            android:textStyle="bold" />-->
+                        <!--                            android:fontFamily="@font/noto_sans_display_semibold" />-->
 
                         <TextView
                             android:id="@+id/me_tv_username"
@@ -154,7 +154,7 @@
                             android:layout_marginStart="10dp"
                             android:textColor="#666"
                             android:textSize="15sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                     </LinearLayout>
 
@@ -194,7 +194,7 @@
                         android:layout_marginEnd="4dp"
                         android:layout_marginBottom="16dp"
                         android:layout_weight="1"
-                        android:background="@drawable/shape_me_post_bg"
+                        android:background="@drawable/ripple_8dp_f5f5f5"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -202,12 +202,11 @@
                             android:id="@+id/me_profile_post_num"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/shape_me_post_bg"
                             android:gravity="center"
                             android:text="0"
                             android:textColor="#000"
                             android:textSize="17sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -217,7 +216,7 @@
                             android:text="Post"
                             android:textColor="#ff999999"
                             android:textSize="12sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     </LinearLayout>
 
@@ -230,7 +229,7 @@
                         android:layout_marginEnd="4dp"
                         android:layout_marginBottom="16dp"
                         android:layout_weight="1"
-                        android:background="@drawable/shape_me_post_bg"
+                        android:background="@drawable/ripple_8dp_f5f5f5"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -238,12 +237,11 @@
                             android:id="@+id/me_profile_following_num"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/shape_me_post_bg"
                             android:gravity="center"
                             android:text="0"
                             android:textColor="#000"
                             android:textSize="17sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -253,7 +251,7 @@
                             android:text="Following"
                             android:textColor="#ff999999"
                             android:textSize="12sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                     </LinearLayout>
 
@@ -266,7 +264,7 @@
                         android:layout_marginEnd="4dp"
                         android:layout_marginBottom="16dp"
                         android:layout_weight="1"
-                        android:background="@drawable/shape_me_post_bg"
+                        android:background="@drawable/ripple_8dp_f5f5f5"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -274,12 +272,11 @@
                             android:id="@+id/me_profile_follower_num"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/shape_me_post_bg"
                             android:gravity="center"
                             android:text="0"
                             android:textColor="#000"
                             android:textSize="17sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -289,7 +286,7 @@
                             android:text="Follower"
                             android:textColor="#ff999999"
                             android:textSize="12sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                     </LinearLayout>
 
@@ -303,7 +300,7 @@
                         android:layout_marginEnd="16dp"
                         android:layout_marginBottom="16dp"
                         android:layout_weight="1"
-                        android:background="@drawable/shape_me_post_bg"
+                        android:background="@drawable/ripple_8dp_f5f5f5"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -311,12 +308,11 @@
                             android:id="@+id/me_profile_score_num"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/shape_me_post_bg"
                             android:gravity="center"
                             android:text="0"
                             android:textColor="#000"
                             android:textSize="17sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -326,7 +322,7 @@
                             android:text="Crcma"
                             android:textColor="#ff999999"
                             android:textSize="12sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="@font/noto_sans_display_semibold" />
 
                     </LinearLayout>
 
@@ -336,50 +332,50 @@
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_save_messages"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"/>
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_contacts"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"/>
 
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_nearby"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
 
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_invite"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"/>
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_chat_set"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:underline_show="false" />
+                    app:underline_show="false"/>
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_privacy_policy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp" />
+                    android:layout_marginTop="16dp"/>
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_version"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:into_icon_show="false" />
+                    app:into_icon_show="false"/>
 
                 <org.telegram.cricdit.view.CommonItemView
                     android:id="@+id/me_cv_about_us"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"
-                    app:underline_show="false" />
+                    app:underline_show="false"/>
 
             </LinearLayout>
 

TMessagesProj/src/main/res/layout/activity_news_detail_comment.xml

@@ -334,7 +334,6 @@
                 android:layout_marginBottom="10dp"
                 android:text=""
                 android:textSize="@dimen/sp_19"
-                android:textStyle="bold"
                 android:visibility="visible" />
 
         </LinearLayout>

TMessagesProj/src/main/res/layout/activity_news_search.xml

@@ -105,7 +105,6 @@
                 android:paddingBottom="10dp"
                 android:paddingLeft="15dp"
                 android:textSize="18sp"
-                android:textStyle="bold"
                 style="@style/TvItemTitleStyle"/>
 
             <androidx.recyclerview.widget.RecyclerView
@@ -119,7 +118,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="35dp"
                 android:textSize="18sp"
-                android:textStyle="bold"
                 android:gravity="center_vertical"
                 android:paddingLeft="7.5dp"
                 android:layout_marginLeft="7.5dp"

TMessagesProj/src/main/res/layout/activity_player_profile.xml

@@ -26,7 +26,10 @@
                     android:layout_height="60dp"
                     android:layout_marginLeft="14dp"
                     android:src="@mipmap/bg_avatar_default"
-                    android:scaleType="centerCrop"/>
+                    android:scaleType="centerCrop"
+                    app:civ_border_width="2dp"
+                    app:civ_border_color="@color/c_E5E5E5"
+                    app:civ_border_overlay="true"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"

TMessagesProj/src/main/res/layout/activity_rank_detail_comment.xml

@@ -118,7 +118,6 @@
                 android:text=""
                 style="@style/TvItemTitleStyle"
                 android:textSize="19sp"
-                android:textStyle="bold"
                 android:visibility="visible" />
 
         </LinearLayout>

TMessagesProj/src/main/res/layout/activity_ranking_list.xml

@@ -62,7 +62,7 @@
                     android:id="@+id/tv_title_1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/noto_sans_display_semibold"
                     android:textSize="19sp"
                     android:layout_marginLeft="12dp"
                     android:layout_marginBottom="10dp"/>
@@ -85,7 +85,7 @@
                     android:id="@+id/tv_title_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/noto_sans_display_semibold"
                     android:textSize="19sp"
                     android:layout_marginTop="16dp"
                     android:layout_marginLeft="12dp"

TMessagesProj/src/main/res/layout/common_title_bar_two.xml

@@ -32,8 +32,8 @@
         android:maxEms="11"
         android:maxLines="1"
         android:textColor="@color/white"
-        android:textSize="18sp"
-        android:textStyle="bold"
+        android:textSize="16sp"
+        android:fontFamily="@font/noto_sans_display_semibold"
         app:layout_constraintBottom_toBottomOf="@id/btn_left"
         app:layout_constraintStart_toEndOf="@id/btn_left"
         app:layout_constraintTop_toTopOf="@id/btn_left" />

TMessagesProj/src/main/res/layout/fragment_comment.xml

@@ -22,7 +22,6 @@
             android:text="@string/comments"
             style="@style/TvItemTitleStyle"
             android:textSize="19sp"
-            android:textStyle="bold"
             android:visibility="gone" />
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout

TMessagesProj/src/main/res/layout/fragment_cricket_fantasy.xml

@@ -49,7 +49,6 @@
                         android:text="@string/player_stats"
                         android:textSize="16dp"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"
                         style="@style/TvItemTitleStyle"/>
 
                     <TextView
@@ -85,7 +84,7 @@
                         android:gravity="center_vertical"
                         android:paddingLeft="12dp"
                         android:text="@string/players"
-                        android:textSize="13dp"
+                        android:textSize="12dp"
                         android:textColor="@color/c_666666"/>
 
                     <TextView
@@ -94,7 +93,7 @@
                         android:layout_weight="1"
                         android:gravity="center_vertical"
                         android:text="@string/matches_played"
-                        android:textSize="13dp"
+                        android:textSize="12dp"
                         android:textColor="@color/c_666666"/>
 
                     <TextView
@@ -103,7 +102,7 @@
                         android:layout_weight="1"
                         android:gravity="center_vertical"
                         android:text="@string/points_per"
-                        android:textSize="13dp"
+                        android:textSize="12dp"
                         android:textColor="@color/c_666666"/>
 
                     <LinearLayout
@@ -121,7 +120,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="%"
-                            android:textSize="14dp"
+                            android:textSize="12dp"
                             android:textColor="@color/c_666666"/>
                     </LinearLayout>
                 </LinearLayout>
@@ -147,7 +146,7 @@
                             android:text="N Ellis"
                             android:textSize="16dp"
                             android:textColor="@color/c_333333"
-                            android:textStyle="bold"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -205,7 +204,7 @@
                             android:text="N Ellis"
                             android:textSize="16dp"
                             android:textColor="@color/c_333333"
-                            android:textStyle="bold"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -263,7 +262,7 @@
                             android:text="N Ellis"
                             android:textSize="16dp"
                             android:textColor="@color/c_333333"
-                            android:textStyle="bold"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -320,7 +319,7 @@
                     android:text="@string/see_all_players_stats"
                     android:textSize="14dp"
                     android:textColor="@color/colorBlue"
-                    android:textStyle="bold"/>
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <ImageView
                     android:layout_width="16dp"
@@ -373,7 +372,6 @@
                         android:text="@string/expert_analysis"
                         android:textSize="16dp"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"
                         style="@style/TvItemTitleStyle"/>
 
                     <TextView
@@ -440,7 +438,7 @@
                         android:text="Mega League Teams"
                         android:textSize="@dimen/sp_14"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <TextView
                         android:layout_width="0dp"
@@ -470,7 +468,7 @@
                         android:text="Mega League Teams"
                         android:textSize="@dimen/sp_14"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <TextView
                         android:layout_width="0dp"
@@ -500,7 +498,7 @@
                         android:text="Mega League Teams"
                         android:textSize="@dimen/sp_14"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <TextView
                         android:layout_width="0dp"
@@ -533,7 +531,7 @@
                     android:text="@string/see_all_expert_tips"
                     android:textSize="14dp"
                     android:textColor="@color/colorBlue"
-                    android:textStyle="bold"/>
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <ImageView
                     android:layout_width="16dp"
@@ -558,7 +556,7 @@
                 android:text="@string/venue_and_team_stats"
                 android:textSize="18dp"
                 android:textColor="@color/c_333333"
-                android:textStyle="bold"
+                android:fontFamily="@font/noto_sans_display_semibold"
                 android:visibility="gone"/>
 
             <androidx.cardview.widget.CardView
@@ -596,8 +594,7 @@
                         android:text="@string/venue"
                         android:textSize="16dp"
                         style="@style/TvItemTitleStyle"
-                        android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:textColor="@color/c_333333"/>
 
                     <View
                         android:id="@+id/line_five"
@@ -737,7 +734,7 @@
                         android:text="@string/see_top_players_at_this_venue"
                         android:textSize="14dp"
                         android:textColor="@color/colorBlue"
-                        android:textStyle="bold"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <ImageView
                         android:layout_width="16dp"
@@ -754,73 +751,77 @@
                 android:id="@+id/cv_team_comparison"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="10dp"
                 android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
                 app:cardCornerRadius="5dp"
-                app:cardElevation="2dp"
-                android:foreground="?android:attr/selectableItemBackground">
+                app:cardElevation="5dp">
+
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <ImageView
                         android:id="@+id/iv_four"
-                        android:layout_width="23dp"
-                        android:layout_height="23dp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        android:layout_marginTop="12dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
-                        android:src="@mipmap/icon_team_comparison"/>
+                        android:layout_marginTop="18dp"
+                        android:background="@mipmap/icon_team_comparison"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="@id/iv_four"
+                        android:layout_marginLeft="9dp"
+                        android:text="@string/team_comparison"
+                        android:textColor="@color/c_333333"
+                        android:textSize="18dp"
+                        android:fontFamily="@font/noto_sans_display_semibold"
                         app:layout_constraintBottom_toBottomOf="@id/iv_four"
                         app:layout_constraintLeft_toRightOf="@id/iv_four"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/team_comparison"
-                        style="@style/TvItemTitleStyle"
-                        android:textSize="16sp"/>
+                        app:layout_constraintTop_toTopOf="@id/iv_four" />
 
                     <View
                         android:id="@+id/line_seven"
                         android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        app:layout_constraintTop_toBottomOf="@id/iv_four"
-                        android:layout_marginTop="12dp"
-                        android:background="@color/line_color"/>
+                        android:layout_height="0.5dp"
+                        android:layout_marginTop="23dp"
+                        android:background="@color/c_E5E5E5"
+                        app:layout_constraintTop_toBottomOf="@id/iv_four" />
 
                     <TextView
                         android:id="@+id/tv_home_name"
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="19dp"
-                        android:textColor="@color/c_666666"
+                        android:textColor="@color/c_4B4C53"
                         android:textSize="12dp"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintStart_toStartOf="@+id/iv_home_logo"
                         app:layout_constraintTop_toBottomOf="@id/line_seven" />
 
                     <ImageView
+                        android:id="@+id/imageView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="@id/tv_home_name"
+                        android:background="@mipmap/icon_cricket_vs"
                         app:layout_constraintBottom_toBottomOf="@id/tv_home_name"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
-                        android:background="@mipmap/icon_cricket_vs"/>
+                        app:layout_constraintTop_toTopOf="@id/tv_home_name" />
 
                     <TextView
                         android:id="@+id/tv_away_name"
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/c_666666"
-                        android:textSize="12dp"
                         android:gravity="right"
+                        android:textColor="@color/c_4B4C53"
+                        android:textSize="12dp"
                         app:layout_constraintBottom_toBottomOf="@id/tv_home_name"
                         app:layout_constraintEnd_toEndOf="@+id/iv_away_logo"
                         app:layout_constraintRight_toRightOf="parent"
@@ -830,194 +831,198 @@
                         android:id="@+id/iv_home_logo"
                         android:layout_width="28dp"
                         android:layout_height="28dp"
-                        app:layout_constraintTop_toBottomOf="@id/tv_home_name"
-                        app:layout_constraintLeft_toLeftOf="parent"
+                        android:layout_marginLeft="12dp"
                         android:layout_marginTop="8dp"
-                        android:layout_marginLeft="24dp"
+                        android:scaleType="fitCenter"
                         android:src="@mipmap/img_team_logo_default"
-                        android:scaleType="fitCenter"/>
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_home_name" />
 
                     <ImageView
                         android:id="@+id/iv_away_logo"
                         android:layout_width="28dp"
                         android:layout_height="28dp"
-                        app:layout_constraintTop_toBottomOf="@id/tv_away_name"
-                        app:layout_constraintRight_toRightOf="parent"
                         android:layout_marginTop="8dp"
-                        android:layout_marginRight="24dp"
+                        android:layout_marginRight="12dp"
+                        android:scaleType="fitCenter"
                         android:src="@mipmap/img_team_logo_default"
-                        android:scaleType="fitCenter"/>
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_away_name" />
 
                     <TextView
                         android:id="@+id/tv_winning"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/iv_home_logo"
-                        app:layout_constraintLeft_toLeftOf="@id/tv_home_name"
                         android:layout_marginTop="18dp"
                         android:text="@string/winning_chances"
-                        android:textSize="12dp"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:textSize="12dp"
+                        android:fontFamily="@font/noto_sans_display_semibold"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_home_name"
+                        app:layout_constraintTop_toBottomOf="@id/iv_home_logo" />
 
                     <TextView
                         android:id="@+id/tv_home_win_rate"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/tv_winning"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="12dp"
-                        android:textSize="14dp"
+                        android:layout_marginTop="8dp"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
+                        android:textSize="14dp"
+                        android:fontFamily="@font/noto_sans_display_semibold"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_winning" />
 
                     <TextView
                         android:id="@+id/tv_away_win_rate"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/tv_winning"
-                        app:layout_constraintRight_toRightOf="parent"
                         android:layout_marginTop="8dp"
                         android:layout_marginRight="12dp"
-                        android:textSize="14dp"
                         android:textColor="@color/c_333333"
-                        android:textStyle="bold"/>
-                    
+                        android:textSize="14dp"
+                        android:fontFamily="@font/noto_sans_display_semibold"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_winning" />
+
                     <ProgressBar
                         android:id="@+id/progress_bar"
+                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="8dp"
-                        app:layout_constraintTop_toBottomOf="@id/tv_home_win_rate"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
-                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                         android:max="100"
                         android:progress="50"
-                        android:progressDrawable="@drawable/progress_team_comparison"/>
+                        android:progressDrawable="@drawable/progress_team_comparison"
+                        app:layout_constraintTop_toBottomOf="@id/tv_home_win_rate" />
 
                     <TextView
                         android:id="@+id/tv_home_round"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/progress_bar"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        android:layout_marginTop="25dp"
                         android:layout_marginLeft="12dp"
+                        android:layout_marginTop="25dp"
+                        android:textColor="@color/c_333333"
                         android:textSize="12dp"
-                        android:textColor="@color/c_333333"/>
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/progress_bar" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="@id/tv_home_round"
+                        android:text="@string/recent_form"
+                        android:textColor="@color/c_666666"
+                        android:textSize="10sp"
+                        android:letterSpacing="0.1"
                         app:layout_constraintBottom_toBottomOf="@id/tv_home_round"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
-                        android:text="@string/recent_form"
-                        android:textColor="@color/c_666666"
-                        style="@style/TvSmallCapsStyle"/>
+                        app:layout_constraintTop_toTopOf="@id/tv_home_round" />
 
                     <TextView
                         android:id="@+id/tv_away_round"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="@id/tv_home_round"
-                        app:layout_constraintBottom_toBottomOf="@id/tv_home_round"
-                        app:layout_constraintRight_toRightOf="parent"
                         android:layout_marginRight="12dp"
+                        android:textColor="@color/c_333333"
                         android:textSize="12dp"
-                        android:textColor="@color/c_333333"/>
+                        app:layout_constraintBottom_toBottomOf="@id/tv_home_round"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/tv_home_round" />
 
                     <LinearLayout
                         android:id="@+id/ll_round"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/tv_home_round"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="12dp"
-                        android:layout_marginRight="12dp">
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="12dp"
+                        app:layout_constraintTop_toBottomOf="@id/tv_home_round">
+
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:orientation="vertical">
+
                             <LinearLayout
                                 android:id="@+id/ll_home_round"
                                 android:layout_width="match_parent"
                                 android:layout_height="24dp"
-                                android:orientation="horizontal"/>
+                                android:orientation="horizontal" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/latest"
-                                android:textColor="@color/c_666666"
                                 android:layout_marginTop="@dimen/dp_4"
-                                style="@style/TvSmallCapsStyle"
-                                android:textSize="@dimen/sp_11"/>
+                                android:text="@string/latest"
+                                android:textSize="10sp"
+                                android:letterSpacing="0.1"
+                                android:textColor="@color/c_666666"/>
                         </LinearLayout>
 
                         <View
-                            android:layout_width="1dp"
+                            android:layout_width="0.5dp"
                             android:layout_height="43dp"
                             android:layout_marginLeft="8dp"
                             android:layout_marginRight="8dp"
-                            android:background="@color/line_color"/>
+                            android:background="@color/c_E5E5E5" />
 
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:orientation="vertical">
+
                             <LinearLayout
                                 android:id="@+id/ll_away_round"
                                 android:layout_width="match_parent"
                                 android:layout_height="24dp"
-                                android:orientation="horizontal"/>
+                                android:orientation="horizontal" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/latest"
                                 android:layout_marginTop="@dimen/dp_4"
+                                android:text="@string/latest"
                                 android:textColor="@color/c_666666"
-                                style="@style/TvSmallCapsStyle"
-                                android:textSize="@dimen/sp_11"/>
+                                android:textSize="10sp"
+                                android:letterSpacing="0.1"/>
                         </LinearLayout>
                     </LinearLayout>
 
                     <View
                         android:id="@+id/line_eight"
                         android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        app:layout_constraintTop_toBottomOf="@id/ll_round"
+                        android:layout_height="0.5dp"
                         android:layout_marginTop="12dp"
-                        android:background="@color/line_color"/>
+                        android:background="@color/c_E5E5E5"
+                        app:layout_constraintTop_toBottomOf="@id/ll_round" />
 
                     <TextView
                         android:id="@+id/tv_see_tem"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/line_eight"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintLeft_toLeftOf="parent"
+                        android:layout_marginLeft="12dp"
                         android:layout_marginTop="12dp"
                         android:layout_marginBottom="12dp"
-                        android:layout_marginLeft="12dp"
                         android:text="@string/see_team_strengths"
+                        android:textColor="@color/c_1D2550"
                         android:textSize="14dp"
-                        android:textColor="@color/colorBlue"
-                        android:textStyle="bold"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/line_eight" />
 
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        app:layout_constraintTop_toTopOf="@id/tv_see_tem"
+                        android:layout_marginRight="7dp"
+                        android:background="@mipmap/icon_arrow_right_three"
                         app:layout_constraintBottom_toBottomOf="@id/tv_see_tem"
                         app:layout_constraintRight_toRightOf="parent"
-                        android:layout_marginRight="7dp"
-                        android:background="@mipmap/icon_arrow_right_three"/>
+                        app:layout_constraintTop_toTopOf="@id/tv_see_tem" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>

TMessagesProj/src/main/res/layout/fragment_cricket_info.xml

@@ -15,7 +15,9 @@
             android:layout_marginLeft="14dp"
             android:layout_marginTop="18dp"
             android:text="@string/teams"
-            style="@style/TvItemTitleStyle"/>
+            android:textColor="@color/c_333333"
+            android:textSize="16sp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <LinearLayout
             android:id="@+id/ll_home"
@@ -36,10 +38,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="12dp"
-                style="@style/TvCapsStyle"
                 android:textSize="14dp"
                 android:textColor="@color/c_333333"
-                android:textStyle="bold"/>
+                android:fontFamily="@font/noto_sans_display_semibold"/>
 
             <View
                 android:layout_width="0dp"
@@ -55,10 +56,10 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_CCCCCC"/>
 
         <LinearLayout
             android:id="@+id/ll_away"
@@ -79,10 +80,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="12dp"
-                style="@style/TvCapsStyle"
                 android:textSize="14dp"
                 android:textColor="@color/c_333333"
-                android:textStyle="bold"/>
+                android:fontFamily="@font/noto_sans_display_semibold"/>
 
             <View
                 android:layout_width="0dp"
@@ -99,7 +99,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="12dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -107,7 +107,9 @@
             android:layout_marginTop="18dp"
             android:layout_marginLeft="14dp"
             android:text="@string/tournament"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="16sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <LinearLayout
             android:id="@+id/ll_tournament"
@@ -125,12 +127,17 @@
 
             <TextView
                 android:id="@+id/tv_tournament_name"
-                android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
-                style="@style/TvItemSecondTitleStyle"/>
+                android:textSize="14dp"
+                android:textColor="@color/c_333333"
+                android:fontFamily="@font/noto_sans_display_semibold"/>
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1"/>
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -142,7 +149,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="12dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -150,7 +157,9 @@
             android:layout_marginTop="18dp"
             android:layout_marginLeft="14dp"
             android:text="@string/match_details"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="16sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -158,7 +167,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:text="@string/match"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -167,16 +176,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:layout_marginLeft="14dp"
-            style="@style/TvDateStyle"
+            android:textSize="14dp"
             android:textColor="@color/c_333333"/>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_CCCCCC"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -184,7 +193,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:text="@string/match_start_time"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -193,16 +202,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:layout_marginLeft="14dp"
-            style="@style/TvDateStyle"
+            android:textSize="14dp"
             android:textColor="@color/c_333333"/>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_CCCCCC"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -210,7 +219,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:text="@string/stadium_venue"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -219,16 +228,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:layout_marginLeft="14dp"
-            android:textSize="13dp"
+            android:textSize="14dp"
             android:textColor="@color/c_2C9DE9"/>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_CCCCCC"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -236,7 +245,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:text="@string/match_officials"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"
             android:visibility="gone"/>
 
@@ -254,7 +263,7 @@
             android:layout_width="match_parent"
             android:layout_height="12dp"
             android:layout_marginTop="12dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -262,7 +271,9 @@
             android:layout_marginLeft="14dp"
             android:layout_marginTop="18dp"
             android:text="@string/playing_xi"
-            style="@style/TvItemTitleStyle"/>
+            android:textColor="@color/c_333333"
+            android:textSize="16sp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_playing_home_name"
@@ -270,8 +281,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
-            style="@style/TvCapsStyle"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -280,17 +290,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:layout_marginLeft="14dp"
-            style="@style/TvNormalStyle"
             android:textSize="14dp"
-            android:textColor="@color/c_333333" />
+            android:textColor="@color/c_333333"/>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_CCCCCC"/>
 
         <TextView
             android:id="@+id/tv_playing_away_name"
@@ -307,9 +316,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:layout_marginLeft="14dp"
-            style="@style/TvNormalStyle"
             android:textSize="14dp"
-            android:textColor="@color/c_333333" />
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:id="@+id/tv_jump_squad"
@@ -318,31 +326,32 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="22dp"
             android:text="@string/view_full_squad_info"
-            android:textSize="12sp"
-            android:textStyle="bold"
+            android:textSize="11sp"
+            android:fontFamily="@font/noto_sans_display_semibold"
             android:textAllCaps="true"
-            android:textColor="@color/colorBlue"/>
+            android:textColor="@color/c_1D2550"/>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="12dp"
             android:layout_marginTop="12dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="37dp"
             android:layout_marginTop="12dp"
             android:orientation="horizontal"
-            android:background="@color/line_color2">
+            android:background="@color/c_E5E5E5">
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="#"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -350,8 +359,10 @@
                 android:layout_weight="1.2"
                 android:gravity="center"
                 android:text="@string/team2"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -359,8 +370,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="P"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -368,8 +380,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="W"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -377,8 +390,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="L"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -386,8 +400,10 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="NR"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -395,17 +411,21 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="NRR"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1.3"
                 android:gravity="center"
-                android:text="RTS"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:text="PTS"
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="11sp"
+                android:textColor="@color/c_801D2550"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -417,37 +437,35 @@
             android:layout_width="match_parent"
             android:layout_height="36dp"
             android:layout_marginTop="18dp"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:gravity="center_vertical"
             android:paddingLeft="12dp"
             android:text="@string/glossary"
-            android:fontFamily="serif"
-            android:textSize="14dp"
-            android:textStyle=""
-            android:textColor="@color/c_999999"
+            android:textSize="10sp"
+            android:letterSpacing="0.1"
+            android:textColor="@color/c_1D2550"
+            android:textStyle="bold"
             android:background="@color/c_E5E5E5"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="#:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/rank"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -455,22 +473,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="Team:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/team_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -478,22 +496,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="P:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/p_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -501,22 +519,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="W:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/w_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -524,22 +542,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="D:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/d_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -547,22 +565,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="L:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/l_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -570,22 +588,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="NR:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/nr_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -593,22 +611,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="NRR:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/nrr_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -616,22 +634,22 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="PTS:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/pts_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -639,8 +657,6 @@
             android:layout_width="match_parent"
             android:layout_height="35dp"
             android:gravity="center_vertical"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:orientation="horizontal">
             <com.coorchice.library.SuperTextView
                 android:layout_width="20dp"
@@ -648,7 +664,8 @@
                 android:gravity="center"
                 android:layout_marginLeft="14dp"
                 android:text="Q"
-                android:textSize="14dp"
+                android:textSize="11sp"
+                android:textStyle="bold"
                 android:textColor="@color/white"
                 app:stv_solid="@color/c_EEA831"
                 app:stv_corner="30dp"/>
@@ -658,7 +675,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/q_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
     </LinearLayout>

TMessagesProj/src/main/res/layout/fragment_cricket_points.xml

@@ -11,17 +11,19 @@
         android:focusableInTouchMode="true">
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="37dp"
+            android:layout_height="36dp"
             android:orientation="horizontal"
-            android:background="@color/c_CCCCCC">
+            android:background="@color/c_E5E5E5"
+            android:paddingTop="@dimen/dp_10">
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="#"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -29,8 +31,10 @@
                 android:layout_weight="1.2"
                 android:gravity="center"
                 android:text="@string/team2"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:letterSpacing="0.1"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -38,8 +42,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="P"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -47,8 +52,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="W"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -56,8 +62,9 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="L"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -65,8 +72,10 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="NR"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -74,17 +83,21 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="NRR"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1.3"
                 android:gravity="center"
-                android:text="RTS"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:text="PTS"
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -96,14 +109,13 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_marginTop="18dp"
-            android:layout_marginLeft="14dp"
-            android:layout_marginRight="14dp"
             android:gravity="center_vertical"
             android:paddingLeft="14dp"
             android:text="@string/glossary"
-            android:fontFamily="serif"
-            android:textSize="14dp"
-            android:textColor="@color/c_999999"
+            android:textSize="10sp"
+            android:letterSpacing="0.1"
+            android:textColor="@color/c_1D2550"
+            android:textStyle="bold"
             android:background="@color/c_E5E5E5"/>
 
         <LinearLayout
@@ -117,14 +129,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="#:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/rank"
-                android:textSize="14dp"
+                android:textSize="13sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -139,14 +153,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="Team:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/team_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -161,14 +177,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="P:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/p_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -183,14 +201,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="W:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/w_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -205,14 +225,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="D:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/d_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -227,14 +249,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="L:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/l_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -249,14 +273,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="NR:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/nr_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -271,14 +297,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="NRR:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/nrr_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -293,14 +321,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:text="PTS:"
-                style="@style/TvNormalTitleStyle"/>
+                android:textStyle="bold"
+                android:textSize="12sp"
+                android:textColor="@color/c_333333"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/pts_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
 
@@ -318,7 +348,8 @@
                 android:gravity="center"
                 android:layout_marginLeft="14dp"
                 android:text="Q"
-                android:textSize="14dp"
+                android:textSize="11sp"
+                android:textStyle="bold"
                 android:textColor="@color/white"
                 app:stv_solid="@color/c_EEA831"
                 app:stv_corner="30dp"/>
@@ -328,7 +359,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/q_desc"
-                android:textSize="14dp"
+                android:textSize="12sp"
                 android:textColor="@color/c_666666"/>
         </LinearLayout>
     </LinearLayout>

TMessagesProj/src/main/res/layout/fragment_cricket_scorecard.xml

@@ -7,29 +7,35 @@
         android:id="@+id/ll_home"
         android:layout_width="match_parent"
         android:layout_height="45dp"
-        android:orientation="horizontal"
+        android:background="@color/c_FFE6E2"
         android:gravity="center_vertical"
-        android:background="@color/c_FFE6E2">
+        android:orientation="horizontal">
+
         <TextView
             android:id="@+id/tv_home_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_marginLeft="14dp"
-            style="@style/TvItemTitleStyle"/>
+            android:layout_weight="1"
+            android:textColor="@color/c_333333"
+            android:textSize="17sp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_home_round"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textColor="@color/c_666666"
+            android:textSize="14sp"/>
 
         <TextView
             android:id="@+id/tv_home_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/TvItemTitleStyle"/>
+            android:textColor="@color/c_333333"
+            android:textSize="17sp"
+            android:layout_marginLeft="10dp"
+            android:fontFamily="@font/noto_sans_display_bold"/>
 
         <ImageView
             android:id="@+id/iv_arrow_one"
@@ -38,7 +44,7 @@
             android:layout_gravity="center"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="14dp"
-            android:background="@mipmap/icon_arrow_down_four"/>
+            android:background="@mipmap/icon_arrow_down_four" />
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -47,209 +53,216 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:visibility="gone">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
             android:orientation="vertical">
+
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="12dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
                     android:paddingLeft="12dp"
                     android:text="BATTER"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="B"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="4s"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="6s"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="12dp"
                     android:gravity="right"
+                    android:paddingRight="12dp"
                     android:text="S/R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_home_batter"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:layout_marginLeft="12dp"
+                    android:layout_weight="1"
                     android:text="@string/extras"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
 
                 <TextView
                     android:id="@+id/tv_home_extras"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="12dp"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_333333"/>
+                    android:textColor="@color/c_333333"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:background="@color/c_CCCCCC"/>
+                android:background="@color/c_CCCCCC" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="12dp"
                     android:text="@string/did_not_bat"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
 
                 <TextView
                     android:id="@+id/tv_home_no_bat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="12dp"
-                    style="@style/TvNormalStyle"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="18dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="5"
                     android:paddingLeft="12dp"
                     android:text="BOWLER"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="O"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="W"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_home_bowler"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="7dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="6"
                     android:paddingLeft="12dp"
                     android:text="FALL OF WICKETS"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="@string/score_uppercase"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="@string/over_uppercase"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_home_wicket"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
@@ -258,29 +271,35 @@
         android:layout_width="match_parent"
         android:layout_height="45dp"
         android:layout_marginTop="0.5dp"
-        android:orientation="horizontal"
+        android:background="@color/c_FFE6E2"
         android:gravity="center_vertical"
-        android:background="@color/c_FFE6E2">
+        android:orientation="horizontal">
+
         <TextView
             android:id="@+id/tv_away_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_marginLeft="14dp"
-            style="@style/TvItemTitleStyle"/>
+            android:layout_weight="1"
+            android:textColor="@color/c_333333"
+            android:textSize="17sp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_away_round"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12dp"
-            android:textColor="@color/c_666666"/>
+            android:textColor="@color/c_666666"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/tv_away_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/TvItemTitleStyle"/>
+            android:textColor="@color/c_333333"
+            android:textSize="17sp"
+            android:layout_marginLeft="10dp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <ImageView
             android:id="@+id/iv_arrow_two"
@@ -289,7 +308,7 @@
             android:layout_gravity="center"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="14dp"
-            android:background="@mipmap/icon_arrow_down_four"/>
+            android:background="@mipmap/icon_arrow_down_four" />
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -298,209 +317,216 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:visibility="gone">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
             android:orientation="vertical">
+
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="12dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
                     android:paddingLeft="12dp"
                     android:text="BATTER"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="B"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="4s"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="6s"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="12dp"
                     android:gravity="right"
+                    android:paddingRight="12dp"
                     android:text="S/R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_away_batter"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:layout_marginLeft="12dp"
+                    android:layout_weight="1"
                     android:text="@string/extras"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
 
                 <TextView
                     android:id="@+id/tv_away_extras"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="12dp"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_333333"/>
+                    android:textColor="@color/c_333333"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:background="@color/c_CCCCCC"/>
+                android:background="@color/c_CCCCCC" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="12dp"
                     android:text="@string/did_not_bat"
-                    android:textSize="14dp"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
 
                 <TextView
                     android:id="@+id/tv_away_no_bat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="12dp"
-                    style="@style/TvNormalStyle"
-                    android:textColor="@color/c_666666"/>
+                    android:textColor="@color/c_666666"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="18dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="5"
                     android:paddingLeft="12dp"
                     android:text="BOWLER"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="O"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="R"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="W"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_away_bowler"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="25dp"
                 android:layout_marginTop="7dp"
+                android:background="@drawable/shape_cccccc_5dp_rec"
                 android:gravity="center_vertical"
-                android:background="@drawable/shape_cccccc_5dp_rec">
+                android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="6"
                     android:paddingLeft="12dp"
                     android:text="FALL OF WICKETS"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="@string/score_uppercase"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="@string/over_uppercase"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textColor="@color/c_801D2550"
+                    android:textSize="12dp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_away_wicket"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>

TMessagesProj/src/main/res/layout/fragment_cricket_stats.xml

@@ -20,15 +20,16 @@
             <View
                 android:layout_width="3dp"
                 android:layout_height="20dp"
-                android:background="@color/colorLightBlue"/>
+                android:background="@color/colorSplashBlue"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/batting_stats"
-                style="@style/TvItemTitleStyle"
-                android:textSize="18dp"/>
+                android:textSize="16sp"
+                android:textColor="@color/c_333333"
+                android:fontFamily="@font/noto_sans_display_semibold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -55,9 +56,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/highest_individual_score"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -69,16 +70,16 @@
                             android:id="@+id/tv_highest_score_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_highest_score"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -95,6 +96,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line1"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -117,9 +119,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/most_runs"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -131,16 +133,16 @@
                             android:id="@+id/tv_most_run_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_most_run"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -157,6 +159,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line2"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -179,9 +182,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/best_batting_average"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -193,16 +196,16 @@
                             android:id="@+id/tv_best_batting_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_best_batting"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -219,6 +222,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line3"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -241,9 +245,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/highest_strike_rate"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -255,16 +259,16 @@
                             android:id="@+id/tv_highest_strike_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_highest_strike"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -281,6 +285,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line4"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -303,9 +308,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/maximum_sixes"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -317,16 +322,16 @@
                             android:id="@+id/tv_maximum_six_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_maximum_six"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -347,7 +352,7 @@
             android:layout_width="match_parent"
             android:layout_height="12dp"
             android:layout_marginTop="8dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -359,15 +364,16 @@
             <View
                 android:layout_width="3dp"
                 android:layout_height="20dp"
-                android:background="@color/colorLightBlue"/>
+                android:background="@color/colorSplashBlue"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/bowling_stats"
-                style="@style/TvItemTitleStyle"
-                android:textSize="18dp"/>
+                android:textSize="16sp"
+                android:textColor="@color/c_333333"
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -394,9 +400,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/most_wickets"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -408,16 +414,16 @@
                             android:id="@+id/tv_most_wicket_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_most_wicket"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -434,6 +440,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line5"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -456,9 +463,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/best_bowling_average"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -470,16 +477,16 @@
                             android:id="@+id/tv_best_bowling_av_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_best_bowling_av"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -496,6 +503,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line6"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -518,9 +526,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/best_bowling_economy"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -532,16 +540,16 @@
                             android:id="@+id/tv_best_bowling_ec_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_best_bowling_ec"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -562,7 +570,7 @@
             android:layout_width="match_parent"
             android:layout_height="12dp"
             android:layout_marginTop="8dp"
-            android:background="@color/line_color"/>
+            android:background="@color/c_E5E5E5"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -574,15 +582,16 @@
             <View
                 android:layout_width="3dp"
                 android:layout_height="20dp"
-                android:background="@color/colorLightBlue"/>
+                android:background="@color/colorSplashBlue"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:text="@string/fielding_stats"
-                style="@style/TvItemTitleStyle"
-                android:textSize="18dp" />
+                android:textSize="16sp"
+                android:textColor="@color/c_333333"
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -609,9 +618,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/most_catches"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -623,16 +632,16 @@
                             android:id="@+id/tv_most_catches_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_most_catches"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -649,6 +658,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line7"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -671,9 +681,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/most_run_outs"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -685,16 +695,16 @@
                             android:id="@+id/tv_most_run_out_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_most_run_out"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -711,6 +721,7 @@
             </LinearLayout>
 
             <View
+                android:id="@+id/view_line8"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginLeft="12dp"
@@ -734,9 +745,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/most_stumpings"
-                        android:textSize="16dp"
+                        android:textSize="14sp"
                         android:textColor="@color/c_333333"
-                        style="@style/TvSansSerifMediumStyle"/>
+                        android:fontFamily="@font/noto_sans_display_semibold"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -748,16 +759,16 @@
                             android:id="@+id/tv_most_stumping_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"/>
 
                         <TextView
                             android:id="@+id/tv_most_stumping"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="16dp"
+                            android:textSize="14sp"
                             android:textColor="@color/c_333333"
-                            style="@style/TvSansSerifMediumStyle"/>
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
                     </LinearLayout>
                 </LinearLayout>
 

TMessagesProj/src/main/res/layout/fragment_match.xml

@@ -13,7 +13,6 @@
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingTop="8dp"
-        android:visibility="gone"
         android:paddingBottom="8dp"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -22,13 +21,14 @@
             android:id="@+id/tv_tournament"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_match_tour_normal"
+            android:background="@drawable/selector_cricket_stats_bg2"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:paddingStart="10dp"
             android:paddingTop="6dp"
             android:paddingEnd="10dp"
-            android:paddingBottom="6dp">
+            android:paddingBottom="6dp"
+            android:layout_marginRight="30dp">
 
             <TextView
                 android:id="@+id/match_tournament_count"
@@ -61,15 +61,17 @@
 
         </LinearLayout>
 
-
         <LinearLayout
             android:id="@+id/ll_streaming"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="35dp"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="horizontal"
-            android:visibility="gone">
+            android:paddingLeft="@dimen/dp_10"
+            android:paddingRight="@dimen/dp_10"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:background="@drawable/selector_cricket_stats_bg2">
 
             <ImageView
                 android:id="@+id/iv_streaming"
@@ -85,7 +87,7 @@
                 android:layout_marginLeft="8dp"
                 android:text="@string/streaming"
                 android:textColor="@color/c_333333"
-                android:textSize="16dp" />
+                android:textSize="13sp" />
         </LinearLayout>
     </LinearLayout>
 
@@ -93,7 +95,6 @@
         android:id="@+id/match_stream_underline"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:visibility="gone"
         android:background="@color/line_color"
         app:layout_constraintTop_toBottomOf="@id/match_stream_container" />
 
@@ -111,7 +112,7 @@
             android:id="@+id/match_recyclerView"
             android:overScrollMode="never"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"/>
 
         <include layout="@layout/base_head_loadmore" />
 

TMessagesProj/src/main/res/layout/fragment_news_group.xml

@@ -60,7 +60,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/create_a_dao_group_title"
-                            style="@style/TvItemSecondTitleStyle"/>
+                            style="@style/TvItemSecondTitleStyle"
+                            android:fontFamily="@font/noto_sans_display_semibold"/>
 
                         <TextView
                             android:id="@+id/tv_create_dao_content"

TMessagesProj/src/main/res/layout/fragment_player_bio.xml

@@ -8,12 +8,15 @@
         android:layout_height="match_parent"
         android:background="@color/white">
         <TextView
+            android:id="@+id/tv_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="19dp"
             android:layout_marginLeft="14dp"
             android:text="@string/teams"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="17dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_teams"
@@ -22,18 +25,22 @@
             android:layout_marginTop="12dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
-            style="@style/TvNormalStyle"
+            android:textSize="14dp"
             android:textColor="@color/c_333333"/>
 
         <TextView
+            android:id="@+id/tv_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="19dp"
             android:layout_marginLeft="14dp"
             android:text="@string/recent_matches"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="17dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <LinearLayout
+            android:id="@+id/ll_2"
             android:layout_width="match_parent"
             android:layout_height="25dp"
             android:layout_marginTop="12dp"
@@ -46,10 +53,10 @@
                 android:layout_height="match_parent"
                 android:layout_weight="2"
                 android:gravity="center_vertical"
-                android:paddingLeft="14dp"
+                android:paddingLeft="10dp"
                 android:text="@string/matches2"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -57,8 +64,8 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:text="@string/bat"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -66,8 +73,8 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:text="@string/bowl"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -75,8 +82,8 @@
                 android:layout_weight="1.2"
                 android:gravity="center_vertical"
                 android:text="@string/format"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -99,7 +106,9 @@
             android:layout_marginTop="19dp"
             android:layout_marginLeft="14dp"
             android:text="@string/profile"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="17dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_profile"
@@ -110,7 +119,7 @@
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
             android:text="Info not available"
-            style="@style/TvNormalStyle"
+            android:textSize="14dp"
             android:textColor="@color/c_333333"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

TMessagesProj/src/main/res/layout/fragment_player_career.xml

@@ -10,7 +10,7 @@
         <LinearLayout
             android:id="@+id/ll_type"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
+            android:layout_height="46dp"
             android:layout_marginTop="13dp"
             android:layout_marginLeft="14dp"
             android:layout_marginRight="14dp"
@@ -24,6 +24,7 @@
                 android:layout_marginLeft="12dp"
                 android:text="ODI"
                 android:textSize="16dp"
+                android:fontFamily="@font/noto_sans_display_semibold"
                 android:textColor="@color/c_333333"/>
 
             <View
@@ -55,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/odi_debut"
-                    android:textSize="12dp"
+                    android:textSize="10sp"
                     android:textColor="@color/c_666666"/>
 
                 <TextView
@@ -65,14 +66,14 @@
                     android:text="30 Jul 2020"
                     android:textSize="14dp"
                     android:textColor="@color/c_333333"
-                    android:textStyle="bold"/>
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="IER vs ENG"
-                    android:textSize="12dp"
+                    android:textSize="10sp"
                     android:textColor="@color/c_666666"/>
 
                 <TextView
@@ -80,8 +81,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="Southampton"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textSize="10sp"
+                    android:textColor="@color/c_801D2550"/>
             </LinearLayout>
 
             <View
@@ -99,7 +100,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/last_odi"
-                    android:textSize="12dp"
+                    android:textSize="10sp"
                     android:textColor="@color/c_666666"/>
 
                 <TextView
@@ -109,14 +110,14 @@
                     android:text="30 Jul 2020"
                     android:textSize="14dp"
                     android:textColor="@color/c_333333"
-                    android:textStyle="bold"/>
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="IER vs ENG"
-                    android:textSize="12dp"
+                    android:textSize="10sp"
                     android:textColor="@color/c_666666"/>
 
                 <TextView
@@ -124,8 +125,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="Southampton"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textSize="10sp"
+                    android:textColor="@color/c_801D2550"/>
             </LinearLayout>
         </LinearLayout>
 
@@ -139,7 +140,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/performance"
-                style="@style/TvItemTitleStyle" />
+                android:textSize="17dp"
+                android:textColor="@color/c_333333"
+                android:fontFamily="@font/noto_sans_display_semibold"/>
 
             <View
                 android:layout_width="0dp"
@@ -148,7 +151,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_performance"
-                android:layout_width="100dp"
+                android:layout_width="85dp"
                 android:layout_height="25dp"
                 android:layout_marginRight="14dp"
                 android:gravity="center_vertical"
@@ -160,8 +163,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="12dp"
                     android:text="@string/batting"
-                    android:textSize="12dp"
-                    android:textColor="@color/c_999999"/>
+                    android:textSize="11sp"
+                    android:textColor="@color/c_801D2550"/>
 
                 <View
                     android:layout_width="0dp"
@@ -197,9 +200,12 @@
             android:layout_marginTop="18dp"
             android:layout_marginLeft="14dp"
             android:text="@string/recent_odi_matches"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="17dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <LinearLayout
+            android:id="@+id/ll_2"
             android:layout_width="match_parent"
             android:layout_height="25dp"
             android:layout_marginTop="12dp"
@@ -212,10 +218,10 @@
                 android:layout_height="match_parent"
                 android:layout_weight="2"
                 android:gravity="center_vertical"
-                android:paddingLeft="14dp"
+                android:paddingLeft="10dp"
                 android:text="@string/against"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -223,8 +229,8 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:text="@string/bat"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -232,8 +238,8 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:text="@string/bowl"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
@@ -241,8 +247,8 @@
                 android:layout_weight="1.2"
                 android:gravity="center_vertical"
                 android:text="@string/format"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:textColor="@color/c_801D2550"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView

TMessagesProj/src/main/res/layout/item_cricket.xml

@@ -1,43 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:background="@color/colorWhite"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@color/white">
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginLeft="12dp"
+        android:layout_marginLeft="14dp"
         android:layout_marginRight="8dp"
-        android:fontFamily="sans-serif-medium"
         android:textSize="15sp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"
-        android:drawableRight="@mipmap/icon_arrow_right_four"
+        android:fontFamily="@font/noto_sans_display_semibold"
+        android:drawableRight="@mipmap/icon_arrow_right_three"
         android:drawablePadding="6dp"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_inner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:background="@drawable/shape_cricket_line_bg"
-        />
+        android:layout_marginTop="14dp"
+        android:layout_marginBottom="14dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginRight="9dp"
+        android:background="@drawable/shape_cricket_line_bg"/>
 
     <TextView
-        android:id="@+id/tv_see_more"
+        android:id="@+id/tv_result"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="16dp"
-        android:text="@string/see_more"
-        android:textStyle="bold"
+        android:layout_marginBottom="12dp"
         android:textAllCaps="true"
+        android:text="@string/see_more"
         android:textSize="12sp"
-        android:textColor="@color/colorBlue"/>
+        android:textColor="@color/c_1D2550"
+        android:fontFamily="@font/noto_sans_display_semibold"/>
+
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_detail.xml

@@ -1,172 +1,171 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView
+    android:id="@+id/cardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:layout_marginStart="12.5dp"
-    android:layout_marginEnd="12.5dp"
-    android:background="@drawable/shape_cricket_line_bg"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="12dp"
-        android:layout_marginLeft="12dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    card_view:cardCornerRadius="5dp"
+    card_view:cardElevation="3dp"
+    card_view:cardMaxElevation="3dp"
+    card_view:cardPreventCornerOverlap="true"
+    card_view:cardUseCompatPadding="true"
+    android:clickable="true"
+    android:layout_marginTop="12dp"
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:foreground="?android:attr/selectableItemBackground">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
         <LinearLayout
-            android:background="@drawable/shape_inner_notify_bg"
-            android:id="@+id/ll_alarm"
+            android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:gravity="center"
-            android:orientation="horizontal"
-            >
-            <ImageView
-                android:id="@+id/iv_alarm"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="12dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/ll_alarm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:layout_marginLeft="6dp"
-                android:background="@mipmap/icon_alarm_clock"/>
+                android:layout_marginRight="8dp"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:background="@color/c_E5E5E5">
+                <ImageView
+                    android:id="@+id/iv_alarm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="6dp"
+                    android:background="@mipmap/icon_alarm_clock"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/tv_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="6dp"
+                    android:textSize="12sp"
+                    android:fontFamily="@font/noto_sans_display_semibold"/>
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/tv_time"
+                android:id="@+id/tv_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginTop="3dp"
-                android:layout_marginRight="6dp"
-                android:layout_marginBottom="3dp"
-                android:text="7h 12m"
-                android:textColor="@color/colorDarkBlue"
-                android:textSize="11sp"
-                android:textStyle="bold"/>
+                android:textSize="12sp"
+                android:textColor="@color/c_666666"/>
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tv_date"
+        <LinearLayout
+            android:id="@+id/ll_one"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:textAllCaps="true"
-            android:textColor="@color/c_585858"/>
-    </LinearLayout>
+            app:layout_constraintTop_toBottomOf="@id/linearLayout"
+            app:layout_constraintLeft_toLeftOf="@id/linearLayout"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/iv_home_logo"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@mipmap/img_team_logo_default"
+                android:scaleType="fitCenter"/>
 
-    <LinearLayout
-        android:id="@+id/ll_one"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/linearLayout"
-        app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        android:layout_marginTop="12dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/iv_home_logo"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:src="@mipmap/img_team_logo_default"
-            android:scaleType="fitCenter"/>
+            <TextView
+                android:id="@+id/tv_home_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:textSize="15sp"
+                android:textColor="@color/c_333333"/>
+        </LinearLayout>
 
         <TextView
-            android:id="@+id/tv_home_name"
+            android:id="@+id/tv_home_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxEms="5"
-            android:maxLines="1"
-            style="@style/TvCapsStyle"/>
-    </LinearLayout>
+            app:layout_constraintTop_toTopOf="@id/ll_one"
+            app:layout_constraintBottom_toBottomOf="@id/ll_one"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginLeft="173dp"
+            android:textSize="15sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
-    <TextView
-        android:id="@+id/tv_home_score"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/c_141414"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/ll_one"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/ll_one"
-        app:layout_constraintTop_toTopOf="@id/ll_one" />
+        <TextView
+            android:id="@+id/tv_home_score2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="@id/tv_home_score"
+            app:layout_constraintStart_toEndOf="@id/tv_home_score"
+            app:layout_constraintTop_toTopOf="@id/tv_home_score" />
 
-    <TextView
-        android:id="@+id/tv_home_score2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="5"
-        android:textSize="13sp"
-        android:textColor="@color/c_9D9D9D"
-        app:layout_constraintBottom_toBottomOf="@id/tv_home_score"
-        app:layout_constraintStart_toEndOf="@id/tv_home_score"
-        app:layout_constraintTop_toTopOf="@id/tv_home_score" />
+        <LinearLayout
+            android:id="@+id/ll_two"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/ll_one"
+            app:layout_constraintLeft_toLeftOf="@id/linearLayout"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/iv_away_logo"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@mipmap/img_team_logo_default"
+                android:scaleType="fitCenter"/>
 
-    <LinearLayout
-        android:id="@+id/ll_two"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/ll_one"
-        app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        android:layout_marginTop="12dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/iv_away_logo"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:src="@mipmap/img_team_logo_default"
-            android:scaleType="fitCenter"/>
+            <TextView
+                android:id="@+id/tv_away_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:textSize="15sp"
+                android:textColor="@color/c_333333"/>
+        </LinearLayout>
 
         <TextView
-            android:id="@+id/tv_away_name"
+            android:id="@+id/tv_away_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxEms="5"
-            android:maxLines="1"
-            style="@style/TvCapsStyle"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tv_away_score"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/colorBlack"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/ll_two"
-        app:layout_constraintStart_toStartOf="@id/tv_home_score"
-        app:layout_constraintTop_toTopOf="@id/ll_two" />
+            app:layout_constraintTop_toTopOf="@id/ll_two"
+            app:layout_constraintBottom_toBottomOf="@id/ll_two"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginLeft="173dp"
+            android:textSize="15sp"
+            android:textColor="@color/c_333333"
+            android:textStyle="bold"/>
 
-    <TextView
-        android:id="@+id/tv_away_score2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="13sp"
-        android:textColor="@color/c_9D9D9D"
-        app:layout_constraintBottom_toBottomOf="@id/tv_away_score"
-        app:layout_constraintStart_toEndOf="@id/tv_away_score"
-        app:layout_constraintTop_toTopOf="@id/tv_away_score" />
+        <TextView
+            android:id="@+id/tv_away_score2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="@id/tv_away_score"
+            app:layout_constraintStart_toEndOf="@id/tv_away_score"
+            app:layout_constraintTop_toTopOf="@id/tv_away_score" />
 
-    <TextView
-        android:id="@+id/tv_result"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/ll_two"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="12dp"
-        style="@style/TvNormalStyle"
-        android:textStyle="bold"
-        android:textSize="12sp"
-        android:textColor="@color/c_666666"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/tv_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:textColor="@color/c_1D2550"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="@id/linearLayout"
+            app:layout_constraintTop_toBottomOf="@id/ll_two"
+            app:layout_constraintVertical_bias="0.0" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>

TMessagesProj/src/main/res/layout/item_cricket_inner.xml

@@ -1,51 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/ripple_6dp"
+    android:layout_margin="1dp">
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginTop="12dp"
+        android:layout_marginLeft="12dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
+        android:orientation="horizontal">
         <LinearLayout
             android:id="@+id/ll_alarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="8dp"
-            android:background="@drawable/shape_inner_notify_bg"
             android:gravity="center"
-            android:orientation="horizontal">
-
+            android:orientation="horizontal"
+            android:background="@drawable/shape_inner_notify_bg">
             <ImageView
                 android:id="@+id/iv_alarm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:background="@mipmap/icon_alarm_clock"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
+                android:layout_marginLeft="4dp"
                 android:layout_marginTop="3dp"
                 android:layout_marginRight="6dp"
                 android:layout_marginBottom="3dp"
-                android:text="7h 12m"
-                android:textSize="11sp"
-                android:textStyle="bold"
-                style="@style/TvDateStyle"
-                android:textColor="@color/colorDarkBlue"/>
+                android:textSize="12sp"
+                android:fontFamily="@font/noto_sans_display_semibold"/>
         </LinearLayout>
 
         <TextView
@@ -53,56 +48,54 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="12sp"
-            android:textAllCaps="true"
-            android:textColor="@color/c_585858"/>
+            android:textColor="@color/c_666666"/>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_one"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/linearLayout"
+        app:layout_constraintLeft_toLeftOf="@id/linearLayout"
         android:layout_marginTop="16dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal"
-        app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        app:layout_constraintTop_toBottomOf="@id/linearLayout">
-
+        android:orientation="horizontal">
         <ImageView
             android:id="@+id/iv_home_logo"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:scaleType="fitCenter"
-            android:src="@mipmap/img_team_logo_default" />
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@mipmap/img_team_logo_default"
+            android:scaleType="fitCenter"/>
 
         <TextView
             android:id="@+id/tv_home_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxEms="5"
+            android:textSize="15sp"
+            android:textColor="@color/c_333333"
+            android:maxEms="8"
             android:maxLines="1"
-            style="@style/TvCapsStyle"/>
+            android:ellipsize="end"/>
     </LinearLayout>
 
     <TextView
         android:id="@+id/tv_home_score"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/c_141414"
-        android:textSize="15sp"
-        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@id/ll_one"
         app:layout_constraintBottom_toBottomOf="@id/ll_one"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/ll_one"
-        app:layout_constraintTop_toTopOf="@id/ll_one" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="193dp"
+        android:textSize="15sp"
+        android:textColor="@color/c_333333"
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <TextView
         android:id="@+id/tv_home_score2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="13sp"
-        android:textColor="@color/c_9D9D9D"
+        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@id/tv_home_score"
         app:layout_constraintStart_toEndOf="@id/tv_home_score"
         app:layout_constraintTop_toTopOf="@id/tv_home_score" />
@@ -111,48 +104,48 @@
         android:id="@+id/ll_two"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
+        app:layout_constraintTop_toBottomOf="@id/ll_one"
         app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        app:layout_constraintTop_toBottomOf="@id/ll_one">
-
+        android:layout_marginTop="@dimen/dp_10"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
         <ImageView
             android:id="@+id/iv_away_logo"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:scaleType="fitCenter"
-            android:src="@mipmap/img_team_logo_default" />
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@mipmap/img_team_logo_default"
+            android:scaleType="fitCenter"/>
 
         <TextView
             android:id="@+id/tv_away_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:ellipsize="end"
-            android:maxEms="5"
+            android:textSize="15sp"
+            android:textColor="@color/c_141414"
+            android:maxEms="8"
             android:maxLines="1"
-            style="@style/TvCapsStyle"
-            android:textSize="15sp" />
+            android:ellipsize="end"/>
+
     </LinearLayout>
 
     <TextView
         android:id="@+id/tv_away_score"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorBlack"
-        android:textSize="15sp"
-        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@id/ll_two"
         app:layout_constraintBottom_toBottomOf="@id/ll_two"
-        app:layout_constraintStart_toStartOf="@id/tv_home_score"
-        app:layout_constraintTop_toTopOf="@id/ll_two" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="193dp"
+        android:textSize="15sp"
+        android:textColor="@color/colorBlack"
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <TextView
         android:id="@+id/tv_away_score2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="13sp"
-        android:textColor="@color/c_9D9D9D"
+        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@id/tv_away_score"
         app:layout_constraintStart_toEndOf="@id/tv_away_score"
         app:layout_constraintTop_toTopOf="@id/tv_away_score" />
@@ -161,22 +154,17 @@
         android:id="@+id/tv_result"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="17dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginBottom="12dp"
-        style="@style/TvNormalStyle"
-        android:textSize="12sp"
-        android:textColor="@color/c_666666"
-        android:textStyle="bold"
+        app:layout_constraintTop_toBottomOf="@id/ll_two"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="@id/linearLayout"
-        app:layout_constraintTop_toBottomOf="@id/ll_two" />
+        android:layout_margin="12dp"
+        android:textSize="12sp"
+        android:textColor="@color/c_1D2550"/>
 
     <View
         android:id="@+id/line"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/line_color2"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@color/line_color2"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/layout/item_cricket_points.xml

@@ -16,7 +16,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="13sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -25,7 +25,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1.2"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="13sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -34,7 +34,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -43,7 +43,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -52,7 +52,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -61,7 +61,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
         <TextView
@@ -70,11 +70,10 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="+0.654"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_999999"/>
 
-        <FrameLayout
+        <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1.3">
@@ -83,27 +82,29 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="10"
                 android:textSize="14dp"
+                android:layout_centerVertical="true"
                 android:textColor="@color/c_333333"
-                android:textStyle="bold"/>
+                android:fontFamily="@font/noto_sans_display_semibold"
+                android:layout_toLeftOf="@+id/iv_arrow"/>
 
             <ImageView
                 android:id="@+id/iv_arrow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="12dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="5dp"
+                android:layout_marginLeft="@dimen/dp_10"
                 android:background="@mipmap/icon_arrow_down_four"/>
-        </FrameLayout>
+        </RelativeLayout>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@color/c_E5E5E5">
+        android:orientation="vertical">
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -117,34 +118,39 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center"
+                android:gravity="center_vertical"
                 android:text="VRS"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:letterSpacing="0.1"
+                android:textSize="10sp"
+                android:paddingLeft="@dimen/dp_10"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="DATE"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:letterSpacing="0.1"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.5"
                 android:text="PLACE"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:letterSpacing="0.1"
+                android:textColor="@color/c_801D2550"/>
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="3"
                 android:text="RESULT"
-                android:textSize="12dp"
-                android:textColor="@color/c_999999"/>
+                android:textSize="10sp"
+                android:letterSpacing="0.1"
+                android:textColor="@color/c_801D2550"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView

TMessagesProj/src/main/res/layout/item_cricket_points_inner.xml

@@ -11,8 +11,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="center"
+        android:gravity="center_vertical"
         android:textSize="12dp"
+        android:paddingLeft="@dimen/dp_10"
         android:textColor="@color/c_333333"/>
 
     <TextView

TMessagesProj/src/main/res/layout/item_cricket_squad.xml

@@ -21,11 +21,12 @@
         app:layout_constraintTop_toTopOf="@id/iv_home_logo"
         app:layout_constraintLeft_toRightOf="@id/iv_home_logo"
         android:layout_marginLeft="8dp"
-        style="@style/TvNameStyle"
         android:textSize="12sp"
         android:maxLines="1"
         android:maxEms="6"
-        android:ellipsize="end"/>
+        android:ellipsize="end"
+        android:fontFamily="@font/noto_sans_display_semibold"
+        android:textColor="@color/c_333333"/>
 
     <TextView
         android:id="@+id/tv_home_position"
@@ -33,7 +34,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/tv_home_name"
         app:layout_constraintLeft_toLeftOf="@id/tv_home_name"
-        style="@style/TvDateStyle"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"/>
 
     <View
@@ -53,11 +54,12 @@
         app:layout_constraintTop_toTopOf="@id/iv_away_logo"
         app:layout_constraintRight_toLeftOf="@id/iv_away_logo"
         android:layout_marginRight="8dp"
-        style="@style/TvNameStyle"
         android:textSize="12sp"
         android:maxLines="1"
         android:maxEms="6"
-        android:ellipsize="end"/>
+        android:ellipsize="end"
+        android:fontFamily="@font/noto_sans_display_semibold"
+        android:textColor="@color/c_333333"/>
 
     <TextView
         android:id="@+id/tv_away_position"
@@ -65,7 +67,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/tv_away_name"
         app:layout_constraintRight_toRightOf="@id/tv_away_name"
-        style="@style/TvDateStyle"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"/>
 
     <de.hdodenhof.circleimageview.CircleImageView

TMessagesProj/src/main/res/layout/item_cricket_squad_header.xml

@@ -8,20 +8,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="7dp"
         android:layout_marginBottom="25dp"
         android:text="@string/playing_11_for_the_match"
-        style="@style/TvItemTitleStyle"
+        android:textSize="16dp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"/>
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/iv_home_logo"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             android:layout_marginLeft="14dp"
@@ -36,7 +36,9 @@
             app:layout_constraintBottom_toBottomOf="@id/iv_home_logo"
             app:layout_constraintLeft_toRightOf="@id/iv_home_logo"
             android:layout_marginLeft="8dp"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="16dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <View
             android:layout_width="0.5dp"
@@ -56,12 +58,14 @@
             app:layout_constraintBottom_toBottomOf="@id/iv_away_logo"
             app:layout_constraintRight_toLeftOf="@id/iv_away_logo"
             android:layout_marginRight="8dp"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="16dp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <ImageView
             android:id="@+id/iv_away_logo"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:layout_marginRight="14dp"

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_eight.xml

@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_999999"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,14 +36,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -56,14 +58,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -77,14 +80,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="CT:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/catches2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_five.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="13sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_999999"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,14 +36,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -56,14 +58,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -77,14 +80,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="INN:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/innings2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -98,14 +102,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="R:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/runs2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_four.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="13sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_333333"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -43,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -57,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -65,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -79,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="INN:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -87,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/innings2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -101,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="R:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -109,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/runs2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -123,7 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="S/R:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -131,7 +132,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/strike_rate"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_one.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_999999"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,14 +36,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -56,14 +58,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="B:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -77,14 +80,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="S/R:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/strike_rate"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -98,14 +102,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="VS:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/versus_team"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_seven.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_999999"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,14 +36,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -56,14 +58,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -77,14 +80,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="W:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/wickets2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -98,14 +102,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="ECO:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/economy_rate"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -119,14 +124,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="O:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/overs2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_six.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_333333"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -43,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -57,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -65,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -79,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="AVG:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -87,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/average_value"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -101,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="W:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -109,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/wickets2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -123,7 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="O:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -131,7 +132,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/overs2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_three.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_999999"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,14 +36,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -56,14 +58,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -77,14 +80,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="INN:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/innings2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -98,14 +102,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="R:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/runs2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -119,14 +124,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="AVG:"
-            style="@style/TvNormalTitleStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_333333"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/average_value"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_footer_two.xml

@@ -9,7 +9,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="18dp"
         android:text="Updated 2 mins ago"
-        android:textSize="14dp"
+        android:textSize="12sp"
         android:textColor="@color/c_999999"
         android:visibility="gone"/>
 
@@ -20,9 +20,10 @@
         android:gravity="center_vertical"
         android:paddingLeft="14dp"
         android:text="@string/glossary"
-        android:fontFamily="serif"
-        android:textSize="14dp"
-        android:textColor="@color/c_333333"
+        android:textSize="10sp"
+        android:letterSpacing="0.1"
+        android:textColor="@color/c_1D2550"
+        android:textStyle="bold"
         android:background="@color/c_E5E5E5"/>
 
     <LinearLayout
@@ -35,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="#:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -43,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/rank"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -57,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="M:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -65,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/matches"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -79,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="INN:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -87,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/innings2"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 
@@ -101,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:text="AVG:"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_333333"/>
 
         <TextView
@@ -109,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="@string/average_value"
-            android:textSize="14dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_one.xml

@@ -1,42 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="65dp"
+    android:layout_height="70dp"
     android:id="@+id/cl_root"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <FrameLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/selectableItemBackground">
+    <RelativeLayout
         android:id="@+id/fl_avatar"
-        android:layout_width="0dp"
+        android:layout_width="80dp"
         android:layout_height="match_parent"
-        app:layout_constraintHorizontal_weight="1.5"
+        android:paddingLeft="10dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/tv_name">
+        app:layout_constraintLeft_toLeftOf="parent">
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_avatar"
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="20dp"
             android:src="@mipmap/bg_avatar_default"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerCrop"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="15dp"
+            app:civ_border_width="1dp"
+            app:civ_border_color="@color/c_E5E5E5"
+            app:civ_border_overlay="true"/>
 
         <com.coorchice.library.SuperTextView
             android:id="@+id/tv_number"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="6dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:gravity="center"
             android:text="1"
-            android:textSize="12dp"
             android:textColor="@color/white"
+            android:textSize="11dp"
+            app:stv_corner="60dp"
             app:stv_solid="@color/c_DC3C23"
-            app:stv_corner="60dp"/>
-    </FrameLayout>
-
-
+            android:layout_centerVertical="true"
+            android:layout_marginRight="20dp"/>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/tv_name"
@@ -44,34 +46,24 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/fl_avatar"
-        app:layout_constraintRight_toLeftOf="@id/tv_one"
-        app:layout_constraintHorizontal_weight="1.8"
+        app:layout_constraintRight_toLeftOf="@id/tv_four"
         android:layout_marginTop="12dp"
-        android:textSize="14sp"
-        android:textColor="@color/colorBlack"
-        android:ellipsize="end"/>
-
-    <TextView
-        android:id="@+id/tv_name2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/tv_name"
-        app:layout_constraintBottom_toBottomOf="@id/tv_name"
-        app:layout_constraintEnd_toEndOf="@id/tv_three"
-        app:layout_constraintStart_toStartOf="@id/tv_name"
-        android:textSize="14sp"
-        android:textColor="@color/colorBlack"
+        android:textSize="14dp"
+        android:textColor="@color/c_333333"
+        android:maxLines="1"
         android:ellipsize="end"/>
 
     <TextView
         android:id="@+id/tv_team_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@id/fl_avatar"
+        app:layout_constraintRight_toLeftOf="@+id/tv_one"
+        app:layout_constraintHorizontal_weight="1.8"
         android:layout_marginBottom="12dp"
-        android:textSize="13sp"
-        android:layout_marginTop="5dp"
+        android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
     <TextView
@@ -80,10 +72,9 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="@id/tv_team_name"
         app:layout_constraintBottom_toBottomOf="@id/tv_team_name"
-        app:layout_constraintLeft_toRightOf="@id/tv_name"
+        app:layout_constraintLeft_toRightOf="@id/tv_team_name"
         app:layout_constraintRight_toLeftOf="@id/tv_two"
         app:layout_constraintHorizontal_weight="1"
-        android:gravity="center_horizontal"
         android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
@@ -96,7 +87,6 @@
         app:layout_constraintLeft_toRightOf="@id/tv_one"
         app:layout_constraintRight_toLeftOf="@id/tv_three"
         app:layout_constraintHorizontal_weight="1"
-        android:gravity="center_horizontal"
         android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
@@ -109,7 +99,6 @@
         app:layout_constraintLeft_toRightOf="@id/tv_two"
         app:layout_constraintRight_toLeftOf="@id/tv_four"
         app:layout_constraintHorizontal_weight="1"
-        android:gravity="center_horizontal"
         android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
@@ -117,20 +106,20 @@
         android:id="@+id/tv_four"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/tv_name"
-        app:layout_constraintBottom_toBottomOf="@id/tv_name"
+        android:fontFamily="@font/noto_sans_display_semibold"
+        android:gravity="center"
+        android:textColor="@color/c_333333"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_weight="1"
         app:layout_constraintLeft_toRightOf="@id/tv_three"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintHorizontal_weight="1"
-        android:gravity="center"
-        android:textSize="16sp"
-        android:textColor="@color/colorBlack"
-        android:textStyle="bold"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:id="@+id/line"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@color/line_color"/>
+        android:background="@color/c_E5E5E5"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/layout/item_cricket_stats_two.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="65dp"
+    android:layout_height="70dp"
     android:id="@+id/cl_root"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/selectableItemBackground">
     <FrameLayout
         android:id="@+id/fl_avatar"
-        android:layout_width="0dp"
+        android:layout_width="80dp"
         android:layout_height="match_parent"
-        app:layout_constraintHorizontal_weight="1.5"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -20,17 +20,20 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="20dp"
             android:src="@mipmap/bg_avatar_default"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerCrop"
+            app:civ_border_width="1dp"
+            app:civ_border_color="@color/c_E5E5E5"
+            app:civ_border_overlay="true"/>
 
         <com.coorchice.library.SuperTextView
             android:id="@+id/tv_number"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="6dp"
             android:gravity="center"
             android:text="1"
-            android:textSize="11sp"
+            android:textSize="11dp"
             android:textColor="@color/white"
             app:stv_solid="@color/c_DC3C23"
             app:stv_corner="60dp"/>
@@ -42,35 +45,26 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/fl_avatar"
-        app:layout_constraintRight_toLeftOf="@id/tv_one"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintHorizontal_weight="1.8"
         android:layout_marginTop="12dp"
-        android:textSize="14sp"
-        android:textColor="@color/colorBlack"
-        android:ellipsize="end"/>
-
-    <TextView
-        android:id="@+id/tv_name2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/tv_name"
-        app:layout_constraintBottom_toBottomOf="@id/tv_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintStart_toStartOf="@id/tv_name"
-        android:textSize="14sp"
-        android:textColor="@color/colorBlack"
+        android:layout_marginRight="15dp"
+        android:textSize="14dp"
+        android:textColor="@color/c_333333"
+        android:maxLines="2"
         android:ellipsize="end"/>
 
     <TextView
         android:id="@+id/tv_team_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@id/fl_avatar"
+        app:layout_constraintRight_toLeftOf="@+id/tv_one"
+        app:layout_constraintHorizontal_weight="1.8"
         android:layout_marginBottom="12dp"
-        android:textSize="13sp"
-        android:layout_marginTop="5dp"
+        android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
     <TextView
@@ -79,11 +73,10 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="@id/tv_team_name"
         app:layout_constraintBottom_toBottomOf="@id/tv_team_name"
-        app:layout_constraintLeft_toRightOf="@id/tv_name"
+        app:layout_constraintLeft_toRightOf="@id/tv_team_name"
         app:layout_constraintRight_toLeftOf="@id/tv_two"
         app:layout_constraintHorizontal_weight="1"
-        android:gravity="center_horizontal"
-        android:textSize="13sp"
+        android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
     <TextView
@@ -95,8 +88,7 @@
         app:layout_constraintLeft_toRightOf="@id/tv_one"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintHorizontal_weight="1"
-        android:gravity="center_horizontal"
-        android:textSize="13sp"
+        android:textSize="12sp"
         android:textColor="@color/c_666666"/>
 
     <View
@@ -104,5 +96,5 @@
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@color/line_color"/>
+        android:background="@color/c_E5E5E5"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/layout/item_cricket_teams.xml

@@ -2,13 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="69dp"
+    android:layout_height="63dp"
     android:gravity="center_vertical"
-    android:background="@color/white">
+    android:background="?attr/selectableItemBackground">
     <ImageView
         android:id="@+id/iv_logo"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="33dp"
+        android:layout_height="33dp"
         android:layout_marginLeft="14dp"
         android:src="@mipmap/img_team_logo_default"
         android:scaleType="fitCenter"/>
@@ -22,14 +22,16 @@
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_4"
-            style="@style/TvItemTitleStyle"/>
+            android:textSize="14sp"
+            android:textColor="@color/c_333333"
+            android:layout_marginTop="4dp"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_abbreviation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/c_666666"/>
     </LinearLayout>
 

TMessagesProj/src/main/res/layout/item_cricket_teams_second.xml

@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="69dp"
     android:gravity="center_vertical"
-    android:background="@color/white">
+    android:background="?attr/selectableItemBackground">
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_logo"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_marginLeft="14dp"
         android:src="@mipmap/bg_avatar_default"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        app:civ_border_width="1dp"
+        app:civ_border_color="@color/c_E5E5E5"
+        app:civ_border_overlay="true"/>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="14dp"
+        android:layout_marginLeft="14dp"
         android:orientation="vertical">
-
         <TextView
             android:id="@+id/tv_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_4"
-            style="@style/TvNameStyle"/>
+            android:textSize="14sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_abbreviation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/TvDateStyle"/>
+            android:textSize="12sp"
+            android:textColor="@color/c_666666"/>
     </LinearLayout>
 
     <View

TMessagesProj/src/main/res/layout/item_cricket_updates_content.xml

@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="89dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/selectableItemBackground">
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/iv_cover"
         android:layout_width="108dp"
@@ -24,9 +25,9 @@
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
-        android:textSize="14dp"
+        android:textSize="14sp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"
+        android:fontFamily="@font/noto_sans_display_semibold"
         android:maxLines="2"
         android:ellipsize="end"/>
 

TMessagesProj/src/main/res/layout/item_cricket_updates_head.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground">
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/iv_cover"
         android:layout_width="match_parent"
@@ -22,9 +23,9 @@
         android:layout_marginTop="12dp"
         android:layout_marginLeft="14dp"
         android:layout_marginRight="14dp"
-        android:textSize="14dp"
+        android:textSize="16sp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"
+        android:fontFamily="@font/noto_sans_display_semibold"
         android:maxLines="2"
         android:ellipsize="end"/>
 

TMessagesProj/src/main/res/layout/item_more_group.xml

@@ -1,86 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.cardview.widget.CardView
+    android:id="@+id/cardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="12dp"
-    android:layout_marginTop="12dp"
-    android:background="@drawable/shape_more_group_bg"
-    android:paddingBottom="12dp">
-
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    card_view:cardCornerRadius="5dp"
+    card_view:cardElevation="3dp"
+    card_view:cardMaxElevation="3dp"
+    card_view:cardPreventCornerOverlap="true"
+    card_view:cardUseCompatPadding="true"
+    android:clickable="true"
+    android:layout_marginStart="10dp"
+    android:layout_marginTop="10dp"
+    android:foreground="?android:attr/selectableItemBackground">
 
-    <FrameLayout
-        android:id="@+id/more_group_item_avatar_container"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="120dp"
-        app:layout_constraintDimensionRatio="H,1:1"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp">
 
-    <com.makeramen.roundedimageview.RoundedImageView
-        android:id="@+id/more_group_item_avatar"
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintDimensionRatio="H,1:1"
-        app:layout_constraintTop_toTopOf="parent"
-        app:riv_corner_radius_top_left="6dp"
-        app:riv_corner_radius_top_right="6dp" />
+        <FrameLayout
+            android:id="@+id/more_group_item_avatar_container"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            app:layout_constraintDimensionRatio="H,1:1"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <org.telegram.cricdit.view.TagTextView
-        android:id="@+id/more_group_item_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="12dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:text="Cricket India"
-        android:textColor="@color/colorBlack"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/more_group_item_avatar_container" />
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/more_group_item_avatar"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:scaleType="centerCrop"
+            app:layout_constraintDimensionRatio="H,1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:riv_corner_radius_top_left="6dp"
+            app:riv_corner_radius_top_right="6dp" />
 
+        <org.telegram.cricdit.view.TagTextView
+            android:id="@+id/more_group_item_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="12dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="@color/colorBlack"
+            android:textSize="14sp"
+            android:fontFamily="@font/noto_sans_display_semibold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/more_group_item_avatar_container" />
 
-    <TextView
-        android:id="@+id/more_group_item_type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="Type:"
-        android:textColor="@color/colorBlack"
-        android:textSize="13sp"
-        app:layout_constraintStart_toStartOf="@id/more_group_item_title"
-        app:layout_constraintTop_toBottomOf="@id/more_group_item_title" />
 
-    <TextView
-        android:id="@+id/more_group_item_type2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="3dp"
-        android:text="Group"
-        android:textColor="@color/colorBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@id/more_group_item_type"
-        app:layout_constraintStart_toEndOf="@id/more_group_item_type"
-        app:layout_constraintTop_toTopOf="@id/more_group_item_type" />
+        <TextView
+            android:id="@+id/more_group_item_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="Type:"
+            android:textColor="@color/colorBlack"
+            android:textSize="13sp"
+            app:layout_constraintStart_toStartOf="@id/more_group_item_title"
+            app:layout_constraintTop_toBottomOf="@id/more_group_item_title" />
 
-    <TextView
-        android:visibility="gone"
-        android:id="@+id/more_group_item_bio"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="12dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="This is a nice group, have 2000 people join to us.Come on,have 2000 people join to us.Come on"
-        android:textColor="#A0A4A7"
-        android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/more_group_item_title"
-        app:layout_constraintTop_toBottomOf="@id/more_group_item_type" />
+        <TextView
+            android:id="@+id/more_group_item_type2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="3dp"
+            android:text="Group"
+            android:textColor="@color/colorBlue"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="@id/more_group_item_type"
+            app:layout_constraintStart_toEndOf="@id/more_group_item_type"
+            app:layout_constraintTop_toTopOf="@id/more_group_item_type" />
+
+        <TextView
+            android:visibility="gone"
+            android:id="@+id/more_group_item_bio"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="12dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="This is a nice group, have 2000 people join to us.Come on,have 2000 people join to us.Come on"
+            android:textColor="#A0A4A7"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/more_group_item_title"
+            app:layout_constraintTop_toBottomOf="@id/more_group_item_type" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>

TMessagesProj/src/main/res/layout/item_news_s_feed.xml

@@ -5,7 +5,7 @@
     android:paddingTop="15dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:foreground="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/iv_right"
@@ -23,7 +23,8 @@
         android:layout_marginLeft="15dp"
         android:layout_toRightOf="@+id/iv_right"
         android:ellipsize="end"
-        android:maxLines="2" />
+        android:maxLines="2"
+        android:fontFamily="@font/noto_sans_display_regular"/>
 
     <TextView
         android:id="@+id/tv_time"

TMessagesProj/src/main/res/layout/item_news_s_news.xml

@@ -7,7 +7,7 @@
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     tools:ignore="MissingDefaultResource"
-    android:foreground="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/iv_right"
@@ -27,7 +27,8 @@
         android:layout_toRightOf="@+id/iv_right"
         android:ellipsize="end"
         android:maxLines="2"
-        android:gravity="center_vertical"/>
+        android:gravity="center_vertical"
+        android:fontFamily="@font/noto_sans_display_regular"/>
 
     <TextView
         android:id="@+id/tv_time"

TMessagesProj/src/main/res/layout/item_news_search_guess.xml

@@ -4,7 +4,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     style="@style/TvItemTitleStyle"
-    android:textStyle="normal"
     android:drawablePadding="6dp"
     android:paddingTop="6dp"
     android:paddingBottom="6dp"

TMessagesProj/src/main/res/layout/item_news_search_hot.xml

@@ -6,7 +6,7 @@
     android:paddingTop="19dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:foreground="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground">
 
     <TextView
         android:id="@+id/tv_order"
@@ -37,8 +37,7 @@
         android:layout_toRightOf="@id/tv_order"
         android:ellipsize="end"
         android:lines="2"
-        android:maxLines="2"
-        android:textStyle="normal"/>
+        android:maxLines="2"/>
 
     <TextView
         android:id="@+id/tv_msg_num"

TMessagesProj/src/main/res/layout/item_news_short.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:background="?android:attr/selectableItemBackground"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
@@ -14,14 +15,16 @@
 
         <TextView
             android:id="@+id/tv_content"
-            style="@style/TvNormalStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="14dp"
             android:layout_toLeftOf="@id/iv_right"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/sp_15"
+            android:lineSpacingExtra="@dimen/dp_4"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
         <TextView
             android:id="@+id/tv_user_name"

TMessagesProj/src/main/res/layout/item_news_singer_img.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="?android:attr/selectableItemBackground">
 
     <include layout="@layout/item_news_head"/>
 

TMessagesProj/src/main/res/layout/item_news_top.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:foreground="?android:attr/selectableItemBackground">
 
     <TextView
         android:id="@+id/tv_title"
@@ -14,8 +15,10 @@
         android:layout_marginBottom="9.5dp"
         android:maxLines="2"
         android:ellipsize="end"
-        style="@style/TvNormalStyle"
-        android:textSize="@dimen/sp_15"/>
+        android:textSize="@dimen/sp_15"
+        android:textColor="@color/c_333333"
+        android:lineSpacingExtra="@dimen/dp_4"
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <RelativeLayout
         android:id="@+id/rl_video"

TMessagesProj/src/main/res/layout/item_player_bio.xml

@@ -3,16 +3,28 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="61dp">
-    <TextView
-        android:id="@+id/tv_name"
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="2"
         android:gravity="center_vertical"
-        android:paddingLeft="14dp"
-        android:text="MNR vs TRT\n06/08/22"
-        android:textSize="12dp"
-        android:textColor="@color/c_999999"/>
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/dp_10">
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textSize="12dp"
+            android:textColor="@color/c_999999"/>
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textSize="11dp"
+            android:textColor="@color/c_999999"/>
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tv_bat"
@@ -21,6 +33,7 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:textSize="12dp"
+        android:fontFamily="@font/noto_sans_display_semibold"
         android:textColor="@color/c_999999"/>
 
     <TextView
@@ -29,8 +42,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center_vertical"
-        android:text="0/21"
         android:textSize="12dp"
+        android:fontFamily="@font/noto_sans_display_semibold"
         android:textColor="@color/c_999999"/>
 
     <TextView

TMessagesProj/src/main/res/layout/item_player_performance.xml

@@ -8,7 +8,7 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="12dp"
+        android:textSize="10sp"
         android:textColor="@color/c_999999"/>
 
     <TextView
@@ -17,5 +17,6 @@
         android:layout_height="wrap_content"
         android:textSize="16dp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"/>
+        android:layout_marginTop="3dp"
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 </LinearLayout>

TMessagesProj/src/main/res/layout/item_rank_detail.xml

@@ -79,7 +79,10 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24.5dp"
             android:layout_marginBottom="16dp"
-            style="@style/TvNormalTitleStyle"/>
+            android:lineSpacingExtra="4dp"
+            android:textSize="14sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"/>
 
     </LinearLayout>
 

TMessagesProj/src/main/res/layout/item_rank_list_all.xml

@@ -5,11 +5,10 @@
     android:id="@+id/ll_main"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?android:attr/selectableItemBackground"
     android:orientation="vertical"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    tools:ignore="UseCompoundDrawables">
+    android:background="?android:attr/selectableItemBackground">
 
     <View
         android:id="@+id/view_front"
@@ -29,7 +28,10 @@
             android:lines="2"
             android:minHeight="64dp"
             android:ellipsize="end"
-            style="@style/TvNormalTitleStyle"
+            android:lineSpacingExtra="4dp"
+            android:textSize="14sp"
+            android:textColor="@color/c_333333"
+            android:fontFamily="@font/noto_sans_display_semibold"
             app:layout_constraintEnd_toStartOf="@id/rank_list_all_comein"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

TMessagesProj/src/main/res/layout/item_rank_list_hot.xml

@@ -11,8 +11,8 @@
     card_view:cardPreventCornerOverlap="true"
     card_view:cardUseCompatPadding="true"
     android:layout_marginTop="2dp"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:clickable="true">
+    android:clickable="true"
+    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,7 +45,8 @@
                 android:drawablePadding="5dp"
                 android:lineSpacingExtra="2dp"
                 android:paddingBottom="5dp"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:fontFamily="@font/noto_sans_display_regular"/>
 
             <TextView
                 android:id="@+id/tv_hot_num"
@@ -57,7 +58,8 @@
                 android:drawablePadding="4dp"
                 android:text="0"
                 android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:fontFamily="@font/noto_sans_display_semibold"/>
 
         </RelativeLayout>
 

TMessagesProj/src/main/res/layout/item_rank_list_hot2.xml

@@ -44,7 +44,6 @@
 
             <TextView
                 android:id="@+id/tv_title"
-                style="@style/TvNormalTitleStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"

TMessagesProj/src/main/res/layout/item_rank_vote.xml

@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:gravity="center_vertical"
-        style="@style/TvNormalTitleStyle"/>
+        style="@style/TvNormalStyle"/>
 
     <View
         android:id="@+id/view_line"

TMessagesProj/src/main/res/layout/item_recent_matches.xml

@@ -9,7 +9,7 @@
         android:layout_height="match_parent"
         android:layout_weight="2"
         android:gravity="center_vertical"
-        android:paddingLeft="14dp"
+        android:paddingLeft="10dp"
         android:textSize="14dp"
         android:textColor="@color/c_999999"/>
 
@@ -21,7 +21,7 @@
         android:gravity="center_vertical"
         android:textSize="14dp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"/>
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <TextView
         android:id="@+id/tv_bowl"
@@ -31,7 +31,7 @@
         android:gravity="center_vertical"
         android:textSize="14dp"
         android:textColor="@color/c_333333"
-        android:textStyle="bold"/>
+        android:fontFamily="@font/noto_sans_display_semibold"/>
 
     <TextView
         android:id="@+id/tv_type"

TMessagesProj/src/main/res/layout/layout_common_empty.xml

@@ -5,17 +5,28 @@
     android:gravity="center"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:visibility="invisible">
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@mipmap/bg_empty"/>
+    android:visibility="invisible"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/empty_view_anim"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        app:layout_constraintBottom_toTopOf="@id/empty_view_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:lottie_autoPlay="true"
+        app:lottie_fileName="empty.json"
+        app:lottie_loop="false" />
 
     <TextView
         android:id="@+id/tv_empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/empty_common"
-        android:textSize="16dp"
-        android:textColor="@color/c_999999"/>
+        android:text="No results"
+        android:textColor="#000"
+        android:textSize="17sp"
+        android:layout_marginBottom="50dp"
+        android:textStyle="bold"/>
 </LinearLayout>

TMessagesProj/src/main/res/values/colors.xml

@@ -169,7 +169,7 @@
     <color name="c_2C9DE9">#2C9DE9</color>
 <!--    <color name="c_1D2550">#1D2550</color>-->
     <color name="c_1D2550">#527da3</color>
-    <color name="c_801D2550">#801D2550</color>
+    <color name="c_801D2550">#90527da3</color>
     <color name="c_687AE0">#687AE0</color>
     <color name="c_6CA1FC">#6CA1FC</color>
     <color name="c_6F8FC2">#6F8FC2</color>

TMessagesProj/src/main/res/values/strings.xml

@@ -50,9 +50,9 @@
     <string name="upcoming">Upcoming</string>
     <string name="tournament">Tournament</string>
     <string name="streaming">Streaming</string>
-    <string name="see_more">see more</string>
+    <string name="see_more">SEE MORE</string>
     <string name="matches">Matches</string>
-    <string name="matches2">Matches</string>
+    <string name="matches2">MATCHES</string>
     <string name="stats">Stats</string>
     <string name="teams">Teams</string>
     <string name="points_table">Points Table</string>

TMessagesProj/src/main/res/values/styles.xml

@@ -1,4 +1,4 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--THEMES-->
 
@@ -364,47 +364,30 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textStyle">bold</item>
     </style>
-<!-- sans-serif-condensed-medium -->
+
+<!-- semibold -->
     <style name="TvItemTitleStyle">
-        <item name="android:fontFamily">serif</item>
+        <item name="android:fontFamily">@font/noto_sans_display_semibold</item>
         <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:lineSpacingExtra">4dp</item>
         <item name="android:textColor">@color/c_333333</item>
     </style>
 
     <style name="TvItemSecondTitleStyle">
-        <item name="android:fontFamily">serif</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:lineSpacingExtra">4dp</item>
         <item name="android:textColor">@color/c_333333</item>
     </style>
 
-    <style name="TvNormalTitleStyle">
-        <item name="android:fontFamily">serif</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineSpacingExtra">4dp</item>
-        <item name="android:textColor">@color/c_333333</item>
-    </style>
-
-    <style name="TvItemThirdTitleStyle">
-        <item name="android:fontFamily">serif</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:lineSpacingExtra">4dp</item>
-        <item name="android:textColor">@color/c_666666</item>
-    </style>
-
     <style name="TvDateStyle">
-        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">@dimen/sp_12</item>
         <item name="android:textColor">@color/c_A0A4A7</item>
         <item name="android:lineSpacingExtra">4dp</item>
     </style>
 
     <style name="TvNameStyle">
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">@font/noto_sans_display_semibold</item>
         <item name="android:textSize">@dimen/sp_15</item>
         <item name="android:textColor">@color/c_333333</item>
     </style>
@@ -428,21 +411,10 @@
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="TvCapsStyle">
-        <item name="android:textSize">@dimen/sp_15</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textColor">@color/c_141414</item>
-        <item name="android:lineSpacingExtra">4dp</item>
-    </style>
-
-    <style name="TvSmallCapsStyle">
-        <item name="android:textSize">@dimen/sp_12</item>
-        <item name="android:fontFamily">sans-serif-smallcaps</item>
-        <item name="android:lineSpacingExtra">4dp</item>
-    </style>
-
-    <style name="TvSansSerifMediumStyle">
-        <item name="android:fontFamily">sans-serif-medium</item>
+    <style name="ThemeMatch" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:fontFamily">@font/noto_sans_display_regular</item>
     </style>
 
 </resources>

TMessagesProj_App/bundleAfat/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.cricdit.cricdit",
+  "variantName": "bundleAfatRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 23,
+      "versionName": "0.2.2",
+      "outputFile": "Cricdit0.2.2.apk"
+    }
+  ],
+  "elementType": "File"
+}

TMessagesProj_AppHockeyApp/build.gradle

@@ -144,7 +144,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 30
         versionName APP_VERSION_NAME
         ndkVersion "21.4.7075529"