Skip to content

Y
YDL-Component-Medical
Commit 6299145f by konghaorui
Options

补充未选中渐变颜色主题

parent 48552ba6
Showing with 29 additions and 27 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -8,32 +8,26 @@ import android.content.Intent
import android.content.ServiceConnection
import android.net.Uri
import android.os.IBinder
import android.os.Process
import android.provider.Settings
import android.util.Log
import com.alibaba.android.arouter.facade.annotation.Route
import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent
import com.ydl.audioim.YDLavManager
import com.ydl.component.music.FragmentContainerActivity
import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter
import com.ydl.media.audio.PlayService
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.ydl.ydlcommon.utils.ActivityManager.Companion.finishAll
import com.yidianling.common.tools.ToastUtil
import com.yidianling.fm.api.service.IFMService
import com.yidianling.user.ui.collect.CollectSexAndBirthActivity
import com.yidianling.user.widget.SecretDescriptionDialog
import com.yidianling.user.widget.SecretDescriptionDialog.OnSecretDescriptionDialogListener
import com.yidianling.user.widget.SecretDialog
import com.yidianling.user.widget.SecretDialog.OnSecretDialogListener
import kotlinx.android.synthetic.main.activity_main.*
import com.ydl.ydlcommon.utils.ResUtil.getResources
import android.support.v4.app.SupportActivity
import android.support.v4.app.SupportActivity.ExtraData
import com.ydl.component.mvp.DemoContract
/**
......
app/src/main/res/values/colors.xml
......@@ -32,7 +32,9 @@
<!-- 主题色渐变背景颜色 -->
<color name="platform_main_gradient_start_color">#fdbd00</color>
<color name="platform_main_gradient_end_color">#FFD814</color>
<!-- 主题色渐变未选中背景颜色 -->
<color name="platform_main_gradient_start_color_un">#66fdbd00</color>
<color name="platform_main_gradient_end_color_un">#66FFD814</color>
<!-- ============ 文字颜色 ============ -->
<!-- 一级类目，标题、点缀文字颜色-->
<color name="platform_text_dark_color">#242424</color>
......
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -488,7 +488,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/im_main_theme"
android:textColor="@color/platform_main_theme"
android:textSize="12sp"
tools:text="雷水寿" />
......
m-user/src/main/java/com/yidianling/user/ui/collect/CollectSexAndBirthActivity.kt
......@@ -208,7 +208,7 @@ class CollectSexAndBirthActivity : BaseActivity() {
female_rl.setBackgroundResource(R.drawable.user_collect_unselect_bg)
male_img.setImageResource(R.drawable.user_male_selected)
female_img.setImageResource(R.drawable.user_female_unselected)
male_txt.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
male_txt.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
female_txt.setTextColor(Color.parseColor("#242424"))
sex_and_birth_upload_btn.setBackgroundResource(R.drawable.user_collect_bottom_btn_bg)
......@@ -218,7 +218,7 @@ class CollectSexAndBirthActivity : BaseActivity() {
male_img.setImageResource(R.drawable.user_male_unselected)
female_img.setImageResource(R.drawable.user_female_selected)
male_txt.setTextColor(Color.parseColor("#242424"))
female_txt.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
female_txt.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
sex_and_birth_upload_btn.setBackgroundResource(R.drawable.user_collect_bottom_btn_bg)
} else {
......
m-user/src/main/java/com/yidianling/user/ui/collect/widget/CollectFocusView.kt
......@@ -58,8 +58,8 @@ class CollectFocusView : LinearLayout {
@SuppressLint("ResourceAsColor")
fun setFocus(focus: Boolean) {
if (focus) {
user_focus_title.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
user_focus_desc.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
user_focus_title.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
user_focus_desc.setTextColor(ContextCompat.getColor(mContext, R.color.platform_main_theme))
user_focus_title.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
setBackgroundResource(R.drawable.user_collect_select_bg)
} else {
......
m-user/src/main/res/drawable/user_collect_select_bg.xml
......@@ -5,9 +5,9 @@
<corners android:radius="4dp"/>
<stroke android:width="1dp"
android:color="@color/user_main_theme"/>
android:color="@color/platform_main_theme"/>
<solid
android:color="@color/user_main_theme_bright"/>
android:color="@color/platform_main_theme_bright"/>
</shape>
\ No newline at end of file
m-user/src/main/res/layout/user_activity_focus_layout.xml
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="选择您关注的问题"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textStyle="bold"
android:textSize="28dp"/>
......
m-user/src/main/res/layout/user_activity_sex_birth_layout.xml
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="欢迎来到壹点灵"
android:textColor="@color/user_main_theme"
android:textColor="@color/platform_main_theme"
android:textStyle="bold"
android:textSize="28dp"/>
......
m-user/src/xlzx/res/drawable/user_collect_bottom_btn_bg.xml
......@@ -6,7 +6,7 @@
<gradient
android:angle="180"
android:startColor="@color/user_main_theme"
android:endColor="@color/user_main_theme"/>
android:startColor="@color/platform_main_theme"
android:endColor="@color/platform_main_theme"/>
</shape>
\ No newline at end of file
m-user/src/ydl/res/drawable/user_collect_bottom_btn_bg.xml
......@@ -6,7 +6,7 @@
<gradient
android:angle="180"
android:startColor="#159CEF"
android:endColor="#22BFFF"/>
android:startColor="@color/platform_main_gradient_start_color"
android:endColor="@color/platform_main_gradient_end_color"/>
</shape>
\ No newline at end of file
m-user/src/ydl/res/drawable/user_collect_bottom_btn_un_bg.xml
......@@ -6,7 +6,7 @@
<gradient
android:angle="180"
android:startColor="#66159CEF"
android:endColor="#6622BFFF"/>
android:startColor="@color/platform_main_gradient_start_color_un"
android:endColor="@color/platform_main_gradient_end_color_un"/>
</shape>
\ No newline at end of file
ydl-platform/src/main/res/values/colors.xml
......@@ -102,9 +102,11 @@
<!-- 分割线颜色-->
<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_main_gradient_start_color">#159CEF</color>
<color name="platform_main_gradient_end_color">#22BFFF</color>
<!-- 主题色渐变未选中背景颜色 -->
<color name="platform_main_gradient_start_color_un">#66159CEF</color>
<color name="platform_main_gradient_end_color_un">#6622BFFF</color>
<!--次级按钮背景，和背景冲突时使用，黄色基本不变-->
<color name="platform_specific_bg_color">#FFDD33</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment