提交人：jtm

提交内容:优化UI

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -1,6 +1,7 @@
 package com.develop.common.data_repo.db
 
 import android.content.res.Resources
+import com.develop.base.ext.isNightTheme
 import com.develop.common.R
 import com.develop.common.data_repo.db.entity.DevRecipe
 import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
@@ -12,24 +13,48 @@ object DataFactory {
 
     fun createLanguageData(resource: Resources): MutableList<LanguageModel> {
         val languageList = mutableListOf<LanguageModel>()
-        val strList = mutableListOf<String>(
-            resource.getString(R.string.english),
+        val strList = if (isNightTheme()){
+            mutableListOf<String>(
 //            resource.getString(R.string.chinese),
-            resource.getString(R.string.france),
+                resource.getString(R.string.france),
 //            resource.getString(R.string.japan)
-        )
-        val iconList = mutableListOf<Int>(
-            R.drawable.ic_english,
+            )
+        } else {
+            mutableListOf<String>(
+                resource.getString(R.string.english),
+//            resource.getString(R.string.chinese),
+                resource.getString(R.string.france),
+//            resource.getString(R.string.japan)
+            )
+        }
+        val iconList = if (isNightTheme()){
+            mutableListOf<Int>(
+//
+//            R.drawable.ic_chinese,
+            R.drawable.ic_france
+            )
+        } else {
+            mutableListOf<Int>(
+                R.drawable.ic_english,
 //            R.drawable.ic_chinese,
-            R.drawable.ic_france,
+                R.drawable.ic_france,
 //            R.drawable.ic_japan
-        )
-        val typeList = mutableListOf<LanguageType>(
-            LanguageType.English,
+            )
+        }
+        val typeList = if (isNightTheme()){
+            mutableListOf<LanguageType>(
 //            LanguageType.Chinese,
-            LanguageType.France,
+                LanguageType.France
 //            LanguageType.Japan
-        )
+            )
+        } else {
+            mutableListOf<LanguageType>(
+                LanguageType.English,
+//            LanguageType.Chinese,
+                LanguageType.France,
+//            LanguageType.Japan
+            )
+        }
         for (i in strList.indices) {
             languageList.add(LanguageModel(iconList[i], strList[i], typeList[i]))
         }

BusinessCommon/src/main/java/com/develop/common/widget/CircleBgImageView.kt

@@ -13,6 +13,7 @@ class CircleBgImageView @JvmOverloads constructor(
 ) : AppCompatImageView(context, attrs) {
 
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
     init {
         paint.style = Paint.Style.FILL
         context.obtainStyledAttributes(attrs, R.styleable.CircleBgImageView).let {
@@ -25,4 +26,9 @@ class CircleBgImageView @JvmOverloads constructor(
         canvas?.drawCircle(width / 2f, height / 2f, width / 2f, paint)
         super.onDraw(canvas)
     }
+
+    fun setBgColor(color: Int) {
+        paint.color =context.resources.getColor(color)
+        invalidate()
+    }
 }

BusinessSetting/src/main/java/com/develop/setting/ui/PrivacyPolicyActivity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.background_drawable
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.base.scop.runOnMainThread
@@ -67,7 +68,7 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             override fun onFinish() {
                 isFinish = true
                 runOnMainThread {
-                    binding.tvAgree.setBackgroundResource(com.develop.common.R.drawable.shape_60pxf4a12e_corners)
+                    binding.tvAgree.background_drawable = com.develop.common.R.drawable.language_conner
                     binding.tvAgree.text = getString(com.develop.common.R.string.i_agree)
                 }
             }

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -83,8 +83,16 @@ class CookStepActivity : CookStepBaseActivity() {
         super.onCreate(savedInstanceState)
 
         //隐藏称重与电动
-        binding.viewChangeCrush.setGone()
-        binding.viewChangeWeight.setGone()
+//        binding.viewChangeCrush.setGone()
+//        binding.viewChangeWeight.setGone()
+
+        if (!isNightTheme()){
+            binding.viewChangeCrush.setBgColor(R.color.view_change)
+            binding.viewChangeWeight.setBgColor(R.color.view_change)
+        } else {
+            binding.viewChangeCrush.setBgColor(R.color.white)
+            binding.viewChangeWeight.setBgColor(R.color.white)
+        }
 
         binding.controller.clSetTime.onTimePickerCallback =
             object : TimePickerView.OnTimePickerCallback {

skin-support/src/main/res/values/colors.xml

@@ -160,6 +160,6 @@
     <color name="more_bg">#E03E52</color>
     <color name="hide_bg">#fff</color>
     <color name="no_color">#1A1A1A</color>
-    <color name="view_change">#E03E52</color>
+    <color name="view_change">#fff</color>
     <color name="text_hit">#eeeeee</color>
 </resources>