Skip to content

Y
YDL-Component-Medical
Commit 50d7ca80 by konghaorui
Options

统一颜色资源名称 - 1

parent d9b18b5a
Showing with 193 additions and 246 deletions
app/src/main/res/layout/activity_main.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/platform_google_blue" android:background="@color/platform_main_theme"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="30dp" android:paddingLeft="30dp"
android:text="Multiple Base Url Request Test" android:text="Multiple Base Url Request Test"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/platform_google_blue" android:background="@color/platform_main_theme"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="30dp" android:paddingLeft="30dp"
android:text="Component Module Test" android:text="Component Module Test"
......
config.gradle
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = false dev_mode = true
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
......
m-audioim/src/main/res/drawable/audioim_audio_circle_blue_4.xml
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
<corners android:radius="90dp" /> <corners android:radius="90dp" />
<solid android:color="@color/platform_google_blue" /> <solid android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-audioim/src/main/res/values/colors.xml
...@@ -5,5 +5,4 @@ ...@@ -5,5 +5,4 @@
<color name="audioim_color_50ffffff">#B3ffffff</color> <color name="audioim_color_50ffffff">#B3ffffff</color>
<color name="audioim_color_30FFFFFF">#4DFFFFFF</color> <color name="audioim_color_30FFFFFF">#4DFFFFFF</color>
<color name="audioim_color_70FFFFFF">#B3FFFFFF</color> <color name="audioim_color_70FFFFFF">#B3FFFFFF</color>
<color name="audioim_ydl_color">#1da1f2</color>
</resources> </resources>
m-confide/src/main/java/com/ydl/confide/home/popwindow/ConfideHomeSexAgePopupWindow.kt
...@@ -164,7 +164,7 @@ class ConfideHomeSexAgePopupWindow(context: Context, sexData: ArrayList<ConfideH ...@@ -164,7 +164,7 @@ class ConfideHomeSexAgePopupWindow(context: Context, sexData: ArrayList<ConfideH
private fun setSelect(tvSex1: TextView,boolean: Boolean){ private fun setSelect(tvSex1: TextView,boolean: Boolean){
if (boolean){ if (boolean){
tvSex1.setBackgroundResource(R.drawable.confide_filter_select_sel) tvSex1.setBackgroundResource(R.drawable.confide_filter_select_sel)
tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color.confide_main_theme)) tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color.platform_main_theme))
}else{ }else{
tvSex1.setBackgroundResource(R.drawable.confide_filter_select_nor) tvSex1.setBackgroundResource(R.drawable.confide_filter_select_nor)
tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color._6)) tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color._6))
......
m-confide/src/main/java/com/ydl/confide/home/popwindow/adapter/ConfideHomeSortAdapter.kt
...@@ -35,7 +35,7 @@ class ConfideHomeSortAdapter(private val context: Context, ...@@ -35,7 +35,7 @@ class ConfideHomeSortAdapter(private val context: Context,
if (holder != null) { if (holder != null) {
holder.tvSort.text = item.name holder.tvSort.text = item.name
if (item.id == selectedSort.id) { if (item.id == selectedSort.id) {
holder.tvSort.setTextColor(context.resources.getColor(R.color.confide_main_theme)) holder.tvSort.setTextColor(context.resources.getColor(R.color.platform_main_theme))
}else{ }else{
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color._6)) holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color._6))
} }
......
m-confide/src/main/java/com/ydl/confide/home/util/ConfideHomeUtils.kt
...@@ -462,7 +462,7 @@ class ConfideHomeUtils { ...@@ -462,7 +462,7 @@ class ConfideHomeUtils {
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
} }
IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> { IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
tv.setTextColor(ContextCompat.getColor(mContext, R.color.confide_main_theme)) tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0)
} }
} }
...@@ -476,7 +476,7 @@ class ConfideHomeUtils { ...@@ -476,7 +476,7 @@ class ConfideHomeUtils {
tv.setTextColor(ContextCompat.getColor(mContext, R.color._6)) tv.setTextColor(ContextCompat.getColor(mContext, R.color._6))
} }
IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> { IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
tv.setTextColor(ContextCompat.getColor(mContext, R.color.confide_main_theme)) tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
} }
} }
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
......
m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeFilterView.kt
...@@ -93,7 +93,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d ...@@ -93,7 +93,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
textView.text = bodyBean.filterName textView.text = bodyBean.filterName
textView.setTag(R.id.tv_title,bodyBean) textView.setTag(R.id.tv_title,bodyBean)
if ("排序" == bodyBean.filterName){ if ("排序" == bodyBean.filterName){
textView.setTextColor(ContextCompat.getColor(context, R.color.confide_main_theme)) textView.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
// textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0) // textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0)
} }
textView.setOnClickListener { textView.setOnClickListener {
...@@ -127,7 +127,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d ...@@ -127,7 +127,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
var view = getChildAt(index) var view = getChildAt(index)
if (view is DrawableRightTextView){ if (view is DrawableRightTextView){
if ("排序" == view.text){ if ("排序" == view.text){
view.setTextColor(ContextCompat.getColor(context, R.color.confide_main_theme)) view.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
}else{ }else{
view.setTextColor(ContextCompat.getColor(context, R.color._6)) view.setTextColor(ContextCompat.getColor(context, R.color._6))
} }
......
m-confide/src/main/res/color/confide_color_filter_selector.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:color="@color/confide_main_theme" android:state_selected="true" android:state_enabled="true"/> <item android:color="@color/platform_main_theme" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/_6" android:state_enabled="true"/> <item android:color="@color/_6" android:state_enabled="true"/>
</selector> </selector>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_bg_sound_selected.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:shape="rectangle" android:shape="rectangle"
android:useLevel="false"> android:useLevel="false">
<solid android:color="@color/confide_main_theme"/> <solid android:color="@color/platform_main_theme"/>
<corners android:radius="10dp"/> <corners android:radius="10dp"/>
......
m-confide/src/main/res/drawable/confide_common_bg.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">
<gradient <gradient
android:startColor="@color/confide_main_theme_light" android:startColor="@color/platform_main_theme_light"
android:endColor="@color/confide_main_theme" android:endColor="@color/platform_main_theme"
android:angle="0" /> android:angle="0" />
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_confidehome_bg.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">
<gradient <gradient
android:startColor="@color/confide_main_theme_light" android:startColor="@color/platform_main_theme_light"
android:endColor="@color/confide_main_theme" android:endColor="@color/platform_main_theme"
android:angle="0" /> android:angle="0" />
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_btn_bg.xml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<corners android:radius="20dp" /> <corners android:radius="20dp" />
<!--<stroke--> <!--<stroke-->
<!--android:width="1dp"--> <!--android:width="1dp"-->
<!--android:color="@color/confide_main_theme" />--> <!--android:color="@color/platform_main_theme" />-->
<gradient <gradient
android:startColor="@color/confide_main_theme" android:startColor="@color/platform_main_theme"
android:endColor="@color/confide_main_theme" android:endColor="@color/platform_main_theme"
android:angle="0"/> android:angle="0"/>
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_reset_btn_bg.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<corners android:radius="20dp" /> <corners android:radius="20dp" />
<stroke <stroke
android:width="1px" android:width="1px"
android:color="@color/confide_main_theme" /> android:color="@color/platform_main_theme" />
<!--<solid android:color="@color/white"/>--> <!--<solid android:color="@color/white"/>-->
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_select_sel.xml
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<solid android:color="#FFFFFF" /> <solid android:color="#FFFFFF" />
<stroke android:width="1px" android:color="@color/confide_main_theme"/> <stroke android:width="1px" android:color="@color/platform_main_theme"/>
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_recent_btn_on_bg.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">
<corners android:radius="100dp"/> <corners android:radius="100dp"/>
<solid android:color="@color/confide_main_theme" /> <solid android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_recommend_expert_line_bg.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">
<corners android:bottomRightRadius="3dp"/> <corners android:bottomRightRadius="3dp"/>
<solid android:color="@color/confide_main_theme" /> <solid android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_show_online_tv.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 背景色 --> <!-- 背景色 -->
<solid android:color="@color/white"/> <solid android:color="@color/white"/>
<!-- 边框色 --> <!-- 边框色 -->
<stroke android:width="1dip" android:color="@color/platform_default_button_bg" /> <stroke android:width="1dip" android:color="@color/platform_main_theme" />
//圆角 //圆角
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_text_select_green_grey.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_checked="true" android:color="@color/confide_main_theme"/> <item android:state_checked="true" android:color="@color/platform_main_theme"/>
<item android:state_checked="false" android:color="@color/platform_text_gray"/> <item android:state_checked="false" android:color="@color/platform_text_gray"/>
</selector> </selector>
\ No newline at end of file
m-confide/src/main/res/layout/confide_good_popup_window.xml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:background="@drawable/confide_filter_reset_btn_bg" android:background="@drawable/confide_filter_reset_btn_bg"
android:text="@string/platform_reset" android:text="@string/platform_reset"
android:textColor="@color/confide_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="@dimen/confide_dp_18" /> android:textSize="@dimen/confide_dp_18" />
<Button <Button
......
m-confide/src/main/res/layout/confide_sexage_popup_window.xml
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/confide_filter_reset_btn_bg" android:background="@drawable/confide_filter_reset_btn_bg"
android:text="@string/platform_reset" android:text="@string/platform_reset"
android:textColor="@color/confide_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="@dimen/confide_dp_18" /> android:textSize="@dimen/confide_dp_18" />
<Button <Button
......
m-confide/src/main/res/values/styles.xml
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/confide_main_theme</item> <item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/confide_main_theme</item> <item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/confide_main_theme</item> <item name="colorAccent">@color/platform_main_theme</item>
</style> </style>
</resources> </resources>
\ No newline at end of file
m-confide/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色-->
<color name="confide_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="confide_main_theme_light">#FCDA42</color>
<!--主题亮色-->
<color name="confide_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="confide_confirm_bg_color">#FFDD33</color>
<!--确认按钮字体颜色-->
<color name="confide_confirm_text_color">#242424</color>
<!--确认按钮提示字体颜色-->
<color name="confide_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色-->
<color name="confide_filter_content_text_color_en">#242424</color>
<color name="confide_filter_content_text_color_un">#555555</color>
<!--私聊按钮背景颜色-->
<color name="confide_chat_start_color">#ffd814</color>
<color name="confide_chat_end_color">#ffdb26</color>
</resources> </resources>
m-confide/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色-->
<color name="confide_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="confide_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="confide_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="confide_confirm_bg_color">#1da1f2</color>
<!--确认按钮颜色-->
<color name="confide_confirm_text_color">#ffffff</color>
<!--确认提示颜色-->
<color name="confide_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色-->
<color name="confide_filter_content_text_color_en">#1da1f2</color>
<color name="confide_filter_content_text_color_un">#242424</color>
<!--私聊按钮背景颜色-->
<color name="confide_chat_start_color">#23B2FA</color>
<color name="confide_chat_end_color">#1DA1F2</color>
</resources> </resources>
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
...@@ -193,7 +193,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -193,7 +193,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
btn_call.setOnClickListener(this) btn_call.setOnClickListener(this)
tv_guide.setOnClickListener(this) tv_guide.setOnClickListener(this)
rl_search.setOnClickListener(this) rl_search.setOnClickListener(this)
srlContainer.setColorSchemeColors(ContextCompat.getColor(this, R.color.consultant_main_theme)) srlContainer.setColorSchemeColors(ContextCompat.getColor(this, R.color.platform_main_theme))
srlContainer.setProgressViewOffset(false, 0, 200) srlContainer.setProgressViewOffset(false, 0, 200)
srlContainer.setOnRefreshListener(this) srlContainer.setOnRefreshListener(this)
...@@ -1421,7 +1421,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -1421,7 +1421,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
} }
FILTER_STATUS_FILTERED -> { FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.consultant_main_theme)) tv.setTextColor(ContextCompat.getColor(this, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
} }
FILTER_STATUS_OPEN -> { FILTER_STATUS_OPEN -> {
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
...@@ -153,7 +153,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres ...@@ -153,7 +153,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
btn_call.setOnClickListener(this) btn_call.setOnClickListener(this)
tv_guide.setOnClickListener(this) tv_guide.setOnClickListener(this)
rl_search.setOnClickListener(this) rl_search.setOnClickListener(this)
srlContainer.setColorSchemeColors(ContextCompat.getColor(activity, R.color.consultant_main_theme)) srlContainer.setColorSchemeColors(ContextCompat.getColor(activity, R.color.platform_main_theme))
srlContainer.setProgressViewOffset(false, 0, 200) srlContainer.setProgressViewOffset(false, 0, 200)
srlContainer.setOnRefreshListener(this) srlContainer.setOnRefreshListener(this)
initNetLossView() initNetLossView()
...@@ -1360,7 +1360,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres ...@@ -1360,7 +1360,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
} }
FILTER_STATUS_FILTERED -> { FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(context, R.color.consultant_main_theme)) tv.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
} }
FILTER_STATUS_OPEN -> { FILTER_STATUS_OPEN -> {
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
...@@ -230,7 +230,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch ...@@ -230,7 +230,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
//私聊文案 //私聊文案
if (TextUtils.isEmpty(itemBean.chatBtnText)){ if (TextUtils.isEmpty(itemBean.chatBtnText)){
holder.tvChat.text = "私聊" holder.tvChat.text = "私聊"
holder.tvChat.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_color)) holder.tvChat.setTextColor(ContextCompat.getColor(context,R.color.platform_but_text_color))
holder.tvChat.background = ContextCompat.getDrawable(context,R.drawable.consultant_expert_search_chat) holder.tvChat.background = ContextCompat.getDrawable(context,R.drawable.consultant_expert_search_chat)
}else{ }else{
holder.tvChat.text = itemBean.chatBtnText holder.tvChat.text = itemBean.chatBtnText
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/RegionRecyclerViewAdapter.kt
...@@ -31,7 +31,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList< ...@@ -31,7 +31,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
//选中状态 //选中状态
holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD) holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD)
// holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(255, 255, 255)) // holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(255, 255, 255))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.consultant_main_theme)) holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.platform_main_theme))
holder.itemView.view_select.visibility = View.VISIBLE holder.itemView.view_select.visibility = View.VISIBLE
} else { } else {
//未选中状态 //未选中状态
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SortRecyclerViewAdapter.kt
...@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context, ...@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context,
holder.tvSort.text = item.value holder.tvSort.text = item.value
if (item.key == selectedSort.key) { if (item.key == selectedSort.key) {
holder.tvSort.setTypeface(Typeface.DEFAULT_BOLD) holder.tvSort.setTypeface(Typeface.DEFAULT_BOLD)
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.consultant_main_theme)) holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
// holder.ivCheck.visibility = View.VISIBLE // holder.ivCheck.visibility = View.VISIBLE
} }
} }
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SubRecyclerViewAdapter.kt
...@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte ...@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
if (selectedSub.key == region.key) { if (selectedSub.key == region.key) {
//选中状态 //选中状态
holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT_BOLD) holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT_BOLD)
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.consultant_main_theme)) holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.platform_main_theme))
// holder.itemView.ivCheckCircle.visibility = View.VISIBLE // holder.itemView.ivCheckCircle.visibility = View.VISIBLE
} else { } else {
//未选中状态 //未选中状态
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/FilterPopupWindow.kt
...@@ -270,11 +270,11 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -270,11 +270,11 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
//按钮置灰/解除置灰 //按钮置灰/解除置灰
contentView.btnConfirm.isEnabled = it > 0 contentView.btnConfirm.isEnabled = it > 0
if (it > 0) { if (it > 0) {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_color)) contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.platform_but_text_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_dark) contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_dark)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_white)) // contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_white))
} else { } else {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_hint_color)) contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.platform_text_light_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_light) contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_light)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.color_999999)) // contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.color_999999))
} }
......
m-consultant/src/main/res/color/consultant_color_search_filter_selector.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:color="@color/consultant_filter_content_text_color_en" android:state_selected="true" android:state_enabled="true"/> <item android:color="@color/platform_but_text_color_selected" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/consultant_filter_content_text_color_un" android:state_enabled="true"/> <item android:color="@color/platform_but_text_color_unselected" android:state_enabled="true"/>
</selector> </selector>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_blue_but.xml
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<solid android:color="#F2faff"/> <solid android:color="#F2faff"/>
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/consultant_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_5_dark.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/consultant_confirm_bg_color" /> <solid android:color="@color/platform_main_theme" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/consultant_confirm_bg_color" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_5_light.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/consultant_main_theme_light" /> <solid android:color="@color/platform_main_theme_light" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/consultant_main_theme_light" /> android:color="@color/platform_main_theme_light" />
</shape> </shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_line_green_5.xml
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<solid android:color="@color/platform_white" /> <solid android:color="@color/platform_white" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/consultant_main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector.xml
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true"> <item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/consultant_main_theme_bright" /> <solid android:color="@color/platform_main_theme_bright" />
<corners android:radius="4dp"/> <corners android:radius="4dp"/>
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="@color/consultant_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
</item> </item>
<item android:state_enabled="true"> <item android:state_enabled="true">
......
m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector_radius11.xml
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true"> <item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/consultant_main_theme_bright" /> <solid android:color="@color/platform_main_theme_bright" />
<corners android:radius="11dp"/> <corners android:radius="11dp"/>
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="@color/consultant_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
</item> </item>
<item android:state_enabled="true"> <item android:state_enabled="true">
......
m-consultant/src/main/res/drawable/consultant_expert_search_chat.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">
<gradient <gradient
android:angle="180" android:angle="180"
android:startColor="@color/consultant_chat_start_color" android:startColor="@color/platform_main_gradient_start_color"
android:endColor="@color/consultant_chat_end_color"/> android:endColor="@color/platform_main_gradient_end_color"/>
<padding <padding
android:bottom="@dimen/platform_dp_3" android:bottom="@dimen/platform_dp_3"
android:left="@dimen/platform_dp_10" android:left="@dimen/platform_dp_10"
......
m-consultant/src/main/res/layout/consultant_activity_hot_search.xml
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
android:tag="tag_search_input_edit" android:tag="tag_search_input_edit"
android:textColor="#242424" android:textColor="#242424"
android:textColorHint="#b3b3b3" android:textColorHint="#b3b3b3"
android:textCursorDrawable="@color/consultant_main_theme" android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp" /> android:textSize="13sp" />
<ImageView <ImageView
......
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
android:textSize="@dimen/platform_dp_13" android:textSize="@dimen/platform_dp_13"
android:textStyle="bold" android:textStyle="bold"
android:background="@drawable/consultant_expert_search_chat" android:background="@drawable/consultant_expert_search_chat"
android:textColor="@color/consultant_confirm_text_color" android:textColor="@color/platform_but_text_color"
android:text="私聊"/> android:text="私聊"/>
<!--描述--> <!--描述-->
......
m-consultant/src/main/res/layout/consultant_expert_search_products_item.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/consultant_expert_search_single" android:background="@drawable/consultant_expert_search_single"
android:textColor="@color/platform_color_1DA1F2" android:textColor="@color/platform_main_theme"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="@dimen/platform_dp_3" android:paddingRight="@dimen/platform_dp_3"
android:paddingLeft="@dimen/platform_dp_3" android:paddingLeft="@dimen/platform_dp_3"
......
m-consultant/src/main/res/layout/consultant_item_empty.xml
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:text="@string/platform_search_by_category" android:text="@string/platform_search_by_category"
android:textColor="@color/consultant_main_theme" /> android:textColor="@color/platform_main_theme" />
</LinearLayout> </LinearLayout>
m-consultant/src/main/res/layout/consultant_item_price_range.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:background="@drawable/shape_round_gray_bored" android:background="@drawable/shape_round_gray_bored"
android:inputType="number" android:inputType="number"
android:maxLines="1" android:maxLines="1"
android:textCursorDrawable="@color/consultant_main_theme" android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp" android:textSize="13sp"
android:maxLength="7" android:maxLength="7"
/> />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:background="@drawable/shape_round_gray_bored" android:background="@drawable/shape_round_gray_bored"
android:inputType="number" android:inputType="number"
android:maxLines="1" android:maxLines="1"
android:textCursorDrawable="@color/consultant_main_theme" android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp" android:textSize="13sp"
android:maxLength="7" android:maxLength="7"
/> />
......
m-consultant/src/main/res/layout/consultant_item_region.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="4dp" android:layout_width="4dp"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@color/consultant_main_theme" android:background="@color/platform_main_theme"
android:visibility="invisible"/> android:visibility="invisible"/>
<TextView <TextView
android:id="@+id/tvRegionName" android:id="@+id/tvRegionName"
......
m-consultant/src/main/res/layout/consultant_layout_search_content.xml
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
android:paddingRight="@dimen/platform_dp_32" android:paddingRight="@dimen/platform_dp_32"
android:paddingBottom="@dimen/platform_dp_8" android:paddingBottom="@dimen/platform_dp_8"
android:text="重新加载" android:text="重新加载"
android:textColor="@color/consultant_main_theme"/> android:textColor="@color/platform_main_theme"/>
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
......
m-consultant/src/main/res/layout/consultant_ui_filter_popup.xml
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
android:gravity="center" android:gravity="center"
android:hint="暂无匹配咨询师" android:hint="暂无匹配咨询师"
android:textColorHint="@color/platform_color_E0E0E0" android:textColorHint="@color/platform_color_E0E0E0"
android:textColor="@color/consultant_confirm_text_color" android:textColor="@color/platform_but_text_color"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
m-consultant/src/main/res/layout/consultant_ui_subject_popup_window.xml
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
android:gravity="center" android:gravity="center"
android:text="@string/platform_confirm" android:text="@string/platform_confirm"
android:textSize="17dp" android:textSize="17dp"
android:textColor="@color/consultant_confirm_text_color" /> android:textColor="@color/platform_but_text_color" />
</LinearLayout> </LinearLayout>
m-consultant/src/main/res/values/styles.xml
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/consultant_main_theme</item> <item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/consultant_main_theme</item> <item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/consultant_main_theme</item> <item name="colorAccent">@color/platform_main_theme</item>
</style> </style>
<style name="consultant_expert_service_popupwindow_filter_anim_style"> <style name="consultant_expert_service_popupwindow_filter_anim_style">
......
m-consultant/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色-->
<color name="consultant_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="consultant_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="consultant_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="consultant_confirm_bg_color">#FFDD33</color>
<!--确认按钮字体颜色-->
<color name="consultant_confirm_text_color">#242424</color>
<!--确认按钮提示字体颜色-->
<color name="consultant_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色-->
<color name="consultant_filter_content_text_color_en">#242424</color>
<color name="consultant_filter_content_text_color_un">#555555</color>
<!--私聊按钮背景颜色-->
<color name="consultant_chat_start_color">#ffd814</color>
<color name="consultant_chat_end_color">#ffdb26</color>
</resources> </resources>
m-consultant/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色-->
<color name="consultant_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="consultant_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="consultant_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="consultant_confirm_bg_color">#1da1f2</color>
<!--确认按钮颜色-->
<color name="consultant_confirm_text_color">#ffffff</color>
<!--确认提示颜色-->
<color name="consultant_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色-->
<color name="consultant_filter_content_text_color_en">#1da1f2</color>
<color name="consultant_filter_content_text_color_un">#242424</color>
<!--私聊按钮背景颜色-->
<color name="consultant_chat_start_color">#23B2FA</color>
<color name="consultant_chat_end_color">#1DA1F2</color>
</resources> </resources>
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
...@@ -67,7 +67,7 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa ...@@ -67,7 +67,7 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
specialId = intent.getStringExtra("special_id").toInt() specialId = intent.getStringExtra("special_id").toInt()
} }
LogUtil.i("special id: $specialId") LogUtil.i("special id: $specialId")
swl.setColorSchemeResources(R.color.main_theme) swl.setColorSchemeResources(R.color.platform_main_theme)
swl.setOnRefreshListener(this) swl.setOnRefreshListener(this)
tv_left_menu.setOnClickListener { tv_left_menu.setOnClickListener {
//分享 //分享
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
...@@ -147,7 +147,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -147,7 +147,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor( filter_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
...@@ -241,7 +241,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -241,7 +241,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor( classify_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
...@@ -338,7 +338,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -338,7 +338,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor( classify_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
...@@ -360,7 +360,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -360,7 +360,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor( classify_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
classify_layout.setCompoundDrawablesWithIntrinsicBounds( classify_layout.setCompoundDrawablesWithIntrinsicBounds(
...@@ -407,7 +407,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -407,7 +407,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor( filter_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
...@@ -429,7 +429,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -429,7 +429,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor( filter_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
filter_layout.setCompoundDrawablesWithIntrinsicBounds( filter_layout.setCompoundDrawablesWithIntrinsicBounds(
...@@ -650,7 +650,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -650,7 +650,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor( classify_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
...@@ -697,7 +697,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -697,7 +697,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor( filter_layout.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
this@CourseListContainerActivity, this@CourseListContainerActivity,
R.color.main_theme R.color.platform_main_theme
) )
) )
} else { } else {
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
...@@ -178,7 +178,7 @@ class CoursePlayActivity : BaseActivity() { ...@@ -178,7 +178,7 @@ class CoursePlayActivity : BaseActivity() {
} }
holder.setTextColor( holder.setTextColor(
R.id.text_title, R.id.text_title,
this@CoursePlayActivity.resources.getColor(R.color.main_theme) this@CoursePlayActivity.resources.getColor(R.color.platform_main_theme)
) )
} else { } else {
gifView.visibility = View.GONE gifView.visibility = View.GONE
......
m-course/src/main/java/com/yidianling/course/course_special_list/activity/CourseSpecialListActivity.kt
...@@ -91,7 +91,7 @@ class CourseSpecialListActivity : ...@@ -91,7 +91,7 @@ class CourseSpecialListActivity :
swipelayout.setProgressViewOffset(false, 0, 52) swipelayout.setProgressViewOffset(false, 0, 52)
swipelayout.isRefreshing = true swipelayout.isRefreshing = true
swipelayout.setOnRefreshListener(this) swipelayout.setOnRefreshListener(this)
swipelayout.setColorSchemeResources(R.color.main_theme) swipelayout.setColorSchemeResources(R.color.platform_main_theme)
rv_list.layoutManager = LinearLayoutManager(this) rv_list.layoutManager = LinearLayoutManager(this)
if (null == mAdapterWrapper) { if (null == mAdapterWrapper) {
mAdapterWrapper = YDLAdapterWrapper(mListAdapter!!) mAdapterWrapper = YDLAdapterWrapper(mListAdapter!!)
......
m-course/src/main/res/drawable/course_background_course_play_buy_button.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<item android:state_enabled="true"> <item android:state_enabled="true">
<shape> <shape>
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<solid android:color="@color/main_theme" /> <solid android:color="@color/platform_main_theme" />
</shape> </shape>
</item> </item>
</selector> </selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_green_6.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/main_theme" /> <solid android:color="@color/platform_main_theme" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_green_7.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="7dp" /> <corners android:radius="7dp" />
<solid android:color="@color/main_theme" /> <solid android:color="@color/platform_main_theme" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_confirm_btn_bg.xml
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<corners android:radius="6dp" /> <corners android:radius="6dp" />
<solid android:color="@color/main_theme" /> <solid android:color="@color/platform_main_theme" />
<stroke <stroke
android:width="0.5px" android:width="0.5px"
android:color="@color/main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_reset_btn_bg.xml
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
<stroke <stroke
android:width="0.5px" android:width="0.5px"
android:color="@color/main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_poster.xml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title" app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:background="@color/main_theme"> tools:background="@color/platform_main_theme">
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/viewpager" android:id="@+id/viewpager"
......
m-course/src/main/res/layout/activity_courses.xml
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp" android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center" android:gravity="center"
android:text="综合排序" android:text="综合排序"
android:textColor="@color/main_theme" android:textColor="@color/platform_main_theme"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
m-course/src/main/res/layout/activity_my_course.xml
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
android:layout_height="40dp" android:layout_height="40dp"
android:background="@color/white" android:background="@color/white"
app:tabGravity="fill" app:tabGravity="fill"
app:tabIndicatorColor="@color/main_theme" app:tabIndicatorColor="@color/platform_main_theme"
app:tabMode="fixed" app:tabMode="fixed"
app:tabSelectedTextColor="@color/main_theme" app:tabSelectedTextColor="@color/platform_main_theme"
app:tabTextColor="#333"/> app:tabTextColor="#333"/>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
......
m-course/src/main/res/layout/course_common_search_bar.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
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="match_parent" android:layout_height="match_parent"
tools:background="@color/main_theme" tools:background="@color/platform_main_theme"
tools:parentTag="android.widget.LinearLayout"> tools:parentTag="android.widget.LinearLayout">
<LinearLayout <LinearLayout
......
m-course/src/main/res/layout/course_filter_popup_window.xml
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg" android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置" android:text="重置"
android:textColor="@color/main_theme" android:textColor="@color/platform_main_theme"
android:textSize="17dp" android:textSize="17dp"
android:textStyle="bold" /> android:textStyle="bold" />
......
m-course/src/main/res/layout/course_good_popup_window.xml
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg" android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置" android:text="重置"
android:textColor="@color/main_theme" android:textColor="@color/platform_main_theme"
android:textSize="18dp" /> android:textSize="18dp" />
<Button <Button
......
m-course/src/main/res/layout/course_layout_title_bar.xml
...@@ -30,5 +30,5 @@ ...@@ -30,5 +30,5 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:textColor="@color/main_theme" /> android:textColor="@color/platform_main_theme" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_play_music_view.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:background="@color/main_theme" /> tools:background="@color/platform_main_theme" />
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
......
m-course/src/main/res/layout/item_course_new_list_view.xml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:pa_type="pa_round" app:pa_type="pa_round"
tools:background="@color/main_theme"/> tools:background="@color/platform_main_theme"/>
<ImageView <ImageView
......
m-course/src/main/res/layout/item_course_topic_text.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<ImageView <ImageView
android:layout_width="5dp" android:layout_width="5dp"
android:layout_height="17dp" android:layout_height="17dp"
android:background="@color/main_theme"/> android:background="@color/platform_main_theme"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
m-course/src/main/res/values/arrays.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<integer-array name="course_colors"> <integer-array name="course_colors">
<item>@color/main_theme</item> <item>@color/platform_main_theme</item>
</integer-array> </integer-array>
</resources> </resources>
\ No newline at end of file
m-course/src/main/res/values/styles.xml
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<style name="CourseCommonTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="CourseCommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/main_theme</item> <item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/main_theme</item> <item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="android:fitsSystemWindows">true</item> <item name="android:fitsSystemWindows">true</item>
<item name="android:windowBackground">@color/course_color_FAFAFA</item> <item name="android:windowBackground">@color/course_color_FAFAFA</item>
<item name="android:textCursorDrawable">@null</item> <item name="android:textCursorDrawable">@null</item>
......
m-course/src/ydl/res/color/color_course_filter_selector.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:color="@color/main_theme" android:state_selected="true" android:state_enabled="true"/> <item android:color="@color/platform_main_theme" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/course_color_666666" android:state_enabled="true"/> <item android:color="@color/course_color_666666" android:state_enabled="true"/>
</selector> </selector>
\ No newline at end of file
m-course/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色-->
<color name="main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="main_theme_bright">#E8F6FF</color>
<color name="right_text_color">#1da1f2</color>
</resources> </resources>
m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt
...@@ -110,9 +110,9 @@ class MyTrendsActivity : BaseActivity() { ...@@ -110,9 +110,9 @@ class MyTrendsActivity : BaseActivity() {
//切换标签选中状态 //切换标签选中状态
private fun changeLabel(position: Int, isChangeFragment: Boolean) { private fun changeLabel(position: Int, isChangeFragment: Boolean) {
if (position == 0) { if (position == 0) {
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_main_theme)) item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.platform_main_theme))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_main_theme)) item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.platform_main_theme))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray)) item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white)) item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
...@@ -122,8 +122,8 @@ class MyTrendsActivity : BaseActivity() { ...@@ -122,8 +122,8 @@ class MyTrendsActivity : BaseActivity() {
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white)) item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_main_theme)) item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.platform_main_theme))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_main_theme)) item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.platform_main_theme))
} }
if (isChangeFragment) { if (isChangeFragment) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java
...@@ -185,7 +185,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -185,7 +185,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
*/ */
private void initLoadMore() { private void initLoadMore() {
member_swrl.setOnRefreshListener(this); member_swrl.setOnRefreshListener(this);
member_swrl.setColorSchemeResources(R.color.dynamic_main_theme); member_swrl.setColorSchemeResources(R.color.platform_main_theme);
member_swrl.post(new Runnable() { member_swrl.post(new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -289,7 +289,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -289,7 +289,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
// members_top_user_focus_ortion_hint_iv.setVisibility(View.VISIBLE); // members_top_user_focus_ortion_hint_iv.setVisibility(View.VISIBLE);
members_top_user_focus_ortion_tv.setText("已关注"); members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme)); members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
focus_state = "1"; focus_state = "1";
} else { } else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg); members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
...@@ -465,7 +465,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -465,7 +465,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20); members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null); members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注"); members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme)); members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
} else { } else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg); members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
fans_count = (fans_counti - 1) + ""; fans_count = (fans_counti - 1) + "";
...@@ -557,7 +557,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -557,7 +557,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20); members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null); members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注"); members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme)); members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
} else { } else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg); members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null); members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
...@@ -733,8 +733,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -733,8 +733,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
hideFragments(transaction); hideFragments(transaction);
switch (index) { switch (index) {
case 0: case 0:
members_trend_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green)); members_trend_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_google_green)); members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
if (trendlisfragment == null) { if (trendlisfragment == null) {
trendlisfragment = TrendListInFragment.newInstance("3", "0", "member_trend", mem_id); trendlisfragment = TrendListInFragment.newInstance("3", "0", "member_trend", mem_id);
...@@ -745,8 +745,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene ...@@ -745,8 +745,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
select_tab = 0; select_tab = 0;
break; break;
case 1: case 1:
members_information_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green)); members_information_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_google_green)); members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
if (memberfragment == null) { if (memberfragment == null) {
memberfragment = MemberFragment.newInstance(age, emotional_state, job, address, introduction); memberfragment = MemberFragment.newInstance(age, emotional_state, job, address, introduction);
transaction.add(R.id.members_content_frm, memberfragment); transaction.add(R.id.members_content_frm, memberfragment);
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java
...@@ -212,13 +212,13 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie ...@@ -212,13 +212,13 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
topic_title = bundle.getString("topic_title"); topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE); publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title); publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme)); publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme));
} else if ("topic_publish".equals(publish_type)) {// 从话题详情进来的发布 } else if ("topic_publish".equals(publish_type)) {// 从话题详情进来的发布
topic_id = bundle.getString("topic_id"); topic_id = bundle.getString("topic_id");
topic_title = bundle.getString("topic_title"); topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE); publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title); publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme)); publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme));
} else if ("default_publish".equals(publish_type)) {// 默认发布类型 } else if ("default_publish".equals(publish_type)) {// 默认发布类型
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE); publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
} }
...@@ -828,7 +828,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie ...@@ -828,7 +828,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
} }
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE); publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title); publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme)); publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme));
// 获取编辑框焦点 // 获取编辑框焦点
publish_trend_content_editext.setFocusable(true); publish_trend_content_editext.setFocusable(true);
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicActivity.java
...@@ -88,13 +88,13 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen ...@@ -88,13 +88,13 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
// resetText(); // resetText();
// switch (position) { // switch (position) {
// case 0: // case 0:
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green)); // topic_tab_all_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
// topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green)); // topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
// //
// break; // break;
// case 1: // case 1:
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green)); // topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.platform_main_theme));
// topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green)); // topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
// //
// break; // break;
// //
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java
...@@ -181,7 +181,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD ...@@ -181,7 +181,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
private void initViews() { private void initViews() {
setSupportActionBar(mToolbar); setSupportActionBar(mToolbar);
mSwl.setOnRefreshListener(this); mSwl.setOnRefreshListener(this);
mSwl.setColorSchemeResources(R.color.dynamic_main_theme); mSwl.setColorSchemeResources(R.color.platform_main_theme);
mSwl.setProgressViewOffset(false, 0, 200); mSwl.setProgressViewOffset(false, 0, 200);
topTrendsRcv.setLayoutManager(new LinearLayoutManager(this)); topTrendsRcv.setLayoutManager(new LinearLayoutManager(this));
topTrendsRcv.setAdapter(mRecommendTopAdapter); topTrendsRcv.setAdapter(mRecommendTopAdapter);
...@@ -458,16 +458,16 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD ...@@ -458,16 +458,16 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
mTopicDetailVp.setCurrentItem(0); mTopicDetailVp.setCurrentItem(0);
} }
selectTab = 0; selectTab = 0;
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme)); mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.platform_main_theme));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme)); mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
break; break;
case 1: case 1:
if (mTopicDetailVp.getCurrentItem() != 1) { if (mTopicDetailVp.getCurrentItem() != 1) {
mTopicDetailVp.setCurrentItem(1); mTopicDetailVp.setCurrentItem(1);
} }
selectTab = 1; selectTab = 1;
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme)); mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.platform_main_theme));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme)); mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
break; break;
} }
...@@ -499,7 +499,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD ...@@ -499,7 +499,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
.error(R.drawable.dynamic_default_img) .error(R.drawable.dynamic_default_img)
.into(mTopicDetailTopBgIv); .into(mTopicDetailTopBgIv);
mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.dynamic_focused_topic_detail_bg : R.drawable.dynamic_focus_topic_detail_bg); mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.dynamic_focused_topic_detail_bg : R.drawable.dynamic_focus_topic_detail_bg);
mTopicDetailFocusTv.setTextColor(getResources().getColor("1".equals(is_focused) ? R.color.platform_white : R.color.dynamic_but_text_color)); mTopicDetailFocusTv.setTextColor(getResources().getColor("1".equals(is_focused) ? R.color.platform_white : R.color.platform_but_text_color));
mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.dynamic_trend_foucused) : "+" + this.getString(R.string.dynamic_trend_foucus)); mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.dynamic_trend_foucused) : "+" + this.getString(R.string.dynamic_trend_foucus));
if (!"2".equals(topicId)) { if (!"2".equals(topicId)) {
mTopicDetailFocusTv.setVisibility(View.VISIBLE); mTopicDetailFocusTv.setVisibility(View.VISIBLE);
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
...@@ -194,7 +194,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -194,7 +194,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} else { } else {
trends_lastr_swl!!.setViewGroup(trends_rcv) trends_lastr_swl!!.setViewGroup(trends_rcv)
trends_lastr_swl!!.setOnRefreshListener(this) trends_lastr_swl!!.setOnRefreshListener(this)
trends_lastr_swl!!.setColorSchemeResources(R.color.dynamic_main_theme) trends_lastr_swl!!.setColorSchemeResources(R.color.platform_main_theme)
} }
initRecyclerView() initRecyclerView()
} }
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
...@@ -779,7 +779,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr ...@@ -779,7 +779,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
}); });
} }
swl.setOnRefreshListener(this); swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.dynamic_main_theme); swl.setColorSchemeResources(R.color.platform_main_theme);
vpAds.getLayoutParams().height = ScreenUtil.getDisplayWidth() * 19 / 66; vpAds.getLayoutParams().height = ScreenUtil.getDisplayWidth() * 19 / 66;
vpAds.requestLayout(); vpAds.requestLayout();
vpAds.setOnTouchListener((v, event) -> { vpAds.setOnTouchListener((v, event) -> {
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java
...@@ -148,7 +148,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -148,7 +148,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
private void initViews() { private void initViews() {
initBannerView(); initBannerView();
swl.setOnRefreshListener(this); swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.dynamic_main_theme); swl.setColorSchemeResources(R.color.platform_main_theme);
mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override @Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
...@@ -293,11 +293,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -293,11 +293,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemFocusTv.setSelected(false); mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666)); mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(true); mItemHotTv.setSelected(true);
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color)); mItemHotTv.setTextColor(getResources().getColor(R.color.platform_but_text_color));
break; break;
case 1: case 1:
mItemRecommendTv.setSelected(true); mItemRecommendTv.setSelected(true);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color)); mItemRecommendTv.setTextColor(getResources().getColor(R.color.platform_but_text_color));
mItemFocusTv.setSelected(false); mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666)); mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(false); mItemHotTv.setSelected(false);
...@@ -307,7 +307,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -307,7 +307,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemRecommendTv.setSelected(false); mItemRecommendTv.setSelected(false);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666)); mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemFocusTv.setSelected(true); mItemFocusTv.setSelected(true);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color)); mItemFocusTv.setTextColor(getResources().getColor(R.color.platform_but_text_color));
mItemHotTv.setSelected(false); mItemHotTv.setSelected(false);
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666)); mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
break; break;
......
m-dynamic/src/main/res/drawable/dynamic_background_publish_trend_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">
<gradient <gradient
android:startColor="@color/dynamic_main_theme_light" android:startColor="@color/platform_main_theme_light"
android:endColor="@color/dynamic_main_theme" android:endColor="@color/platform_main_theme"
android:angle="0" /> android:angle="0" />
</shape> </shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_bg_fcous_selected.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
<corners <corners
android:bottomRightRadius="5dp" android:bottomRightRadius="5dp"
android:topRightRadius="5dp"/> android:topRightRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_hot_selected.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
<corners <corners
android:bottomLeftRadius="5dp" android:bottomLeftRadius="5dp"
android:topLeftRadius="5dp"/> android:topLeftRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_green_20.xml
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
<corners android:radius="20dp"></corners> <corners android:radius="20dp"></corners>
<solid android:color="@color/dynamic_white" /> <solid android:color="@color/dynamic_white" />
<stroke android:width="1dp" android:color="@color/dynamic_main_theme"/> <stroke android:width="1dp" android:color="@color/platform_main_theme"/>
</shape> </shape>
m-dynamic/src/main/res/drawable/dynamic_bg_recommend_selected.xml
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_cancel_focus_text_bg.xml
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:startColor="@color/dynamic_main_theme" android:startColor="@color/platform_main_theme"
android:endColor="@color/dynamic_main_theme_light"/> android:endColor="@color/platform_main_theme_light"/>
<corners android:bottomRightRadius="8dp"/> <corners android:bottomRightRadius="8dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_focus_btn_bg2.xml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/> android:topRightRadius="20dp"/>
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
m-dynamic/src/main/res/drawable/dynamic_focus_topic_detail_bg.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
<corners <corners
android:bottomRightRadius="20dp" android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp" android:bottomLeftRadius="20dp"
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/> android:topRightRadius="20dp"/>
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
m-dynamic/src/main/res/drawable/dynamic_has_focus_bg.xml
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
<corners android:radius="17.5dp"/> <corners android:radius="17.5dp"/>
<stroke android:width="1dp" <stroke android:width="1dp"
android:color="@color/dynamic_main_theme"/> android:color="@color/platform_main_theme"/>
</shape> </shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_shape_green_border_trend_info_bg.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/dynamic_main_theme" /> android:color="@color/platform_main_theme" />
<solid android:color="@color/dynamic_transparent" /> <solid android:color="@color/dynamic_transparent" />
</shape> </shape>
m-dynamic/src/main/res/layout/dynamic_activity_members.xml
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingRight="15dp" android:paddingRight="15dp"
android:text="动态" android:text="动态"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
android:layout_height="2dp" android:layout_height="2dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" /> android:background="@color/platform_main_theme" />
</RelativeLayout> </RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
android:paddingRight="15dp" android:paddingRight="15dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="我发布的" android:text="我发布的"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
android:layout_height="2dp" android:layout_height="2dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" /> android:background="@color/platform_main_theme" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
......
m-dynamic/src/main/res/layout/dynamic_activity_topic_detail.xml
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
android:background="@drawable/dynamic_focus_topic_detail_bg" android:background="@drawable/dynamic_focus_topic_detail_bg"
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:textColor="@color/dynamic_but_text_color" android:textColor="@color/platform_but_text_color"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingRight="15dp" android:paddingRight="15dp"
android:text="" android:text=""
android:textColor="@color/dynamic_main_theme" /> android:textColor="@color/platform_main_theme" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/topic_detail_users_rcv" android:id="@+id/topic_detail_users_rcv"
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingRight="15dp" android:paddingRight="15dp"
android:text="最新" android:text="最新"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="18sp" /> android:textSize="18sp" />
<View <View
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
android:layout_height="2dp" android:layout_height="2dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" /> android:background="@color/platform_main_theme" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:elevation="3dp" android:elevation="3dp"
android:src="@drawable/dynamic_newsfeed_new2" android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_main_theme" app:backgroundTint="@color/platform_main_theme"
app:borderWidth="0dp" app:borderWidth="0dp"
app:fabSize="normal" /> app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="发布" android:text="发布"
android:textColor="@color/dynamic_sel_but_text_color" android:textColor="@color/platform_but_text_color_selected"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
android:clickable="true" android:clickable="true"
android:gravity="center" android:gravity="center"
android:text="+ 关注" android:text="+ 关注"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="显示所有评论" android:text="显示所有评论"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="15sp" android:textSize="15sp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg" android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center" android:gravity="center"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
tools:visibility="visible" tools:visibility="visible"
android:visibility="gone" android:visibility="gone"
android:text="私聊"/> android:text="私聊"/>
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="40dp" android:layout_marginLeft="40dp"
android:layout_marginRight="40dp" android:layout_marginRight="40dp"
android:textColor="@color/dynamic_main_theme" android:textColor="@color/platform_main_theme"
android:background="@drawable/dynamic_bg_radius_line_green_20" android:background="@drawable/dynamic_bg_radius_line_green_20"
android:text="回到主贴"/> android:text="回到主贴"/>
......
m-dynamic/src/main/res/layout/dynamic_cancel_focus_dialog_layout.xml
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="确定" android:text="确定"
android:textColor="@color/dynamic_but_text_color" android:textColor="@color/platform_but_text_color"
android:textSize="@dimen/dynamic_text_size_16" android:textSize="@dimen/dynamic_text_size_16"
android:gravity="center" android:gravity="center"
android:background="@drawable/dynamic_cancel_focus_text_bg" android:background="@drawable/dynamic_cancel_focus_text_bg"
......
m-dynamic/src/main/res/layout/dynamic_fragment_moments.xml
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height" android:layout_height="@dimen/title_bar_height"
android:alpha="1" android:alpha="1"
android:background="@color/dynamic_main_theme" android:background="@color/platform_main_theme"
app:layout_collapseMode="pin"> app:layout_collapseMode="pin">
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:gravity="center" android:gravity="center"
android:text="问答" android:text="问答"
android:textColor="@color/dynamic_but_text_color" android:textColor="@color/platform_but_text_color"
android:textSize="20sp" /> android:textSize="20sp" />
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:elevation="3dp" android:elevation="3dp"
android:src="@drawable/dynamic_publish_trend" android:src="@drawable/dynamic_publish_trend"
app:backgroundTint="@color/dynamic_main_theme" app:backgroundTint="@color/platform_main_theme"
app:borderWidth="0dp" app:borderWidth="0dp"
app:fabSize="normal" /> app:fabSize="normal" />
......
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