提交人：jtm

提交内容:优化显示内容

BusinessAuth/src/main/java/com/develop/auth/ui/MemberForgotFragment.kt

@@ -7,6 +7,8 @@ import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberForgotBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.resId2Dimension
 import com.develop.base.mvvm.BaseBVMFragment
 import com.develop.common.ui.CommonBVMFragment
 import com.drake.net.utils.scopeDialog
@@ -36,6 +38,10 @@ class MemberForgotFragment : CommonBVMFragment<FragmentMemberForgotBinding, Memb
             showPlainDialog()
             viewModel.sendEmail(email)
         }
+
+        if (isNightTheme()){
+            binding.tvSendEmail.textSize = dp10
+        }
         binding.tvResetPassword.setOnClickListener {
             val email = binding.etEmailId.text.toString()
             val captcha = binding.etCaptcha.text.toString()
@@ -62,7 +68,7 @@ class MemberForgotFragment : CommonBVMFragment<FragmentMemberForgotBinding, Memb
             }
         }
     }
-
+    var dp10 = (com.develop.common.R.dimen.convert_10px).resId2Dimension()
     override fun createViewModel(): MemberViewModel {
         return getViewModelOfActivity(MemberViewModel::class.java)
     }

BusinessCommon/src/main/java/com/develop/common/dialog/ShareQRCodeDialog.kt

@@ -6,6 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setGone
 import com.develop.base.ext.src
 import com.develop.base.mvvm.FullScreenTransparentDialog
@@ -39,9 +41,16 @@ class ShareQRCodeDialog : FullScreenTransparentDialog() {
             src = R.drawable.ic_cancel
             background_drawable = R.drawable.bg_icon_cancel
         }
+        if (isNightTheme()) {
+            binding.tvTitle.textSize = dp30
+            binding.tvSubtitle.textSize = dp20
+        }
         return binding.root
     }
 
+    var dp30 = (com.develop.common.R.dimen.convert_20px).resId2Dimension()
+    var dp20 = (com.develop.common.R.dimen.convert_10px).resId2Dimension()
+
     private fun loadQRCode(width: Int, height: Int) {
         ThreadUtils.runOnWorkThread({
             val bitmap = QRCodeUtils.createQRCodeBitmap(recipeNum, width, height)

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

@@ -10,6 +10,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.src
@@ -115,6 +116,12 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
             }
         }
         binding.favouriteLayout.background_drawable = com.develop.common.R.drawable.home_menu_corners
+        if (isNightTheme()){
+            binding.tvFavourite.textSize = dp20
+            binding.tvSetting.textSize = dp20
+            binding.tvHistory.textSize = dp20
+            binding.tvPolicy.textSize = dp20
+        }
     }
 
     private fun initCallbackAndListener() {
@@ -274,6 +281,7 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         var dp1080 = (com.develop.common.R.dimen.convert_1080px).resId2Dimension().toInt()
         var dp160 = (com.develop.common.R.dimen.convert_160px).resId2Dimension().toInt()
         var dp750 = (com.develop.common.R.dimen.convert_750px).resId2Dimension().toInt()
+        var dp20 = (com.develop.common.R.dimen.convert_12px).resId2Dimension()
     }
 
     override fun onResume() {

BusinessMain/src/main/res/layout/activity_home.xml

@@ -57,6 +57,7 @@
                 android:background="@drawable/ic_history" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_history"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/convert_29px"
@@ -84,6 +85,7 @@
                 android:background="@drawable/ic_favourite" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_favourite"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/convert_29px"
@@ -111,6 +113,7 @@
                 android:background="@drawable/ic_setting" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_setting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/convert_29px"
@@ -142,6 +145,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/convert_29px"
                 android:text="@string/privacy_policy"
+                android:id="@+id/tv_policy"
                 android:textColor="@color/home_menu_title"
                 android:textSize="@dimen/convert_30px" />
         </LinearLayout>

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

@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.graphics.drawable.DrawableCompat
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Autowired
@@ -204,7 +205,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                         withString("number", recipeNumber)
                         withBoolean("isLike", isLike)
                         withString("cook_step_detail", cookDetailJson)
-                        withString("portionSizelJson",portionSizelJson)
+                        withString("portionSizelJson", portionSizelJson)
                     }
                 } else if (!viewModel.isDownloading()) {
                     binding.tvDownload.setText(com.develop.common.R.string.downloading)
@@ -215,7 +216,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                     withString("number", recipeNumber)
                     withBoolean("isLike", isLike)
                     withString("cook_step_detail", cookDetailJson)
-                    withString("portionSizelJson",portionSizelJson)
+                    withString("portionSizelJson", portionSizelJson)
                 }
             }
         }
@@ -255,6 +256,13 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             com.develop.common.R.drawable.ic_more_share,
             com.develop.common.R.dimen.convert_60px
         )
+        if (isNightTheme()) {
+            binding.tvMoreScore.textSize = dp5
+            binding.tvMoreDelete.textSize = dp5
+            binding.tvMoreShare.textSize = dp5
+            binding.moreContainer.setPadding(dp20,dp20,0,dp20)
+
+        }
 
         binding.tvMoreScore.setOnClickListener {
             navigateTo(Screens.Cook.COOK_EVALUATE) {
@@ -466,6 +474,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     companion object {
+        var dp5 = (com.develop.common.R.dimen.convert_10px).resId2Dimension()
+        var dp20 = (com.develop.common.R.dimen.convert_20px).resId2Dimension().toInt()
         private const val TAB_SOURCE = 1
         private const val TAB_DESC = 2
         private const val TAB_TOOLS = 3

BusinessStep/src/main/res/layout/activity_cook_detail.xml

@@ -329,6 +329,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
+            android:id="@+id/more_container"
             android:layout_width="@dimen/convert_252px"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/convert_35px"