New updates

app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
         <activity android:name=".Activity.RegActivity"/>
         <activity android:name=".Activity.HomeActivity"/>
         <activity android:name=".Activity.ForgetPasswordActivity"/>
+        <activity android:name=".Activity.FavoritesActivity"/>
 
         <meta-data
             android:name="preloaded_fonts"

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

@@ -0,0 +1,33 @@
+package com.example.projectfigma.Activity
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.projectfigma.DataBase.DataBase
+import com.example.projectfigma.Fragments.BottomPanelFragment
+import com.example.projectfigma.R
+import com.example.projectfigma.Util.StatusBar
+import com.example.projectfigma.databinding.ActivityFavoritesBinding
+
+class FavoritesActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityFavoritesBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityFavoritesBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        StatusBar.hideStatusBar(window)
+
+        val dateBase = DataBase.getDb(this)
+
+        val rv = findViewById<RecyclerView>(R.id.rvFoods).apply {
+            layoutManager = GridLayoutManager(context, 2)
+        }
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+}

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

@@ -8,10 +8,10 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.projectfigma.Adapters.BestSellerAdapter
-import com.example.projectfigma.DAO.BestSellerDao
+import com.example.projectfigma.DAO.DishesDao
 import com.example.projectfigma.DAO.UserDao
 import com.example.projectfigma.DataBase.DataBase
-import com.example.projectfigma.Entites.BestSeller
+import com.example.projectfigma.Entites.Dishes
 import com.example.projectfigma.Entites.User
 import com.example.projectfigma.Fragments.*
 import com.example.projectfigma.R
@@ -21,11 +21,11 @@ class HomeActivity : AppCompatActivity(),
     HeaderButtonsFragment.Listener {
 
     private lateinit var adapter: BestSellerAdapter
-    private lateinit var dao: BestSellerDao
+    private lateinit var dao: DishesDao
     private lateinit var userDao: UserDao
     private lateinit var drawer: DrawerLayout
 
-    private lateinit var user: User
+    private var user: User? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,7 +35,7 @@ class HomeActivity : AppCompatActivity(),
         drawer = findViewById(R.id.drawer_layout)
 
         val db = DataBase.getDb(this)
-        dao = db.getBestSellerDao()
+        dao = db.getDishesDao()
         userDao = db.getUserDao()
 
         val email = intent.getStringExtra("user_email")
@@ -49,7 +49,7 @@ class HomeActivity : AppCompatActivity(),
                 LinearLayoutManager.HORIZONTAL,
                 false
             )
