Browse Source

提交人:jtm
提交内容:优化UI

江天明 1 year ago
parent
commit
dc725321d5

BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_cookint_note.webp


+ 1 - 0
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -92,6 +92,7 @@ class CookStepActivity : CookStepBaseActivity() {
         } else {
             binding.viewChangeCrush.setBgColor(R.color.white)
             binding.viewChangeWeight.setBgColor(R.color.white)
+            binding.viewNote.setVisible()
         }
 
         binding.controller.clSetTime.onTimePickerCallback =

+ 3 - 3
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -113,9 +113,9 @@ abstract class CookStepBaseActivity :
         binding.tvTitleStep.setOnClickListener {
             showCookDetailDialog()
         }
-//        binding.tvStepName.setOnClickListener {
-//            showCookDetailDialog()
-//        }
+        binding.viewNote.setOnClickListener {
+            showCookDetailDialog()
+        }
         binding.viewRemark.setOnClickListener {
 
             Log.i(

+ 1 - 0
BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -117,6 +117,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun initView() {
+        binding.tvJarCount.visibility = View.INVISIBLE
         val tintList = if (!isNightTheme()) {
             resources.getColorStateList(com.develop.common.R.color.color_cook_tab_tint)
         } else {

+ 11 - 0
BusinessStep/src/main/res/layout/activity_cook_step_base.xml

@@ -55,6 +55,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
+        <View
+            android:id="@+id/view_note"
+            android:layout_width="@dimen/convert_56px"
+            android:layout_height="@dimen/convert_45px"
+            android:background="@drawable/ic_cookint_note"
+            android:visibility="gone"
+            android:layout_marginEnd="@dimen/convert_33px"
+            android:layout_marginTop="@dimen/convert_24px"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView