Skip to content

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

统一颜色资源名称 - 1

parent d9b18b5a
Showing with 432 additions and 539 deletions
app/src/main/res/layout/activity_main.xml
......@@ -17,7 +17,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/platform_google_blue"
android:background="@color/platform_main_theme"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="Multiple Base Url Request Test"
......@@ -59,7 +59,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/platform_google_blue"
android:background="@color/platform_main_theme"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="Component Module Test"
......
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = false
dev_mode = true
ydl_app = [
appName : "心理咨询壹点灵",
......
m-audioim/src/main/res/drawable/audioim_audio_circle_blue_4.xml
......@@ -3,6 +3,6 @@
<corners android:radius="90dp" />
<solid android:color="@color/platform_google_blue" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-audioim/src/main/res/values/colors.xml
......@@ -5,5 +5,4 @@
<color name="audioim_color_50ffffff">#B3ffffff</color>
<color name="audioim_color_30FFFFFF">#4DFFFFFF</color>
<color name="audioim_color_70FFFFFF">#B3FFFFFF</color>
<color name="audioim_ydl_color">#1da1f2</color>
</resources>
m-confide/src/main/java/com/ydl/confide/home/popwindow/ConfideHomeSexAgePopupWindow.kt
......@@ -164,7 +164,7 @@ class ConfideHomeSexAgePopupWindow(context: Context, sexData: ArrayList<ConfideH
private fun setSelect(tvSex1: TextView,boolean: Boolean){
if (boolean){
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{
tvSex1.setBackgroundResource(R.drawable.confide_filter_select_nor)
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,
if (holder != null) {
holder.tvSort.text = item.name
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{
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 {
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
}
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)
}
}
......@@ -476,7 +476,7 @@ class ConfideHomeUtils {
tv.setTextColor(ContextCompat.getColor(mContext, R.color._6))
}
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)
......
m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeFilterView.kt
......@@ -93,7 +93,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
textView.text = bodyBean.filterName
textView.setTag(R.id.tv_title,bodyBean)
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.setOnClickListener {
......@@ -127,7 +127,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
var view = getChildAt(index)
if (view is DrawableRightTextView){
if ("排序" == view.text){
view.setTextColor(ContextCompat.getColor(context, R.color.confide_main_theme))
view.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
}else{
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"?>
<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"/>
</selector>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_bg_sound_selected.xml
......@@ -4,7 +4,7 @@
android:shape="rectangle"
android:useLevel="false">
<solid android:color="@color/confide_main_theme"/>
<solid android:color="@color/platform_main_theme"/>
<corners android:radius="10dp"/>
......
m-confide/src/main/res/drawable/confide_common_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/confide_main_theme_light"
android:endColor="@color/confide_main_theme"
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:angle="0" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_confidehome_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/confide_main_theme_light"
android:endColor="@color/confide_main_theme"
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:angle="0" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_btn_bg.xml
......@@ -4,10 +4,10 @@
<corners android:radius="20dp" />
<!--<stroke-->
<!--android:width="1dp"-->
<!--android:color="@color/confide_main_theme" />-->
<!--android:color="@color/platform_main_theme" />-->
<gradient
android:startColor="@color/confide_main_theme"
android:endColor="@color/confide_main_theme"
android:startColor="@color/platform_main_theme"
android:endColor="@color/platform_main_theme"
android:angle="0"/>
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_reset_btn_bg.xml
......@@ -4,7 +4,7 @@
<corners android:radius="20dp" />
<stroke
android:width="1px"
android:color="@color/confide_main_theme" />
android:color="@color/platform_main_theme" />
<!--<solid android:color="@color/white"/>-->
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_filter_select_sel.xml
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<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>
\ 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"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="100dp"/>
<solid android:color="@color/confide_main_theme" />
<solid android:color="@color/platform_main_theme" />
</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"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:bottomRightRadius="3dp"/>
<solid android:color="@color/confide_main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/confide_show_online_tv.xml
......@@ -3,7 +3,7 @@
<!-- 背景色 -->
<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" />
</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"?>
<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"/>
</selector>
\ No newline at end of file
m-confide/src/main/res/layout/confide_good_popup_window.xml
......@@ -49,7 +49,7 @@
android:layout_marginLeft="15dp"
android:background="@drawable/confide_filter_reset_btn_bg"
android:text="@string/platform_reset"
android:textColor="@color/confide_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/confide_dp_18" />
<Button
......
m-confide/src/main/res/layout/confide_sexage_popup_window.xml
......@@ -114,7 +114,7 @@
android:layout_weight="1"
android:background="@drawable/confide_filter_reset_btn_bg"
android:text="@string/platform_reset"
android:textColor="@color/confide_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/confide_dp_18" />
<Button
......
m-confide/src/main/res/values/styles.xml
......@@ -5,9 +5,9 @@
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/confide_main_theme</item>
<item name="colorPrimaryDark">@color/confide_main_theme</item>
<item name="colorAccent">@color/confide_main_theme</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/platform_main_theme</item>
</style>
</resources>
\ No newline at end of file
m-confide/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<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>
m-confide/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<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>
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
......@@ -193,7 +193,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
btn_call.setOnClickListener(this)
tv_guide.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.setOnRefreshListener(this)
......@@ -1421,7 +1421,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
}
FILTER_STATUS_FILTERED -> {
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)
}
FILTER_STATUS_OPEN -> {
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
......@@ -153,7 +153,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
btn_call.setOnClickListener(this)
tv_guide.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.setOnRefreshListener(this)
initNetLossView()
......@@ -1360,7 +1360,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
}
FILTER_STATUS_FILTERED -> {
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)
}
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
//私聊文案
if (TextUtils.isEmpty(itemBean.chatBtnText)){
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)
}else{
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<
//选中状态
holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD)
// 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
} else {
//未选中状态
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SortRecyclerViewAdapter.kt
......@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context,
holder.tvSort.text = item.value
if (item.key == selectedSort.key) {
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
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SubRecyclerViewAdapter.kt
......@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
if (selectedSub.key == region.key) {
//选中状态
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
} 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
//按钮置灰/解除置灰
contentView.btnConfirm.isEnabled = 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.setTextColor(ContextCompat.getColor(context,R.color.consultant_white))
} 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.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"?>
<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/consultant_filter_content_text_color_un" 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/platform_but_text_color_unselected" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_blue_but.xml
......@@ -5,5 +5,5 @@
<solid android:color="#F2faff"/>
<stroke
android:width="1dp"
android:color="@color/consultant_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_5_dark.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/consultant_confirm_bg_color" />
<solid android:color="@color/platform_main_theme" />
<stroke
android:width="1dp"
android:color="@color/consultant_confirm_bg_color" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_5_light.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/consultant_main_theme_light" />
<solid android:color="@color/platform_main_theme_light" />
<stroke
android:width="1dp"
android:color="@color/consultant_main_theme_light" />
android:color="@color/platform_main_theme_light" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_line_green_5.xml
......@@ -5,5 +5,5 @@
<solid android:color="@color/platform_white" />
<stroke
android:width="1dp"
android:color="@color/consultant_main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector.xml
......@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/consultant_main_theme_bright" />
<solid android:color="@color/platform_main_theme_bright" />
<corners android:radius="4dp"/>
<stroke
android:width="0.5dp"
android:color="@color/consultant_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
</item>
<item android:state_enabled="true">
......
m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector_radius11.xml
......@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/consultant_main_theme_bright" />
<solid android:color="@color/platform_main_theme_bright" />
<corners android:radius="11dp"/>
<stroke
android:width="0.5dp"
android:color="@color/consultant_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
</item>
<item android:state_enabled="true">
......
m-consultant/src/main/res/drawable/consultant_expert_search_chat.xml
......@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="@color/consultant_chat_start_color"
android:endColor="@color/consultant_chat_end_color"/>
android:startColor="@color/platform_main_gradient_start_color"
android:endColor="@color/platform_main_gradient_end_color"/>
<padding
android:bottom="@dimen/platform_dp_3"
android:left="@dimen/platform_dp_10"
......
m-consultant/src/main/res/layout/consultant_activity_hot_search.xml
......@@ -60,7 +60,7 @@
android:tag="tag_search_input_edit"
android:textColor="#242424"
android:textColorHint="#b3b3b3"
android:textCursorDrawable="@color/consultant_main_theme"
android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp" />
<ImageView
......
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
......@@ -357,7 +357,7 @@
android:textSize="@dimen/platform_dp_13"
android:textStyle="bold"
android:background="@drawable/consultant_expert_search_chat"
android:textColor="@color/consultant_confirm_text_color"
android:textColor="@color/platform_but_text_color"
android:text="私聊"/>
<!--描述-->
......
m-consultant/src/main/res/layout/consultant_expert_search_products_item.xml
......@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:paddingRight="@dimen/platform_dp_3"
android:paddingLeft="@dimen/platform_dp_3"
......
m-consultant/src/main/res/layout/consultant_item_empty.xml
......@@ -32,6 +32,6 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/platform_search_by_category"
android:textColor="@color/consultant_main_theme" />
android:textColor="@color/platform_main_theme" />
</LinearLayout>
m-consultant/src/main/res/layout/consultant_item_price_range.xml
......@@ -27,7 +27,7 @@
android:background="@drawable/shape_round_gray_bored"
android:inputType="number"
android:maxLines="1"
android:textCursorDrawable="@color/consultant_main_theme"
android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp"
android:maxLength="7"
/>
......@@ -46,7 +46,7 @@
android:background="@drawable/shape_round_gray_bored"
android:inputType="number"
android:maxLines="1"
android:textCursorDrawable="@color/consultant_main_theme"
android:textCursorDrawable="@color/platform_main_theme"
android:textSize="13sp"
android:maxLength="7"
/>
......
m-consultant/src/main/res/layout/consultant_item_region.xml
......@@ -10,7 +10,7 @@
android:layout_width="4dp"
android:layout_height="21dp"
android:layout_gravity="center_vertical"
android:background="@color/consultant_main_theme"
android:background="@color/platform_main_theme"
android:visibility="invisible"/>
<TextView
android:id="@+id/tvRegionName"
......
m-consultant/src/main/res/layout/consultant_layout_search_content.xml
......@@ -148,7 +148,7 @@
android:paddingRight="@dimen/platform_dp_32"
android:paddingBottom="@dimen/platform_dp_8"
android:text="重新加载"
android:textColor="@color/consultant_main_theme"/>
android:textColor="@color/platform_main_theme"/>
</LinearLayout>
<ImageButton
......
m-consultant/src/main/res/layout/consultant_ui_filter_popup.xml
......@@ -159,7 +159,7 @@
android:gravity="center"
android:hint="暂无匹配咨询师"
android:textColorHint="@color/platform_color_E0E0E0"
android:textColor="@color/consultant_confirm_text_color"
android:textColor="@color/platform_but_text_color"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
m-consultant/src/main/res/layout/consultant_ui_subject_popup_window.xml
......@@ -36,6 +36,6 @@
android:gravity="center"
android:text="@string/platform_confirm"
android:textSize="17dp"
android:textColor="@color/consultant_confirm_text_color" />
android:textColor="@color/platform_but_text_color" />
</LinearLayout>
m-consultant/src/main/res/values/styles.xml
......@@ -12,9 +12,9 @@
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/consultant_main_theme</item>
<item name="colorPrimaryDark">@color/consultant_main_theme</item>
<item name="colorAccent">@color/consultant_main_theme</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/platform_main_theme</item>
</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"?>
<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>
m-consultant/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<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>
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
......@@ -67,7 +67,7 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
specialId = intent.getStringExtra("special_id").toInt()
}
LogUtil.i("special id: $specialId")
swl.setColorSchemeResources(R.color.main_theme)
swl.setColorSchemeResources(R.color.platform_main_theme)
swl.setOnRefreshListener(this)
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
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......@@ -241,7 +241,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......@@ -338,7 +338,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......@@ -360,7 +360,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
......@@ -407,7 +407,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......@@ -429,7 +429,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
......@@ -650,7 +650,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......@@ -697,7 +697,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.main_theme
R.color.platform_main_theme
)
)
} else {
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
......@@ -178,7 +178,7 @@ class CoursePlayActivity : BaseActivity() {
}
holder.setTextColor(
R.id.text_title,
this@CoursePlayActivity.resources.getColor(R.color.main_theme)
this@CoursePlayActivity.resources.getColor(R.color.platform_main_theme)
)
} else {
gifView.visibility = View.GONE
......
m-course/src/main/java/com/yidianling/course/course_special_list/activity/CourseSpecialListActivity.kt
......@@ -91,7 +91,7 @@ class CourseSpecialListActivity :
swipelayout.setProgressViewOffset(false, 0, 52)
swipelayout.isRefreshing = true
swipelayout.setOnRefreshListener(this)
swipelayout.setColorSchemeResources(R.color.main_theme)
swipelayout.setColorSchemeResources(R.color.platform_main_theme)
rv_list.layoutManager = LinearLayoutManager(this)
if (null == mAdapterWrapper) {
mAdapterWrapper = YDLAdapterWrapper(mListAdapter!!)
......
m-course/src/main/res/drawable/course_background_course_play_buy_button.xml
......@@ -4,7 +4,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="4dp" />
<solid android:color="@color/main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_green_6.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/main_theme" />
<solid android:color="@color/platform_main_theme" />
<stroke
android:width="1dp"
android:color="@color/main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_green_7.xml
......@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="7dp" />
<solid android:color="@color/main_theme" />
<solid android:color="@color/platform_main_theme" />
<stroke
android:width="1dp"
android:color="@color/main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_confirm_btn_bg.xml
......@@ -4,9 +4,9 @@
<corners android:radius="6dp" />
<solid android:color="@color/main_theme" />
<solid android:color="@color/platform_main_theme" />
<stroke
android:width="0.5px"
android:color="@color/main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_reset_btn_bg.xml
......@@ -8,5 +8,5 @@
<stroke
android:width="0.5px"
android:color="@color/main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_poster.xml
......@@ -38,7 +38,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:background="@color/main_theme">
tools:background="@color/platform_main_theme">
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
......
m-course/src/main/res/layout/activity_courses.xml
......@@ -50,7 +50,7 @@
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="综合排序"
android:textColor="@color/main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="14sp"
android:textStyle="bold" />
......
m-course/src/main/res/layout/activity_my_course.xml
......@@ -26,9 +26,9 @@
android:layout_height="40dp"
android:background="@color/white"
app:tabGravity="fill"
app:tabIndicatorColor="@color/main_theme"
app:tabIndicatorColor="@color/platform_main_theme"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/main_theme"
app:tabSelectedTextColor="@color/platform_main_theme"
app:tabTextColor="#333"/>
<android.support.v4.view.ViewPager
......
m-course/src/main/res/layout/course_common_search_bar.xml
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/main_theme"
tools:background="@color/platform_main_theme"
tools:parentTag="android.widget.LinearLayout">
<LinearLayout
......
m-course/src/main/res/layout/course_filter_popup_window.xml
......@@ -142,7 +142,7 @@
android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置"
android:textColor="@color/main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="17dp"
android:textStyle="bold" />
......
m-course/src/main/res/layout/course_good_popup_window.xml
......@@ -46,7 +46,7 @@
android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置"
android:textColor="@color/main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="18dp" />
<Button
......
m-course/src/main/res/layout/course_layout_title_bar.xml
......@@ -30,5 +30,5 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:textColor="@color/main_theme" />
android:textColor="@color/platform_main_theme" />
</RelativeLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_play_music_view.xml
......@@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:background="@color/main_theme" />
tools:background="@color/platform_main_theme" />
<ImageView
android:layout_width="match_parent"
......
m-course/src/main/res/layout/item_course_new_list_view.xml
......@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:pa_type="pa_round"
tools:background="@color/main_theme"/>
tools:background="@color/platform_main_theme"/>
<ImageView
......
m-course/src/main/res/layout/item_course_topic_text.xml
......@@ -23,7 +23,7 @@
<ImageView
android:layout_width="5dp"
android:layout_height="17dp"
android:background="@color/main_theme"/>
android:background="@color/platform_main_theme"/>
<TextView
android:layout_width="wrap_content"
......
m-course/src/main/res/values/arrays.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer-array name="course_colors">
<item>@color/main_theme</item>
<item>@color/platform_main_theme</item>
</integer-array>
</resources>
\ No newline at end of file
m-course/src/main/res/values/styles.xml
......@@ -13,8 +13,8 @@
<style name="CourseCommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/main_theme</item>
<item name="colorPrimaryDark">@color/main_theme</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:windowBackground">@color/course_color_FAFAFA</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"?>
<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"/>
</selector>
\ No newline at end of file
m-course/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<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>
m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt
......@@ -110,9 +110,9 @@ class MyTrendsActivity : BaseActivity() {
//切换标签选中状态
private fun changeLabel(position: Int, isChangeFragment: Boolean) {
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_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
......@@ -122,8 +122,8 @@ class MyTrendsActivity : BaseActivity() {
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_hint_tv!!.setBackgroundColor(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.platform_main_theme))
}
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
*/
private void initLoadMore() {
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() {
@Override
public void run() {
......@@ -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_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";
} else {
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
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.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 {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
fans_count = (fans_counti - 1) + "";
......@@ -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.setCompoundDrawables(null, null, drawable, null);
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 {
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);
......@@ -733,8 +733,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
hideFragments(transaction);
switch (index) {
case 0:
members_trend_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green));
members_trend_hint_tv.setBackgroundColor(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.platform_main_theme));
if (trendlisfragment == null) {
trendlisfragment = TrendListInFragment.newInstance("3", "0", "member_trend", mem_id);
......@@ -745,8 +745,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
select_tab = 0;
break;
case 1:
members_information_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green));
members_information_hint_tv.setBackgroundColor(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.platform_main_theme));
if (memberfragment == null) {
memberfragment = MemberFragment.newInstance(age, emotional_state, job, address, introduction);
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
topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
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)) {// 从话题详情进来的发布
topic_id = bundle.getString("topic_id");
topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
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)) {// 默认发布类型
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
}
......@@ -828,7 +828,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
}
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
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);
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicActivity.java
......@@ -88,13 +88,13 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
// resetText();
// switch (position) {
// case 0:
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
// topic_tab_all_hint_tv.setBackgroundColor(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.platform_main_theme));
//
// break;
// case 1:
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
// topic_tab_hot_hint_tv.setBackgroundColor(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.platform_main_theme));
//
// break;
//
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java
......@@ -181,7 +181,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
private void initViews() {
setSupportActionBar(mToolbar);
mSwl.setOnRefreshListener(this);
mSwl.setColorSchemeResources(R.color.dynamic_main_theme);
mSwl.setColorSchemeResources(R.color.platform_main_theme);
mSwl.setProgressViewOffset(false, 0, 200);
topTrendsRcv.setLayoutManager(new LinearLayoutManager(this));
topTrendsRcv.setAdapter(mRecommendTopAdapter);
......@@ -458,16 +458,16 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
mTopicDetailVp.setCurrentItem(0);
}
selectTab = 0;
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.platform_main_theme));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
break;
case 1:
if (mTopicDetailVp.getCurrentItem() != 1) {
mTopicDetailVp.setCurrentItem(1);
}
selectTab = 1;
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.platform_main_theme));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme));
break;
}
......@@ -499,7 +499,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
.error(R.drawable.dynamic_default_img)
.into(mTopicDetailTopBgIv);
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));
if (!"2".equals(topicId)) {
mTopicDetailFocusTv.setVisibility(View.VISIBLE);
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
......@@ -194,7 +194,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} else {
trends_lastr_swl!!.setViewGroup(trends_rcv)
trends_lastr_swl!!.setOnRefreshListener(this)
trends_lastr_swl!!.setColorSchemeResources(R.color.dynamic_main_theme)
trends_lastr_swl!!.setColorSchemeResources(R.color.platform_main_theme)
}
initRecyclerView()
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
......@@ -779,7 +779,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
});
}
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.requestLayout();
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,
private void initViews() {
initBannerView();
swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.dynamic_main_theme);
swl.setColorSchemeResources(R.color.platform_main_theme);
mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
......@@ -293,11 +293,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(true);
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color));
mItemHotTv.setTextColor(getResources().getColor(R.color.platform_but_text_color));
break;
case 1:
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.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(false);
......@@ -307,7 +307,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemRecommendTv.setSelected(false);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
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.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
break;
......
m-dynamic/src/main/res/drawable/dynamic_background_publish_trend_top.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/dynamic_main_theme_light"
android:endColor="@color/dynamic_main_theme"
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:angle="0" />
</shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_bg_fcous_selected.xml
......@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
<corners
android:bottomRightRadius="5dp"
android:topRightRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_hot_selected.xml
......@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
<corners
android:bottomLeftRadius="5dp"
android:topLeftRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_green_20.xml
......@@ -3,6 +3,6 @@
<corners android:radius="20dp"></corners>
<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>
m-dynamic/src/main/res/drawable/dynamic_bg_recommend_selected.xml
......@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_cancel_focus_text_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:startColor="@color/dynamic_main_theme"
android:endColor="@color/dynamic_main_theme_light"/>
android:startColor="@color/platform_main_theme"
android:endColor="@color/platform_main_theme_light"/>
<corners android:bottomRightRadius="8dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_focus_btn_bg2.xml
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="1dp"
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/dynamic_focus_topic_detail_bg.xml
......@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
<corners
android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp"
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="0.5dp"
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/dynamic_has_focus_bg.xml
......@@ -5,6 +5,6 @@
<corners android:radius="17.5dp"/>
<stroke android:width="1dp"
android:color="@color/dynamic_main_theme"/>
android:color="@color/platform_main_theme"/>
</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 @@
<stroke
android:width="1dp"
android:color="@color/dynamic_main_theme" />
android:color="@color/platform_main_theme" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/layout/dynamic_activity_members.xml
......@@ -289,7 +289,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="动态"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="18sp" />
<TextView
......@@ -298,7 +298,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" />
android:background="@color/platform_main_theme" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
......@@ -68,7 +68,7 @@
android:paddingRight="15dp"
android:gravity="center_vertical"
android:text="我发布的"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="18sp" />
<TextView
......@@ -77,7 +77,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="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_topic_detail.xml
......@@ -124,7 +124,7 @@
android:background="@drawable/dynamic_focus_topic_detail_bg"
android:gravity="center"
android:text=""
android:textColor="@color/dynamic_but_text_color"
android:textColor="@color/platform_but_text_color"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
......@@ -161,7 +161,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text=""
android:textColor="@color/dynamic_main_theme" />
android:textColor="@color/platform_main_theme" />
<android.support.v7.widget.RecyclerView
android:id="@+id/topic_detail_users_rcv"
......@@ -249,7 +249,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="最新"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="18sp" />
<View
......@@ -258,7 +258,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" />
android:background="@color/platform_main_theme" />
</RelativeLayout>
<RelativeLayout
......@@ -306,7 +306,7 @@
android:layout_marginBottom="20dp"
android:elevation="3dp"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_main_theme"
app:backgroundTint="@color/platform_main_theme"
app:borderWidth="0dp"
app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
......@@ -55,7 +55,7 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="发布"
android:textColor="@color/dynamic_sel_but_text_color"
android:textColor="@color/platform_but_text_color_selected"
android:textSize="14sp" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
......@@ -183,7 +183,7 @@
android:clickable="true"
android:gravity="center"
android:text="+ 关注"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
......@@ -420,7 +420,7 @@
android:paddingRight="20dp"
android:paddingTop="8dp"
android:text="显示所有评论"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="15sp"
android:visibility="gone"
tools:visibility="visible" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
......@@ -278,7 +278,7 @@
android:layout_marginRight="15dp"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
tools:visibility="visible"
android:visibility="gone"
android:text="私聊"/>
......@@ -345,7 +345,7 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="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:text="回到主贴"/>
......
m-dynamic/src/main/res/layout/dynamic_cancel_focus_dialog_layout.xml
......@@ -75,7 +75,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="确定"
android:textColor="@color/dynamic_but_text_color"
android:textColor="@color/platform_but_text_color"
android:textSize="@dimen/dynamic_text_size_16"
android:gravity="center"
android:background="@drawable/dynamic_cancel_focus_text_bg"
......
m-dynamic/src/main/res/layout/dynamic_fragment_moments.xml
......@@ -196,7 +196,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
android:alpha="1"
android:background="@color/dynamic_main_theme"
android:background="@color/platform_main_theme"
app:layout_collapseMode="pin">
......@@ -206,7 +206,7 @@
android:layout_marginRight="15dp"
android:gravity="center"
android:text="问答"
android:textColor="@color/dynamic_but_text_color"
android:textColor="@color/platform_but_text_color"
android:textSize="20sp" />
......@@ -292,7 +292,7 @@
android:layout_marginBottom="40dp"
android:elevation="3dp"
android:src="@drawable/dynamic_publish_trend"
app:backgroundTint="@color/dynamic_main_theme"
app:backgroundTint="@color/platform_main_theme"
app:borderWidth="0dp"
app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/dynamic_fragment_trends_list.xml
......@@ -52,11 +52,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginRight="20dp"
android:background="@color/dynamic_main_theme"
android:background="@color/platform_main_theme"
android:elevation="3dp"
android:padding="0dp"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_main_theme"
app:backgroundTint="@color/platform_main_theme"
app:borderWidth="0dp"
app:fabSize="normal"
app:layout_anchor="@+id/trends_rcv"
......
m-dynamic/src/main/res/layout/dynamic_include_trend_info_bottom.xml
......@@ -43,7 +43,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="发送"
android:textColor="@color/dynamic_green3"
android:textColor="@color/platform_main_theme"
android:textSize="16sp"/>
</LinearLayout>
......
m-dynamic/src/main/res/layout/dynamic_item_alltopic.xml
......@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="+ 关注"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="16sp" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_item_talk_list.xml
......@@ -121,7 +121,7 @@
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:text="私聊"
android:textColor="@color/dynamic_main_theme"
android:textColor="@color/platform_main_theme"
android:visibility="gone"
tools:visibility="visible" />
......
m-dynamic/src/main/res/values/arrays.xml
......@@ -2,7 +2,7 @@
<resources>
<integer-array name="ydl_colors">
<item>@color/platform_main_theme_blue</item>
<item>@color/platform_main_theme</item>
</integer-array>
......
m-dynamic/src/main/res/values/colors.xml
......@@ -5,7 +5,6 @@
<color name="dynamic_colorPrimaryDark">#303F9F</color>
<color name="dynamic_colorAccent">#FF4081</color>
<color name="dynamic_green3">#1da1f2</color>
<color name="dynamic_msg_system_press">#fff7f7f7</color>
<color name="dynamic_msg_bg_press">#eeeeeeee</color>
<color name="dynamic_colorDivider">#ebebeb</color>
......@@ -13,15 +12,12 @@
<color name="dynamic_google_red">#ed412c</color>
<color name="dynamic_google_blue">#3e82f7</color>
<color name="dynamic_google_yellow">#fdbd00</color>
<color name="dynamic_google_green">#1da1f2</color>
<color name="dynamic_google_green_dark">#1da1f2</color>
<color name="dynamic_color_grey_d0d0d0">#d0d0d0</color>
<!--app主要颜色-->
<color name="dynamic_white">#ffffff</color>
<color name="dynamic_theme_title_bar_color">#FFFFFF</color>
<color name="dynamic_theme_bg">#FAFAFA</color>
<color name="dynamic_default_button_bg">#1da1f2</color>
<color name="dynamic_default_text_color">#555555</color>
<color name="dynamic_default_text_color_hint">#333333</color>
<color name="dynamic_divide_color">#EDEDED</color>
......@@ -53,11 +49,8 @@
<color name="dynamic_GreyWhite">#F7F7F7</color>
<color name="dynamic_im_list_select_hover">#dbdbdb</color>
<color name="dynamic_color_b3b3b3">#b3b3b3</color>
<color name="dynamic_color_green_disable">#1da1f2</color>
<color name="dynamic_color_green_00d3a9">#1da1f2</color>
<color name="dynamic_color_black_b3000000">#b3000000</color>
<color name="dynamic_color_grey_eaeaea">#eaeaea</color>
<color name="dynamic_color_blue_3a9efb">#3a9efb</color>
<!-- main bg color -->
<color name="dynamic_main_bg_color">#FFFFFF</color>
......@@ -83,7 +76,6 @@
<color name="dynamic_title_bottom_line_bg">#DDDDDD</color>
<color name="dynamic_title_green">#1da1f2</color>
<color name="dynamic_defult_bg">#f3f3f3</color>
<!--动态-->
......
m-dynamic/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="dynamic_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="dynamic_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="dynamic_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="dynamic_confirm_bg_color">#FFDD33</color>
<!--按钮文字颜色 YDL 为白色-->
<color name="dynamic_but_text_color">#242424</color>
<!--选择按钮文字颜色 YDL 为蓝色-->
<color name="dynamic_sel_but_text_color">#242424</color>
</resources>
m-dynamic/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="dynamic_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="dynamic_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="dynamic_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="dynamic_confirm_bg_color">#1da1f2</color>
<!--按钮文字颜色-->
<color name="dynamic_but_text_color">#ffffff</color>
<!--选择按钮文字颜色-->
<color name="dynamic_sel_but_text_color">#1da1f2</color>
</resources>
m-fm/src/main/java/com/yidianling/fm/FMActivity.java
......@@ -81,8 +81,8 @@ public class FMActivity extends BaseActivity {
}
FragmentWithTabPagerAdapter adapter = new FragmentWithTabPagerAdapter(getSupportFragmentManager(), titleList, fragmentList);
stl_tab.setBackgroundColor(Color.WHITE);
stl_tab.setSelectedIndicatorColors(ColorUtil.changeColor(this, R.color.fm_google_green));
stl_tab.setSelectColor(ColorUtil.changeColor(this, R.color.fm_google_green));
stl_tab.setSelectedIndicatorColors(ColorUtil.changeColor(this, R.color.platform_main_theme));
stl_tab.setSelectColor(ColorUtil.changeColor(this, R.color.platform_main_theme));
vp_content.setAdapter(adapter);
stl_tab.setIsDoubleTab(true);
stl_tab.setDividerColors(Color.TRANSPARENT);
......
m-fm/src/main/java/com/yidianling/fm/FMListViewFragment.java
......@@ -71,7 +71,7 @@ public class FMListViewFragment extends BaseFragment implements PtrHandler, Load
store_house_ptr_frame = getRootView().findViewById(R.id.store_house_ptr_frame);
}
final MaterialHeader header = new MaterialHeader(getActivity());
int color = getResources().getColor(R.color.fm_google_green);
int color = getResources().getColor(R.color.platform_main_theme);
header.setColorSchemeColors(new int[]{color});
header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
int padding = (int) getActivity().getResources().getDimension(R.dimen.platform_default_dis_size);
......
m-fm/src/main/res/drawable/fm_dot_seekbar_fm.xml
......@@ -9,7 +9,7 @@
android:width="7dp"
android:height="7dp" />
<stroke android:color="@color/white" android:width="1dp"/>
<solid android:color="@color/fm_google_green" />
<solid android:color="@color/platform_main_theme" />
</shape>
</item>
<item>
......
m-fm/src/main/res/layout/fm_activity_fm.xml
......@@ -9,7 +9,7 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon_color="@color/fm_google_green"
app:pa_left_start_icon_color="@color/platform_main_theme"
app:pa_title_text="心灵电台" />
<FrameLayout
......
m-fm/src/xlzx/res/values/colors.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="fm_google_green">#FFDD33</color>
</resources>
\ No newline at end of file
m-fm/src/ydl/res/values/colors.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="fm_google_green">#1da1f2</color>
</resources>
\ No newline at end of file
m-home/src/main/res/values/styles.xml
......@@ -6,9 +6,9 @@
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/platform_main_theme_blue</item>
<item name="colorPrimaryDark">@color/platform_main_theme_blue</item>
<item name="colorAccent">@color/platform_main_theme_blue</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/platform_main_theme</item>
</style>
</resources>
\ No newline at end of file
m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
......@@ -108,7 +108,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
home_swipe_refresh_layout.setColorSchemeColors(
ContextCompat.getColor(
context,
R.color.platform_google_yellow
R.color.platform_main_theme
)
)
home_swipe_refresh_layout.setProgressViewOffset(false, 0, 200)
......
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
......@@ -101,7 +101,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
lineParam.leftMargin = dp15
lineParam.rightMargin = dp15
lineView = View(context)
lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
lineView!!.setBackgroundColor(resources.getColor(R.color.platform_big_bg_color))
lineView!!.layoutParams = lineParam
}
......@@ -122,7 +122,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
)
cutOffParams.height = RxImageTool.dip2px(10f)
val cutOffView = View(context)
cutOffView.setBackgroundColor(resources.getColor(R.color.home_colorBg))
cutOffView.setBackgroundColor(resources.getColor(R.color.platform_color_F5F5F5))
cutOffView.layoutParams = cutOffParams
ll_home_module_button.addView(cutOffView)
......
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomePagerBannerCategoryView.kt
......@@ -277,7 +277,7 @@ class HomePagerBannerCategoryView(mContext: Context, homeEvent: IHomeBaseEvent)
lineParam.rightMargin = dp15
lineParam.topMargin = multiple * (imageViewWidth + dp8 + textViewHeight) + dp8
lineView = View(context)
lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
lineView!!.setBackgroundColor(resources.getColor(R.color.platform_big_bg_color))
lineView!!.layoutParams = lineParam
}
......
m-home/src/xlzx/res/layout/home_assuage_grief_image_under_four_item_view.xml
......@@ -41,7 +41,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="88"
android:background="@color/baby_blue">
android:background="@color/platform_main_theme">
<ImageView
android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
android:scaleType="centerCrop"
......
m-home/src/xlzx/res/layout/home_layout_home_module_input.xml
......@@ -60,7 +60,7 @@
android:singleLine="true"
android:textColor="@color/platform_color_444444"
android:textColorHint="#999999"
android:textCursorDrawable="@color/home_color_0CACF4"
android:textCursorDrawable="@color/platform_main_theme"
android:tag="tag_search_input_edit"
android:textSize="12sp"
/>
......
m-home/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="home_category_view_test_line">#F0F0F0</color>
<color name="home_colorBg">#f5f5f5</color>
<color name="home_color_0CACF4">#0CACF4</color>
</resources>
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
......@@ -153,7 +153,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
private fun initView() {
home_swipe_refresh_layout?.setOnRefreshListener(this)
home_swipe_refresh_layout?.setColorSchemeColors(ContextCompat.getColor(context, R.color.platform_main_theme_blue))
home_swipe_refresh_layout?.setColorSchemeColors(ContextCompat.getColor(context, R.color.platform_main_theme))
home_swipe_refresh_layout?.setProgressViewOffset(false, 0, 200)
home_module_fragment_recycler.addOnScrollListener(homeEvent?.onPageScroll(view_rl_top_bg))
home_service_call.setOnClickListener { homeEvent?.serviceCallClick() }
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerCategoryItemView.kt
......@@ -9,12 +9,12 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.TextView
import com.yidianling.home.R
import com.yidianling.home.event.IHomeBaseEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.utils.ScreenUtil
import com.yidianling.common.tools.RxImageTool
import com.yidianling.home.R
import com.yidianling.home.event.IHomeBaseEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import kotlinx.android.synthetic.ydl.home_pager_banner_category_view.view.*
/**
......@@ -242,7 +242,7 @@ class HomePagerBannerCategoryItemView(mContext: Context, homeEvent: IHomeBaseEve
lineParam.rightMargin = dp15
lineParam.topMargin = multiple * (imageViewWidth + dp8 + textViewHeight) + dp8
lineView = View(context)
lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
lineView!!.setBackgroundColor(resources.getColor(R.color.platform_big_bg_color))
lineView!!.layoutParams = lineParam
}
......
m-home/src/ydl/res/layout/home_assuage_grief_image_under_four_item_view.xml
......@@ -41,7 +41,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="88"
android:background="#1da1f2">
android:background="@color/platform_color_1DA1F2">
<ImageView
android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
android:scaleType="centerCrop"
......
m-home/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="home_category_view_test_line">#F0F0F0</color>
</resources>
m-im/src/main/java/com/yidianling/im/ui/page/fragment/ChatFragment.kt
......@@ -302,13 +302,13 @@ class ChatFragment : BaseFragment(), XRecyclerView.LoadingListener {
chat_serviced_message.setTextColor(Color.parseColor("#666666"))
if (modelType == ChatModelType.ALL) {
chat_all_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_all_message.setTextColor(resources.getColor(R.color.platform_but_text_color_selected))
chat_all_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
} else if (modelType == ChatModelType.SERVICING) {
chat_servicing_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_servicing_message.setTextColor(resources.getColor(R.color.platform_but_text_color_selected))
chat_servicing_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
} else if (modelType == ChatModelType.SERVICED) {
chat_serviced_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_serviced_message.setTextColor(resources.getColor(R.color.platform_but_text_color_selected))
chat_serviced_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
}
}
......
m-im/src/main/java/com/yidianling/uikit/business/session/view/CommonQuestionItemView.kt
package com.yidianling.uikit.business.session.view
import android.content.Context
import android.graphics.Color
import android.text.Spannable
import android.text.SpannableString
import android.text.TextUtils
......@@ -36,7 +35,7 @@ class CommonQuestionItemView(var mContext: Context) : LinearLayout(mContext) {
if (title.contains(keyWords!!)) {
val temp = title.split(keyWords)
val spanString = SpannableString(temp[0] + keyWords + temp[1])
spanString.setSpan(ForegroundColorSpan(Color.parseColor("#1da1f2")), temp[0].length, (temp[0] + keyWords).length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
spanString.setSpan(ForegroundColorSpan(resources.getColor(R.color.platform_main_theme)), temp[0].length, (temp[0] + keyWords).length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
tv_title.text = spanString
} else {
tv_title.text = title
......
m-im/src/main/java/com/yidianling/uikit/business/team/activity/AdvancedTeamInfoActivity.java
......@@ -455,7 +455,7 @@ public class AdvancedTeamInfoActivity extends UI implements
private void initActionbar() {
titleBarBottom.setmRightText(getString(R.string.im_menu));
titleBarBottom.setRightTextColor(getResources().getColor(R.color.platform_main_theme_blue));
titleBarBottom.setRightTextColor(getResources().getColor(R.color.platform_main_theme));
titleBarBottom.setOnRightTextClick((view, isActive) -> showRegularTeamMenu());
}
......
m-im/src/main/java/com/yidianling/uikit/business/team/activity/AdvancedTeamNicknameActivity.java
......@@ -60,7 +60,7 @@ public class AdvancedTeamNicknameActivity extends UI implements TextWatcher{
TitleBarBottom toolbarView = findView(R.id.chat_tb);
toolbarView.setmRightText(getResources().getString(R.string.im_save));
toolbarView.setRightTextColor(getResources().getColor(R.color.platform_google_green));
toolbarView.setRightTextColor(getResources().getColor(R.color.platform_main_theme));
toolbarView.setOnRightTextClick(new TitleBarBottom.OnTitleBarTextClick() {
@Override
public void onClick(View view, boolean isActive) {
......
m-im/src/main/java/com/yidianling/uikit/business/team/activity/TeamPropertySettingActivity.java
......@@ -99,7 +99,7 @@ public class TeamPropertySettingActivity extends UI {
mToolbarView = findView(R.id.chat_tb);
mToolbarView.setmRightText(getResources().getString(R.string.im_save));
mToolbarView.setRightTextColor(getResources().getColor(R.color.platform_google_green));
mToolbarView.setRightTextColor(getResources().getColor(R.color.platform_main_theme));
mToolbarView.setOnRightTextClick(new TitleBarBottom.OnTitleBarTextClick() {
@Override
public void onClick(View view, boolean isActive) {
......
m-im/src/main/res/drawable/im_bg_radius_topright_blue_8.xml
......@@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topRightRadius="8dp"/>
<solid android:color="@color/platform_google_green" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/im_bg_raduis_up_green.xml
......@@ -7,6 +7,5 @@
android:bottomLeftRadius="0dip"
android:bottomRightRadius="0dip"/><!-- 圆角的半径 也可以统一设置半径 android:radius="9dip"-->
<!-- todo 组件化之后，心理咨询用RGB(63,202,106)-->
<solid android:color="#1da1f2" /> <!-- 没有描边的中间部分 --><!--solid 与 gradient 只能显示在代码最后那个-->
<solid android:color="@color/platform_main_theme" /> <!-- 没有描边的中间部分 --><!--solid 与 gradient 只能显示在代码最后那个-->
</shape>
m-im/src/main/res/drawable/im_chat_model_selected_bg.xml
......@@ -2,12 +2,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/im_main_theme_bright"/>
<solid android:color="@color/platform_main_theme_bright"/>
<corners android:radius="11dp"/>
<stroke
android:width="0.5dp"
android:color="@color/im_main_theme"/>
android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/im_chat_unusual_view_btn_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:endColor="@color/im_main_theme"
android:startColor="@color/im_main_theme_light"/>
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme_light"/>
<corners android:radius="14dp" />
......
m-im/src/main/res/drawable/im_custom_indicator_bg.xml
......@@ -3,6 +3,6 @@
android:shape="rectangle">
<gradient
android:startColor="@color/im_main_theme"
android:endColor="@color/im_main_theme_light"/>
android:startColor="@color/platform_main_theme"
android:endColor="@color/platform_main_theme_light"/>
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/im_customer_card_send_dialog_line.xml
......@@ -4,7 +4,7 @@
<solid android:color="@color/platform_color_D8D8D8" />
<gradient
android:endColor="@color/im_main_theme"
android:startColor="@color/im_main_theme_light" />
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme_light" />
<corners android:bottomRightRadius="8dp" />
</shape>
m-im/src/main/res/drawable/im_message_chat_setting_sure_btn_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:endColor="@color/im_main_theme"
android:startColor="@color/im_main_theme_light"/>
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme_light"/>
<corners android:bottomRightRadius="8dp" />
......
m-im/src/main/res/layout/im_chat_unusual_view.xml
......@@ -29,7 +29,7 @@
android:paddingRight="22dp"
android:text="去咨询"
android:textSize="12dp"
android:textColor="@color/im_but_text_color"
android:textColor="@color/platform_but_text_color"
android:layout_marginTop="20dp"
android:background="@drawable/im_chat_unusual_view_btn_bg"
/>
......
m-im/src/main/res/layout/im_ui_message_custom_consult_perfect_data.xml
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:textSize="12dp"
android:layout_marginLeft="12dp"
android:textColor="@color/platform_google_green"
android:textColor="@color/platform_main_theme"
android:text="提醒完善"/>
</LinearLayout>
......
m-im/src/main/res/layout/im_ui_message_custom_recommand_expert_list.xml
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/tv_msg_receive"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12sp"
tools:text="提醒TA上线"
android:visibility="gone"
......
m-im/src/main/res/layout/im_ui_message_phone_call_system_notice.xml
......@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/tv_msg_receive"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="12sp"
tools:text="邀请开通" />
......
m-im/src/main/res/values/arrays.xml
......@@ -67,7 +67,7 @@
</string-array>
<integer-array name="ydl_colors">
<item>@color/platform_main_theme_blue</item>
<item>@color/platform_main_theme</item>
</integer-array>
</resources>
m-im/src/main/res_uikit/drawable/im_background_chat_collect_info_send.xml
......@@ -4,5 +4,5 @@
<corners android:radius="6dp" />
<solid android:color="@color/platform_color_1DA1F2"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/im_background_chat_confide_order_action.xml
......@@ -5,6 +5,6 @@
<corners android:radius="20dp" />
<gradient
android:endColor="@color/platform_color_1DA1F2"
android:endColor="@color/platform_main_theme"
android:startColor="@color/im_color_3DBEF5" />
</shape>
m-im/src/main/res_uikit/drawable/im_background_chat_confide_order_call_online.xml
......@@ -8,7 +8,7 @@
<stroke
android:width="1dp"
android:color="@color/platform_color_1DA1F2" />
android:color="@color/platform_main_theme" />
</shape>
m-im/src/main/res_uikit/drawable/im_background_collect_info_bottom_start.xml
......@@ -6,7 +6,7 @@
android:radius="20dp" />
<gradient
android:endColor="@color/platform_color_1DA1F2"
android:endColor="@color/platform_main_theme"
android:startColor="#23B2FA" />
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/layout/im_item_collect_info_question_style.xml
......@@ -10,6 +10,6 @@
android:paddingTop="7dp"
android:layout_marginTop="14dp"
android:paddingBottom="7dp"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="15sp"
tools:text="恋爱情感" />
m-im/src/main/res_uikit/layout/im_nim_chat_confide_order_info_view.xml
......@@ -15,7 +15,7 @@
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="倾诉"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="11sp" />
<TextView
......
m-im/src/main/res_uikit/layout/im_nim_ui_title_bar_bottom.xml
......@@ -95,7 +95,7 @@
android:gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:textColor="@color/platform_default_button_bg"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/platform_default_text_size_big"
android:drawablePadding="5dp"
tools:drawableLeft="@drawable/platform_share"
......
m-im/src/main/res_uikit/layout/im_safe_help_remind_dialog_layout.xml
......@@ -44,7 +44,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="取消"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:background="@drawable/im_safe_help_remind_line"
android:textSize="@dimen/im_text_size_16"
android:gravity="center"
......@@ -61,7 +61,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="确定"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/im_text_size_16"
android:gravity="center"
android:background="@drawable/im_safe_help_remind_line"
......
m-im/src/main/res_uikit/layout/im_view_collect_user_infomation.xml
......@@ -111,7 +111,7 @@
android:background="@drawable/im_background_collect_info_bottom_gender"
android:gravity="center"
android:text="男"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="16sp" />
<TextView
......@@ -123,7 +123,7 @@
android:background="@drawable/im_background_collect_info_bottom_gender"
android:gravity="center"
android:text="女"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="16sp" />
</LinearLayout>
......@@ -152,7 +152,7 @@
android:gravity="center"
android:paddingRight="20dp"
android:text="确定"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textSize="17sp" />
<DatePicker
......
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -458,7 +458,7 @@
<!-- android:gravity="center"-->
<!-- android:paddingLeft="5dp"-->
<!-- android:text="即时倾诉"-->
<!-- android:textColor="@color/platform_google_blue"-->
<!-- android:textColor="@color/platform_main_theme"-->
<!-- android:textSize="12dp"-->
<!-- android:textStyle="bold" />-->
......@@ -572,7 +572,7 @@
android:layout_marginStart="11dp"
android:gravity="center_vertical"
android:text="常见问题"
android:textColor="@color/platform_color_1DA1F2"
android:textColor="@color/platform_main_theme"
android:textStyle="bold" />
</RelativeLayout>
......
m-im/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="im_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="im_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="im_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="im_confirm_bg_color">#FFDD33</color>
<!--按钮文字颜色-->
<color name="im_but_text_color">#242424</color>
<!--选择按钮文字颜色-->
<color name="im_sel_but_text_color">#242424</color>
<!--确认按钮提示字体颜色-->
<color name="im_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色-->
<color name="im_filter_content_text_color_en">#242424</color>
<color name="im_filter_content_text_color_un">#555555</color>
<!--私聊按钮背景颜色-->
<color name="im_chat_start_color">#ffd814</color>
<color name="im_chat_end_color">#ffdb26</color>
</resources>
m-im/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="im_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="im_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="im_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="im_confirm_bg_color">#1da1f2</color>
<!--按钮文字颜色-->
<color name="im_but_text_color">#ffffff</color>
<!--选择按钮文字颜色-->
<color name="im_sel_but_text_color">#1da1f2</color>
<!--确认提示颜色-->
<color name="im_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色-->
<color name="im_filter_content_text_color_en">#1da1f2</color>
<color name="im_filter_content_text_color_un">#242424</color>
<!--私聊按钮背景颜色-->
<color name="im_chat_start_color">#23B2FA</color>
<color name="im_chat_end_color">#1DA1F2</color>
</resources>
m-tests/src/main/java/com/yidianling/tests/home/TestHomeActivity.kt
......@@ -8,7 +8,6 @@ import android.support.v7.widget.RecyclerView
import android.text.TextUtils
import android.view.View
import android.widget.LinearLayout
import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.ydl.ydlcommon.base.BaseMvpActivity
......@@ -127,7 +126,7 @@ class TestHomeActivity : BaseMvpActivity<ITestHomeContract.View,ITestHomeContrac
private fun initAdapter() {
swipe_refresh_layout.setOnRefreshListener(this)
swipe_refresh_layout.setColorSchemeColors(ContextCompat.getColor(this, R.color.tests_main_theme))
swipe_refresh_layout.setColorSchemeColors(ContextCompat.getColor(this, R.color.platform_main_theme))
mLayoutManager = LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)
recyclerview.layoutManager = mLayoutManager
if (null == mTestHomeAdapter) {
......
m-tests/src/main/java/com/yidianling/tests/list/view/TestCategoryListActivity.kt
......@@ -306,7 +306,7 @@ class TestCategoryListActivity : BaseMvpActivity<TestListActivityView, TestListA
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
} else {
tv.setTextColor(ContextCompat.getColor(this, R.color.tests_main_theme))
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.tests_ic_arrow_drop_down, 0)
}
}
......
m-tests/src/main/java/com/yidianling/tests/list/view/adapter/CategoryConditionRecyclerViewAdapter.kt
......@@ -34,7 +34,7 @@ class CategoryConditionRecyclerViewAdapter(private val context: Context,
holder.tvSort.text = item.value
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.platform_color_242424))
if (!TextUtils.isEmpty(lastSelectText) && item.value.equals(lastSelectText) && position!=0){
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.tests_main_theme))
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
lastSelectView = holder.tvSort
}
}
......@@ -49,7 +49,7 @@ class CategoryConditionRecyclerViewAdapter(private val context: Context,
lastSelectView?.setTextColor(ContextCompat.getColor(context, R.color.platform_color_242424))
if (adapterPosition != 0){
tvSort.setTextColor(ContextCompat.getColor(context, R.color.tests_main_theme))
tvSort.setTextColor(ContextCompat.getColor(context, R.color.platform_main_theme))
}
if (adapterPosition != RecyclerView.NO_POSITION){
......
m-tests/src/main/res/drawable/tests_bg_btn_big_corner_border_green.xml
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/tests_main_theme" />
<stroke android:width="1dp" android:color="@color/platform_main_theme" />
<corners android:radius="100dp"/>
<solid android:color="#cacaca"/>
</shape>
......@@ -10,7 +10,7 @@
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/tests_main_theme" />
<stroke android:width="1dp" android:color="@color/platform_main_theme" />
<corners android:radius="100dp"/>
<solid android:color="@color/white"/>
</shape>
......
m-tests/src/main/res/drawable/tests_bg_btn_big_corner_green.xml
......@@ -3,14 +3,14 @@
<item android:state_enabled="true" android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="100dp"/>
<solid android:color="@color/tests_main_theme"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="100dp"/>
<solid android:color="@color/tests_main_theme"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-tests/src/main/res/drawable/tests_bg_btn_no_corner_green.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true">
<color android:color="@color/tests_main_theme" />
<color android:color="@color/platform_main_theme" />
</item>
<item android:state_enabled="true" android:state_pressed="false">
<color android:color="@color/tests_main_theme" />
<color android:color="@color/platform_main_theme" />
</item>
</selector>
\ No newline at end of file
m-tests/src/main/res/drawable/tests_progressbar_test.xml
......@@ -8,14 +8,14 @@
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="@color/tests_main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="@color/tests_main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
</clip>
</item>
......
m-tests/src/main/res/drawable/tests_testhome_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/tests_main_theme_light"
android:endColor="@color/tests_main_theme"
android:startColor="@color/platform_main_theme_light"
android:endColor="@color/platform_main_theme"
android:angle="0" />
</shape>
\ No newline at end of file
m-tests/src/main/res/layout/tests_activity_select_conversation.xml
......@@ -8,7 +8,7 @@
<com.ydl.ydlcommon.view.TitleBar
android:layout_width="match_parent"
android:layout_height="@dimen/platform_title_bar_height"
app:pa_left_start_icon_color="@color/tests_main_theme"
app:pa_left_start_icon_color="@color/platform_main_theme"
app:pa_title_text="最新联系人" />
<RelativeLayout
......
m-tests/src/main/res/layout/tests_activity_test_category_list.xml
......@@ -69,7 +69,7 @@
app:pa_tab_height="44dp"
app:pa_tab_indicator_margin="13dp"
app:pa_tab_mode="scrollable"
app:pa_indicator_color="@color/tests_main_theme"
app:pa_indicator_color="@color/platform_main_theme"
/>
<LinearLayout
......
m-tests/src/main/res/layout/tests_activity_test_list.xml
......@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/platform_title_bar_height"
app:pa_bm_line_color="@color/transparent"
app:pa_left_start_icon_color="@color/tests_main_theme"
app:pa_left_start_icon_color="@color/platform_main_theme"
app:pa_right_iv="@drawable/platform_more12x"
app:pa_right_start_icon="@drawable/tests_icon_navsearch_green"
app:pa_title_text="心理测试" />
......@@ -45,9 +45,9 @@
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="40dp"
app:tabIndicatorColor="@color/tests_main_theme"
app:tabIndicatorColor="@color/platform_main_theme"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/tests_main_theme" />
app:tabSelectedTextColor="@color/platform_main_theme" />
<View
android:layout_width="match_parent"
......
m-tests/src/main/res/layout/tests_item_hot_search.xml
......@@ -12,6 +12,6 @@
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:textColor="@color/tests_main_theme"
android:textColor="@color/platform_main_theme"
tools:text="自闭症" />
m-tests/src/main/res/values/styles.xml
......@@ -25,9 +25,9 @@
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/tests_main_theme</item>
<item name="colorPrimaryDark">@color/tests_main_theme</item>
<item name="colorAccent">@color/tests_main_theme</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/platform_main_theme</item>
</style>
</resources>
\ No newline at end of file
m-tests/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="tests_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="tests_main_theme_light">#FCDA42</color>
</resources>
m-tests/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="tests_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="tests_main_theme_light">#56CCF2</color>
</resources>
m-user/src/main/java/com/yidianling/user/mine/AccountHistoryListItemView.java
......@@ -72,7 +72,7 @@ public class AccountHistoryListItemView extends LinearLayout {
//如果是提现的单
if (TextUtils.equals("9", fund.type_int) || TextUtils.equals("10", fund.type_int)) {
if (TextUtils.equals("2", fund.status_int)) {//审核中
tvStatus.setTextColor(getResources().getColor(R.color.user_main_theme));
tvStatus.setTextColor(getResources().getColor(R.color.platform_main_theme));
}
if (!TextUtils.equals("2", fund.status_int) && !TextUtils.equals("5", fund.status_int)) {//未打款成功都算审核失败
tvStatus.setTextColor(getResources().getColor(R.color.user_with_status_fail));
......
m-user/src/main/java/com/yidianling/user/mine/FeedBackActivity.kt
......@@ -96,8 +96,8 @@ class FeedBackActivity : BaseActivity(), View.OnClickListener {
LogUtil.d("final edit phone: $phone")
}
})
tb_title!!.setLeftTextColor(resources.getColor(R.color.user_main_theme))
tb_title!!.setRightTextColor(resources.getColor(R.color.user_main_theme))
tb_title!!.setLeftTextColor(resources.getColor(R.color.platform_main_theme))
tb_title!!.setRightTextColor(resources.getColor(R.color.platform_main_theme))
tv_commit.setOnClickListener {
if (TextUtils.isEmpty(et_input_phone!!.text.toString())) {
ToastUtil.toastShort("请输入联系手机，以便我们及时反馈")
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
......@@ -102,7 +102,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
EventBus.getDefault().register(this);
swipeRefreshLayout = getRootView().findViewById(R.id.swipe_refresh_layout);
swipeRefreshLayout.setColorSchemeColors(ContextCompat.getColor(getContext(), R.color.user_main_theme));
swipeRefreshLayout.setColorSchemeColors(ContextCompat.getColor(getContext(), R.color.platform_main_theme));
swipeRefreshLayout.setProgressViewOffset(false, 0, 200);
img_bg = getRootView().findViewById(R.id.img_bg);
......
m-user/src/main/java/com/yidianling/user/mine/RechargeActivity.java
......@@ -165,7 +165,7 @@ public class RechargeActivity extends BaseActivity {
mChild.get(i).setTextColor(0xff000000);
}
charge_money = Integer.valueOf(prices.get(position).replace("元", ""));
mChild.get(position).setBg(0xff1da1f2);
mChild.get(position).setBg(getResources().getColor(R.color.platform_main_theme));
mChild.get(position).setTextColor(0xffffffff);
});
......
m-user/src/main/java/com/yidianling/user/safePrivate/SetHandUnLockActivity.kt
......@@ -43,7 +43,7 @@ class SetHandUnLockActivity : BaseActivity() {
tipText = findViewById<TextView>(R.id.text_tip) as TextView
lock9 = findViewById<Lock9View>(R.id.lock9View) as Lock9View
titleBar?.setRightTextColor(ContextCompat.getColor(this, R.color.user_main_theme))
titleBar?.setRightTextColor(ContextCompat.getColor(this, R.color.platform_main_theme))
titleBar?.setRightTextVisiable(View.GONE)
titleBar?.setLeftImageListener {
......
m-user/src/main/res/drawable/user_bg_radius_green_20.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"></corners>
<solid android:color="@color/user_main_theme" />
<stroke android:width="1dp" android:color="@color/user_main_theme"/>
<solid android:color="@color/platform_main_theme" />
<stroke android:width="1dp" android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/user_country_list_item_select.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/platform_color_1DA1F2"
<item android:color="@color/platform_main_theme"
android:state_pressed="true"/>
<item android:color="@color/platform_black_deep"
android:state_pressed="false"/>
......
m-user/src/main/res/drawable/user_mine_background_back_text.xml
......@@ -7,6 +7,6 @@
<solid android:color="@color/white" />
<stroke
android:width="1dp"
android:color="@color/user_main_theme" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/user_mine_background_commit_text.xml
......@@ -5,7 +5,7 @@
<corners android:radius="22dp" />
<gradient
android:endColor="@color/platform_color_1DA1F2"
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_color_42C1FF" />
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/user_mine_bg_btn_big_corner_green.xml
......@@ -3,14 +3,14 @@
<item android:state_enabled="true" android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="100dp"/>
<solid android:color="@color/user_main_theme"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="100dp"/>
<solid android:color="@color/user_main_theme"/>
<solid android:color="@color/platform_main_theme"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-user/src/main/res/drawable/user_user_privacy_agree_background.xml
......@@ -3,7 +3,7 @@
<corners android:radius="20dp" />
<gradient
android:endColor="@color/platform_color_1DA1F2"
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_color_42C1FF" />
</shape>
\ No newline at end of file
m-user/src/main/res/layout/user_activity_fill_info.xml
......@@ -72,7 +72,7 @@
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="5dp" />
</LinearLayout>
m-user/src/main/res/layout/user_activity_finger_print_check.xml
......@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="点击进入指纹解锁"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:gravity="center"
android:drawablePadding="20dp"
android:drawableTop="@drawable/user_lock_ico_zhiwen"
......@@ -42,7 +42,7 @@
android:gravity="center"
android:padding="5dp"
android:layout_marginBottom="10dp"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
m-user/src/main/res/layout/user_activity_finger_print_set.xml
......@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="点击进入指纹解锁"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:gravity="center"
android:drawablePadding="20dp"
android:drawableTop="@drawable/user_lock_ico_zhiwen"
......
m-user/src/main/res/layout/user_activity_get_identifying_code.xml
......@@ -73,7 +73,7 @@
android:background="?android:attr/selectableItemBackground"
android:padding="@dimen/platform_default_dis_size"
android:text="重新发送"
android:textColor="@color/user_main_theme" />
android:textColor="@color/platform_main_theme" />
</LinearLayout>
<ImageView
......@@ -132,7 +132,7 @@
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="5dp" />
......
m-user/src/main/res/layout/user_activity_hand_unlock.xml
......@@ -45,7 +45,7 @@
app:pa_lock9_nodeOnSrc="@drawable/user_lock_btn_shoushi_pre"
app:pa_lock9_padding="20dp"
app:pa_lock9_spacing="40dp"
app:pa_lock9_lineColor="@color/user_main_theme"
app:pa_lock9_lineColor="@color/platform_main_theme"
app:pa_lock9_lineWidth="5dp"
app:pa_lock9_autoLink="false"
app:pa_lock9_enableVibrate="true"
......@@ -62,14 +62,14 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:text="忘记手势密码"/>
<TextView
android:id="@+id/text_login"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:gravity="center"
android:text="切换登录方式"/>
</LinearLayout>
......
m-user/src/main/res/layout/user_activity_hand_unlock_set.xml
......@@ -44,7 +44,7 @@
app:pa_lock9_nodeOnSrc="@drawable/user_lock_btn_shoushi_pre"
app:pa_lock9_padding="28dp"
app:pa_lock9_spacing="28dp"
app:pa_lock9_lineColor="@color/user_main_theme"
app:pa_lock9_lineColor="@color/platform_main_theme"
app:pa_lock9_lineWidth="5dp"
app:pa_lock9_autoLink="false"
app:pa_lock9_enableVibrate="true"
......
m-user/src/main/res/layout/user_activity_input_phone.xml
......@@ -106,7 +106,7 @@
android:paddingBottom="@dimen/platform_default_dis_size_micro"
android:paddingTop="@dimen/platform_default_dis_size_micro"
android:text="@string/platform_user_protocol"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/platform_default_text_size_small"/>
</LinearLayout>
......@@ -122,7 +122,7 @@
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="5dp"/>
</LinearLayout>
m-user/src/main/res/layout/user_activity_login.xml
......@@ -94,7 +94,7 @@
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="5dp" />
</LinearLayout>
......@@ -116,7 +116,7 @@
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_huge"
android:text="新手注册"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="17sp"/>
<TextView
......@@ -129,7 +129,7 @@
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_huge"
android:text="短信快捷登录"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="17sp" />
</RelativeLayout>
......
m-user/src/main/res/layout/user_mine_activity_feed_back_success.xml
......@@ -57,7 +57,7 @@
android:background="@drawable/user_mine_background_back_text"
android:gravity="center"
android:text="返回"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="18sp" />
<TextView
......
m-user/src/main/res/layout/user_mine_activity_recharge.xml
......@@ -100,7 +100,7 @@
android:text="下一步"
android:textColor="@color/white"
android:textSize="16sp"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="4dp" />
</LinearLayout>
m-user/src/main/res/layout/user_mine_activity_with_draw.xml
......@@ -121,7 +121,7 @@
android:paddingLeft="15dp"
android:paddingTop="15dp"
android:text="全部提现"
android:textColor="#1da1f2"
android:textColor="@color/platform_color_1DA1F2"
android:textSize="17sp" />
</LinearLayout>
......
m-user/src/main/res/layout/user_mine_ui_recharge_gv.xml
......@@ -20,7 +20,7 @@
app:layout_constraintEnd_toStartOf="@+id/rcb_02"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:pa_round_btn_bg="@color/user_main_theme"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="4dp"
tools:ignore="MissingConstraints" />
......
m-user/src/main/res/values/arrays.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer-array name="user_colors">
<item>@color/user_main_theme</item>
<item>@color/platform_main_theme</item>
</integer-array>
</resources>
\ No newline at end of file
m-user/src/xlzx/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="user_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="user_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="user_main_theme_bright">#fffae0</color>
</resources>
m-user/src/ydl/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="user_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="user_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="user_main_theme_bright">#E8F6FF</color>
</resources>
ydl-platform/src/main/java/com/ydl/ydlcommon/bean/StatusBarOptions.kt
package com.ydl.ydlcommon.bean
import android.os.Build
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.base.BaseApp
/**
* Created by haorui on 2019-08-15.
......@@ -17,7 +19,8 @@ class StatusBarOptions {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return "#FFFFFF"
}
return "#1da1f2"
// return "#"+Integer.toHexString(ContextCompat.getColor(BaseApp.getApp(), R.color.platform_main_theme))
return BaseApp.getApp().resources.getString(0+R.color.platform_main_theme);
}
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/MyToggleButton.java
......@@ -117,7 +117,7 @@ public class MyToggleButton extends View{
}
private void initColor() {
onColor = getResources().getColor(R.color.platform_google_green);
onColor = getResources().getColor(R.color.platform_main_theme);
offColor = getResources().getColor(R.color.platform_gray7);
offBorderColor = getResources().getColor(R.color.platform_gray7);
spotColor = getResources().getColor(R.color.platform_white);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/widgets/TopTabSelectLayout.java
......@@ -103,7 +103,7 @@ public class TopTabSelectLayout extends LinearLayout implements View.OnClickList
mNormalRightBgSourceId = R.drawable.platform_round_right_white;
mPressedTextColorId = R.color.platform_white;
mNormalTextColorId = R.color.platform_main_theme_blue;
mNormalTextColorId = R.color.platform_main_theme;
setSelectIndex(0);
}
......
ydl-platform/src/main/res/drawable/platform_bg_btn_nor.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="3dp" />
<solid android:color="#1da1f2" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_bg_radius_green_20.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="22dp"></corners>
<solid android:color="@color/platform_google_green" />
<stroke android:width="1dp" android:color="@color/platform_google_green"/>
<solid android:color="@color/platform_main_theme" />
<stroke android:width="1dp" android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_bg_radius_line_green_20.xml
......@@ -3,6 +3,6 @@
<corners android:radius="20dp"></corners>
<solid android:color="@color/platform_white" />
<stroke android:width="1dp" android:color="@color/platform_google_green"/>
<stroke android:width="1dp" android:color="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_bg_radius_line_green_5.xml
......@@ -5,5 +5,5 @@
<solid android:color="@color/platform_white" />
<stroke
android:width="1dp"
android:color="@color/platform_main_theme_blue" />
android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_ic_vector_check.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#1da1f2"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"
tools:ignore="VectorRaster" />
</vector>
ydl-platform/src/main/res/drawable/platform_round_left_green.xml
......@@ -6,6 +6,6 @@
android:topLeftRadius="5dp" />
<stroke
android:width="1dp"
android:color="@color/platform_main_theme_blue" />
<solid android:color="@color/platform_main_theme_blue" />
android:color="@color/platform_main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_round_left_white.xml
......@@ -6,6 +6,6 @@
android:bottomLeftRadius="5dp" />
<stroke
android:width="1dp"
android:color="@color/platform_main_theme_blue" />
android:color="@color/platform_main_theme" />
<solid android:color="@color/platform_white" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_round_right_green.xml
......@@ -6,6 +6,6 @@
android:bottomRightRadius="5dp" />
<stroke
android:width="1dp"
android:color="@color/platform_main_theme_blue" />
<solid android:color="@color/platform_main_theme_blue" />
android:color="@color/platform_main_theme" />
<solid android:color="@color/platform_main_theme" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_round_right_white.xml
......@@ -6,6 +6,6 @@
android:topRightRadius="5dp" />
<stroke
android:width="1dp"
android:color="@color/platform_main_theme_blue" />
android:color="@color/platform_main_theme" />
<solid android:color="@color/platform_white" />
</shape>
\ No newline at end of file
ydl-platform/src/main/res/drawable/platform_web_progressbar.xml
......@@ -26,10 +26,10 @@
<gradient
android:angle="0"
android:centerColor="@color/platform_default_button_bg"
android:centerColor="@color/platform_main_theme"
android:centerY="0.75"
android:endColor="@color/platform_default_button_bg"
android:startColor="@color/platform_default_button_bg" />
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme" />
</shape>
</clip>
</item>
......@@ -44,8 +44,8 @@
<gradient
android:angle="0"
android:endColor="@color/platform_default_button_bg"
android:startColor="@color/platform_default_button_bg" />
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme" />
</shape>
</clip>
</item>
......
ydl-platform/src/main/res/layout/platform_dialog_common_layout.xml
......@@ -94,7 +94,7 @@
android:layout_weight="1"
android:background="@color/platform_transparent"
android:text="确定"
android:textColor="@color/baby_blue"
android:textColor="@color/platform_main_theme"
android:textSize="15sp"
android:visibility="gone"
tools:visibility="visible" />
......
ydl-platform/src/main/res/layout/platform_dialog_no_bind_phone.xml
......@@ -34,6 +34,6 @@
android:text="现在绑定"
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_bg="@color/platform_default_button_bg"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="@dimen/platform_default_dis_size_micro" />
</LinearLayout>
\ No newline at end of file
ydl-platform/src/main/res/layout/platform_top_select_layout.xml
......@@ -45,7 +45,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/platform_main_theme_blue"
android:textColor="@color/platform_main_theme"
tools:text="左边" />
<TextView
......@@ -56,7 +56,7 @@
android:gravity="center"
android:textColor="@color/platform_white"
tools:text="右边"
tools:textColor="@color/platform_main_theme_blue" />
tools:textColor="@color/platform_main_theme" />
</LinearLayout>
<RelativeLayout
......
ydl-platform/src/main/res/layout/platform_ui_title_bar.xml
......@@ -74,7 +74,7 @@
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/platform_default_button_bg"
android:textColor="@color/platform_main_theme"
android:textSize="@dimen/platform_default_text_size_big"
tools:drawableLeft="@drawable/platform_common_share"
tools:ignore="RelativeOverlap" />
......
ydl-platform/src/main/res/layout/platform_view_foot_view_more.xml
......@@ -24,7 +24,7 @@
android:layout_gravity="center_horizontal"
android:visibility="gone"
tools:visibility="visible"
android:textColor="@color/platform_google_green"
android:textColor="@color/platform_main_theme"
android:background="@drawable/platform_bg_radius_line_green_20"/>
<TextView
......
ydl-platform/src/main/res/values/colors.xml
......@@ -106,17 +106,11 @@
<color name="platform_msg_system_press">#fff7f7f7</color>
<color name="platform_msg_bg_press">#eeeeeeee</color>
<color name="platform_colorDivider">#ebebeb</color>
<color name="platform_google_red">#ed412c</color>
<color name="platform_google_blue">#1da1f2</color>
<color name="platform_google_yellow">#fdbd00</color>
<color name="platform_google_green">#1da1f2</color>
<color name="platform_google_green_dark">#1da1f2</color>
<color name="platform_color_1DA1F2">#1DA1F2</color>
<color name="platform_new_divide_color">#f0f0f0</color>
<color name="platform_white">#ffffff</color>
<color name="platform_theme_title_bar_color">#FFFFFF</color>
<color name="platform_theme_bg">#FAFAFA</color>
<color name="platform_main_theme_blue">#1da1f2</color>
<color name="platform_default_button_bg">#1da1f2</color>
<color name="platform_default_text_color">#555555</color>
<color name="platform_default_text_color_hint">#333333</color>
<color name="platform_divide_color">#EDEDED</color>
......@@ -161,12 +155,9 @@
<color name="platform_GreyWhite">#F7F7F7</color>
<color name="platform_im_list_select_hover">#dbdbdb</color>
<color name="platform_color_b3b3b3">#b3b3b3</color>
<color name="platform_color_green_disable">#1da1f2</color>
<color name="platform_color_green_00d3a9">#1da1f2</color>
<color name="platform_color_black_b3000000">#b3000000</color>
<color name="platform_color_grey_eaeaea">#eaeaea</color>
<color name="platform_color_blue_3a9efb">#3a9efb</color>
<color name="platform_title_green">#1da1f2</color>
<color name="platform_defult_bg">#f3f3f3</color>
<color name="platform_text_trend_defult">#999999</color>
<color name="platform_text_trend_black">#444444</color>
......@@ -208,9 +199,8 @@
<color name="platform_color_32D296">#32D296</color>
<color name="platform_color_444444">#444444</color>
<color name="platform_color_42C1FF">#42C1FF</color>
<color name="platform_color_1DA1F2">#1DA1F2</color>
<color name="platform_color_151DA1F2">#261DA1F2</color>
<color name="platform_color_242424" tools:ignore="MissingDefaultResource">#242424</color>
<color name="platform_color_242424">#242424</color>
<color name="platform_color_FAFAFA">#FAFAFA</color>
<color name="platform_color_878787">#878787</color>
<color name="platform_color_F7F7F7">#F7F7F7</color>
......@@ -255,4 +245,45 @@
<color name="platform_color_FF3A2F">#FF3A2F</color>
<color name="platform_color_EEEEEE">#EEEEEE</color>
<!-- ============================ 业务组件统一主题颜色 ============================ -->
<!-- ============ 标准颜色 ============ -->
<!--主题色 - 用于TabBar、突出文字、按钮和icon-->
<color name="platform_main_theme">#1da1f2</color>
<!--辅助色 1 - 主色系浅色-->
<color name="platform_main_theme_light">#60BDF5</color>
<!--辅助色 2 - 主色系亮色-->
<color name="platform_main_theme_bright">#E8F6FF</color>
<!-- ============ 背景颜色 ============ -->
<!-- 标签背景色-->
<color name="platform_tag_bg_color">#F7F7F7</color>
<!-- 大面积背景颜色-->
<color name="platform_big_bg_color">#F0F0F0</color>
<!-- 分割线颜色-->
<color name="platform_dividing_line_color">#EBEBEB</color>
<!-- 主题色渐变背景颜色 -->
<color name="platform_main_gradient_start_color">#1DA1F2</color>
<color name="platform_main_gradient_end_color">#23B2FA</color>
<!-- ============ 文字颜色 ============ -->
<!-- 一级类目，标题、点缀文字颜色-->
<color name="platform_text_dark_color">#242424</color>
<!-- 二级类目文字颜色-->
<color name="platform_text_light_color">#666666</color>
<!-- 三级次要文字颜色-->
<color name="platform_text_bright_color">#999999</color>
<!-- 四级编辑框提示文字颜色-->
<color name="platform_text_hint_color">#BFBFBF</color>
<!-- ============ 按钮颜色 ============ -->
<!--确认文字按钮颜色 - 亮色模式下与深色模式相反-->
<color name="platform_but_text_color">#ffffff</color>
<!--按钮字体颜色 - 亮色模式下与深色模式近似-->
<color name="platform_but_text_color_unselected">#242424</color>
<color name="platform_but_text_color_selected">#1da1f2</color>
<color name="consultant_confirm_text_color">#242424</color>
<color name="consultant_filter_content_text_color_un">#555555</color>
<color name="consultant_filter_content_text_color_en">#242424</color>
</resources>
ydl-platform/src/main/res/values/styles.xml
......@@ -11,8 +11,8 @@
</style>
<style name="platform_CommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/platform_main_theme_blue</item>
<item name="colorPrimaryDark">@color/platform_main_theme_blue</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:windowBackground">@color/platform_theme_bg</item>
<item name="android:textSize">@dimen/platform_default_text_size</item>
......@@ -65,9 +65,9 @@
<item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/platform_main_theme_blue</item>
<item name="colorPrimaryDark">@color/platform_main_theme_blue</item>
<item name="colorAccent">@color/platform_main_theme_blue</item>
<item name="colorPrimary">@color/platform_main_theme</item>
<item name="colorPrimaryDark">@color/platform_main_theme</item>
<item name="colorAccent">@color/platform_main_theme</item>
</style>
......
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
......@@ -38,7 +38,6 @@ import com.ydl.utils.PopUtils;
import com.ydl.ydl_router.manager.YDLRouterManager;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.base.BaseApp;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.ui.LogoLoadingView;
import com.ydl.ydlcommon.utils.BuryPointUtils;
......@@ -343,12 +342,6 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
@Override
protected void initDataAndEvent() {
//设置h5页面默认statusbar的颜色
// if (null != getStatusView()) {
// getStatusView().setBackgroundColor(Color.parseColor("#1da1f2"));
// }
getParam();
TellData tellData = (TellData) getIntent().getSerializableExtra("tell_data");
if (tellData == null) {
......@@ -1059,7 +1052,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
private void initHead() {
// header
final MaterialHeader header = new MaterialHeader(this);
int[] colors = new int[]{getResources().getColor(YDLConstants.FROM_YDL.equals(appFrom) ? R.color.platform_google_green : R.color.platform_google_yellow)};
int[] colors = new int[]{getResources().getColor(R.color.platform_main_theme )};
header.setColorSchemeColors(colors);
header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
int padding = (int) getResources().getDimension(R.dimen.platform_default_dis_size);
......
ydl-webview/src/main/java/com/ydl/webview/ProgressWebView.java
......@@ -9,8 +9,8 @@ import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.view.Gravity;
import android.widget.ProgressBar;
import com.tencent.smtt.sdk.WebView;
import com.ydl.ydlcommon.utils.ModularUtils;
/**
* Created by jinkai on 16/5/9.
......@@ -28,7 +28,7 @@ public class ProgressWebView extends WebView {
progressbar.setProgressDrawable(getResources().getDrawable(R.drawable.platform_web_progressbar));
LayerDrawable drawable = (LayerDrawable) progressbar.getProgressDrawable();
GradientDrawable gradientDrawable = new GradientDrawable();
gradientDrawable.setColor(ContextCompat.getColor(context,ModularUtils.Companion.isYDL()? com.ydl.ydlcommon.R.color.platform_google_green : com.ydl.ydlcommon.R.color.platform_google_yellow));
gradientDrawable.setColor(ContextCompat.getColor(context,com.ydl.ydlcommon.R.color.platform_main_theme));
ClipDrawable clipDrawable = new ClipDrawable(gradientDrawable, Gravity.START, ClipDrawable.HORIZONTAL);
drawable.setDrawableByLayerId(android.R.id.progress, clipDrawable);
drawable.setDrawableByLayerId(android.R.id.secondaryProgress, clipDrawable);
......
ydl-webview/src/main/res/drawable/web_progress_bar.xml
......@@ -26,10 +26,10 @@
<gradient
android:angle="0"
android:centerColor="@color/platform_default_button_bg"
android:centerColor="@color/platform_main_theme"
android:centerY="0.75"
android:endColor="@color/platform_default_button_bg"
android:startColor="@color/platform_default_button_bg" />
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme" />
</shape>
</clip>
</item>
......@@ -44,8 +44,8 @@
<gradient
android:angle="0"
android:endColor="@color/platform_default_button_bg"
android:startColor="@color/platform_default_button_bg" />
android:endColor="@color/platform_main_theme"
android:startColor="@color/platform_main_theme" />
</shape>
</clip>
</item>
......
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