gg

app/src/main/AndroidManifest.xml

@@ -7,13 +7,12 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Project"
         tools:targetApi="31">
-        <activity
-            android:name=".Activity.AdvertisingPage"
-            android:exported="false" />
         <activity
             android:name=".Activity.MainActivity"
             android:exported="true">
@@ -23,12 +22,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".Activity.RecomendationActivity" />
         <activity android:name=".Activity.WelcomeActivity" />
         <activity android:name=".Activity.LogActivity" />
         <activity android:name=".Activity.RegActivity" />
         <activity android:name=".Activity.HomeActivity" />
         <activity android:name=".Activity.ForgetPasswordActivity" />
         <activity android:name=".Activity.FavoritesActivity" />
+        <activity android:name=".Activity.BestSellerActivity" />
         <activity android:name=".Activity.AdverstsingPageActivity" />
 
         <meta-data

app/src/main/java/com/example/projectfigma/Activity/BestSellerActivity.kt

@@ -0,0 +1,25 @@
+package com.example.projectfigma.Activity
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.projectfigma.Fragments.BottomPanelFragment
+import com.example.projectfigma.R
+import com.example.projectfigma.Util.StatusBar
+import com.example.projectfigma.databinding.ActivityAdvertisingPageBinding
+import com.example.projectfigma.databinding.ActivityBestSellerBinding
+
+class BestSellerActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityBestSellerBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityBestSellerBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        StatusBar.hideStatusBar(window)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+}

app/src/main/java/com/example/projectfigma/Activity/HomeActivity.kt

@@ -1,6 +1,7 @@
 package com.example.projectfigma.Activity
 
 import android.os.Bundle
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -58,6 +59,9 @@ class HomeActivity : AppCompatActivity(),
             }.also { this@HomeActivity.adapter = it }
         }
 
+
+
+
         dao.getBestSellersWithLimit(4).observe(this) { list ->
             adapter.updateList(list)
         }

app/src/main/java/com/example/projectfigma/Activity/RecomendationActivity.kt

@@ -0,0 +1,28 @@
+package com.example.projectfigma.Activity
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.example.projectfigma.Fragments.BottomPanelFragment
+import com.example.projectfigma.R
+import com.example.projectfigma.Util.StatusBar
+import com.example.projectfigma.databinding.ActivityAdvertisingPageBinding
+import com.example.projectfigma.databinding.ActivityRecomendationBinding
+
+class RecomendationActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityRecomendationBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityRecomendationBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        StatusBar.hideStatusBar(window)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+}

app/src/main/java/com/example/projectfigma/Adapters/MainBestSellerAdapter.kt

@@ -0,0 +1,52 @@
+package com.example.projectfigma.Adapters
+
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.projectfigma.Entites.Dishes
+import com.example.projectfigma.R
+
+class MainBestSellerAdapter (private var dishes: List<Dishes>) :
+    RecyclerView.Adapter<MainBestSellerAdapter.DishViewHolder>() {
+
+    inner class DishViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val image: ImageView = itemView.findViewById(R.id.dishImage)
+        val title: TextView = itemView.findViewById(R.id.dishTitle)
+        val description: TextView = itemView.findViewById(R.id.dishDescription)
+        val price: TextView = itemView.findViewById(R.id.dishPrice)
+        val rating: TextView = itemView.findViewById(R.id.tvRating)
+        val category: ImageView = itemView.findViewById(R.id.iconCategory)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DishViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_dish_best_seller, parent, false)
+        return DishViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: DishViewHolder, position: Int) {
+        val dish  = dishes[position]
+
+        // Используем Glide для загрузки изображения
+        Glide.with(holder.itemView.context)
+            .load(Uri.parse(dish.imageUri))
+            .into(holder.image)
+
+        holder.category.setImageResource(dish.category.iconRes)
+        holder.title.text = dish.name
+        holder.description.text = dish.description
+        holder.price.text = "$${dish.price}"
+        holder.rating.text = "${dish.rating}"
+    }
+
+    override fun getItemCount(): Int = dishes.size
+
+    fun updateData(newList: List<Dishes>) {
+        dishes = newList
+        notifyDataSetChanged()
+    }
+}

app/src/main/java/com/example/projectfigma/Adapters/MainRecommendAdapter.kt

@@ -0,0 +1,50 @@
+package com.example.projectfigma.Adapters
+
+import android.net.Uri
+import android.view.View
+import android.view.ViewGroup
+import android.view.LayoutInflater
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.projectfigma.Entites.Dishes
+import com.example.projectfigma.R
+
+class MainRecommendAdapter(
+    private var dishes: List<Dishes>
+) : RecyclerView.Adapter<MainRecommendAdapter.ViewHolder>() {
+
+    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val imgFood: ImageView = view.findViewById(R.id.imgFood)
+        val imgCategory: ImageView = view.findViewById(R.id.imgCategory)
+        val tvTitle: TextView = view.findViewById(R.id.tvTitle)
+        val tvDesc: TextView = view.findViewById(R.id.tvDesc)
+        val tvPrice: TextView = view.findViewById(R.id.tvPrice)
+        val tvRating: TextView = view.findViewById(R.id.tvRating)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val v = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_main_recomend, parent, false)
+        return ViewHolder(v)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val dish = dishes[position]
+
+        Glide.with(holder.itemView.context)
+            .load(Uri.parse(dish.imageUri))
+            .into(holder.imgFood)
+        holder.imgCategory.setImageResource(dish.category.iconRes)
+        holder.tvTitle.text = dish.name
+        holder.tvDesc.text = dish.description
+        holder.tvPrice.text = "$" + dish.price.toString()
+        holder.tvRating.text = dish.rating.toString()
+    }
+
+    override fun getItemCount(): Int = dishes.size
+    fun updateData(newItems: List<Dishes>) {
+        dishes = newItems
+    }
+}

app/src/main/java/com/example/projectfigma/DAO/DishesDao.kt

@@ -40,17 +40,4 @@ interface DishesDao {
 
     @Update
     suspend fun update(item: Dishes)
-
-    //Сортировка по популярности (например, по рейтингу)
-    @Query("SELECT * FROM dishes ORDER BY rating DESC")
-    fun getSortedByRating(): LiveData<List<Dishes>>
-
-    //Сортировка по цене (возрастание)
-    @Query("SELECT * FROM dishes ORDER BY price ASC")
-    fun getSortedByPriceAsc(): LiveData<List<Dishes>>
-
-    //Сортировка по цене (убывание)
-    @Query("SELECT * FROM dishes ORDER BY price DESC")
-    fun getSortedByPriceDesc(): LiveData<List<Dishes>>
-
 }