-            adapter = BestSellerAdapter(emptyList()) { item: BestSeller ->
+            adapter = BestSellerAdapter(emptyList()) { item: Dishes ->
                 Toast.makeText(
                     this@HomeActivity,
                     "Clicked: ${item.price}",
@@ -58,7 +58,7 @@ class HomeActivity : AppCompatActivity(),
             }.also { this@HomeActivity.adapter = it }
         }
 
-        dao.getAllV().observe(this) { list ->
+        dao.getBestSellersWithLimit(4).observe(this) { list ->
             adapter.updateList(list)
         }
 
@@ -89,8 +89,8 @@ class HomeActivity : AppCompatActivity(),
             .commitNow()
 
         profileMenu.setUserData(
-            name = user.name,
-            email = user.gmail,
+            name = user?.name.takeUnless { it.isNullOrBlank() } ?: "Гость",
+            email = user?.gmail.takeUnless { it.isNullOrBlank() } ?: "Не указано",
             avatarRes = R.drawable.ic_profile_placeholder
         )
 

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

@@ -7,19 +7,19 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.projectfigma.Entites.BestSeller
+import com.example.projectfigma.Entites.Dishes
 import com.example.projectfigma.R
 
 class BestSellerAdapter(
-    private var items: List<BestSeller>,
-    private val onClick: (BestSeller) -> Unit
+    private var items: List<Dishes>,
+    private val onClick: (Dishes) -> Unit
 ) : RecyclerView.Adapter<BestSellerAdapter.VH>() {
 
     inner class VH(view: View) : RecyclerView.ViewHolder(view) {
         private val ivFood: ImageView = view.findViewById(R.id.ivFood)
         private val tvPrice: TextView = view.findViewById(R.id.tvPrice)
 
-        fun bind(item: BestSeller) {
+        fun bind(item: Dishes) {
             tvPrice.text = String.format("$%.2f", item.price)
             Glide.with(ivFood.context)
                 .load(item.imageUri)
@@ -40,7 +40,7 @@ class BestSellerAdapter(
         holder.bind(items[position])
     }
 
-    fun updateList(newItems: List<BestSeller>) {
+    fun updateList(newItems: List<Dishes>) {
         items = newItems
         notifyDataSetChanged()
     }

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

@@ -0,0 +1,57 @@
+package com.example.projectfigma.Adapters
+
+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 FavoriteFoodAdapter(
+    private val items: MutableList<Dishes>
+) : RecyclerView.Adapter<FavoriteFoodAdapter.VH>() {
+
+    inner class VH(view: View) : RecyclerView.ViewHolder(view) {
+        val imgFood: ImageView    = view.findViewById(R.id.imgFood)
+        val imgTag: ImageView     = view.findViewById(R.id.imgTag)
+        val imgFavorite: ImageView= view.findViewById(R.id.imgFavorite)
+        val tvTitle: TextView     = view.findViewById(R.id.tvTitle)
+        val tvDesc: TextView      = view.findViewById(R.id.tvDesc)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_favorite_food, parent, false)
+        return VH(view)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int) {
+        val dish = items[position]
+
+        holder.tvTitle.text = dish.name
+        holder.tvDesc.text  = dish.description
+
+        // загрузка изображения блюда
+        Glide.with(holder.itemView)
+            .load(dish.imageUri)
+            .into(holder.imgFood)
+
+        // иконка категории
+        holder.imgTag.setImageResource(dish.category.iconRes)
+
+        // иконка «избранное»— всегда заполнена
+        holder.imgFavorite.setImageResource(R.drawable.ic_heart_border)
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    /** Полностью обновить список избранного */
+    fun updateList(newItems: List<Dishes>) {
+        items.clear()
+        items.addAll(newItems)
+        notifyDataSetChanged()
+    }
+}

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

@@ -6,19 +6,18 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import com.example.projectfigma.Entites.BestSeller
+import com.example.projectfigma.Entites.Dishes
 import com.example.projectfigma.R
 
-class PromoAdapter(private var items: List<BestSeller>) :
+class PromoAdapter(private var items: List<Dishes>) :
     RecyclerView.Adapter<PromoAdapter.VH>() {
 
     inner class VH(view: View) : RecyclerView.ViewHolder(view) {
         private val image: ImageView = view.findViewById(R.id.promo_image)
         private val title: TextView = view.findViewById(R.id.title)
         private val discount: TextView = view.findViewById(R.id.discount)
 
-        fun bind(item: BestSeller) {
+        fun bind(item: Dishes) {
             title.text = "Experience our delicious new dish"
             discount.text = "${30}% OFF"
         }
@@ -37,7 +36,7 @@ class PromoAdapter(private var items: List<BestSeller>) :
     override fun getItemCount(): Int = items.size
 
     /** Вызываем из Activity/Fragment при получении новых данных */
-    fun updateList(newItems: List<BestSeller>) {
+    fun updateList(newItems: List<Dishes>) {
         items = newItems
         notifyDataSetChanged()
     }

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

@@ -0,0 +1,40 @@
+package com.example.projectfigma.Adapters
+
+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 RecommendAdapter (
+    private val items: List<Dishes>
+) : RecyclerView.Adapter<RecommendAdapter.VH>() {
+
+    inner class VH(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val ivFood: ImageView = itemView.findViewById(R.id.ivFood)
+        private val tvRating: TextView = itemView.findViewById(R.id.tvRating)
+        private val tvPrice: TextView = itemView.findViewById(R.id.tvPrice)
+
+        fun bind(food: Dishes) {
+            Glide.with(itemView).load(food.imageUri).into(ivFood)
+            tvRating.text = String.format("%.1f", food.rating)
+            tvPrice.text = "$${String.format("%.2f", food.price)}"
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_food, parent, false)
+        return VH(view)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int) {
+        holder.bind(items[position])
+    }
+
+    override fun getItemCount(): Int = items.size
+}

app/src/main/java/com/example/projectfigma/Converters/ConvertToDishesCategory.kt

@@ -0,0 +1,12 @@
+package com.example.projectfigma.Converters
+
+import androidx.room.TypeConverter
+import com.example.projectfigma.Enums.DishCategory
+
+class ConvertToDishesCategory {
+    @TypeConverter
+    fun fromCategory(cat: DishCategory): String = cat.name
+
+    @TypeConverter
+    fun toCategory(name: String): DishCategory = DishCategory.valueOf(name)
+}

app/src/main/java/com/example/projectfigma/Util/Converters.kt → app/src/main/java/com/example/projectfigma/Converters/ConvertersToDateTime.kt

@@ -1,9 +1,10 @@
-package com.example.projectfigma.Util
+package com.example.projectfigma.Converters
 
 import androidx.room.TypeConverter
+import com.example.projectfigma.Enums.DishCategory
 import java.util.Date
 
-class Converters {
+class ConvertersToDateTime {
     @TypeConverter
     fun fromTimestamp(value: Long?): Date? {
         return value?.let { Date(it) }

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

@@ -0,0 +1,36 @@
+package com.example.projectfigma.DAO
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import com.example.projectfigma.Entites.Dishes
+
+@Dao
+interface DishesDao {
+    @Query("SELECT * FROM dishes")
+    fun getAll(): List<Dishes>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(item: Dishes)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(items: List<Dishes>)
+
+    @Query("SELECT * FROM dishes")
+    fun getAllV(): LiveData<List<Dishes>>
+
+    @Query("SELECT * FROM dishes b WHERE b.isBestSeller = 1")
+    fun getBestSellers(): LiveData<List<Dishes>>
+
+    @Query("SELECT * FROM dishes b WHERE b.isBestSeller = 1 LIMIT :limit")
+    fun getBestSellersWithLimit(limit : Int): LiveData<List<Dishes>>
+
+    @Query("SELECT * FROM dishes b WHERE b.isRecommend = 1")
+    fun getRecommend(): LiveData<List<Dishes>>
+
+    @Update
+    suspend fun update(item: Dishes)
+}

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

@@ -9,7 +9,7 @@ import com.example.projectfigma.Entites.Session
 @Dao
 interface SessionDao {
     @Query("SELECT * FROM session WHERE id = 0")
-    suspend fun getSession(): Session?
+    fun getSession(): Session?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun upsert(session: Session)