...

app/src/main/java/com/base/scanqrclear/qr/QrResultsActivity.kt

@@ -39,7 +39,7 @@ import com.base.scanqrclear.utils.BarUtils
 import com.base.scanqrclear.utils.BitmapUtils.saveBitmapToFile
 import com.base.scanqrclear.utils.KotlinExt.toFormatTime6
 import com.base.scanqrclear.utils.LogEx
-import com.base.scanqrclear.utils.OpenFoodDialog.showOpenFoodDialog
+import com.base.scanqrclear.ui.widget.OpenFoodDialog.showOpenFoodDialog
 import com.base.scanqrclear.utils.QRCodeUtils.generateEAN13Barcode
 import com.base.scanqrclear.utils.QRCodeUtils.generateEAN8Barcode
 import com.base.scanqrclear.utils.QRCodeUtils.generateQRCode

app/src/main/java/com/base/scanqrclear/ui/main/CreateFragment.kt

 package com.base.scanqrclear.ui.main
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Intent
 import android.view.View
 import androidx.core.content.ContextCompat
@@ -9,7 +10,6 @@ import com.base.scanqrclear.R
 import com.base.scanqrclear.ads.AdsMgr
 import com.base.scanqrclear.ads.AdsShowCallBack
 import com.base.scanqrclear.base.BaseFragment
-import com.base.scanqrclear.base.goToAc
 import com.base.scanqrclear.bean.FunctionUIBean
 import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_CONTACT
 import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL
@@ -61,6 +61,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
 
     private var functionRvAdapter1: FunctionRvAdapter? = null
     private var functionRvAdapter2: FunctionRvAdapter? = null
+    private var headAdapter: HeadAdapter? = null
 
     private val functions1 by lazy(LazyThreadSafetyMode.NONE) {
         listOf(
@@ -100,6 +101,11 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
 
         binding.rv.adapter = concatAdapter
 
+        headAdapter = HeadAdapter(this).apply {
+            concatAdapter.addAdapter(this)
+            submitList(listOf(""))
+        }
+
         functionRvAdapter1 = FunctionRvAdapter().apply {
             itemClick = ::itemClick
             concatAdapter.addAdapter(this)
@@ -281,9 +287,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
 
     override fun initListener() {
         super.initListener()
-        binding.tvLogo.setOnClickListener {
-            goToAc(ScanAc::class.java)
-        }
+
         binding.tvZodiac.setOnClickListener {
 //            startActivity(Intent(context, WebBrowserActivity::class.java).apply {
 //                putExtra("url", "https://www.horoscope.com/us/index.aspx")
@@ -315,10 +319,13 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
     private fun showGuideScan() {
         val isGuideScan = AppPreferences.getInstance().getBoolean("isGuideScan", false)
         if (isGuideScan) return
-        val activity = requireActivity() as MainActivity?
+        val activity = requireActivity() as Activity?
         activity ?: return
+        val targetView = headAdapter?.guideIv
+        targetView ?: return
+
         val builder = GuideBuilder()
-        builder.setTargetView(binding.ivScan)
+        builder.setTargetView(targetView)
             .setHighTargetGraphStyle(Component.CIRCLE)
             .setAlpha(150)
             .setHighTargetCorner(20)
@@ -330,7 +337,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
             }
 
             override fun onDismiss() {
-                startActivity(Intent(activity, ScanAc::class.java))
+                activity.startActivity(Intent(activity, ScanAc::class.java))
             }
         })
         builder.addComponent(LottieComponent())
@@ -339,4 +346,5 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
         guide.show(activity)
     }
 
+
 }
\ No newline at end of file

app/src/main/java/com/base/scanqrclear/ui/main/HeadAdapter.kt

+package com.base.scanqrclear.ui.main
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.fragment.app.Fragment
+import com.base.scanqrclear.R
+import com.base.scanqrclear.base.goToAc
+import com.base.scanqrclear.databinding.ItemHeadCreateBinding
+import com.base.scanqrclear.ui.adapter.CommonViewHolder
+import com.base.scanqrclear.utils.XmlEx.inflate
+import com.chad.library.adapter4.BaseQuickAdapter
+
+class HeadAdapter(
+    val fragment: Fragment
+) : BaseQuickAdapter<Any, CommonViewHolder>() {
+     var guideIv: ImageView? = null
+    override fun onBindViewHolder(holder: CommonViewHolder, position: Int, item: Any?) {
+        item ?: return
+        val binding = ItemHeadCreateBinding.bind(holder.itemView)
+        guideIv = binding.ivScan
+        binding.tvLogo.setOnClickListener {
+            fragment.goToAc(ScanAc::class.java)
+        }
+    }
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): CommonViewHolder {
+        return CommonViewHolder(R.layout.item_head_create.inflate(parent))
+    }
+
+
+}
\ No newline at end of file

