Skip to content

H
hadalive
Commit 15ed606e by Dell
Options

1、球聚UI改版

parent 8f4a39b0
Showing with 479 additions and 452 deletions
FlycoTabLayout_Lib/src/main/java/com/flyco/tablayout/SlidingTabLayout.java
...@@ -9,6 +9,7 @@ import android.graphics.Path; ...@@ -9,6 +9,7 @@ import android.graphics.Path;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.GradientDrawable.Orientation;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
...@@ -91,7 +92,7 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager. ...@@ -91,7 +92,7 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager.
private boolean mIndicatorGradient; private boolean mIndicatorGradient;
private int mIndicatorStartColor; private int mIndicatorStartColor;
private int mIndicatorEndColor; private int mIndicatorEndColor;
private float mIndicatorAngel; private int mIndicatorAngel;
private int mIndicatorGravity; private int mIndicatorGravity;
private float mIndicatorPartCornerValue; private float mIndicatorPartCornerValue;
private boolean mIndicatorPartCorner; private boolean mIndicatorPartCorner;
...@@ -117,6 +118,9 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager. ...@@ -117,6 +118,9 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager.
private static final int TEXT_BOLD_NONE = 0; private static final int TEXT_BOLD_NONE = 0;
private static final int TEXT_BOLD_WHEN_SELECT = 1; private static final int TEXT_BOLD_WHEN_SELECT = 1;
private static final int TEXT_BOLD_BOTH = 2; private static final int TEXT_BOLD_BOTH = 2;
private static final int ANGLE_TOP_BOTTOM = 1;
private static final int ANGLE_LEFT_RIGHT = 2;
private float mTextsize; private float mTextsize;
private float mTextSelectSize; private float mTextSelectSize;
private int mTextSelectColor; private int mTextSelectColor;
...@@ -198,7 +202,7 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager. ...@@ -198,7 +202,7 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager.
mIndicatorStartColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_start_color, 0); mIndicatorStartColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_start_color, 0);
mIndicatorEndColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_end_color, 0); mIndicatorEndColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_end_color, 0);
mIndicatorGradient = ta.getBoolean(R.styleable.SlidingTabLayout_ti_indicator_gradient, false); mIndicatorGradient = ta.getBoolean(R.styleable.SlidingTabLayout_ti_indicator_gradient, false);
mIndicatorAngel = ta.getDimension(R.styleable.SlidingTabLayout_tl_indicator_angel, 0f); mIndicatorAngel = ta.getInt(R.styleable.SlidingTabLayout_tl_indicator_angel, ANGLE_TOP_BOTTOM);
mIndicatorStyle = ta.getInt(R.styleable.SlidingTabLayout_tl_indicator_style, STYLE_NORMAL); mIndicatorStyle = ta.getInt(R.styleable.SlidingTabLayout_tl_indicator_style, STYLE_NORMAL);
mIndicatorColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_color, Color.parseColor(mIndicatorStyle == STYLE_BLOCK ? "#4B6A87" : "#ffffff")); mIndicatorColor = ta.getColor(R.styleable.SlidingTabLayout_tl_indicator_color, Color.parseColor(mIndicatorStyle == STYLE_BLOCK ? "#4B6A87" : "#ffffff"));
mIndicatorHeight = ta.getDimension(R.styleable.SlidingTabLayout_tl_indicator_height, mIndicatorHeight = ta.getDimension(R.styleable.SlidingTabLayout_tl_indicator_height,
...@@ -696,7 +700,13 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager. ...@@ -696,7 +700,13 @@ public class SlidingTabLayout extends HorizontalScrollView implements ViewPager.
mIndicatorCornerRadius = mIndicatorHeight / 2; mIndicatorCornerRadius = mIndicatorHeight / 2;
} }
if (mIndicatorGradient) { if (mIndicatorGradient) {
mIndicatorDrawable.setOrientation(GradientDrawable.Orientation.BOTTOM_TOP); Orientation orientation = null;
if (mIndicatorAngel == ANGLE_TOP_BOTTOM) {
orientation = Orientation.BOTTOM_TOP;
} else {
orientation = Orientation.RIGHT_LEFT;
}
mIndicatorDrawable.setOrientation(orientation);
mIndicatorDrawable.setColors(new int[]{mIndicatorStartColor, mIndicatorEndColor}); mIndicatorDrawable.setColors(new int[]{mIndicatorStartColor, mIndicatorEndColor});
} else { } else {
mIndicatorDrawable.setColor(mIndicatorColor); mIndicatorDrawable.setColor(mIndicatorColor);
......
FlycoTabLayout_Lib/src/main/res/values/attrs.xml
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
<!-- 设置显示器渐变颜色 --> <!-- 设置显示器渐变颜色 -->
<attr name="tl_indicator_start_color" format="color"/> <attr name="tl_indicator_start_color" format="color"/>
<attr name="tl_indicator_end_color" format="color"/> <attr name="tl_indicator_end_color" format="color"/>
<attr name="tl_indicator_angel" format="dimension"/> <attr name="tl_indicator_angel" format="enum" >
<enum name="TOP_BOTTOM" value="1"/>
<enum name="LEFT_RIGHT" value="2"/>
</attr>
<!-- 设置显示器是否使用渐变颜色 --> <!-- 设置显示器是否使用渐变颜色 -->
<attr name="ti_indicator_gradient" format="boolean"/> <attr name="ti_indicator_gradient" format="boolean"/>
<!-- 设置显示器是否部分圆角 --> <!-- 设置显示器是否部分圆角 -->
......
app/build.gradle
...@@ -217,6 +217,8 @@ dependencies { ...@@ -217,6 +217,8 @@ dependencies {
// implementation 'com.jaeger.statusbarutil:library:1.5.1' // implementation 'com.jaeger.statusbarutil:library:1.5.1'
implementation 'com.kuaishou:akdanmaku:1.0.3' implementation 'com.kuaishou:akdanmaku:1.0.3'
implementation 'com.github.lihangleo2:ShadowLayout:3.2.4'
} }
repositories { repositories {
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/MainActivity.kt
...@@ -5,9 +5,7 @@ import android.content.Intent ...@@ -5,9 +5,7 @@ import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.content.res.Configuration import android.content.res.Configuration
import android.view.KeyEvent import android.view.KeyEvent
import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.RelativeLayout
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.flyco.tablayout.CommonTabLayout import com.flyco.tablayout.CommonTabLayout
...@@ -18,7 +16,6 @@ import com.mirkowu.basetoolbar.BaseToolbar ...@@ -18,7 +16,6 @@ import com.mirkowu.basetoolbar.BaseToolbar
import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.GSYVideoManager
import com.softgarden.baselibrary.base.BaseFragment import com.softgarden.baselibrary.base.BaseFragment
import com.softgarden.baselibrary.base.FragmentBasePagerAdapter import com.softgarden.baselibrary.base.FragmentBasePagerAdapter
import com.softgarden.baselibrary.utils.DisplayUtil
import com.softgarden.baselibrary.utils.L import com.softgarden.baselibrary.utils.L
import com.softgarden.baselibrary.utils.SPUtil import com.softgarden.baselibrary.utils.SPUtil
import com.softgarden.baselibrary.utils.ToastUtil import com.softgarden.baselibrary.utils.ToastUtil
...@@ -27,18 +24,13 @@ import com.hupu.tv.player.app.app.Constants ...@@ -27,18 +24,13 @@ import com.hupu.tv.player.app.app.Constants
import com.hupu.tv.player.app.base.RefreshActivity import com.hupu.tv.player.app.base.RefreshActivity
import com.hupu.tv.player.app.bean.BannerBean import com.hupu.tv.player.app.bean.BannerBean
import com.hupu.tv.player.app.bean.BoardBean import com.hupu.tv.player.app.bean.BoardBean
import com.hupu.tv.player.app.bean.LiveUserBean
import com.hupu.tv.player.app.bean.TabEntityBean import com.hupu.tv.player.app.bean.TabEntityBean
import com.hupu.tv.player.app.event.RefreshAvatarEvent import com.hupu.tv.player.app.event.RefreshAvatarEvent
import com.hupu.tv.player.app.event.RefreshUserEvent
import com.hupu.tv.player.app.event.UserExitEvent import com.hupu.tv.player.app.event.UserExitEvent
import com.hupu.tv.player.app.ui.contact.MainActivityContact
import com.hupu.tv.player.app.ui.fragment.* import com.hupu.tv.player.app.ui.fragment.*
import com.hupu.tv.player.app.ui.presenter.MainActivityPresenter
import com.hupu.tv.player.app.utils.DialogUtils import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.GlideUtils import com.hupu.tv.player.app.utils.GlideUtils
import com.hupu.tv.player.app.utils.UserHelper import com.hupu.tv.player.app.utils.UserHelper
import com.kongzue.dialog.v3.CustomDialog
import com.softgarden.baselibrary.base.IBaseDisplay import com.softgarden.baselibrary.base.IBaseDisplay
import com.softgarden.baselibrary.base.IBasePresenter import com.softgarden.baselibrary.base.IBasePresenter
import kotlinx.android.synthetic.main.activity_main2.* import kotlinx.android.synthetic.main.activity_main2.*
...@@ -153,21 +145,23 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -153,21 +145,23 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
val mTitles = arrayOf( val mTitles = arrayOf(
getString(R.string.string_main_schedule), getString(R.string.string_main_schedule),
getString(R.string.string_main_news), getString(R.string.string_main_news),
"", getString(R.string.string_main_home),
getString(R.string.string_main_have_material), getString(R.string.string_main_have_material),
getString(R.string.string_main_mine) getString(R.string.string_main_mine)
) )
val mIconUnSelectIds = intArrayOf( val mIconUnSelectIds = intArrayOf(
R.mipmap.icon_main_match_nomal, R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_news_normal, R.mipmap.icon_main_news_normal,
0, R.mipmap.icon_main_live_normal,
R.mipmap.icon_main_follow_normal, R.mipmap.icon_main_follow_normal,
R.mipmap.icon_main_mine_normal R.mipmap.icon_main_mine_normal
) )
val mIconSelectIds = intArrayOf( val mIconSelectIds = intArrayOf(
R.mipmap.icon_main_match_select, R.mipmap.icon_main_match_select,
R.mipmap.icon_main_news_selected, R.mipmap.icon_main_news_selected,
0, R.mipmap.icon_main_live_selected,
R.mipmap.icon_main_follow_selected, R.mipmap.icon_main_follow_selected,
R.mipmap.icon_main_mine_selected R.mipmap.icon_main_mine_selected
) )
...@@ -179,14 +173,6 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -179,14 +173,6 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mTabLayout.setOnTabSelectListener(object : OnTabSelectListener { mTabLayout.setOnTabSelectListener(object : OnTabSelectListener {
override fun onTabSelect(position: Int) { override fun onTabSelect(position: Int) {
if (position == 2) {
tv_main_live.setTextColor(getColor(R.color.main_select))
iv_main_live.setImageResource(R.mipmap.icon_main_live_selected)
} else {
tv_main_live.setTextColor(getColor(R.color.main_unselect))
iv_main_live.setImageResource(R.mipmap.icon_main_live_normal)
}
if (position == 4) { if (position == 4) {
if (SPUtil[Constants.USER_LOGIN, false] == true) { if (SPUtil[Constants.USER_LOGIN, false] == true) {
oldSelected = position oldSelected = position
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/MaterialDetailActivity.kt
...@@ -163,8 +163,8 @@ class MaterialDetailActivity : RefreshActivity<MaterialDetailPresenter>(), ...@@ -163,8 +163,8 @@ class MaterialDetailActivity : RefreshActivity<MaterialDetailPresenter>(),
} }
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (mWebView.canGoBack()) { if (mWebView?.canGoBack() == true) {
mWebView.goBack() mWebView?.goBack()
return true return true
} }
return super.onKeyDown(keyCode, event) return super.onKeyDown(keyCode, event)
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/SpecialistDetailActivity.kt
...@@ -67,8 +67,8 @@ class SpecialistDetailActivity : RefreshActivity<SpecialistDetailPresenter>(), ...@@ -67,8 +67,8 @@ class SpecialistDetailActivity : RefreshActivity<SpecialistDetailPresenter>(),
finish() finish()
} }
tv_title_middle.text = "精选专家" tv_title_middle.text = "精选专家"
tv_title_middle.setTextColor(getColor(R.color.white)) // tv_title_middle.setTextColor(getColor(R.color.white))
CommonUtils.drawableTint(R.mipmap.icon_back,"#FFFFFF",iv_left_icon) // CommonUtils.drawableTint(R.mipmap.icon_back,"#FFFFFF",iv_left_icon)
// val drawable = resources.getDrawable(R.mipmap.icon_back) // val drawable = resources.getDrawable(R.mipmap.icon_back)
// val wrap = DrawableCompat.wrap(drawable) // val wrap = DrawableCompat.wrap(drawable)
// DrawableCompat.setTint(wrap,getColor(R.color.white)) // DrawableCompat.setTint(wrap,getColor(R.color.white))
...@@ -164,7 +164,8 @@ class SpecialistDetailActivity : RefreshActivity<SpecialistDetailPresenter>(), ...@@ -164,7 +164,8 @@ class SpecialistDetailActivity : RefreshActivity<SpecialistDetailPresenter>(),
GlideUtils.loadAvatar(this, data?.anchorIcon, iv_avatar) GlideUtils.loadAvatar(this, data?.anchorIcon, iv_avatar)
tv_name.text = data?.anchorName tv_name.text = data?.anchorName
tv_describe.text = data?.anchorDesc tv_describe.text = data?.anchorDesc
tv_follow_num.text = "关注：${data?.follows ?: 0}" // tv_follow_num.text = "关注：${data?.follows ?: 0}"
tv_follow_num.text = "${data?.follows ?: 0}"
mRecentList = data?.record mRecentList = data?.record
initTabLayout(defaultList()) initTabLayout(defaultList())
} }
......
app/src/main/java/com/hupu/tv/player/app/ui/adapter/FollowMatchContentAdapter.kt
package com.hupu.tv.player.app.ui.adapter package com.hupu.tv.player.app.ui.adapter
import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.util.Log import android.util.Log
import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.OrientationHelper
import androidx.recyclerview.widget.RecyclerView
import cc.taylorzhang.singleclick.onSingleClick import cc.taylorzhang.singleclick.onSingleClick
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseQuickAdapter.OnItemClickListener
import com.chad.library.adapter.base.BaseViewHolder import com.chad.library.adapter.base.BaseViewHolder
import com.hupu.tv.player.app.R import com.hupu.tv.player.app.R
import com.hupu.tv.player.app.app.Constants import com.hupu.tv.player.app.app.Constants
import com.hupu.tv.player.app.bean.MatchContentBean
import com.hupu.tv.player.app.bean.MatchInfoEntity import com.hupu.tv.player.app.bean.MatchInfoEntity
import com.hupu.tv.player.app.event.SubscribeEvent import com.hupu.tv.player.app.event.SubscribeEvent
import com.hupu.tv.player.app.ui.activity.LiveActivity
import com.hupu.tv.player.app.ui.activity.NewMatchDetailActivity
import com.hupu.tv.player.app.ui.activity.UserInfoActivity
import com.hupu.tv.player.app.utils.CommonUtils
import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.GlideUtils import com.hupu.tv.player.app.utils.GlideUtils
import com.softgarden.baselibrary.base.BaseFragment
import com.softgarden.baselibrary.utils.ActivityManager
import com.softgarden.baselibrary.utils.RecyclerViewUtil.addItemDecoration
import com.softgarden.baselibrary.utils.RecyclerViewUtil.nestedScrollNoFluent
import com.softgarden.baselibrary.utils.SPUtil
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
/** /**
...@@ -111,13 +92,13 @@ class FollowMatchContentAdapter : ...@@ -111,13 +92,13 @@ class FollowMatchContentAdapter :
helper.itemView, helper.itemView,
homeTeam?.teamIcon, homeTeam?.teamIcon,
helper.getView(R.id.iv_home), helper.getView(R.id.iv_home),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
GlideUtils.loadImage( GlideUtils.loadImage(
helper.itemView, helper.itemView,
awayTeam?.teamIcon, awayTeam?.teamIcon,
helper.getView(R.id.iv_away), helper.getView(R.id.iv_away),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
helper.setText(R.id.tv_home_score, (homeTeam?.score ?: 0).toString()) helper.setText(R.id.tv_home_score, (homeTeam?.score ?: 0).toString())
.setText(R.id.tv_away_score, (awayTeam?.score ?: 0).toString()) .setText(R.id.tv_away_score, (awayTeam?.score ?: 0).toString())
......
app/src/main/java/com/hupu/tv/player/app/ui/adapter/LiveTopAdapter.kt
...@@ -5,7 +5,6 @@ import android.view.View ...@@ -5,7 +5,6 @@ import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import cc.taylorzhang.singleclick.onSingleClick import cc.taylorzhang.singleclick.onSingleClick
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder import com.chad.library.adapter.base.BaseViewHolder
...@@ -13,12 +12,9 @@ import com.hupu.tv.player.app.R ...@@ -13,12 +12,9 @@ import com.hupu.tv.player.app.R
import com.hupu.tv.player.app.app.Constants import com.hupu.tv.player.app.app.Constants
import com.hupu.tv.player.app.bean.MatchContentBean import com.hupu.tv.player.app.bean.MatchContentBean
import com.hupu.tv.player.app.event.SubscribeEvent import com.hupu.tv.player.app.event.SubscribeEvent
import com.hupu.tv.player.app.ui.activity.UserInfoActivity
import com.hupu.tv.player.app.utils.CommonUtils import com.hupu.tv.player.app.utils.CommonUtils
import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.GlideUtils import com.hupu.tv.player.app.utils.GlideUtils
import com.softgarden.baselibrary.base.BaseFragment import com.softgarden.baselibrary.base.BaseFragment
import com.softgarden.baselibrary.utils.SPUtil
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
...@@ -48,13 +44,13 @@ class LiveTopAdapter(private val basefragment: BaseFragment<*>) : ...@@ -48,13 +44,13 @@ class LiveTopAdapter(private val basefragment: BaseFragment<*>) :
basefragment, basefragment,
homeTeam.teamIcon, homeTeam.teamIcon,
helper.getView(R.id.iv_team_icon), helper.getView(R.id.iv_team_icon),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
GlideUtils.loadImage( GlideUtils.loadImage(
basefragment, basefragment,
awayTeam.teamIcon, awayTeam.teamIcon,
helper.getView(R.id.iv_team_icon_away), helper.getView(R.id.iv_team_icon_away),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
//tvSubscribe 未开始时显示 status 2 //tvSubscribe 未开始时显示 status 2
// val tvSubscribe = helper.getView<TextView>(R.id.tv_subscribe) // val tvSubscribe = helper.getView<TextView>(R.id.tv_subscribe)
......
app/src/main/java/com/hupu/tv/player/app/ui/adapter/NewMatchContentAdapter.kt
package com.hupu.tv.player.app.ui.adapter package com.hupu.tv.player.app.ui.adapter
import android.content.Intent
import android.graphics.Color
import android.util.Log import android.util.Log
import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.OrientationHelper
import androidx.recyclerview.widget.RecyclerView
import cc.taylorzhang.singleclick.onSingleClick import cc.taylorzhang.singleclick.onSingleClick
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseQuickAdapter.OnItemClickListener
import com.chad.library.adapter.base.BaseViewHolder import com.chad.library.adapter.base.BaseViewHolder
import com.hupu.tv.player.app.R import com.hupu.tv.player.app.R
import com.hupu.tv.player.app.app.Constants import com.hupu.tv.player.app.app.Constants
import com.hupu.tv.player.app.bean.MatchContentBean
import com.hupu.tv.player.app.bean.MatchInfoEntity import com.hupu.tv.player.app.bean.MatchInfoEntity
import com.hupu.tv.player.app.event.SubscribeEvent import com.hupu.tv.player.app.event.SubscribeEvent
import com.hupu.tv.player.app.ui.activity.LiveActivity
import com.hupu.tv.player.app.ui.activity.NewMatchDetailActivity
import com.hupu.tv.player.app.ui.activity.UserInfoActivity
import com.hupu.tv.player.app.utils.CommonUtils import com.hupu.tv.player.app.utils.CommonUtils
import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.GlideUtils import com.hupu.tv.player.app.utils.GlideUtils
import com.softgarden.baselibrary.base.BaseFragment
import com.softgarden.baselibrary.utils.ActivityManager
import com.softgarden.baselibrary.utils.RecyclerViewUtil.addItemDecoration
import com.softgarden.baselibrary.utils.RecyclerViewUtil.nestedScrollNoFluent
import com.softgarden.baselibrary.utils.SPUtil
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
/** /**
...@@ -103,10 +84,10 @@ class NewMatchContentAdapter(private val parentPosition: Int = 0) : ...@@ -103,10 +84,10 @@ class NewMatchContentAdapter(private val parentPosition: Int = 0) :
) )
.getView<TextView>(R.id.tv_name).apply { .getView<TextView>(R.id.tv_name).apply {
text = item.matchShortName text = item.matchShortName
if (!item.sportsColor.isNullOrEmpty()) { // if (!item.sportsColor.isNullOrEmpty()) {
CommonUtils.drawableTint(R.mipmap.bg_match_color, item.sportsColor, this) // CommonUtils.drawableTint(R.mipmap.bg_match_color, item.sportsColor, this)
// setBackgroundColor(Color.parseColor(item.sportsColor)) //// setBackgroundColor(Color.parseColor(item.sportsColor))
} // }
} }
when (item.status) { when (item.status) {
...@@ -177,25 +158,18 @@ class NewMatchContentAdapter(private val parentPosition: Int = 0) : ...@@ -177,25 +158,18 @@ class NewMatchContentAdapter(private val parentPosition: Int = 0) :
} }
} }
} }
// helper.getView<TextView>(R.id.tv_status).text = when (item.status) {
// Constants.MATCH_TITLE_SCHEDULE_ID -> "未"
// Constants.MATCH_TITLE_START_ID -> (item.startedTime ?: 0).toString()
// Constants.MATCH_TITLE_RESULT_ID -> "完"
// else -> "未"
// }
helper.setText(R.id.tv_home, homeTeam?.teamName).setText(R.id.tv_away, awayTeam?.teamName) helper.setText(R.id.tv_home, homeTeam?.teamName).setText(R.id.tv_away, awayTeam?.teamName)
GlideUtils.loadImage( GlideUtils.loadImage(
helper.itemView, helper.itemView,
homeTeam?.teamIcon, homeTeam?.teamIcon,
helper.getView(R.id.iv_home), helper.getView(R.id.iv_home),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
GlideUtils.loadImage( GlideUtils.loadImage(
helper.itemView, helper.itemView,
awayTeam?.teamIcon, awayTeam?.teamIcon,
helper.getView(R.id.iv_away), helper.getView(R.id.iv_away),
R.mipmap.place_hoder_team_logo_small R.mipmap.place_holder_team_logo_small
) )
......
app/src/main/java/com/hupu/tv/player/app/ui/adapter/NewsListAdapter.kt
...@@ -23,7 +23,7 @@ class NewsListAdapter : BaseQuickAdapter<NewsListEntity, BaseViewHolder>(R.layou ...@@ -23,7 +23,7 @@ class NewsListAdapter : BaseQuickAdapter<NewsListEntity, BaseViewHolder>(R.layou
override fun convert(helper: BaseViewHolder, item: NewsListEntity) { override fun convert(helper: BaseViewHolder, item: NewsListEntity) {
helper.setText(R.id.tv_title, item.title) helper.setText(R.id.tv_title, item.title)
.setText(R.id.tv_like_count, item.fakeLike.toString()) .setText(R.id.tv_like_count, item.fakeLike.toString())
GlideUtils.loadRoundCircleImageCenterCrop(helper.itemView, item.coverPicture, helper.getView(R.id.iv_cover),6, R.mipmap.bg_live_news_place_holder) GlideUtils.loadRoundCircleImageCenterCrop(helper.itemView, item.coverPicture, helper.getView(R.id.iv_cover),4, R.mipmap.bg_live_news_place_holder)
val recyclerView = helper.getView<RecyclerView>(R.id.recycler_label) val recyclerView = helper.getView<RecyclerView>(R.id.recycler_label)
recyclerView.layoutManager = LinearLayoutManager(mContext,RecyclerView.HORIZONTAL,false) recyclerView.layoutManager = LinearLayoutManager(mContext,RecyclerView.HORIZONTAL,false)
val newsLabelAdapter = NewsLabelAdapter(R.layout.item_news_label) val newsLabelAdapter = NewsLabelAdapter(R.layout.item_news_label)
......
app/src/main/java/com/hupu/tv/player/app/utils/GlideUtils.java
...@@ -234,8 +234,8 @@ public class GlideUtils { ...@@ -234,8 +234,8 @@ public class GlideUtils {
.asBitmap() .asBitmap()
.centerCrop() .centerCrop()
.load(url) .load(url)
.placeholder(R.mipmap.place_hoder_team_logo_small) .placeholder(R.mipmap.place_holder_team_logo_small)
.error(R.mipmap.place_hoder_team_logo_small) .error(R.mipmap.place_holder_team_logo_small)
.diskCacheStrategy(DiskCacheStrategy.ALL) //设置缓存 .diskCacheStrategy(DiskCacheStrategy.ALL) //设置缓存
.into(new BitmapImageViewTarget(imageView) { .into(new BitmapImageViewTarget(imageView) {
@Override @Override
......
app/src/main/res/color/selector_label.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/color_FC7436"/> <item android:state_selected="true" android:color="@color/color_FC7436"/>
<item android:state_selected="false" android:color="@color/black"/> <item android:state_selected="false" android:color="@color/white"/>
<item android:color="@color/black"/> <item android:color="@color/white"/>
</selector> </selector>
\ No newline at end of file
app/src/main/res/color/selector_specialist.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/white"/> <item android:state_selected="true" android:color="@color/white"/>
<item android:state_selected="false" android:color="@color/color_FC7436"/> <item android:state_selected="false" android:color="@color/color_FC7034"/>
<item android:color="@color/color_FC7436"/> <item android:color="@color/color_FC7034"/>
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable/selector_login.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/color_FC7034"/>
<item android:state_selected="false" android:drawable="@color/color_2D363E"/>
<item android:drawable="@color/color_2D363E"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_red_label.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/shape_red_label_win"/> <item android:state_selected="true" android:drawable="@drawable/shape_red_label_win"/>
<item android:state_selected="false" android:drawable="@drawable/shape_red_label_loss"/> <item android:state_selected="false" android:drawable="@color/transparent"/>
<item android:drawable="@drawable/shape_red_label_loss"/> <item android:drawable="@color/transparent"/>
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable/selector_specialist.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@mipmap/icon_specialist_selector"/> <item android:state_selected="true" android:drawable="@drawable/shape_specialist_follow"/>
<item android:state_selected="false" android:drawable="@drawable/translate"/> <item android:state_selected="false" android:drawable="@drawable/translate"/>
<item android:drawable="@drawable/translate"/> <item android:drawable="@drawable/translate"/>
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable/selector_specialist_left.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/shape_specialist_selected_left"/>
<item android:state_selected="false" android:drawable="@drawable/translate"/>
<item android:drawable="@drawable/translate"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_specialist_middle.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/shape_specialist_selected_middle"/>
<item android:state_selected="false" android:drawable="@drawable/translate"/>
<item android:drawable="@drawable/translate"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_specialist_right.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/shape_specialist_selected_right"/>
<item android:state_selected="false" android:drawable="@drawable/translate"/>
<item android:drawable="@drawable/translate"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_bg_match_top.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
android:shape="rectangle"> <item>
<solid android:color="@color/white"/> <shape android:shape="rectangle">
<corners android:bottomLeftRadius="@dimen/dp_4" android:bottomRightRadius="@dimen/dp_4"/> <solid android:color="@color/view_color"/>
</shape>
</item>
<item android:bottom="3dp">
<shape android:shape="rectangle">
<solid android:color="@color/white" />
</shape>
</item>
</layer-list>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_bg_news_text.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle" >
<solid android:color="@color/orange_news_tag"/> <solid android:color="#FFEDE0"/>
<corners android:radius="@dimen/dp_9"/> <corners android:radius="@dimen/dp_9"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_bg_send_message.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#E9E9E9"/> <solid android:color="#F4F4F4"/>
<corners android:radius="2dp"/> <corners android:radius="2dp"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_get_code_new.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="#F1F1F1"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_main_bg_color.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="#FFD1AB"
android:endColor="#FF9466"
android:angle="0" />
<corners android:radius="@dimen/dp_8"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_match_top.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle" >
<stroke android:color="@color/white" android:width="@dimen/dp_1"/> <stroke android:color="#FFBA69" android:width="@dimen/dp_1"/>
<corners android:radius="@dimen/dp_14"/> <corners android:radius="@dimen/dp_8"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_label_win.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval" > android:shape="oval" >
<solid android:color="#1FAD2E36" /> <solid android:color="@color/white" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_send_message.xml
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle" >
<gradient <gradient
android:startColor="#FC7032" android:startColor="#FFBA69"
android:endColor="#FFA56A" android:endColor="#FC7034"
android:angle="180" /> android:angle="0" />
<corners android:radius="@dimen/dp_4"/> <corners android:radius="@dimen/dp_4"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_specialist_main.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke android:color="#FF9466" android:width="@dimen/dp_1"/>
<corners android:radius="@dimen/dp_4"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_specialist_selected.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FF9466"
android:startColor="#FFD1AB" />
<corners android:topLeftRadius="@dimen/dp_4" android:bottomLeftRadius="@dimen/dp_4"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_specialist_selected_left.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FF9466"
android:startColor="#FFD1AB" />
<corners android:topLeftRadius="@dimen/dp_4" android:bottomLeftRadius="@dimen/dp_4"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_specialist_selected_middle.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FF9466"
android:startColor="#FFD1AB" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_specialist_selected_right.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FF9466"
android:startColor="#FFD1AB" />
<corners android:topRightRadius="@dimen/dp_4" android:bottomRightRadius="@dimen/dp_4"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_live.xml
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
app:tl_tab_width="@dimen/dp_57" app:tl_tab_width="@dimen/dp_57"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/main_select" app:tl_textSelectColor="@color/main_select"
app:tl_textUnselectColor="@color/black" app:tl_textUnselectColor="@color/color_959DB0"
app:tl_textsize="@dimen/sp_14" app:tl_textsize="@dimen/sp_14"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
......
app/src/main/res/layout/activity_login.xml
...@@ -7,12 +7,7 @@ ...@@ -7,12 +7,7 @@
android:background="@color/color_F5F6F7" android:background="@color/color_F5F6F7"
android:orientation="vertical" android:orientation="vertical"
> >
<ImageView
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:src="@mipmap/bg_user_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -35,8 +30,8 @@ ...@@ -35,8 +30,8 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_25" android:layout_marginTop="@dimen/dp_25"
android:text="快速注册" android:text="快速注册"
android:textColor="@color/color_333333" android:textColor="@color/color_2D363E"
android:textSize="@dimen/sp_17" android:textSize="@dimen/sp_13"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
...@@ -46,6 +41,13 @@ ...@@ -46,6 +41,13 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:layout_marginTop="@dimen/dp_44"
android:layout_gravity="center"
android:src="@mipmap/bg_login_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -57,8 +59,8 @@ ...@@ -57,8 +59,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="手机登陆" android:text="手机登陆"
android:textColor="@color/black" android:textColor="@drawable/selector_login"
android:textSize="@dimen/sp_19" /> android:textSize="@dimen/sp_17" />
<TextView <TextView
android:id="@+id/tv_password_login" android:id="@+id/tv_password_login"
...@@ -66,8 +68,8 @@ ...@@ -66,8 +68,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19" android:layout_marginStart="@dimen/dp_19"
android:text="密码登陆" android:text="密码登陆"
android:textColor="@color/black" android:textColor="@drawable/selector_login"
android:textSize="@dimen/sp_19" /> android:textSize="@dimen/sp_17" />
</LinearLayout> </LinearLayout>
...@@ -78,36 +80,17 @@ ...@@ -78,36 +80,17 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_login_china" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:text="中国"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_19"
android:layout_marginStart="@dimen/dp_10"
android:background="@color/color_D1DAEB" />
<EditText <EditText
android:id="@+id/et_login_phone" android:id="@+id/et_login_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:background="@null" android:background="@null"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入手机号码" android:hint="请输入手机号码"
android:inputType="phone" android:inputType="phone"
android:textColor="@color/color_333333" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_758199" android:textColorHint="@color/color_AAAAAA"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
</LinearLayout> </LinearLayout>
...@@ -135,7 +118,8 @@ ...@@ -135,7 +118,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入验证码" android:hint="请输入验证码"
android:inputType="number" android:inputType="number"
android:textColorHint="@color/color_758199" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_AAAAAA"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<com.hupu.tv.player.app.widget.TimerTextView <com.hupu.tv.player.app.widget.TimerTextView
...@@ -143,36 +127,38 @@ ...@@ -143,36 +127,38 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_23"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/shape_get_code" android:background="@drawable/shape_get_code_new"
android:gravity="center" android:gravity="center"
android:minWidth="@dimen/dp_84" android:minWidth="@dimen/dp_84"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:text="获取验证码" android:text="获取验证码"
android:textColor="@color/white" android:textColor="@color/color_FC7034"
android:textSize="@dimen/sp_10" /> android:textSize="@dimen/sp_10" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:id="@+id/ll_password" android:id="@+id/ll_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_27" android:layout_marginTop="@dimen/dp_27"
android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<EditText <EditText
android:layout_weight="1"
android:id="@+id/et_login_password" android:id="@+id/et_login_password"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_23"
android:layout_weight="1"
android:background="@null" android:background="@null"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入6-24位密码" android:hint="请输入6-24位密码"
android:inputType="textPassword" android:inputType="textPassword"
android:textColorHint="@color/color_758199" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_AAAAAA"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<ImageView <ImageView
android:id="@+id/iv_show_password" android:id="@+id/iv_show_password"
android:layout_width="@dimen/dp_40" android:layout_width="@dimen/dp_40"
...@@ -206,22 +192,22 @@ ...@@ -206,22 +192,22 @@
android:id="@+id/tv_agreement" android:id="@+id/tv_agreement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_758199" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
tools:text="注册登录即代表你已同意《用户协议》和《隐私协议》" /> tools:text="注册登录即代表你已同意《用户协议》和《隐私协议》" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:gravity="center"
android:text="登录"
android:textStyle="bold"
android:textSize="@dimen/sp_15"
android:textColor="@color/white"
android:id="@+id/tv_login" android:id="@+id/tv_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_38" android:layout_marginTop="@dimen/dp_38"
android:background="@mipmap/bg_common_button" /> android:background="@mipmap/bg_common_button"
android:gravity="center"
android:text="登录"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
android:textStyle="bold" />
<TextView <TextView
...@@ -230,7 +216,7 @@ ...@@ -230,7 +216,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14" android:layout_marginTop="@dimen/dp_14"
android:text="忘记密码?" android:text="忘记密码?"
android:textColor="@color/color_FC7436" android:textColor="@color/color_FC7034"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_main2.xml
...@@ -14,24 +14,18 @@ ...@@ -14,24 +14,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/rl_layout_bottom" /> android:layout_above="@+id/rl_layout_bottom" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:src="@mipmap/bg_main_tab" />
<RelativeLayout <RelativeLayout
android:layout_marginBottom="@dimen/dp_10"
android:id="@+id/rl_layout_bottom" android:id="@+id/rl_layout_bottom"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp"> android:layout_height="@dimen/dp_80">
<com.flyco.tablayout.CommonTabLayout <com.flyco.tablayout.CommonTabLayout
android:background="@color/white"
android:id="@+id/mTabLayout" android:id="@+id/mTabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="@dimen/dp_80"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
app:tl_iconHeight="@dimen/dp_25" app:tl_iconHeight="@dimen/dp_25"
app:tl_iconWidth="@dimen/dp_25" app:tl_iconWidth="@dimen/dp_25"
...@@ -39,40 +33,8 @@ ...@@ -39,40 +33,8 @@
app:tl_textSelectColor="@color/main_select" app:tl_textSelectColor="@color/main_select"
app:tl_textUnselectColor="@color/main_unselect" app:tl_textUnselectColor="@color/main_unselect"
app:tl_textsize="@dimen/sp_10" /> app:tl_textsize="@dimen/sp_10" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:gravity="center"
android:layout_marginBottom="@dimen/dp_25"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_marginBottom="@dimen/dp_3"
android:id="@+id/iv_main_live"
android:src="@mipmap/icon_main_live_normal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_main_live"
android:textColor="@color/main_select"
android:text="直播"
android:textSize="@dimen/sp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
......
app/src/main/res/layout/activity_register.xml
...@@ -7,12 +7,7 @@ ...@@ -7,12 +7,7 @@
android:background="@color/color_F5F6F7" android:background="@color/color_F5F6F7"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/bg_user_login" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -47,6 +42,13 @@ ...@@ -47,6 +42,13 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:layout_marginTop="@dimen/dp_44"
android:layout_gravity="center"
android:src="@mipmap/bg_login_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -63,36 +65,17 @@ ...@@ -63,36 +65,17 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_login_china" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:text="中国"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_19"
android:layout_marginStart="@dimen/dp_10"
android:background="@color/color_D1DAEB" />
<EditText <EditText
android:id="@+id/et_register_phone" android:id="@+id/et_register_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:background="@null" android:background="@null"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入手机号码" android:hint="请输入手机号码"
android:inputType="phone" android:inputType="phone"
android:textColor="@color/color_333333" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_758199" android:textColorHint="@color/color_959DB0"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
</LinearLayout> </LinearLayout>
...@@ -119,7 +102,8 @@ ...@@ -119,7 +102,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入验证码" android:hint="请输入验证码"
android:inputType="number" android:inputType="number"
android:textColorHint="@color/color_758199" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_959DB0"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<com.hupu.tv.player.app.widget.TimerTextView <com.hupu.tv.player.app.widget.TimerTextView
...@@ -127,7 +111,7 @@ ...@@ -127,7 +111,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_23"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/shape_get_code" android:background="@drawable/shape_get_code_new"
android:gravity="center" android:gravity="center"
android:minWidth="@dimen/dp_84" android:minWidth="@dimen/dp_84"
android:paddingStart="8dp" android:paddingStart="8dp"
...@@ -151,7 +135,8 @@ ...@@ -151,7 +135,8 @@
android:background="@null" android:background="@null"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请输入用户名" android:hint="请输入用户名"
android:textColorHint="@color/color_758199" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_959DB0"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<View <View
...@@ -176,7 +161,8 @@ ...@@ -176,7 +161,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="输入6-24位登录密码" android:hint="输入6-24位登录密码"
android:inputType="textPassword" android:inputType="textPassword"
android:textColorHint="@color/color_758199" android:textColor="@color/color_2D363E"
android:textColorHint="@color/color_959DB0"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<ImageView <ImageView
...@@ -217,15 +203,15 @@ ...@@ -217,15 +203,15 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:gravity="center"
android:text="注册"
android:textSize="@dimen/sp_16"
android:textColor="@color/white"
android:id="@+id/iv_register" android:id="@+id/iv_register"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_38" android:layout_marginTop="@dimen/dp_38"
android:background="@mipmap/bg_common_button" /> android:background="@mipmap/bg_common_button"
android:gravity="center"
android:text="注册"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_specialist_detial.xml
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
layout="@layout/layout_title" layout="@layout/layout_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_60" android:layout_height="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
android:layout_width="48dp" android:layout_width="@dimen/dp_44"
android:layout_height="@dimen/dp_48" android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_14" android:layout_marginStart="@dimen/dp_14"
android:background="@mipmap/bg_mine_avatar" android:background="@mipmap/bg_mine_avatar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -40,10 +40,11 @@ ...@@ -40,10 +40,11 @@
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:textStyle="bold"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_14" android:layout_marginStart="@dimen/dp_14"
android:textColor="@color/white" android:textColor="#2D363E"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_14"
app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="@id/iv_avatar"
...@@ -53,87 +54,82 @@ ...@@ -53,87 +54,82 @@
android:id="@+id/tv_follow_num" android:id="@+id/tv_follow_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3" android:textColor="@color/color_FC7034"
android:textColor="@color/white" android:textSize="@dimen/sp_17"
android:textSize="@dimen/sp_12" app:layout_constraintTop_toTopOf="@id/tv_follow"
app:layout_constraintStart_toStartOf="@id/tv_name" app:layout_constraintBottom_toBottomOf="@id/tv_follow"
app:layout_constraintTop_toBottomOf="@id/tv_name" app:layout_constraintEnd_toEndOf="parent"
tools:text="关注: 1" /> tools:text="1" />
<TextView <TextView
android:maxLines="3"
android:ellipsize="end"
android:id="@+id/tv_describe" android:id="@+id/tv_describe"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3" android:layout_marginTop="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_14" android:layout_marginEnd="@dimen/dp_14"
android:textColor="@color/white" android:textColor="#2D363E"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/tv_follow"
app:layout_constraintStart_toStartOf="@id/tv_name" app:layout_constraintStart_toStartOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_follow_num" app:layout_constraintTop_toBottomOf="@id/tv_name"
tools:text="20年多年资深球迷，精研赛事基本面，对指数有独到见解。尤其擅长主流赛事,20年多年资深球迷，精研赛事基本面，对指数有独到见解。尤其擅长主流赛事" /> tools:text="20年多年资深球迷，精研赛事基本面，对指数有独到见解。尤其擅长主流赛事,20年多年资深球迷，精研赛事基本面，对指数有独到见解。尤其擅长主流赛事" />
<TextView <TextView
android:drawablePadding="@dimen/dp_2"
android:id="@+id/tv_follow" android:id="@+id/tv_follow"
android:layout_width="@dimen/dp_48" android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_20" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_14" android:layout_marginEnd="@dimen/dp_10"
android:background="@drawable/shape_specialist_follow"
android:gravity="center" android:gravity="center"
android:textColor="@color/color_333333" android:textColor="@color/color_2D363E"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/tv_follow_num"
app:layout_constraintTop_toTopOf="@id/tv_name" app:layout_constraintTop_toTopOf="@id/tv_name"
app:layout_constraintBottom_toBottomOf="@+id/tv_follow_num" app:layout_constraintBottom_toBottomOf="@+id/tv_describe"
tools:text="关注" /> tools:text="关注"
app:drawableStartCompat="@mipmap/icon_follow_sp" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_tab"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="@dimen/dp_215">
android:layout_marginTop="@dimen/dp_70"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_avatar">
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_3"
android:layout_below="@id/tabLayout_material"
android:layout_marginTop="-3dp"
android:background="@color/color_EDEDED" />
<com.flyco.tablayout.SlidingTabLayout <com.flyco.tablayout.SlidingTabLayout
android:layout_alignParentBottom="true"
android:id="@+id/tabLayout_material" android:id="@+id/tabLayout_material"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_45" android:layout_height="@dimen/dp_50"
android:layout_gravity="center" android:layout_gravity="center"
app:tl_indicator_color="@color/color_FC7436" app:tl_indicator_color="@color/transparent"
app:tl_indicator_corner_radius="@dimen/dp_3" app:tl_indicator_corner_radius="@dimen/dp_3"
app:tl_indicator_height="@dimen/dp_3" app:tl_indicator_height="@dimen/dp_3"
app:tl_indicator_style="NORMAL" app:tl_indicator_style="NORMAL"
app:tl_indicator_width="@dimen/dp_24" app:tl_indicator_width="@dimen/dp_24"
app:tl_select_textsize="@dimen/sp_17" app:tl_select_textsize="@dimen/sp_14"
app:tl_tab_width="@dimen/dp_180" app:tl_tab_width="@dimen/dp_180"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/color_FC7436" app:tl_textSelectColor="@color/color_FC7034"
app:tl_textUnselectColor="@color/color_333333" app:tl_textUnselectColor="@color/color_2D363E"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_14"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
</RelativeLayout>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rl_tab"
android:id="@+id/vp_specialist" android:id="@+id/vp_specialist"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_below="@id/view_line"
android:background="@color/background_f5" /> android:background="@color/background_f5" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
app/src/main/res/layout/child_item_have_material.xml
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<ImageView <ImageView
android:layout_marginTop="@dimen/dp_3" android:layout_marginTop="@dimen/dp_3"
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
android:layout_width="@dimen/dp_39" android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_39" android:layout_height="@dimen/dp_36"
android:background="@mipmap/bg_mine_avatar" android:background="@mipmap/bg_mine_avatar"
android:padding="@dimen/dp_2" android:padding="@dimen/dp_2"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
tools:text="长红状元" tools:text="长红状元"
android:textColor="@color/color_333333" android:textColor="#2D363E"
android:textSize="@dimen/sp_17" android:textSize="@dimen/sp_13"
app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -54,13 +54,15 @@ ...@@ -54,13 +54,15 @@
app:layout_constraintTop_toBottomOf="@id/tv_name" /> app:layout_constraintTop_toBottomOf="@id/tv_name" />
<TextView <TextView
android:paddingVertical="@dimen/dp_1"
android:paddingHorizontal="@dimen/dp_6"
app:layout_goneMarginStart="@dimen/dp_0" app:layout_goneMarginStart="@dimen/dp_0"
android:layout_marginTop="@dimen/dp_6" android:layout_marginTop="@dimen/dp_6"
android:id="@+id/tv_continue_red" android:id="@+id/tv_continue_red"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:background="@mipmap/icon_continue_red_bg" android:background="@drawable/shape_main_bg_color"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
...@@ -72,7 +74,7 @@ ...@@ -72,7 +74,7 @@
android:id="@+id/tv_win_rate" android:id="@+id/tv_win_rate"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_FC7436" android:textColor="@color/color_FC7034"
android:textSize="@dimen/sp_19" android:textSize="@dimen/sp_19"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -84,7 +86,7 @@ ...@@ -84,7 +86,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:gravity="center" android:gravity="center"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_333333" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBaseline_toBaselineOf="@id/tv_continue_red" app:layout_constraintBaseline_toBaselineOf="@id/tv_continue_red"
...@@ -108,8 +110,8 @@ ...@@ -108,8 +110,8 @@
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
tools:text="今日精选西甲：西汉姆联VS南安普敦（附比分参考）" tools:text="今日精选西甲：西汉姆联VS南安普敦（附比分参考）"
android:textColor="@color/color_333333" android:textColor="#2D363E"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_13"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
......
app/src/main/res/layout/child_item_specialist.xml
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:textStyle="bold"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:minWidth="@dimen/dp_87" android:minWidth="@dimen/dp_87"
android:textColor="@color/color_758199" android:textColor="@color/color_758199"
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
android:id="@+id/tv_home_name" android:id="@+id/tv_home_name"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textStyle="bold"
tools:text="西汉姆联西汉姆联西汉姆联" tools:text="西汉姆联西汉姆联西汉姆联"
android:maxEms="8" android:maxEms="8"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -65,7 +63,6 @@ ...@@ -65,7 +63,6 @@
android:maxLines="1" android:maxLines="1"
android:maxEms="8" android:maxEms="8"
android:ellipsize="end" android:ellipsize="end"
android:textStyle="bold"
tools:text="南安普敦南安普敦南安普敦南安普敦" tools:text="南安普敦南安普敦南安普敦南安普敦"
app:layout_constraintTop_toTopOf="@id/tv_home_name" app:layout_constraintTop_toTopOf="@id/tv_home_name"
app:layout_constraintStart_toEndOf="@id/tv_score" app:layout_constraintStart_toEndOf="@id/tv_score"
...@@ -86,7 +83,7 @@ ...@@ -86,7 +83,7 @@
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:paddingHorizontal="@dimen/dp_5" android:paddingHorizontal="@dimen/dp_5"
android:background="@drawable/shape_item_score" android:background="@drawable/shape_item_score"
android:textColor="@color/color_FC7436" android:textColor="@color/color_FC7034"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
......
app/src/main/res/layout/child_item_specialist_material.xml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
android:id="@+id/tv_time" android:id="@+id/tv_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_333333" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
tools:text="7天前" /> tools:text="7天前" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_live_conversation.xml
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:minHeight="@dimen/dp_42"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/ll_notice" android:id="@+id/ll_notice"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
android:id="@+id/tv_notice" android:id="@+id/tv_notice"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_333333" android:textColor="#FC7034"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
tools:text="@string/string_movie_detail" /> tools:text="@string/string_movie_detail" />
<TextView <TextView
...@@ -130,8 +132,8 @@ ...@@ -130,8 +132,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textSize="@dimen/sp_13" android:textSize="@dimen/sp_13"
android:textColor="@color/color_758199" android:textColor="#757575"
android:text="说点有爱的评论～" android:text="登录后，即可开始聊天"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_bg_send_message" android:background="@drawable/shape_bg_send_message"
...@@ -147,13 +149,12 @@ ...@@ -147,13 +149,12 @@
/> />
<TextView <TextView
android:textStyle="bold"
android:text="发送" android:text="发送"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_12"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/shape_send_message" android:background="@drawable/shape_send_message"
android:layout_width="@dimen/dp_58" android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_33"/> android:layout_height="@dimen/dp_33"/>
......
app/src/main/res/layout/fragment_main.xml
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_14"
android:paddingTop="@dimen/dp_35"> android:paddingTop="@dimen/dp_35">
<LinearLayout <LinearLayout
android:paddingHorizontal="@dimen/dp_14"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -83,43 +83,37 @@ ...@@ -83,43 +83,37 @@
</LinearLayout> </LinearLayout>
<View <View
android:layout_marginTop="@dimen/dp_5"
android:background="@color/view_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_5" /> android:layout_height="1px" />
<LinearLayout <LinearLayout
android:paddingBottom="9dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.flyco.tablayout.SlidingTabLayout <com.flyco.tablayout.SlidingTabLayout
app:tl_tab_padding_none_first="true"
android:id="@+id/tabLayout_main" android:id="@+id/tabLayout_main"
android:layout_weight="1" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:layout_gravity="center" android:layout_gravity="center"
app:ti_indicator_gradient="true"
app:tl_indicator_color="@color/color_D18A90" app:tl_indicator_color="@color/color_D18A90"
app:tl_indicator_corner_radius="@dimen/dp_15" app:tl_indicator_corner_radius="@dimen/dp_15"
app:tl_indicator_end_color="#FC7032" app:tl_indicator_height="@dimen/dp_3"
app:tl_indicator_height="@dimen/dp_25"
app:tl_indicator_start_color="#FFA56A" app:tl_indicator_start_color="#FFA56A"
app:tl_indicator_style="BLOCK" app:tl_indicator_style="NORMAL"
app:tl_indicator_width="@dimen/dp_65" app:tl_indicator_width="@dimen/dp_20"
app:tl_select_textsize="@dimen/sp_16" app:tl_select_textsize="@dimen/sp_13"
app:tl_tab_width="@dimen/dp_79" app:tl_tab_width="@dimen/dp_90"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/white" app:tl_textSelectColor="#FC7034"
app:tl_textUnselectColor="@color/color_E46101" app:tl_textUnselectColor="@color/color_959DB0"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
<ImageView
android:src="@mipmap/icon_mainfg_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_main_have_material.xml
...@@ -57,18 +57,20 @@ ...@@ -57,18 +57,20 @@
android:layout_marginTop="@dimen/dp_8" /> android:layout_marginTop="@dimen/dp_8" />
<LinearLayout <LinearLayout
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_bg_mine_white" android:background="@drawable/shape_bg_mine_white"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_marginTop="@dimen/dp_12"
android:gravity="center_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12" android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_12"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="@dimen/dp_12">
<ImageView <ImageView
android:layout_marginEnd="-2dp" android:layout_marginEnd="-2dp"
...@@ -90,15 +92,16 @@ ...@@ -90,15 +92,16 @@
<LinearLayout <LinearLayout
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_width="@dimen/dp_147" android:layout_width="@dimen/dp_147"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_26"
android:background="@mipmap/bg_specialist" android:background="@drawable/shape_specialist_main"
android:padding="@dimen/dp_5"> >
<TextView <TextView
android:id="@+id/tv_famous_scholars" android:id="@+id/tv_famous_scholars"
android:layout_width="@dimen/dp_43" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_weight="1"
android:background="@drawable/selector_specialist" android:layout_height="match_parent"
android:background="@drawable/selector_specialist_left"
android:gravity="center" android:gravity="center"
android:text="名家" android:text="名家"
android:textColor="@color/selector_specialist" android:textColor="@color/selector_specialist"
...@@ -106,10 +109,11 @@ ...@@ -106,10 +109,11 @@
<TextView <TextView
android:id="@+id/tv_win_rate" android:id="@+id/tv_win_rate"
android:layout_width="@dimen/dp_43" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_weight="1"
android:layout_marginStart="@dimen/dp_4" android:layout_height="match_parent"
android:background="@drawable/selector_specialist"
android:background="@drawable/selector_specialist_middle"
android:gravity="center" android:gravity="center"
android:text="胜率" android:text="胜率"
android:textColor="@color/selector_specialist" android:textColor="@color/selector_specialist"
...@@ -117,10 +121,11 @@ ...@@ -117,10 +121,11 @@
<TextView <TextView
android:id="@+id/tv_continue_red" android:id="@+id/tv_continue_red"
android:layout_width="@dimen/dp_43" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_weight="1"
android:layout_marginStart="@dimen/dp_4" android:layout_height="match_parent"
android:background="@drawable/selector_specialist"
android:background="@drawable/selector_specialist_right"
android:gravity="center" android:gravity="center"
android:text="连红" android:text="连红"
android:textColor="@color/selector_specialist" android:textColor="@color/selector_specialist"
...@@ -130,6 +135,12 @@ ...@@ -130,6 +135,12 @@
</LinearLayout> </LinearLayout>
<View
android:layout_marginTop="@dimen/dp_10"
android:background="@color/view_color"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"/>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerView" android:id="@+id/mRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -271,18 +282,17 @@ ...@@ -271,18 +282,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/white" app:tl_indicator_color="@color/color_FC7034"
app:tl_indicator_color="@color/color_FC7436"
app:tl_indicator_corner_radius="@dimen/dp_3" app:tl_indicator_corner_radius="@dimen/dp_3"
app:tl_indicator_height="@dimen/dp_3" app:tl_indicator_height="@dimen/dp_4"
app:tl_indicator_style="NORMAL" app:tl_indicator_style="NORMAL"
app:tl_indicator_width="@dimen/dp_24" app:tl_indicator_width="@dimen/dp_24"
app:tl_select_textsize="@dimen/sp_17" app:tl_select_textsize="@dimen/sp_13"
app:tl_tab_width="@dimen/dp_60" app:tl_tab_width="@dimen/dp_60"
app:tl_textBold="BOTH" app:tl_textBold="BOTH"
app:tl_textSelectColor="@color/color_333333" app:tl_textSelectColor="@color/color_FC7034"
app:tl_textUnselectColor="@color/color_758199" app:tl_textUnselectColor="@color/color_959DB0"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
......
app/src/main/res/layout/fragment_main_news.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<LinearLayout <LinearLayout
android:background="@color/white" android:background="@color/white"
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:paddingTop="@dimen/dp_35" android:paddingTop="@dimen/dp_45"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
android:paddingHorizontal="@dimen/dp_12" android:paddingHorizontal="@dimen/dp_12"
app:tl_indicator_color="@color/color_FC7436" app:tl_indicator_color="@color/color_FC7436"
app:tl_indicator_corner_radius="@dimen/dp_15" app:tl_indicator_corner_radius="@dimen/dp_15"
app:tl_indicator_height="@dimen/dp_4" app:tl_indicator_height="@dimen/dp_2"
app:tl_indicator_style="NORMAL" app:tl_indicator_style="NORMAL"
app:tl_indicator_width="@dimen/dp_24" app:tl_indicator_width="@dimen/dp_20"
app:tl_select_textsize="@dimen/sp_19" app:tl_select_textsize="@dimen/sp_13"
app:tl_tab_width="@dimen/dp_56" app:tl_tab_width="@dimen/dp_72"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/color_FC7436" app:tl_textSelectColor="@color/color_FC7436"
app:tl_textUnselectColor="@color/color_333333" app:tl_textUnselectColor="@color/color_959DB0"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_match_all.xml
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout <LinearLayout
android:gravity="center_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
...@@ -95,7 +96,7 @@ ...@@ -95,7 +96,7 @@
android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_5"
android:text="热门直播" android:text="热门直播"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_17" android:textSize="@dimen/sp_14"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_match_main.xml
...@@ -25,29 +25,37 @@ ...@@ -25,29 +25,37 @@
<LinearLayout <LinearLayout
android:paddingBottom="9dp" android:paddingBottom="9dp"
android:background="@color/white" android:background="@color/white"
android:paddingTop="@dimen/dp_30" android:paddingTop="@dimen/dp_47"
android:id="@+id/ll_top" android:id="@+id/ll_top"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<com.flyco.tablayout.SlidingTabLayout <com.flyco.tablayout.SlidingTabLayout
app:tl_indicator_angel="LEFT_RIGHT"
android:id="@+id/tabLayout_main" android:id="@+id/tabLayout_main"
android:layout_width="@dimen/dp_134" android:layout_width="@dimen/dp_125"
android:layout_height="@dimen/dp_37" android:layout_height="@dimen/dp_32"
android:layout_gravity="center" android:layout_gravity="center"
app:tl_indicator_color="@color/color_FC7436" android:background="@drawable/shape_match_top"
app:tl_indicator_corner_radius="@dimen/dp_14" app:ti_indicator_gradient="true"
app:tl_indicator_height="@dimen/dp_4" app:ti_indicator_part_corner="true"
app:tl_indicator_style="NORMAL" app:tl_indicator_color="@color/color_D18A90"
app:tl_indicator_width="@dimen/dp_24" app:tl_indicator_corner_radius="@dimen/dp_8"
app:tl_select_textsize="@dimen/sp_17" app:tl_indicator_end_color="#FC7034"
app:tl_tab_width="@dimen/dp_67" app:tl_indicator_height="@dimen/dp_30"
app:tl_indicator_margin_bottom="@dimen/dp_1"
app:tl_indicator_margin_top="1dp"
app:tl_indicator_start_color="#FFBA69"
app:tl_indicator_style="BLOCK"
app:tl_indicator_width="@dimen/dp_62"
app:tl_select_textsize="@dimen/sp_13"
app:tl_tab_width="@dimen/dp_62"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/color_FC7436" app:tl_textSelectColor="@color/white"
app:tl_textUnselectColor="@color/color_333333" app:tl_textUnselectColor="#FC7034"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_match_type.xml
...@@ -13,33 +13,38 @@ ...@@ -13,33 +13,38 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:background="@drawable/shape_bg_match_top"
android:paddingBottom="@dimen/dp_3"
android:layout_width="match_parent"
android:layout_height="41dp">
<com.flyco.tablayout.SlidingTabLayout <com.flyco.tablayout.SlidingTabLayout
app:tl_indicator_margin_bottom="@dimen/dp_5"
android:id="@+id/tabLayout_main" android:id="@+id/tabLayout_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_38"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/shape_bg_match_top" app:tl_indicator_color="#FC7034"
android:paddingStart="@dimen/dp_13"
app:ti_indicator_gradient="true"
app:tl_icon_padding="@dimen/dp_5"
app:tl_indicator_color="@color/color_D18A90"
app:tl_indicator_corner_radius="@dimen/dp_15" app:tl_indicator_corner_radius="@dimen/dp_15"
app:tl_indicator_end_color="#FC7032" app:tl_indicator_height="@dimen/dp_2"
app:tl_indicator_height="@dimen/dp_25" app:tl_indicator_style="NORMAL"
app:tl_indicator_start_color="#FFA56A" app:tl_indicator_width="@dimen/dp_20"
app:tl_indicator_style="BLOCK" app:tl_select_textsize="@dimen/sp_13"
app:tl_indicator_width="@dimen/dp_60"
app:tl_select_textsize="@dimen/sp_15"
app:tl_tab_width="@dimen/dp_85" app:tl_tab_width="@dimen/dp_85"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/white" app:tl_textSelectColor="#FC7034"
app:tl_textUnselectColor="@color/color_758199" app:tl_textUnselectColor="@color/color_959DB0"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
</LinearLayout>
<com.flyco.tablayout.widget.NestedScrollableHost <com.flyco.tablayout.widget.NestedScrollableHost
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_mine_main_new.xml
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<!-- <ImageView--> <ImageView
<!-- android:layout_width="match_parent"--> android:layout_width="match_parent"
<!-- android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!-- android:background="@mipmap/bg_top_mine" />--> android:background="@mipmap/bg_top_mine" />
<LinearLayout <LinearLayout
android:id="@+id/ll_user_info" android:id="@+id/ll_user_info"
...@@ -88,16 +88,17 @@ ...@@ -88,16 +88,17 @@
<LinearLayout <LinearLayout
android:layout_marginHorizontal="@dimen/dp_12" android:layout_marginHorizontal="@dimen/dp_12"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_87" android:layout_height="@dimen/dp_61"
android:background="@mipmap/bg_mine_top" android:background="@mipmap/bg_mine_top"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_marginStart="@dimen/dp_14"
android:id="@+id/ll_level" android:id="@+id/ll_level"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_19" android:textSize="@dimen/sp_17"
android:textStyle="bold" android:textStyle="bold"
tools:text="LV.1" /> tools:text="LV.1" />
...@@ -137,10 +138,12 @@ ...@@ -137,10 +138,12 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:paddingEnd="@dimen/dp_14"
android:gravity="center|end"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/icon_mine_coin" /> android:src="@mipmap/icon_mine_coin" />
...@@ -158,9 +161,9 @@ ...@@ -158,9 +161,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:text="0.00" android:text="0"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_19" android:textSize="@dimen/sp_17"
android:textStyle="bold" /> android:textStyle="bold" />
......
app/src/main/res/layout/fragment_specialist_material.xml
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_54" android:layout_height="@dimen/dp_54"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/shape_material_recent" android:background="@mipmap/bg_recent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/dp_14" android:padding="@dimen/dp_14"
...@@ -60,16 +60,15 @@ ...@@ -60,16 +60,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="近" android:text="近"
android:textColor="@color/color_333333" android:textColor="@color/white"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_label" android:id="@+id/recycler_label"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_36" android:layout_marginStart="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_36" android:layout_marginEnd="@dimen/dp_36"
android:layout_weight="1"
android:orientation="horizontal" android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="5" tools:itemCount="5"
...@@ -80,7 +79,7 @@ ...@@ -80,7 +79,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="远" android:text="远"
android:textColor="@color/color_333333" android:textColor="@color/white"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_13" />
</LinearLayout> </LinearLayout>
...@@ -98,18 +97,17 @@ ...@@ -98,18 +97,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/white" app:tl_indicator_color="@color/color_FC7034"
app:tl_indicator_color="@color/color_FC7436"
app:tl_indicator_corner_radius="@dimen/dp_3" app:tl_indicator_corner_radius="@dimen/dp_3"
app:tl_indicator_height="@dimen/dp_3" app:tl_indicator_height="@dimen/dp_3"
app:tl_indicator_style="NORMAL" app:tl_indicator_style="NORMAL"
app:tl_indicator_width="@dimen/dp_24" app:tl_indicator_width="@dimen/dp_24"
app:tl_select_textsize="@dimen/sp_17" app:tl_select_textsize="@dimen/sp_13"
app:tl_tab_width="@dimen/dp_60" app:tl_tab_width="@dimen/dp_60"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/color_333333" app:tl_textSelectColor="@color/color_959DB0"
app:tl_textUnselectColor="@color/color_758199" app:tl_textUnselectColor="@color/color_758199"
app:tl_textsize="@dimen/sp_15" app:tl_textsize="@dimen/sp_13"
app:tl_underline_color="@color/transparent" /> app:tl_underline_color="@color/transparent" />
<com.flyco.tablayout.widget.NestedScrollableHost <com.flyco.tablayout.widget.NestedScrollableHost
......
app/src/main/res/layout/item_have_material.xml
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
android:layout_width="@dimen/dp_42" android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_42" android:layout_height="@dimen/dp_34"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@mipmap/bg_mine_avatar" android:background="@mipmap/bg_mine_avatar"
android:padding="@dimen/dp_2" android:padding="@dimen/dp_2"
tools:src="@mipmap/icon_default_avatar" /> tools:src="@mipmap/icon_default_avatar" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_type" android:id="@+id/tv_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="13dp" android:layout_height="13dp"
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_14"
android:textColor="@color/color_333333" android:textColor="#2D363E"
android:textSize="@dimen/sp_13" /> android:textSize="@dimen/sp_12" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_match_content_new.xml
...@@ -9,9 +9,15 @@ ...@@ -9,9 +9,15 @@
<RelativeLayout <RelativeLayout
android:background="@color/white" android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_22"
android:orientation="horizontal"> android:orientation="horizontal">
<View
android:layout_alignParentBottom="true"
android:background="@color/view_color"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"/>
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -40,7 +46,7 @@ ...@@ -40,7 +46,7 @@
android:textColor="@color/color_959DB0" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="visible"
tools:text="半：0-1 角：0-1" /> tools:text="半：0-1 角：0-1" />
<TextView <TextView
...@@ -58,13 +64,14 @@ ...@@ -58,13 +64,14 @@
tools:text="17:00" /> tools:text="17:00" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_status_name" android:id="@+id/tv_status_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:text="未开"
android:textColor="@color/color_959DB0" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12"
tools:text="未开" />
</RelativeLayout> </RelativeLayout>
...@@ -77,7 +84,7 @@ ...@@ -77,7 +84,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_56" android:layout_height="@dimen/dp_36"
android:background="@color/white" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -109,7 +116,7 @@ ...@@ -109,7 +116,7 @@
android:layout_height="@dimen/dp_17" android:layout_height="@dimen/dp_17"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_5"
tools:src="@mipmap/place_hoder_team_logo_small" /> tools:src="@mipmap/place_holder_team_logo_small" />
<TextView <TextView
android:id="@+id/tv_home" android:id="@+id/tv_home"
...@@ -126,7 +133,6 @@ ...@@ -126,7 +133,6 @@
tools:text="帕森拉帕森拉帕拉帕" /> tools:text="帕森拉帕森拉帕拉帕" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_home_score" android:id="@+id/tv_home_score"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -135,6 +141,7 @@ ...@@ -135,6 +141,7 @@
android:textColor="@color/color_FC7436" android:textColor="@color/color_FC7436"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_15"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"
tools:text="0" /> tools:text="0" />
</LinearLayout> </LinearLayout>
...@@ -155,7 +162,6 @@ ...@@ -155,7 +162,6 @@
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_away_score" android:id="@+id/tv_away_score"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -164,6 +170,7 @@ ...@@ -164,6 +170,7 @@
android:textColor="@color/color_FC7436" android:textColor="@color/color_FC7436"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_15"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"
tools:text="0" /> tools:text="0" />
<TextView <TextView
...@@ -186,7 +193,7 @@ ...@@ -186,7 +193,7 @@
android:layout_height="@dimen/dp_17" android:layout_height="@dimen/dp_17"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_5"
tools:src="@mipmap/place_hoder_team_logo_small" /> tools:src="@mipmap/place_holder_team_logo_small" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/item_match_normal_live.xml
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/color_666666" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toStartOf="@id/tv_hot_num" app:layout_constraintEnd_toStartOf="@id/tv_hot_num"
app:layout_constraintStart_toStartOf="@id/tv_title" app:layout_constraintStart_toStartOf="@id/tv_title"
app:layout_constraintTop_toBottomOf="@id/tv_title" app:layout_constraintTop_toBottomOf="@id/tv_title"
......
app/src/main/res/layout/item_match_topl_live_new.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_live_bg_main" xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="@dimen/dp_4"
android:elevation="@dimen/dp_4"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:padding="@dimen/dp_10" android:padding="@dimen/dp_10"
android:layout_width="@dimen/dp_158" android:layout_width="@dimen/dp_158"
...@@ -19,31 +23,29 @@ ...@@ -19,31 +23,29 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@id/home" android:layout_alignTop="@id/home"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:background="@drawable/shape_bg_live_top" android:background="@drawable/shape_bg_live_top"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/dp_8" android:paddingStart="@dimen/dp_5"
android:paddingTop="@dimen/dp_6" android:paddingTop="@dimen/dp_3"
android:paddingEnd="@dimen/dp_8" android:paddingEnd="@dimen/dp_3"
android:paddingBottom="@dimen/dp_6"> android:paddingBottom="@dimen/dp_5">
<TextView <TextView
android:id="@+id/tv_day" android:id="@+id/tv_day"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/mine_recycler_text" android:textColor="#959DB0"
android:textSize="@dimen/sp_9" android:textSize="@dimen/sp_12"
tools:text="今天" /> tools:text="今天" />
<TextView <TextView
android:id="@+id/tv_time" android:id="@+id/tv_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5" android:textColor="#959DB0"
android:textColor="@color/text_normal3" android:textSize="@dimen/sp_12"
android:textSize="@dimen/sp_9"
tools:text="15：00" /> tools:text="15：00" />
</LinearLayout> </LinearLayout>
...@@ -59,6 +61,7 @@ ...@@ -59,6 +61,7 @@
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
tools:visibility="gone"
android:id="@+id/tv_team_name" android:id="@+id/tv_team_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -77,6 +80,7 @@ ...@@ -77,6 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:gravity="end" android:gravity="end"
android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:textStyle="bold" android:textStyle="bold"
tools:text="44" /> tools:text="44" />
...@@ -96,6 +100,7 @@ ...@@ -96,6 +100,7 @@
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView <TextView
tools:visibility="gone"
android:id="@+id/tv_team_name_away" android:id="@+id/tv_team_name_away"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -114,6 +119,7 @@ ...@@ -114,6 +119,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:gravity="end" android:gravity="end"
android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:textStyle="bold" android:textStyle="bold"
tools:text="44" /> tools:text="44" />
...@@ -138,8 +144,8 @@ ...@@ -138,8 +144,8 @@
android:layout_toStartOf="@+id/ll_live" android:layout_toStartOf="@+id/ll_live"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/color_758199" android:textColor="@color/color_959DB0"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_12"
tools:text="CBA" /> tools:text="CBA" />
<!-- <TextView--> <!-- <TextView-->
...@@ -220,4 +226,4 @@ ...@@ -220,4 +226,4 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </androidx.cardview.widget.CardView>
\ No newline at end of file \ No newline at end of file
app/src/main/res/layout/item_news.xml
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_item_news_list" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/dp_15" android:paddingHorizontal="@dimen/dp_11"
android:paddingVertical="@dimen/dp_24"
> >
<LinearLayout <LinearLayout
...@@ -21,19 +22,19 @@ ...@@ -21,19 +22,19 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:textStyle="bold"
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textColor="@color/color_333333" android:textColor="#2D363E"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_14"
tools:text="国足战马代取胜无忧，用轮换 阵容刷净胜球" /> tools:text="国足战马代取胜无忧，用轮换 阵容刷净胜球" />
<LinearLayout <LinearLayout
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_12"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -60,18 +61,18 @@ ...@@ -60,18 +61,18 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_7"
android:textColor="@color/color_666666" android:textColor="@color/color_666666"
android:textSize="@dimen/sp_13" android:textSize="@dimen/sp_12"
tools:text="1200" /> tools:text="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/iv_cover" android:id="@+id/iv_cover"
android:layout_width="@dimen/dp_130" android:layout_width="@dimen/dp_125"
android:layout_height="@dimen/dp_77" android:layout_height="@dimen/dp_75"
android:layout_marginStart="@dimen/dp_17" android:layout_marginStart="@dimen/dp_17"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
......
app/src/main/res/layout/item_news_label.xml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_bg_news_text" android:background="@drawable/shape_bg_news_text"
android:paddingVertical="@dimen/dp_2" android:paddingVertical="@dimen/dp_1"
tools:text="标签标签" tools:text="英超"
android:paddingHorizontal="@dimen/dp_7" android:paddingHorizontal="@dimen/dp_10"
android:textColor="@color/color_FC7436" android:textColor="#FC7941"
android:textSize="@dimen/sp_10"/> android:textSize="@dimen/sp_12"/>
\ No newline at end of file \ No newline at end of file
app/src/main/res/values/colors.xml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<color name="main_bottom_start">#131619</color> <color name="main_bottom_start">#131619</color>
<!-- <color name="main_bottom_end">#052039</color>--> <!-- <color name="main_bottom_end">#052039</color>-->
<color name="main_bottom_end">#131619</color> <color name="main_bottom_end">#131619</color>
<color name="main_select">#FC7436</color> <color name="main_select">#FC7034</color>
<color name="text_blue">#4AEAFF</color> <color name="text_blue">#4AEAFF</color>
<color name="text_red">#FE0057</color> <color name="text_red">#FE0057</color>
<color name="text_vip">#E3B767</color> <color name="text_vip">#E3B767</color>
...@@ -161,7 +161,9 @@ ...@@ -161,7 +161,9 @@
<color name="color_E46101">#E46101</color> <color name="color_E46101">#E46101</color>
<color name="color_999999">#999999</color> <color name="color_999999">#999999</color>
<color name="color_FC7436">#FC7436</color> <color name="color_FC7436">#FC7436</color>
<color name="color_FC7034">#FC7034</color>
<color name="color_333333">#333333</color> <color name="color_333333">#333333</color>
<color name="color_2D363E">#2D363E</color>
<color name="color_334300">#334300</color> <color name="color_334300">#334300</color>
<color name="color_D1DAEB">#D1DAEB</color> <color name="color_D1DAEB">#D1DAEB</color>
<color name="color_758199">#758199</color> <color name="color_758199">#758199</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment