Updates

app/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
 
     implementation("androidx.room:room-ktx:2.7.1")
+    implementation(libs.androidx.activity)
     kapt("androidx.room:room-compiler:2.7.1")
 
     testImplementation("junit:junit:4.13.2")

app/src/main/AndroidManifest.xml

@@ -13,6 +13,9 @@
         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">
@@ -22,11 +25,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <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.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.AdverstsingPageActivity" />
 
         <meta-data
             android:name="preloaded_fonts"

app/src/main/java/com/example/projectfigma/Activity/AdverstsingPageActivity.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.ActivityFavoritesBinding
+
+class AdverstsingPageActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityAdvertisingPageBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityAdvertisingPageBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        StatusBar.hideStatusBar(window)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.example.projectfigma.Activity
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.widget.TextView
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.example.projectfigma.R
+
+class AdvertisingPage : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_advertising_page)
+        val tv: TextView = findViewById(R.id.customtext1piska)
+        tv.paintFlags = tv.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+
+    }
+}

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

@@ -0,0 +1,27 @@
+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)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.buttonPanel, BottomPanelFragment())
+            .commit()
+    }
+}

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

@@ -85,7 +85,8 @@ class RegActivity() : AppCompatActivity(){
                                 binding.passwordEditText.text.toString(),
                                 email,
                                 binding.mobileNumberEdit.text.toString(),
-                                selectedDate ?: Date()
+                                selectedDate ?: Date(),
+                                favoriteDishesId = emptyList()
                             )
 
                             Thread {

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

@@ -0,0 +1,60 @@
+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.DataBase.DataBase
+import com.example.projectfigma.Entites.Dishes
+import com.example.projectfigma.Entites.User
+import com.example.projectfigma.R
+import kotlin.coroutines.coroutineContext
+
+class FavoriteFoodAdapter(
+    private val items: MutableList<Dishes>,
+    private val onFavoriteClick: (dish: Dishes) -> Unit
+) : 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)
+        holder.imgFavorite.setOnClickListener { onFavoriteClick(dish) }
+    }
+
+    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

@@ -5,21 +5,26 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import com.example.projectfigma.Entites.Dishes
 import com.example.projectfigma.R
 
-class PromoAdapter(private var items: List<Dishes>) :
+class PromoAdapter(
+    private var items: List<Dishes>,
+    private val onBannerClick: () -> Unit) :
     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)
+        private val fullCard: CardView = view.findViewById(R.id.fullCard)
 
         fun bind(item: Dishes) {
             title.text = "Experience our delicious new dish"
             discount.text = "${30}% OFF"
+            fullCard.setOnClickListener { onBannerClick() }
         }
     }
 

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/Converters/ConvertersList.kt

@@ -0,0 +1,11 @@
+package com.example.projectfigma.Converters
+
+import androidx.room.TypeConverter
+
+class ConvertersList {
+    @TypeConverter
+    fun fromIntList(value: List<Int>?): String = value?.joinToString(",") ?: ""
+    @TypeConverter
+    fun toIntList(value: String): List<Int> =
+        if (value.isEmpty()) emptyList() else value.split(",").map { it.toInt() }
+}

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

@@ -5,7 +5,9 @@ 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
+import com.example.projectfigma.Enums.DishCategory
 
 @Dao
 interface DishesDao {
@@ -29,4 +31,13 @@ interface DishesDao {
 
     @Query("SELECT * FROM dishes b WHERE b.isRecommend = 1")
     fun getRecommend(): LiveData<List<Dishes>>
+
+    @Query("SELECT * FROM dishes d WHERE d.id = :id")
+    fun getDishById(id : Int) : Dishes
+
+    @Query("SELECT * FROM dishes WHERE id IN (:ids)")
+    fun getDishesByIds(ids: List<Int>): List<Dishes>
+
+    @Update
+    suspend fun update(item: Dishes)
 }

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

@@ -2,16 +2,21 @@ package com.example.projectfigma.DAO
 
 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
 import com.example.projectfigma.Entites.User
 
 @Dao
 interface UserDao {
 
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertUser(item: User)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAll(items: List<User>)
+
     @Update
     fun updateUser(user: User)