app/src/main/java/com/base/scanqrclear/utils/OpenFoodDialog.kt → app/src/main/java/com/base/scanqrclear/ui/widget/OpenFoodDialog.kt

-package com.base.scanqrclear.utils
+package com.base.scanqrclear.ui.widget
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -37,13 +37,14 @@ object OpenFoodDialog {
         binding.tvName.text = openFoodBean.product_name
         var grade = "NA"
         var gradeDesc = "NA"
-
+        var gradeImage = R.mipmap.grade_a
         if (
             openFoodBean.nutriscore_grade?.contains("A") == true ||
             openFoodBean.nutriscore_grade?.contains("a") == true
         ) {
             grade = "A"
             gradeDesc = "Very good nutritional quality"
+            gradeImage = R.mipmap.grade_a
         }
         if (
             openFoodBean.nutriscore_grade?.contains("B") == true ||
@@ -51,6 +52,7 @@ object OpenFoodDialog {
         ) {
             grade = "B"
             gradeDesc = "Good nutritional quality"
+            gradeImage = R.mipmap.grade_b
         }
         if (
             openFoodBean.nutriscore_grade?.contains("C") == true ||
@@ -58,6 +60,7 @@ object OpenFoodDialog {
         ) {
             grade = "C"
             gradeDesc = "Average nutritional quality"
+            gradeImage = R.mipmap.grade_c
         }
         if (
             openFoodBean.nutriscore_grade?.contains("D") == true ||
@@ -65,6 +68,7 @@ object OpenFoodDialog {
         ) {
             grade = "D"
             gradeDesc = "Poor nutritional quality"
+            gradeImage = R.mipmap.grade_d
         }
         if (
             openFoodBean.nutriscore_grade?.contains("E") == true ||
@@ -72,13 +76,15 @@ object OpenFoodDialog {
         ) {
             grade = "E"
             gradeDesc = "Bad nutritional quality"
+            gradeImage = R.mipmap.grade_e
         }
 
 
         binding.tvGrade.text = "Nutr.comp:$grade"
         binding.tvGradeDesc.text = gradeDesc
+        binding.ivGrade.setImageResource(gradeImage)
 
-        var novaImage = R.drawable.nova_group_1
+        var novaImage = R.mipmap.nova_na
         if (openFoodBean.nova_groups == "1") {
             novaImage = R.drawable.nova_group_1
         }

app/src/main/res/layout/dialog_open_food.xml

@@ -61,28 +61,31 @@
 
             <TextView
                 android:id="@+id/tvGradeDesc"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_marginBottom="13dp"
                 android:textColor="@color/black"
                 android:textSize="15sp"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/ivGrade"
                 app:layout_constraintStart_toStartOf="@id/tvGrade"
                 app:layout_constraintTop_toBottomOf="@id/tvGrade"
                 tools:ignore="HardcodedText"
                 tools:text="Very good nutritional quality" />
 
-
             <ImageView
+                android:id="@+id/ivGrade"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:importantForAccessibility="no"
+                android:src="@mipmap/grade_a"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_create.xml

@@ -28,7 +28,8 @@
         android:textSize="15sp"
         app:drawableStartCompat="@mipmap/x_qing"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/space" />
+        app:layout_constraintTop_toBottomOf="@id/space"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tv_zodiac"
@@ -47,32 +48,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_weather" />
 
-    <LinearLayout
-        android:id="@+id/tv_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_zodiac"
-        tools:ignore="UseCompoundDrawables">
 
-        <ImageView
-            android:id="@+id/ivScan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:src="@mipmap/codescan"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="13dp"
-            android:text="@string/app_name"
-            android:textColor="@color/black"
-            android:textSize="19sp" />
-    </LinearLayout>
 
     <!--    <ImageView-->
     <!--        android:id="@+id/ivVip"-->
@@ -96,7 +72,7 @@
         app:layout_constraintBottom_toTopOf="@id/fl_ad"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_logo" />
+        app:layout_constraintTop_toBottomOf="@id/tv_zodiac" />
 
     <com.base.scanqrclear.ads.NativeParentView
         android:id="@+id/fl_ad"

app/src/main/res/layout/item_head_create.xml

+<?xml version="1.0" encoding="utf-8"?>
+<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="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/tv_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/ivScan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:src="@mipmap/codescan"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="13dp"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="19sp" />
+    </LinearLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file