提交人：jtm

提交内容:适配

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -302,12 +302,6 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
     }
 
-    override fun getResources(): Resources {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
-        }
-        return super.getResources()
-    }
 
     override fun onDestroy() {
         super.onDestroy()

BusinessCommon/src/main/java/com/develop/common/utils/ResourceExt.kt

@@ -0,0 +1,74 @@
+package com.develop.common.utils
+
+import android.content.res.ColorStateList
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import androidx.annotation.ColorRes
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.blankj.utilcode.util.Utils
+import org.alee.component.skin.service.ThemeSkinService
+
+/**
+ * 摘要
+ *
+ * <p> 详细描述
+ *
+ * @author MingYu.Liu
+ * created in 2022/9/13
+ *
+ */
+
+
+val @receiver:StringRes Int.stringResource: String
+    get() = Utils.getApp().baseContext.resources.getString(this)
+
+fun @receiver:StringRes Int.stringResource(vararg formats: Any?): String {
+    if (formats.isEmpty()) {
+        return stringResource
+    }
+    return Utils.getApp().baseContext.resources.getString(this, *formats)
+}
+
+/**
+ * 通过id获取图片资源
+ */
+val @receiver:DrawableRes Int.drawableResource: Drawable?
+    get() = mipmapDrawable ?: ThemeSkinService.getInstance().currentThemeSkinPack.getDrawable(this)
+
+val @receiver:DrawableRes Int.mipmapDrawable: Drawable?
+    get() = ThemeSkinService.getInstance().currentThemeSkinPack.getMipmap(this)
+
+
+/**
+ * 通过id获取颜色资源
+ */
+val @receiver:ColorRes Int.colorResource: Int
+    get() = ThemeSkinService.getInstance().currentThemeSkinPack.getColor(this)
+
+val @receiver:ColorRes Int.colorStateListResource: ColorStateList?
+    get() = ThemeSkinService.getInstance().currentThemeSkinPack.getColorStateList(this)
+
+
+/**
+ * 通过id获取颜色图片资源
+ */
+val @receiver:ColorRes Int.colorDrawable
+    get() = ColorDrawable(colorResource)
+
+
+/**
+ * 通过id获取距离
+ */
+val @receiver:DimenRes Int.dimenResource
+    get() = Utils.getApp().baseContext.resources.getDimensionPixelSize(this)
+
+
+/**
+ * 通过id 获取float距离
+ */
+val @receiver:DimenRes Int.floatDimenResource
+    get() = Utils.getApp().baseContext.resources.getDimension(this)
+
+

BusinessCommon/src/main/java/com/develop/common/utils/TextViewExt.kt

@@ -0,0 +1,78 @@
+package com.develop.common.utils
+
+import android.graphics.drawable.Drawable
+import android.widget.TextView
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import com.develop.base.ext.dimenResource
+import com.develop.base.ext.drawableResource
+import com.develop.common.R
+
+/**
+ * 摘要
+ *
+ * <p> 详细描述
+ *
+ * @author MingYu.Liu
+ * created in 2023/1/2
+ *
+ */
+
+
+/**
+ * 为TextView 设置顶部图标
+ * @receiver TextView
+ * @param icon Int 图标资源
+ * @param size Int 图标大小
+ */
+fun TextView.setTopDrawable(@DrawableRes icon: Int, @DimenRes size: Int = R.dimen.convert_24px) {
+    setTopDrawable(icon.drawableResource, size)
+}
+
+/**
+ *
+ * @receiver TextView
+ * @param drawable Drawable? 图标
+ * @param size Int 图标大小
+ */
+fun TextView.setTopDrawable(drawable: Drawable?, @DimenRes size: Int = R.dimen.convert_24px) {
+    setDrawable(top = drawable?.apply {
+        size.dimenResource.run {
+            setBounds(0, 0, this, this)
+        }
+    })
+}
+
+
+/**
+ * 为TextView 设置左侧图标
+ * @receiver TextView
+ * @param icon Int 图标资源
+ * @param size Int 图标大小
+ */
+fun TextView.setLeftDrawable(@DrawableRes icon: Int, @DimenRes size: Int = R.dimen.convert_24px) {
+    setLeftDrawable(icon.drawableResource, size)
+}
+
+/**
+ * 为TextView 设置左侧图标
+ * @receiver TextView
+ * @param drawable Drawable? 图标
+ * @param size Int 图标大小
+ */
+fun TextView.setLeftDrawable(drawable: Drawable?, @DimenRes size: Int = R.dimen.convert_24px) {
+    setDrawable(left = drawable?.apply {
+        size.dimenResource.run {
+            setBounds(0, 0, this, this)
+        }
+    })
+}
+
+fun TextView.setDrawable(
+    left: Drawable? = null,
+    top: Drawable? = null,
+    right: Drawable? = null,
+    bottom: Drawable? = null
+) {
+    setCompoundDrawables(left, top, right, bottom)
+}

BusinessCommon/src/main/res/drawable/bg_icon_cancel.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
 
     <solid android:color="#FFA627"/>
-    <corners android:radius="20dp"/>
+
 
 </shape>

BusinessCommon/src/main/res/drawable/bg_white_button_round20px.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/convert_20px"/>
+    <solid android:color="#FFFFFF"/>
+
+</shape>

BusinessCommon/src/main/res/layout/home_sort_filter_search_view.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bg_color"
     android:paddingStart="@dimen/convert_24px"
     android:paddingEnd="@dimen/convert_24px">
 

BusinessCommon/src/main/res/layout/pop_filter_view.xml

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/ic_pop_bg"
-    android:padding="@dimen/convert_15px">
+    android:id="@+id/pop_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <View
+        android:id="@+id/triangle"
+        android:layout_width="@dimen/convert_70px"
+        android:layout_height="@dimen/convert_40px"
+
+        android:background="@drawable/sanjiaoxing" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:padding="@dimen/convert_15px"
+        android:background="@drawable/bg_white_button_round20px"
         android:id="@+id/filter_recycle"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/convert_40px"

BusinessCommon/src/main/res/values/themes.xml

@@ -4,12 +4,12 @@
     <style name="Theme.FoodCooking" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimaryVariant">@color/bg_color</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorOnSecondary">@color/bg_color</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">#00000000</item>
         <!-- Customize your theme here. -->
@@ -18,7 +18,7 @@
 
     <style name="SplashTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
-        <item name="android:windowBackground">@drawable/splash_logo</item>
+        <item name="android:windowBackground">@drawable/splash_logo_010</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>

BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -15,9 +15,11 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.develop.base.ext.background_color
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.globalApp
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.layout_width
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.text_color
@@ -74,6 +76,10 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
             }.onShowBefore { popupWindow, view ->
                 filterRv = view.findViewById(com.develop.common.R.id.filter_recycle)
+                val triangle:View = view.findViewById(com.develop.common.R.id.triangle)
+                val param = triangle.layoutParams as RelativeLayout.LayoutParams
+                param.marginStart = dp65
+                triangle.layoutParams = param
                 filterRv?.apply {
                     linear()
                     setup {
@@ -94,6 +100,10 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             .intercept { popupWindow, view ->
 
             }.onShowBefore { popupWindow, view ->
+                val triangle:View = view.findViewById(com.develop.common.R.id.triangle)
+                val param = triangle.layoutParams as RelativeLayout.LayoutParams
+                param.addRule(RelativeLayout.CENTER_HORIZONTAL)
+                triangle.layoutParams = param
                 sortRv = view.findViewById(com.develop.common.R.id.filter_recycle)
                 sortRv?.apply {
                     linear()
@@ -144,6 +154,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         sortDataList.addAll(DataFactory.genSortNameList(resources))
 
         binding.rv.apply {
+            background_color = com.develop.common.R.color.bg_color
             setHasFixedSize(true)
             isNestedScrollingEnabled = false
             linear()
@@ -280,7 +291,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
         override fun onSortClick(sortView: View) {
             sortRv?.models = sortDataList
-            sortPopupWindow.showAsDropDown(sortView, -dp24, 0)
+            sortPopupWindow.showAsDropDown(sortView, -dp140, 0)
         }
 
         override fun onSearchClick() {
@@ -586,6 +597,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
         var dp5 = (com.develop.common.R.dimen.convert_5px).resId2Dimension().toInt()
         var dp65 = (com.develop.common.R.dimen.convert_65px).resId2Dimension().toInt()
+        var dp140 = (com.develop.common.R.dimen.convert_140px).resId2Dimension().toInt()
         var dp24 = (com.develop.common.R.dimen.convert_24px).resId2Dimension().toInt()
         var dp21 = (com.develop.common.R.dimen.convert_21px).resId2Dimension().toInt()
         var dp10 = (com.develop.common.R.dimen.convert_10px).resId2Dimension().toInt()

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -24,6 +24,7 @@ import com.develop.common.utils.Resource
 import com.develop.common.dialog.DownloadFailedDialog
 import com.develop.common.dialog.ShareQRCodeDialog
 import com.develop.common.event.RefreshDataEvent
+import com.develop.common.utils.setLeftDrawable
 import com.develop.step.databinding.ActivityCookDetailBinding
 import com.develop.step.viewmodel.CookDetailViewModel
 import java.util.*
@@ -76,8 +77,6 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
 
-
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)
@@ -118,22 +117,22 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun initView() {
-        val tintList = if (!isNightTheme()){
+        val tintList = if (!isNightTheme()) {
             resources.getColorStateList(com.develop.common.R.color.color_cook_tab_tint)
         } else {
             resources.getColorStateList(com.develop.common.R.color.color_night_cook_tab_tint)
         }
         binding.ivTab1.drawable?.apply {
-            DrawableCompat.setTintList(this,tintList)
+            DrawableCompat.setTintList(this, tintList)
         }
         binding.ivTab2.drawable?.apply {
-            DrawableCompat.setTintList(this,tintList)
+            DrawableCompat.setTintList(this, tintList)
         }
         binding.ivTab3.drawable?.apply {
-            DrawableCompat.setTintList(this,tintList)
+            DrawableCompat.setTintList(this, tintList)
         }
         binding.ivTab4.drawable?.apply {
-            DrawableCompat.setTintList(this,tintList)
+            DrawableCompat.setTintList(this, tintList)
         }
 
         if (isLike) {
@@ -145,7 +144,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         binding.viewHide.background_drawable = com.develop.common.R.drawable.hide_bg_conner
         if (cookSource == "local") {
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
-            if (isNightTheme()){
+            if (isNightTheme()) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
             } else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
@@ -224,6 +223,21 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             }
         }
 
+        binding.tvMoreScore.setLeftDrawable(
+            com.develop.common.R.drawable.ic_more_star,
+            com.develop.common.R.dimen.convert_60px
+        )
+
+        binding.tvMoreDelete.setLeftDrawable(
+            com.develop.common.R.drawable.ic_more_delete,
+            com.develop.common.R.dimen.convert_60px
+        )
+
+        binding.tvMoreShare.setLeftDrawable(
+            com.develop.common.R.drawable.ic_more_share,
+            com.develop.common.R.dimen.convert_60px
+        )
+
         binding.tvMoreScore.setOnClickListener {
             navigateTo(Screens.Cook.COOK_EVALUATE) {
                 withString("recipeId", recipeNumber)
@@ -342,13 +356,13 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         binding.tvEasy.text = detail.recipe.difficultyLevel
         binding.startLayout.setCommentNumber(detail.recipe.useNum.toString())
         FoodDataProvider.getUserDatabase().runInTransaction {
-           val result =  FoodDataProvider.getUserDatabase().userInfoDao()
+            val result = FoodDataProvider.getUserDatabase().userInfoDao()
                 .queryUserTag(CURRENT_USER_ID, detail.recipe.number ?: "")
-           runOnUiThread {
-               result?.starCount?.apply {
-                   binding.startLayout.setStarCount(this)
-               }
-           }
+            runOnUiThread {
+                result?.starCount?.apply {
+                    binding.startLayout.setStarCount(this)
+                }
+            }
         }
 //        detail.recipe.score?.let { binding.startLayout.setStarCount(it.toInt()) }
     }
@@ -389,7 +403,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownloadState.setGone()
                 binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
                 binding.viewProgress.setProgress(1f)
-                if (isNightTheme()){
+                if (isNightTheme()) {
                     binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
                 } else {
                     binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))

app/src/main/AndroidManifest.xml

@@ -49,7 +49,7 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.HOME" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>

app/src/main/java/com/develop/foodcooking/MainActivity.kt

@@ -16,8 +16,8 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val isNight = !isNightTheme()
-        ThemeSkinService.getInstance().switchThemeSkin(1)
-        setNightTheme(true)
+        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else 0)
+        setNightTheme(isNight)
         if (MMkvUtils.getBool(FIRST_IN)) {
             navigateTo(Screens.Main.ENTRANCE_CHOSEN)
         } else {

libBase/src/main/java/com/develop/base/mvvm/BaseBindingActivity.kt

@@ -1,5 +1,7 @@
 package com.develop.base.mvvm
 
+import android.content.res.Configuration
+import android.content.res.Resources
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -12,6 +14,8 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.develop.base.util.FragmentKit
 import com.smarx.notchlib.NotchScreenManager
+import me.jessyan.autosize.AutoSize
+import me.jessyan.autosize.AutoSizeCompat
 
 /**
  * 基类activity，绑定viewBinding
@@ -55,6 +59,21 @@ abstract class BaseBindingActivity<T : ViewBinding> : AppCompatActivity() {
         setFullscreen()
     }
 
+    override fun getResources(): Resources {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
+        }
+        return super.getResources()
+    }
+
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            AutoSize.autoConvertDensityOfGlobal(this)
+        }
+    }
+
     /**全屏显示*/
     private fun setFullscreen() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {

skin-support/src/main/res/drawable/bg_icon_cancel.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
 
     <solid android:color="#E03E52"/>
-    <corners android:radius="20dp"/>
 
 </shape>

skin-support/src/main/res/drawable/bg_white_button_round20px.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/convert_20px"/>
+    <solid android:color="#FFFFFF"/>
+
+</shape>

skin-support/src/main/res/drawable/hide_bg_conner.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
 
     <solid android:color="@color/hide_bg"/>
-    <corners android:radius="@dimen/convert_30px"/>
-
 </shape>

skin-support/src/main/res/drawable/home_menu_corners.xml

@@ -4,6 +4,6 @@
     <corners android:radius="@dimen/convert_40px"/>
     <stroke android:width="@dimen/convert_3px"
         android:color="#707070"/>
-    <solid android:color="@color/white" />
+
 
 </shape>

skin-support/src/main/res/drawable/more_bg_conner.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="@color/more_bg"/>
-    <corners android:radius="@dimen/convert_30px"/>
-
+<shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#E03E52"/>
 </shape>

skin-support/src/main/res/drawable/shape_white_round_30px.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="#ffffff"/>
-    <corners android:radius="@dimen/convert_30px"/>
-
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#fff"/>
 </shape>