提交人：jtm

提交内容：修改烹饪步骤布局和称重view

BusinessCommon/src/main/java/com/develop/common/data_repo/FoodDataProvider.kt

@@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLatch
  * 全局管理数据
  */
 object FoodDataProvider {
-    private val SYSTEM_MODE = BuildConfig.DEBUG
+    private val SYSTEM_MODE = !BuildConfig.DEBUG
     private val RES_DST_PARENT = if (SYSTEM_MODE) {
         Environment.getExternalStorageDirectory()
     } else {

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

@@ -0,0 +1,28 @@
+package com.develop.common.widget
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+import com.develop.common.R
+
+class CircleBgImageView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : AppCompatImageView(context, attrs) {
+
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    init {
+        paint.style = Paint.Style.FILL
+        context.obtainStyledAttributes(attrs, R.styleable.CircleBgImageView).let {
+            paint.color = it.getColor(R.styleable.CircleBgImageView_bgColor, Color.TRANSPARENT)
+            it.recycle()
+        }
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        canvas?.drawCircle(width / 2f, height / 2f, width / 2f, paint)
+        super.onDraw(canvas)
+    }
+}

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

@@ -18,7 +18,7 @@ class DownloadProgressView @JvmOverloads constructor(
     private var progress: Float = 1.0f
 
     init {
-        defaultColor = Color.parseColor("#AAAAAA")
+        defaultColor = Color.parseColor("#CCA3A3A2")
     }
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {

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

@@ -18,10 +18,10 @@ class RingControlView @JvmOverloads constructor(
     private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val extraPaint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val ringStrokeWidth = TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP, 13f, context.resources.displayMetrics
+        TypedValue.COMPLEX_UNIT_DIP, 7f, context.resources.displayMetrics
     )
     private val controlDotRadius = TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP, 14f, context.resources.displayMetrics
+        TypedValue.COMPLEX_UNIT_DIP, 8f, context.resources.displayMetrics
     )
     private val ringPadding = (controlDotRadius * 2 - ringStrokeWidth) / 2
     private var progress: Float = 0.5f

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

@@ -21,14 +21,14 @@ class WeightView @JvmOverloads constructor(
     private val path = Path()
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-    private val outlineStrokeWidth = dimenRes(R.dimen.convert_16px).toFloat()
-    private val scaleStrokeWidth = dimenRes(R.dimen.convert_16px).toFloat()
-    private val scaleTopPosition = dimenRes(R.dimen.convert_36px).toFloat()
-    private val scaleBtmPosition = dimenRes(R.dimen.convert_86px).toFloat()
-    private val textPutPosition = dimenRes(R.dimen.convert_150px).toFloat()
-    private val triangleWidth = dimenRes(R.dimen.convert_72px).toFloat()
-    private val triangleHeight = dimenRes(R.dimen.convert_48px).toFloat()
-    private val triangleMargin = dimenRes(R.dimen.convert_10px).toFloat()
+    private val outlineStrokeWidth = dimenRes(R.dimen.convert_9px).toFloat()
+    private val scaleStrokeWidth = dimenRes(R.dimen.convert_4px).toFloat()
+    private val scaleTopPosition = dimenRes(R.dimen.convert_20px).toFloat()
+    private val scaleBtmPosition = dimenRes(R.dimen.convert_50px).toFloat()
+    private val textPutPosition = dimenRes(R.dimen.convert_90px).toFloat()
+    private val triangleWidth = dimenRes(R.dimen.convert_60px).toFloat()
+    private val triangleHeight = dimenRes(R.dimen.convert_30px).toFloat()
+    private val triangleMargin = dimenRes(R.dimen.convert_3px).toFloat()
     private var rotateOffset = 0f
     private val scroller = Scroller(context)
     private val gapCount = 20
@@ -37,9 +37,9 @@ class WeightView @JvmOverloads constructor(
         paint.strokeWidth = outlineStrokeWidth
         textPaint.textSize = TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP,
-            16f, context.resources.displayMetrics
+            14f, context.resources.displayMetrics
         )
-        textPaint.color = Color.parseColor("#999999")
+        textPaint.color = Color.WHITE
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -60,22 +60,19 @@ class WeightView @JvmOverloads constructor(
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        paint.style = Paint.Style.FILL
-        paint.color = Color.parseColor("#d4ffffff")
-        canvas.drawCircle(width / 2f, height.toFloat(), width / 2f, paint)
 
-        paint.color = 0xffe60012.toInt()
+        paint.color = 0xffe60012.toInt() // 三角形指示器
         canvas.drawPath(path, paint)
 
         paint.style = Paint.Style.STROKE
         paint.strokeWidth = outlineStrokeWidth
-        paint.color = Color.parseColor("#aaffffff")
+        paint.color = Color.WHITE
         canvas.drawCircle(width / 2f, height.toFloat(), width / 2f - outlineStrokeWidth / 2f, paint)
-        paint.color = Color.parseColor("#40aaaaaa")
+        paint.color = Color.parseColor("#99ffffff")
         canvas.drawCircle(width / 2f, height.toFloat(), width * 0.25f, paint)
 
         paint.strokeWidth = scaleStrokeWidth
-        paint.color = Color.parseColor("#aaaaaa")
+        paint.color = Color.WHITE
 
         val intervalDegree = 360 / gapCount
         canvas.save()

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#fff"/>
-    <corners android:radius="@dimen/convert_30px"/>
+    <corners android:radius="@dimen/convert_10px"/>
 
 </shape>

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

@@ -2,8 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#ffffff"/>
-    <stroke android:color="#E60012"
-        android:width="@dimen/convert_5px"/>
-    <corners android:radius="@dimen/convert_30px"/>
+    <corners android:radius="@dimen/convert_10px"/>
 
 </shape>

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#ffffff"/>
-    <corners android:radius="@dimen/convert_30px"/>
+    <corners android:radius="@dimen/convert_10px"/>
 
 </shape>

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

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

BusinessCommon/src/main/res/drawable/bg_white_button_round10px.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_10px"/>
+    <solid android:color="#FFFFFF"/>
+
+</shape>

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

@@ -13,11 +13,11 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/cl_layer"
-            android:layout_width="@dimen/convert_780px"
+            android:layout_width="@dimen/convert_500px"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_icon_page"
-            android:paddingTop="@dimen/convert_120px"
-            android:paddingBottom="@dimen/convert_182px"
+            android:paddingTop="@dimen/convert_44px"
+            android:paddingBottom="@dimen/convert_108px"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
         <ImageView

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

@@ -6,47 +6,44 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="#444">
 
-    <RelativeLayout
-        android:layout_width="@dimen/convert_780px"
-        android:layout_height="@dimen/convert_720px"
+    <LinearLayout
+        android:layout_width="@dimen/convert_500px"
+        android:layout_height="@dimen/convert_450px"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
         android:layout_gravity="center"
         android:background="@drawable/bg_icon_page">
 
+        <ImageView
+            android:id="@+id/iv_cancel"
+            android:layout_width="@dimen/convert_110px"
+            android:layout_height="@dimen/convert_110px"
+            android:src="@drawable/ic_cook_step_complete"
+            android:scaleType="fitCenter"
+            android:layout_marginTop="@dimen/convert_72px"/>
+
         <TextView
             android:id="@+id/tv_finish"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/finish"
-            android:textSize="@dimen/convert_90px"
-            android:textColor="#E60012"
+            android:textSize="@dimen/convert_36px"
+            android:textColor="#79C414"
             android:includeFontPadding="false"
-            android:layout_marginTop="@dimen/convert_78px"
-            android:layout_centerHorizontal="true"/>
-
-        <ImageView
-            android:id="@+id/iv_cancel"
-            android:layout_width="@dimen/convert_150px"
-            android:layout_height="@dimen/convert_150px"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_cook_step_complete"
-            android:scaleType="fitCenter"
-            android:layout_below="@+id/tv_finish"
-            android:layout_marginTop="@dimen/convert_98px"/>
+            android:layout_marginTop="@dimen/convert_42px"/>
 
         <TextView
             android:id="@+id/tv_ok"
-            android:layout_width="@dimen/convert_300px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_201px"
+            android:layout_height="@dimen/convert_60px"
             android:background="@drawable/bg_cook_step_ok"
             android:text="@string/ok"
             android:textColor="#ffffff"
             android:gravity="center"
-            android:textSize="@dimen/convert_54px"
-            android:layout_centerHorizontal="true"
-            android:layout_below="@+id/iv_cancel"
-            android:layout_marginTop="@dimen/convert_98px"/>
+            android:textSize="@dimen/convert_30px"
+            android:layout_marginTop="@dimen/convert_64px"/>
 
-    </RelativeLayout>
+    </LinearLayout>
 
 
 </FrameLayout>

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

@@ -6,17 +6,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="#444">
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center">
 
         <LinearLayout
             android:id="@+id/cl_layer"
-            android:layout_width="@dimen/convert_780px"
+            android:layout_width="@dimen/convert_500px"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_icon_page"
-            android:paddingBottom="@dimen/convert_137px"
+            android:paddingBottom="@dimen/convert_64px"
             android:orientation="vertical"
             android:gravity="center_horizontal">
 
@@ -25,44 +25,42 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/warning"
-                android:textSize="@dimen/convert_90px"
+                android:textSize="@dimen/convert_40px"
                 android:textColor="#E60012"
                 android:includeFontPadding="false"
-                android:layout_marginTop="@dimen/convert_95px"
-                android:layout_centerHorizontal="true"/>
+                android:layout_marginTop="@dimen/convert_51px"/>
 
             <ImageView
-                android:layout_width="@dimen/convert_240px"
-                android:layout_height="@dimen/convert_206px"
-                android:layout_centerHorizontal="true"
+                android:layout_width="@dimen/convert_121px"
+                android:layout_height="@dimen/convert_97px"
                 android:src="@drawable/ic_pot_cover"
                 android:scaleType="fitCenter"
                 android:layout_below="@+id/tv_finish"
-                android:layout_marginTop="@dimen/convert_119px"/>
+                android:layout_marginTop="@dimen/convert_43px"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/lid_unlock"
-                android:textSize="@dimen/convert_54px"
+                android:textSize="@dimen/convert_24px"
                 android:textColor="#6B6B6B"
                 android:includeFontPadding="false"
-                android:layout_marginTop="@dimen/convert_99px"
+                android:layout_marginTop="@dimen/convert_30px"
                 android:layout_centerHorizontal="true"/>
 
-        </LinearLayout>
+            <TextView
+                android:id="@+id/iv_cancel"
+                android:layout_width="@dimen/convert_201px"
+                android:layout_height="@dimen/convert_60px"
+                android:background="@drawable/bg_icon_cancel"
+                android:textSize="@dimen/convert_30px"
+                android:textColor="@color/white"
+                android:text="@string/ok"
+                android:gravity="center"
+                android:layout_marginTop="@dimen/convert_41px"/>
 
-        <ImageView
-            android:id="@+id/iv_cancel"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_below="@+id/cl_layer"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_cancel"
-            android:padding="12dp"
-            android:background="@drawable/bg_icon_cancel"
-            android:layout_marginTop="-20dp"/>
+        </LinearLayout>
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </FrameLayout>

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

@@ -7,49 +7,49 @@
     tools:background="#000">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/convert_780px"
-        android:layout_height="@dimen/convert_510px"
+        android:layout_width="@dimen/convert_450px"
+        android:layout_height="@dimen/convert_310px"
         android:layout_gravity="center"
-        android:background="@drawable/bg_white_button">
+        android:background="@drawable/bg_white_button_round10px">
 
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/convert_45px"
+            android:textSize="@dimen/convert_30px"
             android:textColor="#F30101"
             android:text="@string/are_you_sure_to_delete"
-            android:layout_marginTop="@dimen/convert_150px"
+            android:layout_marginTop="@dimen/convert_95px"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <TextView
             android:id="@+id/tv_yes"
-            android:layout_width="@dimen/convert_270px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_140px"
+            android:layout_height="@dimen/convert_60px"
             android:background="@drawable/bg_tare_button"
             android:text="@string/yes"
             android:gravity="center"
             android:textColor="#fff"
-            android:textSize="@dimen/convert_54px"
+            android:textSize="@dimen/convert_30px"
             android:layout_marginStart="@dimen/convert_65px"
-            android:layout_marginBottom="@dimen/convert_71px"
+            android:layout_marginBottom="@dimen/convert_64px"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <TextView
             android:id="@+id/tv_cancel"
-            android:layout_width="@dimen/convert_270px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_140px"
+            android:layout_height="@dimen/convert_60px"
             android:background="@drawable/bg_white_button"
             android:elevation="@dimen/convert_15px"
             android:text="@string/no"
             android:gravity="center"
             android:textColor="#FB900C"
-            android:textSize="@dimen/convert_54px"
+            android:textSize="@dimen/convert_30px"
             android:layout_marginEnd="@dimen/convert_65px"
-            android:layout_marginBottom="@dimen/convert_71px"
+            android:layout_marginBottom="@dimen/convert_64px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 

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

@@ -9,7 +9,7 @@
     <ScrollView
         android:id="@+id/sv_text"
         android:layout_width="match_parent"
-        android:layout_height="506dp"
+        android:layout_height="@dimen/convert_601px"
         android:background="@drawable/bg_cook_detail_dialog"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -17,17 +17,19 @@
             android:id="@+id/tv_details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/convert_39px"
-            android:textColor="#6B6B6B"
+            android:textSize="@dimen/convert_26px"
+            android:textColor="#A3A3A2"
             android:lineSpacingExtra="@dimen/convert_10px"
-            android:paddingHorizontal="@dimen/convert_60px"
-            android:paddingVertical="@dimen/convert_63px"/>
+            android:paddingHorizontal="@dimen/convert_40px"
+            android:paddingVertical="@dimen/convert_40px"/>
 
     </ScrollView>
 
     <ImageView
         android:id="@+id/iv_close"
         style="@style/CloseButton"
+        android:layout_width="@dimen/convert_100px"
+        android:layout_height="@dimen/convert_100px"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/sv_text"

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

@@ -2,18 +2,17 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/convert_16px">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv_jars"
-        android:layout_width="@dimen/convert_474px"
-        android:layout_height="@dimen/convert_90px"
+        android:layout_width="@dimen/convert_360px"
+        android:layout_height="@dimen/convert_88px"
         android:text="1 JARS"
         android:gravity="center"
         android:background="@drawable/bg_amount_item"
         android:textColor="@color/color_amount_text"
-        android:layout_marginTop="@dimen/convert_62px"
+        android:layout_marginTop="@dimen/convert_40px"
         android:layout_gravity="center_horizontal"/>
 
 </FrameLayout>

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

@@ -2,7 +2,7 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_250px"
+    android:layout_height="@dimen/convert_90px"
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="#aaa">
 
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textSize="@dimen/convert_180px"
+        android:textSize="@dimen/convert_72px"
         android:textColor="#ffffff"
         android:includeFontPadding="false"
         tools:text="22"/>

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

@@ -6,10 +6,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/convert_810px"
-        android:layout_height="@dimen/convert_509px"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="@dimen/convert_360px"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/convert_300px"
+        android:layout_marginTop="@dimen/convert_170px"
         android:background="@drawable/bg_cook_note">
 
         <TextView
@@ -17,38 +17,39 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#E60012"
-            android:textSize="@dimen/convert_54px"
+            android:textSize="@dimen/convert_30px"
             android:text="@string/note_title"
-            android:layout_margin="@dimen/convert_50px"
+            android:layout_margin="@dimen/convert_40px"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <View
             android:id="@+id/view_line"
             android:layout_width="@dimen/convert_755px"
-            android:layout_height="@dimen/convert_2px"
-            android:layout_marginTop="@dimen/convert_39px"
-            android:background="#B1B2B2"
+            android:layout_height="@dimen/convert_1px"
+            android:layout_marginTop="@dimen/convert_20px"
+            android:background="#E4E4E4"
+            android:layout_marginHorizontal="@dimen/convert_40px"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_note_title"/>
 
         <View
             android:id="@+id/view_edit"
-            android:layout_width="@dimen/convert_120px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
             android:background="@drawable/ic_note_edit"
-            android:layout_marginEnd="@dimen/convert_48px"
-            android:layout_marginBottom="@dimen/convert_50px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:layout_marginBottom="@dimen/convert_30px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <View
             android:id="@+id/view_complete"
-            android:layout_width="@dimen/convert_120px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
             android:background="@drawable/ic_note_commit"
-            android:layout_marginEnd="@dimen/convert_48px"
+            android:layout_marginEnd="@dimen/convert_26px"
             app:layout_constraintTop_toTopOf="@+id/view_edit"
             app:layout_constraintEnd_toStartOf="@+id/view_edit"/>
 
@@ -56,13 +57,13 @@
             android:id="@+id/et_note"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/convert_44px"
-            android:layout_marginHorizontal="@dimen/convert_50px"
+            android:layout_marginTop="@dimen/convert_20px"
+            android:layout_marginHorizontal="@dimen/convert_40px"
             app:layout_constraintTop_toBottomOf="@+id/view_line"
             app:layout_constraintBottom_toTopOf="@+id/view_complete"
             android:background="@null"
             android:hint="@string/type_your_notes_here"
-            android:textSize="@dimen/convert_45px"
+            android:textSize="@dimen/convert_30px"
             android:textColor="#6B6B6B"
             android:gravity="start"/>
 

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

@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cl_set_time"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/convert_74px"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintVertical_bias="0.36">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="#666">
 
     <TextView
         android:id="@+id/tv_target_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
-        android:paddingBottom="@dimen/convert_50px"
+        android:paddingBottom="@dimen/convert_20px"
         android:text="--05:00--"
         android:textColor="@color/color_fff"
-        android:textSize="@dimen/convert_54px"
+        android:textSize="@dimen/convert_30px"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -30,25 +32,23 @@
         android:includeFontPadding="false"
         android:text=":"
         android:textColor="@color/color_E60012"
-        android:textSize="@dimen/convert_180px"
+        android:textSize="@dimen/convert_72px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_target_time" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/tv_set_time_first"
-        android:layout_width="@dimen/convert_260px"
-        android:layout_height="@dimen/convert_250px"
-        android:layout_marginTop="@dimen/convert_36px"
+        android:layout_width="@dimen/convert_120px"
+        android:layout_height="@dimen/convert_90px"
         app:layout_constraintBottom_toBottomOf="@+id/tv_dot_time"
         app:layout_constraintEnd_toStartOf="@+id/tv_dot_time"
         app:layout_constraintTop_toTopOf="@+id/tv_dot_time" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/tv_set_time_second"
-        android:layout_width="@dimen/convert_260px"
-        android:layout_height="@dimen/convert_250px"
-        android:layout_marginTop="@dimen/convert_36px"
+        android:layout_width="@dimen/convert_120px"
+        android:layout_height="@dimen/convert_90px"
         app:layout_constraintBottom_toBottomOf="@+id/tv_dot_time"
         app:layout_constraintStart_toEndOf="@+id/tv_dot_time"
         app:layout_constraintTop_toTopOf="@+id/tv_dot_time" />
@@ -61,7 +61,7 @@
         android:includeFontPadding="false"
         android:text="min"
         android:textColor="@color/color_E60012"
-        android:textSize="@dimen/convert_54px"
+        android:textSize="@dimen/convert_30px"
         app:layout_constraintEnd_toEndOf="@+id/tv_set_time_first"
         app:layout_constraintStart_toStartOf="@+id/tv_set_time_first"
         app:layout_constraintTop_toBottomOf="@+id/tv_set_time_first" />
@@ -74,7 +74,7 @@
         android:includeFontPadding="false"
         android:text="sec"
         android:textColor="@color/color_E60012"
-        android:textSize="@dimen/convert_54px"
+        android:textSize="@dimen/convert_30px"
         app:layout_constraintEnd_toEndOf="@+id/tv_set_time_second"
         app:layout_constraintStart_toStartOf="@+id/tv_set_time_second"
         app:layout_constraintTop_toBottomOf="@+id/tv_set_time_second" />

BusinessCommon/src/main/res/values-en/strings.xml

@@ -111,8 +111,8 @@
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
+    <string name="turn_right">TURN RIGHT</string>
+    <string name="turn_left">TURN LEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -111,8 +111,8 @@
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
+    <string name="turn_right">TURN RIGHT</string>
+    <string name="turn_left">TURN LEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>

BusinessCommon/src/main/res/values-ja/strings.xml

@@ -111,8 +111,8 @@
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
+    <string name="turn_right">TURN RIGHT</string>
+    <string name="turn_left">TURN LEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -111,8 +111,8 @@
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
+    <string name="turn_right">TURN RIGHT</string>
+    <string name="turn_left">TURN LEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>

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

@@ -14,4 +14,8 @@
     <declare-styleable name="TimePickerView">
         <attr name="time_color" format="color|reference"/>
     </declare-styleable>
+
+    <declare-styleable name="CircleBgImageView">
+        <attr name="bgColor" format="color"/>
+    </declare-styleable>
 </resources>

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

@@ -115,8 +115,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel">CANCEL</string>
     <string name="confirm">CONFIRM</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
+    <string name="turn_right">TURN RIGHT</string>
+    <string name="turn_left">TURN LEFT</string>
     <string name="temperature">TEMPERATURE</string>
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>

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

@@ -293,10 +293,6 @@ abstract class CookStepBaseActivity :
     private fun setPanelViewProperty(selectStep: CookSettingType) {
         binding.controller.apply {
             root.tag = selectStep
-            viewSelectTemp.visibility = View.INVISIBLE
-            viewSelectTime.visibility = View.INVISIBLE
-            viewSelectSpeed.visibility = View.INVISIBLE
-            viewSelectDirection.visibility = View.INVISIBLE
             tvTempValue.isSelected = false
             tvTitleTemp.isSelected = false
             tvSetTime.isSelected = false
@@ -313,30 +309,30 @@ abstract class CookStepBaseActivity :
             viewIconTime.isSelected = false
             viewIconSpeed.isSelected = false
             viewIconDirection.isSelected = false
+            tvCookingTempTarget.isSelected = false
+            tvCookingTimeTarget.isSelected = false
             when (selectStep) {
                 CookSettingType.TEMP_SETTING -> {
-                    viewSelectTemp.visibility = View.VISIBLE
+                    tvCookingTempTarget.isSelected = true
                     tvTempValue.isSelected = true
                     tvTitleTemp.isSelected = true
                     viewBackgroundTemp.isSelected = true
                     viewIconTemp.isSelected = true
                 }
                 CookSettingType.TIME_SETTING -> {
-                    viewSelectTime.visibility = View.VISIBLE
+                    tvCookingTimeTarget.isSelected = true
                     tvSetTime.isSelected = true
                     tvTitleTime.isSelected = true
                     viewBackgroundTime.isSelected = true
                     viewIconTime.isSelected = true
                 }
                 CookSettingType.SPEED_SETTING -> {
-                    viewSelectSpeed.visibility = View.VISIBLE
                     tvSetSpeed.isSelected = true
                     tvTitleSpeed.isSelected = true
                     viewBackgroundSpeed.isSelected = true
                     viewIconSpeed.isSelected = true
                 }
                 CookSettingType.DIRECTION_SETTING -> {
-                    viewSelectDirection.visibility = View.VISIBLE
                     tvSetDirection.isSelected = true
                     tvTitleDirection.isSelected = true
                     viewBackgroundDirection.isSelected = true

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

@@ -117,12 +117,12 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
 //        }
         if (cookSource == "local") {
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
-            binding.viewProgress.setButtonColor(Color.RED)
-            binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_start)
+            binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
+            binding.viewIcon.setGone()
         } else {
             binding.tvDownload.text =
                 getString(com.develop.common.R.string.download).uppercase(Locale.ROOT)
-            binding.viewProgress.setButtonColor(Color.parseColor("#1296db"))
+            binding.viewProgress.setButtonColor(Color.parseColor("#CC1296DB"))
             binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_download)
         }
         hideViews.let {
@@ -222,11 +222,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
 
         binding.viewHide.setOnClickListener {
             hideDetail = !hideDetail
-            if (hideDetail) {
-                binding.viewHide.setBackgroundResource(com.develop.common.R.drawable.ic_detail_hide)
-            } else {
-                binding.viewHide.setBackgroundResource(com.develop.common.R.drawable.ic_detail_show)
-            }
+//            if (hideDetail) {
+//                binding.viewHide.setBackgroundResource(com.develop.common.R.drawable.ic_detail_hide)
+//            } else {
+//                binding.viewHide.setBackgroundResource(com.develop.common.R.drawable.ic_detail_show)
+//            }
             for (view in hideViews) {
                 if (hideDetail) {
                     view.visibility = View.INVISIBLE
@@ -318,7 +318,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownload.text =
                     getString(com.develop.common.R.string.download).uppercase(Locale.ROOT)
                 binding.viewProgress.setProgress(1f)
-                binding.viewProgress.setButtonColor(Color.parseColor("#1296db"))
+                binding.viewProgress.setButtonColor(Color.parseColor("#CC1EABDB"))
                 binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_download)
                 downloadFileDialog.showDialog(supportFragmentManager,"DownloadFailedDialog")
             }
@@ -330,7 +330,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownloadState.setVisible()
                 binding.tvProgress.updateText(updateProgress)
                 binding.viewProgress.setProgress(resource.data!! / 100f)
-                binding.viewProgress.setButtonColor(Color.parseColor("#79C414"))
+                binding.viewProgress.setButtonColor(Color.parseColor("#CC79C414"))
                 binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_download)
             }
             else -> {
@@ -340,8 +340,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownloadState.setGone()
                 binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
                 binding.viewProgress.setProgress(1f)
-                binding.viewProgress.setButtonColor(Color.RED)
-                binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_start)
+                binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
+                binding.viewIcon.setGone()
             }
         }
     }

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

@@ -26,10 +26,10 @@
 
     <ImageView
         android:id="@+id/view_back"
-        android:layout_width="@dimen/convert_46px"
-        android:layout_height="@dimen/convert_46px"
-        android:src="@drawable/ic_white_back"
-        android:padding="@dimen/convert_12px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
+        android:src="@drawable/ic_cook_detail_back"
+        android:padding="@dimen/convert_6px"
         android:layout_marginTop="@dimen/convert_16px"
         android:layout_marginStart="@dimen/convert_26px"
         app:layout_constraintStart_toStartOf="parent"
@@ -187,9 +187,10 @@
             android:layout_width="@dimen/convert_66px"
             android:layout_height="@dimen/convert_66px"
             android:src="@drawable/ic_detail_cook_start"
-            android:layout_marginStart="@dimen/convert_66px"
+            android:visibility="gone"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_download"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
@@ -201,7 +202,8 @@
             android:textColor="#ffffff"
             android:layout_gravity="center_vertical"
             android:text="@string/start_cooking"
-            android:layout_marginEnd="@dimen/convert_26px"
+            android:layout_marginStart="@dimen/convert_21px"
+            app:layout_goneMarginStart="0dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/view_icon"
@@ -309,26 +311,28 @@
         android:elevation="@dimen/convert_20px"
         android:visibility="gone">
 
-        <View
+        <com.develop.common.widget.CircleBgImageView
             android:id="@+id/view_more_close"
-            android:layout_width="@dimen/convert_92px"
-            android:layout_height="@dimen/convert_92px"
-            android:background="@drawable/ic_detail_more"
-            android:layout_marginTop="@dimen/convert_33px"
-            android:layout_marginEnd="@dimen/convert_45px"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
+            android:src="@drawable/ic_cook_detail_window_close"
+            app:bgColor="#E83F97"
+            android:padding="@dimen/convert_10px"
+            android:layout_marginTop="@dimen/convert_52px"
+            android:layout_marginEnd="@dimen/convert_40px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <LinearLayout
-            android:layout_width="@dimen/convert_381px"
+            android:layout_width="@dimen/convert_252px"
             android:layout_height="wrap_content"
-            android:paddingVertical="@dimen/convert_69px"
+            android:paddingVertical="@dimen/convert_40px"
             android:layout_marginEnd="@dimen/convert_53px"
             app:layout_constraintTop_toBottomOf="@+id/view_more_close"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginTop="@dimen/convert_35px"
             android:background="@drawable/bg_cook_detail_more"
-            android:paddingStart="@dimen/convert_63px"
+            android:paddingStart="@dimen/convert_40px"
             android:orientation="vertical">
 
             <TextView
@@ -337,10 +341,10 @@
                 android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_more_star"
                 android:text="@string/score"
-                android:textColor="#6B6B6B"
-                android:textSize="@dimen/convert_54px"
+                android:textColor="#1a1a1a"
+                android:textSize="@dimen/convert_30px"
                 android:gravity="center_vertical"
-                android:drawablePadding="@dimen/convert_29px"/>
+                android:drawablePadding="@dimen/convert_13px"/>
 
             <TextView
                 android:id="@+id/tv_more_share"
@@ -348,11 +352,11 @@
                 android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_more_share"
                 android:text="@string/share"
-                android:textColor="#6B6B6B"
-                android:textSize="@dimen/convert_54px"
+                android:textColor="#1a1a1a"
+                android:textSize="@dimen/convert_30px"
                 android:gravity="center_vertical"
-                android:drawablePadding="@dimen/convert_29px"
-                android:layout_marginTop="@dimen/convert_60px"/>
+                android:drawablePadding="@dimen/convert_13px"
+                android:layout_marginTop="@dimen/convert_40px"/>
 
             <TextView
                 android:id="@+id/tv_more_delete"
@@ -360,11 +364,11 @@
                 android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_more_delete"
                 android:text="@string/delete"
-                android:textColor="#6B6B6B"
-                android:textSize="@dimen/convert_54px"
+                android:textColor="#1a1a1a"
+                android:textSize="@dimen/convert_30px"
                 android:gravity="center_vertical"
-                android:drawablePadding="@dimen/convert_29px"
-                android:layout_marginTop="@dimen/convert_60px"/>
+                android:drawablePadding="@dimen/convert_13px"
+                android:layout_marginTop="@dimen/convert_40px"/>
 
         </LinearLayout>
 

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

@@ -8,14 +8,14 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_132px"
+        android:layout_height="@dimen/convert_100px"
         android:background="#FFA627"
         app:layout_constraintTop_toTopOf="parent">
 
         <View
             android:id="@+id/view_back"
             android:layout_width="@dimen/convert_120px"
-            android:layout_height="@dimen/convert_132px"
+            android:layout_height="@dimen/convert_100px"
             android:background="@drawable/ic_cook_back"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
@@ -23,7 +23,7 @@
         <View
             android:id="@+id/view_progress"
             android:layout_width="0dp"
-            android:layout_height="@dimen/convert_15px"
+            android:layout_height="@dimen/convert_12px"
             app:layout_constraintStart_toEndOf="@+id/view_back"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
@@ -35,23 +35,23 @@
             android:text="Step1:Peel 3 onions(180g)and2..."
             android:gravity="center_vertical"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_45px"
+            android:textSize="@dimen/convert_30px"
             android:maxLines="1"
             android:ellipsize="end"
-            android:layout_marginStart="@dimen/convert_51px"
-            android:layout_marginEnd="@dimen/convert_70px"
+            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_marginEnd="@dimen/convert_50px"
             app:layout_constraintStart_toEndOf="@+id/view_back"
             app:layout_constraintEnd_toStartOf="@+id/view_alarm"/>
 
         <View
             android:id="@+id/view_alarm"
-            android:layout_width="@dimen/convert_75px"
-            android:layout_height="@dimen/convert_59px"
+            android:layout_width="@dimen/convert_56px"
+            android:layout_height="@dimen/convert_45px"
             android:background="@drawable/ic_alarm"
-            android:layout_marginEnd="@dimen/convert_45px"
+            android:layout_marginEnd="@dimen/convert_33px"
+            android:layout_marginTop="@dimen/convert_24px"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -72,47 +72,34 @@
 
     <TextView
         android:id="@+id/tv_step_name"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/convert_479px"
         android:layout_height="wrap_content"
         android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
         android:textColor="#fff"
-        android:layout_marginStart="@dimen/convert_77px"
-        android:layout_marginTop="@dimen/convert_77px"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginEnd="@dimen/convert_99px"
-        android:textSize="@dimen/convert_39px"
+        android:textSize="@dimen/convert_26px"
         android:lineSpacingExtra="10dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/view_remark"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
-
-    <View
-        android:id="@+id/view_remark"
-        android:layout_width="@dimen/convert_122px"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_marginTop="@dimen/convert_47px"
-        android:layout_marginEnd="@dimen/convert_45px"
-        android:background="@drawable/ic_remark"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
 
     <ImageView
         android:id="@+id/iv_prev_step"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:src="@drawable/ic_cook_prev_step"
-        android:layout_marginStart="@dimen/convert_48px"
-        app:layout_constraintVertical_bias="0.4"
+        android:layout_marginStart="@dimen/convert_40px"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
     <ImageView
         android:id="@+id/iv_next_step"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:src="@drawable/ic_cook_next_step"
-        android:layout_marginEnd="@dimen/convert_48px"
-        app:layout_constraintVertical_bias="0.4"
+        android:layout_marginEnd="@dimen/convert_40px"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
@@ -122,14 +109,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         layout="@layout/item_cook_controller"
-        android:layout_marginBottom="@dimen/convert_64px"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <FrameLayout
-        android:id="@+id/fl_cook_details"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -144,9 +123,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_180px"
+            android:textSize="@dimen/convert_72px"
             android:text="50g"
-            android:layout_marginBottom="@dimen/convert_80px"
+            android:layout_marginBottom="@dimen/convert_42px"
             android:includeFontPadding="false"
             android:layout_gravity="center_horizontal"
             app:layout_constraintStart_toStartOf="parent"
@@ -155,22 +134,22 @@
 
         <com.develop.common.widget.WeightView
             android:id="@+id/weight_view"
-            android:layout_width="match_parent"
+            android:layout_width="@dimen/convert_740px"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/convert_83px"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <TextView
             android:id="@+id/tv_weight_tare"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="@dimen/convert_80px"
-            android:paddingVertical="@dimen/convert_20px"
+            android:layout_width="@dimen/convert_197px"
+            android:layout_height="@dimen/convert_80px"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_56px"
+            android:textSize="@dimen/convert_36px"
             android:text="@string/tare"
+            android:gravity="center"
             android:includeFontPadding="false"
-            android:layout_marginBottom="@dimen/convert_66px"
+            android:layout_marginBottom="@dimen/convert_58px"
             android:background="@drawable/bg_tare_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -189,4 +168,47 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
+    <com.develop.common.widget.CircleBgImageView
+        android:id="@+id/view_change_crush"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
+        android:layout_marginTop="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:src="@drawable/ic_cooking_crush_small"
+        app:bgColor="#EE8F08"
+        android:padding="@dimen/convert_10px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
+
+    <com.develop.common.widget.CircleBgImageView
+        android:id="@+id/view_change_weight"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
+        android:layout_marginTop="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:src="@drawable/ic_cooking_weight"
+        app:bgColor="#EE8F08"
+        android:padding="@dimen/convert_10px"
+        app:layout_constraintEnd_toStartOf="@+id/view_change_crush"
+        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
+
+    <com.develop.common.widget.CircleBgImageView
+        android:id="@+id/view_remark"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
+        android:layout_marginTop="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:src="@drawable/ic_cooking_remark"
+        android:padding="@dimen/convert_10px"
+        app:bgColor="@color/white"
+        app:layout_constraintEnd_toStartOf="@+id/view_change_weight"
+        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
+
+    <FrameLayout
+        android:id="@+id/fl_cook_details"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -301,9 +301,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_180px"
+            android:textSize="@dimen/convert_72px"
             android:text="50g"
-            android:layout_marginBottom="@dimen/convert_80px"
+            android:layout_marginBottom="@dimen/convert_42px"
             android:includeFontPadding="false"
             android:layout_gravity="center_horizontal"
             app:layout_constraintStart_toStartOf="parent"
@@ -312,22 +312,22 @@
 
         <com.develop.common.widget.WeightView
             android:id="@+id/weight_view"
-            android:layout_width="match_parent"
+            android:layout_width="@dimen/convert_740px"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/convert_83px"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <TextView
             android:id="@+id/tv_weight_tare"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="@dimen/convert_80px"
-            android:paddingVertical="@dimen/convert_20px"
+            android:layout_width="@dimen/convert_197px"
+            android:layout_height="@dimen/convert_80px"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_56px"
+            android:textSize="@dimen/convert_36px"
             android:text="@string/tare"
+            android:gravity="center"
             android:includeFontPadding="false"
-            android:layout_marginBottom="@dimen/convert_66px"
+            android:layout_marginBottom="@dimen/convert_58px"
             android:background="@drawable/bg_tare_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingHorizontal="@dimen/convert_75px">
+    tools:background="#888">
 
     <com.develop.common.widget.RingControlView
         android:id="@+id/temp_ring_view"
-        android:layout_width="@dimen/convert_500px"
-        android:layout_height="@dimen/convert_500px"
+        android:layout_width="@dimen/convert_270px"
+        android:layout_height="@dimen/convert_270px"
         android:visibility="invisible"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.35"/>
+        app:layout_constraintVertical_bias="0.32" />
 
     <com.develop.common.widget.RingControlView
         android:id="@+id/speed_ring_view"
-        android:layout_width="@dimen/convert_500px"
-        android:layout_height="@dimen/convert_500px"
+        android:layout_width="@dimen/convert_270px"
+        android:layout_height="@dimen/convert_270px"
         android:visibility="invisible"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.35"/>
+        app:layout_constraintVertical_bias="0.32" />
 
     <TextView
         android:id="@+id/tv_speed_text"
@@ -35,7 +34,7 @@
         android:layout_height="wrap_content"
         android:text="2"
         android:textColor="#E60012"
-        android:textSize="@dimen/convert_90px"
+        android:textSize="@dimen/convert_72px"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/speed_ring_view"
         app:layout_constraintEnd_toEndOf="@+id/speed_ring_view"
@@ -47,54 +46,53 @@
         android:id="@+id/tv_ring_temp_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#E60012"
-        android:textSize="@dimen/convert_90px"
         android:text="80°C"
+        android:textColor="#E60012"
+        android:textSize="@dimen/convert_72px"
         android:visibility="gone"
-        tools:visibility="visible"
-        app:layout_constraintStart_toStartOf="@+id/temp_ring_view"
+        app:layout_constraintBottom_toBottomOf="@+id/temp_ring_view"
         app:layout_constraintEnd_toEndOf="@+id/temp_ring_view"
+        app:layout_constraintStart_toStartOf="@+id/temp_ring_view"
         app:layout_constraintTop_toTopOf="@+id/temp_ring_view"
-        app:layout_constraintBottom_toBottomOf="@+id/temp_ring_view"
-        app:layout_constraintVertical_bias="0.45"/>
+        app:layout_constraintVertical_bias="0.45"
+        tools:visibility="visible"/>
 
     <com.develop.common.widget.TimePickerView
         android:id="@+id/cl_set_time"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        tools:background="#aaa"
-        tools:visibility="gone"
-        app:time_color="@color/color_fff"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginBottom="@dimen/convert_387px"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.36"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:time_color="@color/color_fff"
+        tools:background="#aaa"
+        tools:visibility="gone"/>
 
     <TextView
         android:id="@+id/tv_countdown_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/convert_6px"
+        android:text="--05:00--"
         android:textColor="#ffffff"
         android:textSize="@dimen/convert_54px"
-        android:text="--05:00--"
         android:visibility="gone"
-        android:layout_marginBottom="@dimen/convert_6px"
         app:layout_constraintBottom_toTopOf="@+id/cl_set_time"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <FrameLayout
         android:id="@+id/fl_direction"
-        android:layout_width="@dimen/convert_500px"
-        android:layout_height="@dimen/convert_500px"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_width="@dimen/convert_270px"
+        android:layout_height="@dimen/convert_270px"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.36">
+        app:layout_constraintVertical_bias="0.32">
 
         <ImageView
             android:id="@+id/iv_direction"
@@ -111,12 +109,12 @@
                 android:id="@+id/tv_turn_right"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:paddingStart="@dimen/convert_60px"
-                android:layout_weight="1"
                 android:text="@string/turn_left"
                 android:textColor="@color/color_E60012"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_20px" />
 
             <TextView
                 android:id="@+id/tv_turn_left"
@@ -124,309 +122,280 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:paddingEnd= "@dimen/convert_60px"
+                android:paddingEnd="@dimen/convert_60px"
                 android:text="@string/turn_right"
                 android:textColor="@color/color_E5E5E5"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_20px" />
         </LinearLayout>
 
     </FrameLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_cook_temp"
-        android:layout_width="@dimen/convert_210px"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/convert_280px"
+        android:layout_height="@dimen/convert_140px"
+        android:layout_marginBottom="@dimen/convert_190px"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/temp_ring_view"
-        app:layout_constraintBottom_toTopOf="@+id/btn_start">
-
-        <com.develop.common.widget.TriangleView
-            android:id="@+id/view_select_temp"
-            android:layout_width="@dimen/convert_72px"
-            android:layout_height="@dimen/convert_42px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintEnd_toStartOf="@+id/cl_cook_time">
 
         <View
             android:id="@+id/view_background_temp"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_330px"
-            app:layout_constraintTop_toBottomOf="@+id/view_select_temp"
-            android:background="@drawable/bg_cook_item_selected"/>
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_cook_item_selected" />
 
         <TextView
             android:id="@+id/tv_temp_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/convert_21px"
+            android:layout_marginBottom="@dimen/convert_8px"
+            android:includeFontPadding="false"
             android:text="80°C"
             android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_54px"
-            android:layout_marginTop="@dimen/convert_45px"
-            android:includeFontPadding="false"
-            app:layout_constraintTop_toTopOf="@+id/view_background_temp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:textSize="@dimen/convert_40px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
             android:id="@+id/view_icon_temp"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:src="@drawable/ic_cook_temp"
+            android:layout_width="@dimen/convert_42px"
+            android:layout_height="@dimen/convert_42px"
+            android:layout_marginStart="@dimen/convert_11px"
+            android:layout_marginTop="@dimen/convert_17px"
             android:scaleType="fitCenter"
-            android:layout_marginBottom="@dimen/convert_70px"
+            android:src="@drawable/ic_cook_temp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:tint="@color/cook_panel_text" />
 
         <TextView
             android:id="@+id/tv_title_temp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/convert_47px"
             android:text="@string/temperature"
-            android:textSize="@dimen/convert_27px"
             android:textColor="@color/cook_panel_text"
-            android:layout_marginTop="@dimen/convert_8px"
-            app:layout_constraintTop_toBottomOf="@+id/view_icon_temp"
+            android:textSize="@dimen/convert_26px"
+            app:layout_constraintBottom_toBottomOf="@+id/view_icon_temp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toTopOf="@+id/view_icon_temp" />
 
         <TextView
             android:id="@+id/tv_cooking_temp_target"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FFA627"
+            android:layout_marginStart="@dimen/convert_25px"
+            android:layout_marginTop="@dimen/convert_16px"
+            android:layout_marginBottom="@dimen/convert_11px"
             android:text="--80°C--"
-            android:textSize="@dimen/convert_36px"
+            android:textColor="@color/cook_panel_text"
+            android:textSize="@dimen/convert_24px"
             android:visibility="visible"
-            android:layout_marginTop="@dimen/convert_16px"
-            app:layout_constraintTop_toBottomOf="@+id/tv_temp_value"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_cook_time"
-        android:layout_width="@dimen/convert_210px"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toEndOf="@+id/cl_cook_temp"
+        android:layout_width="@dimen/convert_280px"
+        android:layout_height="@dimen/convert_140px"
         app:layout_constraintEnd_toStartOf="@+id/cl_cook_speed"
+        app:layout_constraintStart_toEndOf="@+id/cl_cook_temp"
         app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
 
-        <com.develop.common.widget.TriangleView
-            android:id="@+id/view_select_time"
-            android:layout_width="@dimen/convert_72px"
-            android:layout_height="@dimen/convert_42px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
         <View
             android:id="@+id/view_background_time"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_330px"
-            app:layout_constraintTop_toBottomOf="@+id/view_select_time"
-            android:background="@drawable/bg_cook_item_selected"/>
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_cook_item_selected" />
 
         <TextView
             android:id="@+id/tv_set_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/convert_21px"
+            android:layout_marginBottom="@dimen/convert_8px"
+            android:includeFontPadding="false"
             android:text="00:60"
             android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_54px"
-            android:includeFontPadding="false"
-            android:layout_marginTop="@dimen/convert_45px"
-            app:layout_constraintTop_toTopOf="@+id/view_background_time"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:textSize="@dimen/convert_40px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
             android:id="@+id/view_icon_time"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:src="@drawable/ic_cook_time"
+            android:layout_width="@dimen/convert_42px"
+            android:layout_height="@dimen/convert_42px"
+            android:layout_marginStart="@dimen/convert_20px"
+            android:layout_marginTop="@dimen/convert_17px"
             android:scaleType="fitCenter"
-            android:layout_marginBottom="@dimen/convert_68px"
+            android:src="@drawable/ic_cook_time"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:tint="@color/cook_panel_text" />
 
         <TextView
             android:id="@+id/tv_title_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/convert_70px"
             android:text="@string/time"
-            android:textSize="@dimen/convert_27px"
             android:textColor="@color/cook_panel_text"
-            android:layout_marginTop="@dimen/convert_8px"
-            app:layout_constraintTop_toBottomOf="@+id/view_icon_time"
+            android:textSize="@dimen/convert_26px"
+            app:layout_constraintBottom_toBottomOf="@+id/view_icon_time"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toTopOf="@+id/view_icon_time" />
 
         <TextView
             android:id="@+id/tv_cooking_time_target"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FFA627"
-            android:text="--05:00--"
-            android:textSize="@dimen/convert_36px"
+            android:layout_marginStart="@dimen/convert_25px"
             android:layout_marginTop="@dimen/convert_16px"
-            android:visibility="visible"
-            app:layout_constraintTop_toBottomOf="@+id/tv_set_time"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:layout_marginBottom="@dimen/convert_11px"
+            android:text="--05:00--"
+            android:textColor="@color/cook_panel_text"
+            android:textSize="@dimen/convert_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_cook_speed"
-        android:layout_width="@dimen/convert_210px"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toEndOf="@+id/cl_cook_time"
+        android:layout_width="@dimen/convert_280px"
+        android:layout_height="@dimen/convert_140px"
         app:layout_constraintEnd_toStartOf="@+id/cl_cook_direction"
+        app:layout_constraintStart_toEndOf="@+id/cl_cook_time"
         app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
 
-        <com.develop.common.widget.TriangleView
-            android:id="@+id/view_select_speed"
-            android:layout_width="@dimen/convert_72px"
-            android:layout_height="@dimen/convert_42px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
         <View
             android:id="@+id/view_background_speed"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_330px"
-            app:layout_constraintTop_toBottomOf="@+id/view_select_speed"
-            android:background="@drawable/bg_cook_item_selected"/>
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_cook_item_selected" />
 
         <TextView
             android:id="@+id/tv_set_speed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/convert_21px"
+            android:layout_marginBottom="@dimen/convert_8px"
+            android:includeFontPadding="false"
             android:text="2"
             android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_54px"
-            android:layout_marginTop="@dimen/convert_45px"
-            android:includeFontPadding="false"
-            app:layout_constraintTop_toTopOf="@+id/view_background_speed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:textSize="@dimen/convert_40px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
             android:id="@+id/view_icon_speed"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:src="@drawable/ic_cook_quick"
+            android:layout_width="@dimen/convert_46px"
+            android:layout_height="@dimen/convert_46px"
+            android:layout_marginStart="@dimen/convert_20px"
+            android:layout_marginTop="@dimen/convert_13px"
             android:scaleType="fitCenter"
-            android:layout_marginBottom="@dimen/convert_70px"
+            android:src="@drawable/ic_cook_quick"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="@color/cook_panel_text"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/cook_panel_text" />
 
         <TextView
             android:id="@+id/tv_title_speed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/convert_70px"
             android:text="@string/speed"
-            android:textSize="@dimen/convert_27px"
             android:textColor="@color/cook_panel_text"
-            android:layout_marginTop="@dimen/convert_8px"
-            app:layout_constraintTop_toBottomOf="@+id/view_icon_speed"
+            android:textSize="@dimen/convert_26px"
+            app:layout_constraintBottom_toBottomOf="@+id/view_icon_speed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toTopOf="@+id/view_icon_speed" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_cook_direction"
-        android:layout_width="@dimen/convert_210px"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/convert_280px"
+        android:layout_height="@dimen/convert_140px"
+        app:layout_constraintStart_toEndOf="@+id/cl_cook_speed"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
 
-        <com.develop.common.widget.TriangleView
-            android:id="@+id/view_select_direction"
-            android:layout_width="@dimen/convert_72px"
-            android:layout_height="@dimen/convert_42px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
         <View
             android:id="@+id/view_background_direction"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_330px"
-            app:layout_constraintTop_toBottomOf="@+id/view_select_direction"
-            android:background="@drawable/bg_cook_item_selected"/>
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_cook_item_selected" />
 
         <TextView
             android:id="@+id/tv_set_direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:includeFontPadding="false"
             android:text="@string/turn_right"
             android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_36px"
-            android:layout_marginTop="@dimen/convert_45px"
-            android:includeFontPadding="false"
-            app:layout_constraintTop_toTopOf="@+id/view_background_direction"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:textSize="@dimen/convert_30px"
+            android:layout_marginEnd="@dimen/convert_24px"
+            android:layout_marginBottom="@dimen/convert_8px"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageView
             android:id="@+id/view_icon_direction"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:src="@drawable/ic_cook_rotate"
+            android:layout_width="@dimen/convert_42px"
+            android:layout_height="@dimen/convert_42px"
+            android:layout_marginStart="@dimen/convert_22px"
+            android:layout_marginTop="@dimen/convert_17px"
             android:scaleType="fitCenter"
-            android:layout_marginBottom="@dimen/convert_70px"
+            android:src="@drawable/ic_cook_rotate"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:tint="@color/cook_panel_text"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/cook_panel_text" />
 
         <TextView
             android:id="@+id/tv_title_direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/convert_70px"
             android:text="@string/direction"
-            android:textSize="@dimen/convert_27px"
             android:textColor="@color/cook_panel_text"
-            android:layout_marginTop="@dimen/convert_8px"
-            app:layout_constraintTop_toBottomOf="@+id/view_icon_direction"
+            android:textSize="@dimen/convert_26px"
+            app:layout_constraintBottom_toBottomOf="@+id/view_icon_direction"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toTopOf="@+id/view_icon_direction" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/btn_start"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="@dimen/convert_98px"
+        android:layout_marginBottom="@dimen/convert_50px"
         android:background="@drawable/bg_orange_button"
+        android:gravity="center"
         android:text="@string/start"
         android:textColor="#ffffff"
-        android:textSize="@dimen/convert_54px"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/convert_42px"
-        app:layout_constraintBottom_toTopOf="@+id/btn_reset"/>
+        android:textSize="@dimen/convert_36px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btn_reset"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/btn_reset"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="@dimen/convert_98px"
+        android:layout_marginBottom="@dimen/convert_50px"
         android:background="@drawable/bg_white_button"
+        android:gravity="center"
         android:text="@string/reset_button"
         android:textColor="#FFA627"
-        android:textSize="@dimen/convert_54px"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/convert_71px"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        android:textSize="@dimen/convert_36px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/btn_start" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>