From b74fcf6bb2e9533a48d2ce918d379e8d5bb73b23 Mon Sep 17 00:00:00 2001
From: Prakhar <prakhar@everything.net.in>
Date: Mon, 26 Jul 2021 10:54:50 +0530
Subject: [PATCH 1/2] Added catalog screens

---
 .idea/runConfigurations.xml                   |   1 +
 app/build.gradle                              |  11 +-
 app/src/core/AndroidManifest.xml              |   5 +
 .../app/checkin/data/network/WebApiService.kt |   1 -
 .../manager/activities/CatalogActivity.kt     |  44 +++
 .../manager/activities/ManagerWorkActivity.kt |  14 +-
 .../CatalogAddCustomizationFragment.kt        |  49 +++
 .../manager/fragments/CatalogAddFragment.kt   |  46 +++
 .../fragments/CatalogAddGroupFragment.kt      |  48 +++
 .../fragments/CatalogAddItemFragment.kt       |  47 +++
 .../fragments/CatalogAddItemsFragment.kt      |  47 +++
 .../fragments/CatalogAddVariantFragment.kt    |  49 +++
 .../fragments/CatalogDetailsFragment.kt       |  59 +++
 .../background_color_chip_state_list.xml      |   5 +
 .../res/color/text_color_chip_state_list.xml  |   6 +
 .../background_catalog_add_customization.xml  |   5 +
 .../background_catalog_add_variant.xml        |   5 +
 .../main/res/drawable/ic_add_green_normal.xml |  10 +
 app/src/main/res/drawable/ic_approve.xml      |  42 +++
 .../main/res/drawable/ic_approve_selected.xml |  42 +++
 app/src/main/res/drawable/ic_burgur.xml       |  14 +
 .../main/res/drawable/ic_catalog_toggle.xml   |   8 +
 .../main/res/drawable/ic_drink_outlined.xml   |  18 +
 app/src/main/res/drawable/ic_fries.xml        |  26 ++
 .../main/res/drawable/ic_noun_add_green.xml   |  10 +
 .../main/res/drawable/ic_noun_add_image.xml   |  10 +
 app/src/main/res/drawable/ic_noun_add_red.xml |  10 +
 app/src/main/res/drawable/ic_noun_delete.xml  |  10 +
 app/src/main/res/drawable/ic_percent.xml      |  22 ++
 app/src/main/res/drawable/ic_shake.xml        |  26 ++
 app/src/main/res/drawable/ic_shape.xml        |  10 +
 .../ic_undraw_happy_announcement_ac_67.xml    | 104 ++++++
 ...ic_undraw_personal_settings_re_i_6_w_4.xml |  94 +++++
 .../drawable/rounded_rectangle_button_red.xml |  10 +
 app/src/main/res/layout/activity_catalog.xml  |  76 ++++
 .../main/res/layout/activity_manager_work.xml |   3 +-
 .../main/res/layout/fragment_catalog_add.xml  |  36 ++
 .../fragment_catalog_add_customization.xml    |  59 +++
 .../res/layout/fragment_catalog_add_group.xml | 100 +++++
 .../res/layout/fragment_catalog_add_item.xml  | 348 ++++++++++++++++++
 .../res/layout/fragment_catalog_add_items.xml |  48 +++
 .../layout/fragment_catalog_add_variant.xml   |  54 +++
 .../res/layout/fragment_catalog_details.xml   | 218 +++++++++++
 .../layout/item_catalog_add_customization.xml | 129 +++++++
 .../res/layout/item_catalog_add_variant.xml   |  41 +++
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/styles.xml            |  47 +++
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   6 +-
 versions.gradle                               |   2 +-
 50 files changed, 2063 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemsFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
 create mode 100644 app/src/main/res/color/background_color_chip_state_list.xml
 create mode 100644 app/src/main/res/color/text_color_chip_state_list.xml
 create mode 100644 app/src/main/res/drawable/background_catalog_add_customization.xml
 create mode 100644 app/src/main/res/drawable/background_catalog_add_variant.xml
 create mode 100644 app/src/main/res/drawable/ic_add_green_normal.xml
 create mode 100644 app/src/main/res/drawable/ic_approve.xml
 create mode 100644 app/src/main/res/drawable/ic_approve_selected.xml
 create mode 100644 app/src/main/res/drawable/ic_burgur.xml
 create mode 100644 app/src/main/res/drawable/ic_catalog_toggle.xml
 create mode 100644 app/src/main/res/drawable/ic_drink_outlined.xml
 create mode 100644 app/src/main/res/drawable/ic_fries.xml
 create mode 100644 app/src/main/res/drawable/ic_noun_add_green.xml
 create mode 100644 app/src/main/res/drawable/ic_noun_add_image.xml
 create mode 100644 app/src/main/res/drawable/ic_noun_add_red.xml
 create mode 100644 app/src/main/res/drawable/ic_noun_delete.xml
 create mode 100644 app/src/main/res/drawable/ic_percent.xml
 create mode 100644 app/src/main/res/drawable/ic_shake.xml
 create mode 100644 app/src/main/res/drawable/ic_shape.xml
 create mode 100644 app/src/main/res/drawable/ic_undraw_happy_announcement_ac_67.xml
 create mode 100644 app/src/main/res/drawable/ic_undraw_personal_settings_re_i_6_w_4.xml
 create mode 100644 app/src/main/res/drawable/rounded_rectangle_button_red.xml
 create mode 100644 app/src/main/res/layout/activity_catalog.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add_customization.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add_group.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add_item.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add_items.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_add_variant.xml
 create mode 100644 app/src/main/res/layout/fragment_catalog_details.xml
 create mode 100644 app/src/main/res/layout/item_catalog_add_customization.xml
 create mode 100644 app/src/main/res/layout/item_catalog_add_variant.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d..e497da99 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 4eae8557..f1813ee4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,6 +13,9 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(rootProject.file("keystore.debug")))
 
 android {
+    buildFeatures {
+        dataBinding true
+    }
     signingConfigs {
         config {
             keyAlias keystoreProperties['keyAlias']
@@ -161,9 +164,9 @@ dependencies {
     )
 
     // Google Places API
-    implementation "com.google.android.libraries.places:places:2.2.0"
+    implementation "com.google.android.libraries.places:places:2.4.0"
     // Google Material
-    implementation "com.google.android.material:material:1.2.0-alpha05"
+    implementation "com.google.android.material:material:1.5.0-alpha01"
 
     // FireBase libraries
     implementation(
@@ -192,8 +195,8 @@ dependencies {
             "com.github.bumptech.glide:glide:$versions.glide",
             "jp.wasabeef:glide-transformations:4.1.0"
     )
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     kapt "com.github.bumptech.glide:compiler:$versions.glide"
 
diff --git a/app/src/core/AndroidManifest.xml b/app/src/core/AndroidManifest.xml
index c21e1b8d..5f073097 100644
--- a/app/src/core/AndroidManifest.xml
+++ b/app/src/core/AndroidManifest.xml
@@ -186,6 +186,11 @@
             android:label="Insight"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name=".manager.activities.CatalogActivity"
+            android:label=""
+            android:theme="@style/AppTheme" />
+
         <service android:name=".data.notifications.AppMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
diff --git a/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt b/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
index a46b2ded..4961c629 100644
--- a/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
+++ b/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
@@ -420,7 +420,6 @@ interface WebApiService {
 
     @POST("menus/restaurants/{restaurant_id}/manage/items/")
     fun postChangeMenuAvailability(@Path("restaurant_id") restaurantId: Long, @Body msOrderStatus: List<InventoryAvailabilityModel>): Call<List<InventoryAvailabilityModel>>
-
     // endregion
 
     // region PAYMENT
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt b/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
new file mode 100644
index 00000000..84b2885b
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
@@ -0,0 +1,44 @@
+package com.checkin.app.checkin.manager.activities
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.ActionBar
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.ActivityCatalogBinding
+import com.checkin.app.checkin.manager.fragments.CatalogDetailsFragment
+import com.checkin.app.checkin.misc.activities.BaseActivity
+
+class CatalogActivity : BaseActivity() {
+
+    private var _binding: ActivityCatalogBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = ActivityCatalogBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setSupportActionBar(binding.toolbarCatalogActivity)
+        val actionBar: ActionBar? = supportActionBar
+        actionBar?.setHomeAsUpIndicator(R.drawable.ic_shape)
+        actionBar?.setDisplayHomeAsUpEnabled(true)
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.fragment_container_catalog, CatalogDetailsFragment.newInstance())
+            .commit()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/activities/ManagerWorkActivity.kt b/app/src/main/java/com/checkin/app/checkin/manager/activities/ManagerWorkActivity.kt
index d6976814..1ff2aca6 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/activities/ManagerWorkActivity.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/activities/ManagerWorkActivity.kt
@@ -2,6 +2,7 @@ package com.checkin.app.checkin.manager.activities
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.widget.SwitchCompat
@@ -70,9 +71,9 @@ class ManagerWorkActivity : BaseAccountActivity(), LiveOrdersInteraction {
         pagerAdapter.setupWithTab(tabLayout, pagerManager)
         pagerManager.addOnPageChangeListener(object : SimpleOnPageChangeListener() {
             override fun onPageSelected(position: Int) {
-                if (actionBar != null) {
-                    tvActionBarTitle.text = pagerAdapter.getPageTitle(position)
-                }
+                if (position == 3) swLiveOrdersToggle.visibility = View.GONE
+                else swLiveOrdersToggle.visibility = View.VISIBLE
+                tvActionBarTitle.text = pagerAdapter.getPageTitle(position)
             }
         })
         swLiveOrdersToggle.setOnCheckedChangeListener { _, isChecked ->
@@ -150,13 +151,15 @@ class ManagerWorkActivity : BaseAccountActivity(), LiveOrdersInteraction {
             0 -> R.drawable.ic_orders_list_toggle
             1 -> R.drawable.ic_stats_toggle
             2 -> R.drawable.ic_invoice_toggle
+            3 -> R.drawable.ic_catalog_toggle
             else -> 0
         }
 
         override fun getItem(position: Int): Fragment = when (position) {
             0 -> if (isActivated) mTableFragment else mActiveTableFragment
             1 -> ManagerStatsFragment.newInstance()
-            else -> ManagerInvoiceFragment.newInstance()
+            2 -> ManagerInvoiceFragment.newInstance()
+            else -> CatalogAddFragment.newInstance()
         }
 
         override fun getItemPosition(obj: Any): Int = if (oldValActivated != isActivated) {
@@ -164,12 +167,13 @@ class ManagerWorkActivity : BaseAccountActivity(), LiveOrdersInteraction {
             PagerAdapter.POSITION_NONE
         } else PagerAdapter.POSITION_UNCHANGED
 
-        override fun getCount(): Int = 3
+        override fun getCount(): Int = 4
 
         override fun getPageTitle(position: Int): CharSequence? = when (position) {
             0 -> "Live Orders"
             1 -> "Insight"
             2 -> "Invoice"
+            3 -> "Catalog"
             else -> null
         }
 
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
new file mode 100644
index 00000000..49b525d8
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
@@ -0,0 +1,49 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddCustomizationBinding
+import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddCustomizationFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add_customization
+    private var _binding: FragmentCatalogAddCustomizationBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddCustomizationBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        binding.button2.setOnClickListener {
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddItemsFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        }
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Add Ons"
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogAddCustomizationFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
new file mode 100644
index 00000000..6b7755fd
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
@@ -0,0 +1,46 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.activities.ManagerWorkActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add
+    private var _binding: FragmentCatalogAddBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.button2.setOnClickListener {
+            val intent = Intent(requireActivity(), CatalogActivity::class.java)
+            startActivity(intent)
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance(): CatalogAddFragment = CatalogAddFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
new file mode 100644
index 00000000..fa938b62
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
@@ -0,0 +1,48 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddGroupFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add_group
+    private var _binding: FragmentCatalogAddGroupBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddGroupBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        binding.button3.setOnClickListener {
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddItemFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        }
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Add Group"
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogAddGroupFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
new file mode 100644
index 00000000..bff75e93
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
@@ -0,0 +1,47 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddItemBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddItemFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add_item
+    private var _binding: FragmentCatalogAddItemBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddItemBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        binding.button2.setOnClickListener {
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddVariantFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        }
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Add Item"
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogAddItemFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemsFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemsFragment.kt
new file mode 100644
index 00000000..80424b38
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemsFragment.kt
@@ -0,0 +1,47 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddItemBinding
+import com.checkin.app.checkin.databinding.FragmentCatalogAddItemsBinding
+import com.checkin.app.checkin.databinding.FragmentCatalogDetailsBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddItemsFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add_items
+    private var _binding: FragmentCatalogAddItemsBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddItemsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Menu Name"
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogAddItemsFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
new file mode 100644
index 00000000..bb545c6f
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
@@ -0,0 +1,49 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
+import com.checkin.app.checkin.databinding.FragmentCatalogAddVariantBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogAddVariantFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_add_variant
+    private var _binding: FragmentCatalogAddVariantBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogAddVariantBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        binding.button2.setOnClickListener {
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddCustomizationFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        }
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Variants"
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogAddVariantFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
new file mode 100644
index 00000000..eb564f96
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
@@ -0,0 +1,59 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.widget.doAfterTextChanged
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.databinding.FragmentCatalogDetailsBinding
+import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.misc.fragments.BaseFragment
+
+class CatalogDetailsFragment : BaseFragment() {
+
+    override val rootLayout: Int = R.layout.fragment_catalog_details
+    private var _binding: FragmentCatalogDetailsBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = FragmentCatalogDetailsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.etCatalogGSTNumber.doAfterTextChanged {
+            if (it.isNullOrEmpty()) {
+                binding.financeGroup.visibility = View.GONE
+            } else {
+                binding.financeGroup.visibility = View.VISIBLE
+            }
+        }
+        binding.button2.setOnClickListener {
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddGroupFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Catalog Details"
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance() = CatalogDetailsFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/color/background_color_chip_state_list.xml b/app/src/main/res/color/background_color_chip_state_list.xml
new file mode 100644
index 00000000..368c2f51
--- /dev/null
+++ b/app/src/main/res/color/background_color_chip_state_list.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary_red" android:state_checked="true" />
+    <item android:color="@color/md_grey_300" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_chip_state_list.xml b/app/src/main/res/color/text_color_chip_state_list.xml
new file mode 100644
index 00000000..e7b890c8
--- /dev/null
+++ b/app/src/main/res/color/text_color_chip_state_list.xml
@@ -0,0 +1,6 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+        android:color="@color/white" />
+    <item android:state_checked="false"
+        android:color="@color/black" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_catalog_add_customization.xml b/app/src/main/res/drawable/background_catalog_add_customization.xml
new file mode 100644
index 00000000..3007a3fc
--- /dev/null
+++ b/app/src/main/res/drawable/background_catalog_add_customization.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#1632c282"/>
+    <stroke android:color="#32c282" android:width="0.5dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_catalog_add_variant.xml b/app/src/main/res/drawable/background_catalog_add_variant.xml
new file mode 100644
index 00000000..c339b090
--- /dev/null
+++ b/app/src/main/res/drawable/background_catalog_add_variant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#32ffa3a3"/>
+    <stroke android:color="#ffa3a3" android:width="0.5dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_green_normal.xml b/app/src/main/res/drawable/ic_add_green_normal.xml
new file mode 100644
index 00000000..2fd2613e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_green_normal.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M6.808,0L5.192,0 5.192,5.192 0,5.192 0,6.808 5.192,6.808 5.192,12 6.808,12 6.808,6.808 12,6.808 12,5.192 6.808,5.192z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_approve.xml b/app/src/main/res/drawable/ic_approve.xml
new file mode 100644
index 00000000..dedb316f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_approve.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23dp"
+    android:height="31dp"
+    android:viewportWidth="23"
+    android:viewportHeight="31">
+    <path
+        android:pathData="M22.064,2.505H0.482c-0.266,0 -0.482,0.216 -0.482,0.482v27.53c0,0.267 0.216,0.483 0.482,0.483h21.582c0.266,0 0.481,-0.216 0.481,-0.482V2.988c0,-0.267 -0.215,-0.483 -0.481,-0.483z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M0.482,2.505c-0.266,0 -0.482,0.216 -0.482,0.482v27.53c0,0.267 0.216,0.483 0.482,0.483h10.79V2.505H0.483z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M20.184,4.697H2.674c-0.266,0 -0.482,0.214 -0.482,0.478v23.468c0,0.264 0.216,0.478 0.483,0.478h12.617c0.128,0 0.25,-0.05 0.341,-0.14l4.892,-4.846c0.09,-0.09 0.142,-0.212 0.142,-0.339V5.176c0,-0.265 -0.216,-0.479 -0.483,-0.479z"
+        android:fillColor="#FFF"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M16.426,2.505h-1.72C14.27,1.032 12.886,0 11.273,0 9.66,0 8.275,1.032 7.839,2.505H6.12c-0.266,0 -0.483,0.21 -0.483,0.47v3.757c0,0.26 0.217,0.47 0.483,0.47h10.307c0.267,0 0.483,-0.21 0.483,-0.47V2.975c0,-0.26 -0.216,-0.47 -0.483,-0.47z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M7.84,2.505H6.12c-0.267,0 -0.484,0.21 -0.484,0.47v3.757c0,0.26 0.217,0.47 0.483,0.47h5.154V0C9.66,0 8.275,1.032 7.839,2.505z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M13.281,3.758c-0.238,0 -0.448,-0.17 -0.489,-0.41 -0.11,-0.646 -0.672,-1.115 -1.336,-1.115 -0.274,0 -0.496,-0.22 -0.496,-0.49s0.222,-0.49 0.496,-0.49c1.151,0 2.125,0.813 2.315,1.933 0.045,0.267 -0.137,0.52 -0.407,0.565 -0.028,0.004 -0.056,0.007 -0.083,0.007z"
+        android:fillColor="#FFF"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M11.43,9.08c-3.368,0 -6.107,2.74 -6.107,6.107s2.74,6.106 6.106,6.106c3.367,0 6.106,-2.74 6.106,-6.106 0,-3.367 -2.739,-6.106 -6.106,-6.106z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M5.323,15.187c0,3.367 2.81,6.106 6.263,6.106V9.08c-3.453,0 -6.263,2.739 -6.263,6.106z"
+        android:fillColor="#6D6D6D"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M9.193,18.162c-0.121,0 -0.243,-0.049 -0.335,-0.146L7.34,16.425c-0.185,-0.195 -0.185,-0.51 0,-0.704 0.185,-0.194 0.485,-0.194 0.67,0l1.182,1.24 4.089,-4.29c0.185,-0.194 0.485,-0.194 0.67,0 0.185,0.194 0.185,0.509 0,0.703l-4.424,4.642c-0.093,0.097 -0.214,0.146 -0.335,0.146z"
+        android:fillColor="#FFF"
+        android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_approve_selected.xml b/app/src/main/res/drawable/ic_approve_selected.xml
new file mode 100644
index 00000000..d03ab3aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_approve_selected.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23dp"
+    android:height="31dp"
+    android:viewportWidth="23"
+    android:viewportHeight="31">
+  <path
+      android:pathData="M22.064,2.505H0.482c-0.266,0 -0.482,0.216 -0.482,0.482v27.53c0,0.267 0.216,0.483 0.482,0.483h21.582c0.266,0 0.481,-0.216 0.481,-0.482V2.988c0,-0.267 -0.215,-0.483 -0.481,-0.483z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M0.482,2.505c-0.266,0 -0.482,0.216 -0.482,0.482v27.53c0,0.267 0.216,0.483 0.482,0.483h10.79V2.505H0.483z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M20.184,4.697H2.674c-0.266,0 -0.482,0.214 -0.482,0.478v23.468c0,0.264 0.216,0.478 0.483,0.478h12.617c0.128,0 0.25,-0.05 0.341,-0.14l4.892,-4.846c0.09,-0.09 0.142,-0.212 0.142,-0.339V5.176c0,-0.265 -0.216,-0.479 -0.483,-0.479z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M16.426,2.505h-1.72C14.27,1.032 12.886,0 11.273,0 9.66,0 8.275,1.032 7.839,2.505H6.12c-0.266,0 -0.483,0.21 -0.483,0.47v3.757c0,0.26 0.217,0.47 0.483,0.47h10.307c0.267,0 0.483,-0.21 0.483,-0.47V2.975c0,-0.26 -0.216,-0.47 -0.483,-0.47z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M7.84,2.505H6.12c-0.267,0 -0.484,0.21 -0.484,0.47v3.757c0,0.26 0.217,0.47 0.483,0.47h5.154V0C9.66,0 8.275,1.032 7.839,2.505z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M13.281,3.758c-0.238,0 -0.448,-0.17 -0.489,-0.41 -0.11,-0.646 -0.672,-1.115 -1.336,-1.115 -0.274,0 -0.496,-0.22 -0.496,-0.49s0.222,-0.49 0.496,-0.49c1.151,0 2.125,0.813 2.315,1.933 0.045,0.267 -0.137,0.52 -0.407,0.565 -0.028,0.004 -0.056,0.007 -0.083,0.007z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M11.43,9.08c-3.368,0 -6.107,2.74 -6.107,6.107s2.74,6.106 6.106,6.106c3.367,0 6.106,-2.74 6.106,-6.106 0,-3.367 -2.739,-6.106 -6.106,-6.106z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M5.323,15.187c0,3.367 2.81,6.106 6.263,6.106V9.08c-3.453,0 -6.263,2.739 -6.263,6.106z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M9.193,18.162c-0.121,0 -0.243,-0.049 -0.335,-0.146L7.34,16.425c-0.185,-0.195 -0.185,-0.51 0,-0.704 0.185,-0.194 0.485,-0.194 0.67,0l1.182,1.24 4.089,-4.29c0.185,-0.194 0.485,-0.194 0.67,0 0.185,0.194 0.185,0.509 0,0.703l-4.424,4.642c-0.093,0.097 -0.214,0.146 -0.335,0.146z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_burgur.xml b/app/src/main/res/drawable/ic_burgur.xml
new file mode 100644
index 00000000..95009be1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_burgur.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="58dp"
+    android:height="58dp"
+    android:viewportWidth="58"
+    android:viewportHeight="58">
+  <path
+      android:pathData="M55.286,42.23c1.063,-1.526 0.91,-3.59 -0.368,-4.943 1.349,-1.559 1.432,-3.846 0.2,-5.498 1.968,-0.589 3.167,-2.576 2.77,-4.591 -0.397,-2.015 -2.26,-3.4 -4.304,-3.198C55.764,11.425 44.091,-0.168 31.658,0h-5.316C13.91,-0.17 2.235,11.428 4.416,24c-4.837,-0.233 -6.149,6.376 -1.548,7.814 -1.218,1.65 -1.13,3.924 0.213,5.475 -1.277,1.353 -1.43,3.415 -0.367,4.942 -1.909,0.671 -3.017,2.66 -2.584,4.637C0.563,48.844 2.4,50.188 4.416,50c-1.636,3.804 1.956,8.103 5.926,8h37.316c3.97,0.104 7.564,-4.197 5.926,-8 2.015,0.188 3.853,-1.156 4.286,-3.132 0.433,-1.977 -0.676,-3.966 -2.584,-4.637zM49,42L17,42c-1.656,0.002 -2.998,1.344 -3,3v4c-0.071,0.871 0.265,2.359 -0.456,2.816 -0.028,0.022 -0.057,0.041 -0.087,0.06 -0.308,0.152 -0.673,0.137 -0.968,-0.04 -0.294,-0.178 -0.479,-0.492 -0.489,-0.836 0.003,-1.27 -0.002,-4.687 0,-6 -0.002,-1.656 -1.344,-2.998 -3,-3L6.127,42c-0.835,0.037 -1.605,-0.446 -1.936,-1.213 -0.33,-0.767 -0.152,-1.659 0.449,-2.24 1.85,1.822 4.785,1.929 6.762,0.245 0.533,-0.515 1.248,-0.8 1.99,-0.792 2.27,0.098 2.375,2.062 5.198,2 2.832,0.06 2.92,-1.899 5.199,-2 2.276,0.1 2.372,2.061 5.2,2 2.826,0.061 2.923,-1.9 5.2,-2 1.64,-0.027 2.203,1.322 3.612,1.747 0.414,0.188 0.867,0.27 1.32,0.24 1.271,0.078 2.52,-0.351 3.475,-1.194 1.118,-1.057 2.868,-1.057 3.986,0 1.982,1.684 4.921,1.577 6.775,-0.248 0.603,0.58 0.783,1.473 0.453,2.241S52.708,42.038 51.873,42L49,42zM18.532,44l3.333,4L16,48v-3c0,-0.552 0.448,-1 1,-1h1.532zM21.135,44h5.73L24,47.438 21.135,44zM29.468,44h9.064l3.333,4h-15.73l3.333,-4zM41.135,44h5.73L44,47.438 41.135,44zM6.407,32L35,32c0.552,0 1,0.448 1,1v3.338c-0.577,-0.227 -1.192,-0.341 -1.812,-0.338 -1.182,-0.011 -2.327,0.42 -3.21,1.208 -1.12,1.046 -2.86,1.046 -3.98,0 -0.882,-0.788 -2.026,-1.22 -3.209,-1.208 -2.829,-0.06 -2.922,1.9 -5.2,2 -2.278,-0.101 -2.368,-2.06 -5.198,-2 -2.822,-0.062 -2.925,1.9 -5.197,2 -0.74,0.008 -1.455,-0.277 -1.987,-0.793 -0.986,-0.676 -2.296,-1.447 -2.207,-2.8 0.002,-1.329 1.078,-2.405 2.407,-2.407zM54,34.44c0.087,1.314 -1.235,2.1 -2.212,2.767 -1.119,1.057 -2.868,1.057 -3.987,0 -1.63,-1.395 -3.975,-1.578 -5.801,-0.453L42,33c0,-0.552 0.448,-1 1,-1h8.593c0.643,0.003 1.259,0.262 1.71,0.72 0.452,0.458 0.703,1.077 0.697,1.72zM6,22.342C6.013,11.112 15.113,2.012 26.342,2h5.316c11.23,0.013 20.33,9.113 20.342,20.342 -0.001,0.915 -0.743,1.657 -1.658,1.658L7.658,24C6.743,23.999 6,23.257 6,22.342zM2.003,27.892c0.118,-1.1 1.062,-1.924 2.167,-1.892L54,26c0.55,-0.002 1.075,0.224 1.451,0.623 0.548,0.611 0.673,1.491 0.318,2.23 -0.355,0.74 -1.12,1.192 -1.939,1.147 -1.404,0.001 -9.246,0 -10.83,0 -1.656,0.002 -2.998,1.344 -3,3v4c-0.006,0.5 -0.384,0.919 -0.882,0.975 -0.2,-0.014 -0.396,-0.05 -0.588,-0.108 -0.32,-0.173 -0.521,-0.504 -0.53,-0.867v-4c-0.002,-1.656 -1.344,-2.998 -3,-3L4,30c-0.549,-0.003 -1.072,-0.23 -1.45,-0.628 -0.376,-0.398 -0.574,-0.933 -0.547,-1.48zM2,46c0.001,-1.104 0.896,-1.999 2,-2h5c0.552,0 1,0.448 1,1v3L4,48c-1.104,-0.001 -1.999,-0.896 -2,-2zM52,51.658c-0.003,2.397 -1.945,4.34 -4.342,4.342L10.342,56c-2.397,-0.003 -4.34,-1.945 -4.342,-4.342 0.001,-0.915 0.743,-1.657 1.658,-1.658L10,50c-0.045,0.607 -0.002,1.217 0.126,1.812 0.415,1.455 1.849,2.372 3.343,2.138 1.495,-0.233 2.58,-1.545 2.531,-3.057L16,50h34.342c0.915,0.001 1.657,0.743 1.658,1.658zM54,48h-7.865l3.333,-4L54,44c0.715,0 1.375,0.381 1.732,1s0.357,1.381 0,2 -1.017,1 -1.732,1z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M29,8c-0.552,0 -1,0.448 -1,1s0.448,1 1,1 1,-0.448 1,-1 -0.448,-1 -1,-1zM35,8c-0.552,0 -1,0.448 -1,1s0.448,1 1,1 1,-0.448 1,-1 -0.448,-1 -1,-1zM23,8c-0.552,0 -1,0.448 -1,1s0.448,1 1,1 1,-0.448 1,-1 -0.448,-1 -1,-1z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_catalog_toggle.xml b/app/src/main/res/drawable/ic_catalog_toggle.xml
new file mode 100644
index 00000000..c1007e4c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_catalog_toggle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_approve_selected"/>
+    <item
+        android:drawable="@drawable/ic_approve"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_drink_outlined.xml b/app/src/main/res/drawable/ic_drink_outlined.xml
new file mode 100644
index 00000000..03e190d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drink_outlined.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="31dp"
+    android:height="50dp"
+    android:viewportWidth="31"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M14.467,0l0.101,0.033c0.066,0.025 0.16,0.054 0.278,0.114 0.117,0.066 0.268,0.152 0.415,0.284 0.081,0.059 0.153,0.14 0.23,0.23 0.081,0.086 0.148,0.198 0.22,0.313 0.132,0.24 0.246,0.544 0.275,0.876 0.035,0.328 0.003,0.668 -0.074,0.982 -0.08,0.315 -0.204,0.6 -0.335,0.875 -0.132,0.275 -0.267,0.54 -0.387,0.806 -0.12,0.265 -0.236,0.53 -0.33,0.792 -0.097,0.261 -0.183,0.52 -0.241,0.778 -0.067,0.257 -0.093,0.51 -0.118,0.753 -0.004,0.121 -0.011,0.24 -0.01,0.356 0.008,0.115 0.006,0.228 0.02,0.335 0.012,0.109 0.026,0.212 0.038,0.31l0.058,0.277c0.04,0.173 0.09,0.322 0.123,0.446l0.14,0.383 -0.09,0.057 -0.213,-0.353c-0.06,-0.118 -0.137,-0.26 -0.21,-0.434 -0.034,-0.088 -0.07,-0.182 -0.11,-0.281 -0.032,-0.102 -0.063,-0.21 -0.097,-0.324 -0.032,-0.115 -0.052,-0.238 -0.081,-0.364 -0.022,-0.128 -0.036,-0.261 -0.054,-0.4 -0.02,-0.277 -0.024,-0.574 0.009,-0.875 0.026,-0.304 0.078,-0.613 0.153,-0.914 0.073,-0.304 0.164,-0.603 0.256,-0.894 0.093,-0.293 0.18,-0.58 0.254,-0.857 0.07,-0.277 0.14,-0.54 0.19,-0.775 0.053,-0.235 0.092,-0.443 0.113,-0.634 0.018,-0.192 0,-0.367 -0.03,-0.542 -0.024,-0.085 -0.035,-0.175 -0.069,-0.255 -0.014,-0.041 -0.028,-0.081 -0.04,-0.122 -0.014,-0.04 -0.034,-0.077 -0.05,-0.116 -0.062,-0.156 -0.134,-0.28 -0.19,-0.396 -0.062,-0.115 -0.122,-0.207 -0.156,-0.273l-0.052,-0.1 0.064,-0.091zM11.465,0l0.102,0.033c0.066,0.025 0.16,0.054 0.277,0.114 0.118,0.066 0.27,0.152 0.417,0.284 0.08,0.059 0.153,0.14 0.23,0.23 0.08,0.086 0.147,0.198 0.22,0.313 0.131,0.24 0.246,0.544 0.275,0.876 0.035,0.328 0.003,0.668 -0.075,0.982 -0.079,0.315 -0.203,0.6 -0.335,0.875 -0.13,0.275 -0.267,0.54 -0.386,0.806 -0.12,0.265 -0.236,0.53 -0.331,0.792 -0.096,0.261 -0.182,0.52 -0.24,0.778 -0.067,0.257 -0.093,0.51 -0.119,0.753 -0.003,0.121 -0.01,0.24 -0.01,0.356 0.008,0.115 0.007,0.228 0.02,0.335 0.013,0.109 0.026,0.212 0.04,0.31l0.058,0.277c0.04,0.173 0.09,0.322 0.123,0.446l0.139,0.383 -0.09,0.057 -0.213,-0.353c-0.06,-0.118 -0.137,-0.26 -0.209,-0.434l-0.11,-0.281c-0.032,-0.102 -0.063,-0.21 -0.098,-0.324 -0.032,-0.115 -0.052,-0.238 -0.08,-0.364 -0.023,-0.128 -0.037,-0.261 -0.055,-0.4 -0.02,-0.277 -0.024,-0.574 0.009,-0.875 0.025,-0.304 0.078,-0.613 0.153,-0.914 0.072,-0.304 0.164,-0.603 0.255,-0.894 0.093,-0.293 0.181,-0.58 0.254,-0.857 0.071,-0.277 0.14,-0.54 0.19,-0.775 0.053,-0.235 0.093,-0.443 0.113,-0.634 0.02,-0.192 0,-0.367 -0.029,-0.542 -0.023,-0.085 -0.035,-0.175 -0.069,-0.255 -0.014,-0.041 -0.028,-0.081 -0.04,-0.122 -0.014,-0.04 -0.034,-0.077 -0.05,-0.116 -0.061,-0.156 -0.134,-0.28 -0.19,-0.396 -0.061,-0.115 -0.122,-0.207 -0.155,-0.273l-0.053,-0.1 0.062,-0.091zM18.467,0l0.101,0.033c0.066,0.025 0.16,0.054 0.278,0.114 0.117,0.066 0.268,0.152 0.415,0.284 0.08,0.059 0.153,0.14 0.23,0.23 0.08,0.086 0.149,0.198 0.22,0.313 0.132,0.24 0.247,0.544 0.274,0.876 0.036,0.328 0.004,0.668 -0.074,0.982 -0.078,0.315 -0.202,0.6 -0.334,0.875 -0.13,0.275 -0.267,0.54 -0.387,0.806 -0.12,0.265 -0.236,0.53 -0.33,0.792 -0.096,0.261 -0.182,0.52 -0.241,0.778 -0.067,0.257 -0.093,0.51 -0.118,0.753 -0.003,0.121 -0.01,0.24 -0.01,0.356 0.007,0.115 0.007,0.228 0.02,0.335 0.012,0.109 0.026,0.212 0.039,0.31l0.058,0.277c0.04,0.173 0.09,0.322 0.123,0.446 0.088,0.244 0.14,0.383 0.14,0.383L18.78,9l-0.214,-0.353c-0.059,-0.118 -0.137,-0.26 -0.208,-0.434 -0.034,-0.088 -0.07,-0.182 -0.11,-0.281 -0.034,-0.102 -0.064,-0.21 -0.097,-0.324 -0.033,-0.115 -0.053,-0.238 -0.081,-0.364 -0.023,-0.128 -0.036,-0.261 -0.055,-0.4 -0.019,-0.277 -0.024,-0.574 0.008,-0.875 0.027,-0.304 0.08,-0.613 0.154,-0.914 0.072,-0.304 0.163,-0.603 0.256,-0.894 0.092,-0.293 0.18,-0.58 0.253,-0.857 0.072,-0.277 0.14,-0.54 0.19,-0.775 0.053,-0.235 0.094,-0.443 0.113,-0.634 0.02,-0.192 0,-0.367 -0.03,-0.542 -0.021,-0.085 -0.033,-0.175 -0.067,-0.255L18.85,0.976c-0.014,-0.04 -0.035,-0.077 -0.05,-0.116 -0.061,-0.156 -0.133,-0.28 -0.188,-0.396 -0.063,-0.115 -0.124,-0.207 -0.157,-0.273l-0.053,-0.1 0.064,-0.091z"
+      android:fillColor="#FFA3A3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M15.494,24.01c-3.476,0 -6.762,-0.368 -9.252,-1.036 -0.607,-0.162 -1.118,-0.331 -1.547,-0.498l0.192,1.332 0.008,0.002 0.56,4.017c0.004,0.03 0.004,0.06 0.009,0.09h0.003l2.297,16.476c0.085,1.84 4.837,2.333 7.655,2.333 2.817,0 7.565,-0.492 7.652,-2.33l2.41,-16.478 0.001,-0.013 0.588,-4.014h0.002l0.122,-0.846 0.017,-0.12 0.052,-0.355c-0.423,0.156 -0.92,0.312 -1.51,0.463 -2.465,0.63 -5.753,0.978 -9.26,0.978zM12.189,44.285c-0.29,0.306 -0.805,0.491 -1.377,0.491 -0.89,0 -1.682,-0.463 -1.94,-0.931L6.616,27.658c-0.065,-0.604 0.102,-1.178 0.48,-1.621 0.423,-0.497 1.05,-0.77 1.767,-0.77 1.47,0 2.765,1.186 2.827,2.592l0.707,15.926c0.008,0.177 -0.062,0.345 -0.208,0.5zM17.395,43.335c-0.267,0.681 -1.145,1.29 -1.998,1.352 -0.54,-0.055 -1.156,-0.388 -1.515,-0.822 -0.106,-0.128 -0.251,-0.307 -0.33,-0.514l-0.658,-14.834 0.005,-0.001c-0.057,-0.557 0.132,-1.13 0.532,-1.613 0.471,-0.568 1.193,-0.957 1.895,-1.026 1.45,0.102 2.713,1.346 2.718,2.703h0.005l-0.654,14.754zM24.323,27.735L21.962,43.88c-0.22,0.464 -0.926,0.895 -1.828,0.895 -0.572,0 -1.087,-0.185 -1.376,-0.491 -0.146,-0.155 -0.217,-0.323 -0.208,-0.5l0.707,-15.925c0.06,-1.406 1.356,-2.593 2.827,-2.593 0.716,0 1.342,0.274 1.767,0.77 0.392,0.46 0.56,1.064 0.472,1.698z"
+      android:fillColor="#FFA3A3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M26.127,11.129C23.279,10.408 19.502,10.01 15.494,10.01l-0.027,0.001 -0.027,-0.001C11.43,10.01 7.655,10.408 4.807,11.129 1.63,11.932 0.017,13.019 0.017,14.358c0,0.224 0.05,0.44 0.14,0.65 0.32,1.33 1.16,4.907 1.3,6.271 0.05,0.48 0.317,0.921 0.795,1.326l3.514,24.092c0.037,0.916 1.081,1.637 3.105,2.152 1.761,0.444 4.095,0.69 6.569,0.69h0.054c2.475,0 4.807,-0.246 6.57,-0.69 2.022,-0.514 3.066,-1.236 3.103,-2.152l3.514,-24.092c0.478,-0.405 0.746,-0.847 0.795,-1.326 0.141,-1.364 0.982,-4.94 1.3,-6.271 0.092,-0.21 0.14,-0.427 0.14,-0.65 0,-1.34 -1.61,-2.427 -4.79,-3.23zM28.311,21.155c-0.019,0.176 -0.21,0.454 -0.7,0.77l-0.043,0.276 -0.013,0.002 -3.553,24.355 -0.006,0.042v0.045c-0.013,0.11 -0.444,0.613 -2.309,1.072 -1.662,0.407 -3.86,0.632 -6.193,0.632h-0.054c-2.333,0 -4.532,-0.225 -6.194,-0.632 -1.863,-0.459 -2.296,-0.962 -2.31,-1.072L6.936,46.6l-0.006,-0.042 -3.55,-24.355 -0.013,-0.002 -0.043,-0.275c-0.491,-0.317 -0.682,-0.595 -0.7,-0.771 -0.106,-1.012 -0.55,-3.077 -0.92,-4.694 0.773,0.42 1.805,0.797 3.103,1.125 2.848,0.72 6.624,1.117 10.633,1.117h0.054c4.008,0 7.785,-0.397 10.633,-1.117 1.297,-0.328 2.331,-0.704 3.103,-1.125 -0.37,1.617 -0.815,3.682 -0.92,4.694zM29.667,14.597c-0.261,0.46 -1.259,1.188 -3.824,1.836 -2.757,0.696 -6.432,1.08 -10.349,1.08h-0.054c-3.916,0 -7.591,-0.384 -10.348,-1.08 -2.566,-0.648 -3.563,-1.376 -3.826,-1.836l-0.07,-0.294c0.068,-0.425 0.944,-1.276 3.896,-2.022C7.849,11.584 11.524,11.2 15.44,11.2l0.027,0.002 0.027,-0.002c3.917,0 7.593,0.384 10.35,1.082 2.951,0.746 3.827,1.597 3.895,2.022l-0.072,0.294z"
+      android:fillColor="#FFA3A3"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fries.xml b/app/src/main/res/drawable/ic_fries.xml
new file mode 100644
index 00000000..e2e9f54d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fries.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="35dp"
+    android:viewportWidth="27"
+    android:viewportHeight="35">
+  <path
+      android:pathData="M20.481,34.855L6.519,34.855c-1.45,0.007 -2.684,-1.054 -2.894,-2.488l-2.87,-18.958c-0.093,-0.637 0.095,-1.283 0.516,-1.77 0.42,-0.487 1.032,-0.768 1.676,-0.769h1.973c0.806,-0.002 1.551,0.43 1.95,1.131 1.387,2.353 3.914,3.797 6.646,3.797 2.73,0 5.258,-1.444 6.645,-3.797 0.394,-0.691 1.124,-1.122 1.919,-1.131h1.977c0.646,0 1.26,0.283 1.68,0.773 0.422,0.49 0.609,1.139 0.512,1.778l-2.878,18.946c-0.21,1.433 -1.442,2.494 -2.89,2.488zM1.913,13.233l2.874,18.958c0.125,0.86 0.863,1.497 1.732,1.494h13.962c0.87,0.005 1.61,-0.632 1.735,-1.494l2.875,-18.958c0.041,-0.3 -0.049,-0.603 -0.248,-0.832 -0.198,-0.229 -0.486,-0.36 -0.79,-0.361L22.08,12.04c-0.385,0.007 -0.737,0.218 -0.924,0.554 -1.597,2.71 -4.509,4.373 -7.654,4.373 -3.146,0 -6.057,-1.663 -7.654,-4.373 -0.187,-0.338 -0.542,-0.55 -0.928,-0.554L2.947,12.04c-0.306,0 -0.596,0.133 -0.795,0.365 -0.2,0.231 -0.288,0.538 -0.243,0.84l0.004,-0.012z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M6.948,13.748c-0.247,0 -0.467,-0.157 -0.55,-0.39l-2.028,-5.46c-0.157,-0.422 -0.627,-0.637 -1.049,-0.48 -0.422,0.158 -0.637,0.627 -0.48,1.05l0.968,2.59c0.097,0.201 0.07,0.44 -0.069,0.616s-0.366,0.257 -0.585,0.209c-0.218,-0.049 -0.39,-0.218 -0.442,-0.436l-0.968,-2.527c-0.248,-0.665 -0.122,-1.412 0.33,-1.96 0.453,-0.547 1.162,-0.812 1.863,-0.694 0.7,0.118 1.284,0.6 1.532,1.266l2.028,5.46c0.063,0.178 0.036,0.377 -0.074,0.532 -0.109,0.155 -0.286,0.247 -0.476,0.248v-0.024z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M11.683,16.178c-0.273,0 -0.51,-0.19 -0.57,-0.456L8.773,5.25c-0.052,-0.287 -0.253,-0.524 -0.528,-0.623 -0.275,-0.098 -0.581,-0.042 -0.804,0.147 -0.222,0.188 -0.327,0.482 -0.275,0.769l1.69,8.724c0.06,0.318 -0.147,0.625 -0.465,0.686 -0.318,0.062 -0.625,-0.146 -0.686,-0.464L6,5.77c-0.209,-1.077 0.495,-2.12 1.572,-2.328 1.077,-0.21 2.12,0.494 2.328,1.571l2.34,10.452c0.04,0.173 -0.002,0.355 -0.113,0.494 -0.11,0.139 -0.279,0.22 -0.456,0.22h0.012z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M12.112,16.186c-0.323,0 -0.585,-0.262 -0.585,-0.585L11.527,2.13c0,-1.098 0.89,-1.988 1.987,-1.988s1.987,0.89 1.987,1.987v13.467c0,0.323 -0.262,0.585 -0.585,0.585 -0.323,0 -0.585,-0.262 -0.585,-0.585L14.331,2.13c0,-0.451 -0.366,-0.817 -0.817,-0.817 -0.452,0 -0.817,0.366 -0.817,0.817L12.697,15.6c0,0.324 -0.262,0.586 -0.585,0.586zM20.099,13.686c-0.19,0 -0.367,-0.093 -0.477,-0.248 -0.109,-0.155 -0.136,-0.353 -0.073,-0.532l2.008,-5.39c0.388,-1.028 1.536,-1.548 2.565,-1.16 1.028,0.387 1.548,1.536 1.16,2.564l-0.983,2.636c-0.052,0.218 -0.224,0.387 -0.443,0.436 -0.218,0.048 -0.446,-0.033 -0.585,-0.208 -0.139,-0.176 -0.165,-0.416 -0.068,-0.618l0.983,-2.636c0.157,-0.422 -0.058,-0.892 -0.48,-1.05 -0.422,-0.156 -0.892,0.058 -1.049,0.48l-2.008,5.344c-0.085,0.23 -0.305,0.382 -0.55,0.382z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M15.345,16.178c-0.178,0 -0.346,-0.081 -0.456,-0.22 -0.111,-0.139 -0.153,-0.32 -0.114,-0.494l2.34,-10.471c0.216,-1.077 1.263,-1.776 2.34,-1.56 1.077,0.215 1.776,1.263 1.56,2.34l-1.665,8.72c-0.04,0.21 -0.188,0.381 -0.389,0.451 -0.2,0.07 -0.424,0.028 -0.585,-0.111 -0.16,-0.139 -0.236,-0.353 -0.196,-0.562l1.689,-8.725c0.055,-0.286 -0.046,-0.58 -0.266,-0.772 -0.22,-0.191 -0.526,-0.25 -0.801,-0.156 -0.276,0.095 -0.48,0.33 -0.536,0.616l-2.34,10.488c-0.061,0.27 -0.304,0.46 -0.581,0.456zM24.549,21.271L2.45,21.271c-0.323,0 -0.585,-0.262 -0.585,-0.585 0,-0.323 0.262,-0.585 0.585,-0.585L24.55,20.101c0.323,0 0.585,0.262 0.585,0.585 0,0.323 -0.262,0.585 -0.585,0.585zM23.281,29.25L3.72,29.25c-0.323,0 -0.585,-0.261 -0.585,-0.584 0,-0.323 0.262,-0.585 0.585,-0.585L23.28,28.081c0.323,0 0.585,0.262 0.585,0.585 0,0.323 -0.262,0.585 -0.585,0.585z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_noun_add_green.xml b/app/src/main/res/drawable/ic_noun_add_green.xml
new file mode 100644
index 00000000..c66d9dfa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_noun_add_green.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="17"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M8.5,0C3.806,0 0,3.806 0,8.5S3.806,17 8.5,17 17,13.194 17,8.5 13.194,0 8.5,0zM8.5,15.945c-4.105,0 -7.445,-3.34 -7.445,-7.445S4.395,1.055 8.5,1.055s7.445,3.34 7.445,7.445 -3.34,7.445 -7.445,7.445zM9.028,4.58L7.972,4.58v3.392L4.58,7.972v1.056h3.392v3.392h1.056L9.028,9.028h3.392L12.42,7.972L9.028,7.972L9.028,4.58z"
+      android:fillColor="@color/greenish_teal"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_noun_add_image.xml b/app/src/main/res/drawable/ic_noun_add_image.xml
new file mode 100644
index 00000000..17d91a94
--- /dev/null
+++ b/app/src/main/res/drawable/ic_noun_add_image.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="88dp"
+    android:height="72dp"
+    android:viewportWidth="88"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M75.916,8.583L62.165,8.583l-4.793,-8.5L30.628,0.083l-4.793,8.5L12.084,8.583c-6.341,0 -11.5,5.159 -11.5,11.5v40.334c0,6.341 5.159,11.5 11.5,11.5h63.832c6.341,0 11.5,-5.159 11.5,-11.5L87.416,20.083c0,-6.341 -5.159,-11.5 -11.5,-11.5zM44,62.999c-11.901,0 -21.583,-9.683 -21.583,-21.583 0,-11.899 9.682,-21.582 21.583,-21.582 11.901,0 21.583,9.683 21.583,21.582 0,11.9 -9.682,21.583 -21.583,21.583zM47.5,26.834h-7v11h-11v7h11v11h7v-11h11v-7h-11v-11z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_noun_add_red.xml b/app/src/main/res/drawable/ic_noun_add_red.xml
new file mode 100644
index 00000000..ef2a81e3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_noun_add_red.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="17"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M8.5,0C3.806,0 0,3.806 0,8.5S3.806,17 8.5,17 17,13.194 17,8.5 13.194,0 8.5,0zM8.5,15.945c-4.105,0 -7.445,-3.34 -7.445,-7.445S4.395,1.055 8.5,1.055s7.445,3.34 7.445,7.445 -3.34,7.445 -7.445,7.445zM9.028,4.58L7.972,4.58v3.392L4.58,7.972v1.056h3.392v3.392h1.056L9.028,9.028h3.392L12.42,7.972L9.028,7.972L9.028,4.58z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_noun_delete.xml b/app/src/main/res/drawable/ic_noun_delete.xml
new file mode 100644
index 00000000..3e76c0e6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_noun_delete.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="16dp"
+    android:viewportWidth="22"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M9.226,0.127c-1.44,0 -2.839,0.975 -2.839,2.462v1.406L3.903,3.995C1.831,3.995 0,5.501 0,7.512v2.462c0,0.582 0.477,1.054 1.065,1.054h0.354v17.583c0,1.735 1.443,3.165 3.194,3.165h12.774c1.75,0 3.194,-1.43 3.194,-3.165L20.581,11.028h0.354c0.588,0 1.065,-0.472 1.065,-1.054L22,7.512c0,-2.01 -1.83,-3.517 -3.903,-3.517h-2.484L15.613,2.59c0,-1.487 -1.399,-2.462 -2.839,-2.462L9.226,0.128zM9.226,2.237h3.548c0.526,0 0.71,0.28 0.71,0.352L13.484,5.05c0,0.583 0.476,1.055 1.064,1.055h3.549c1.073,0 1.774,0.69 1.774,1.407v1.407L2.129,8.919L2.129,7.512c0,-0.717 0.701,-1.407 1.774,-1.407h3.549c0.588,0 1.064,-0.472 1.064,-1.055L8.516,2.59c0,-0.072 0.184,-0.352 0.71,-0.352zM3.548,11.028h14.904v17.583c0,0.603 -0.457,1.055 -1.065,1.055L4.613,29.666c-0.608,0 -1.065,-0.452 -1.065,-1.055L3.548,11.028zM8.15,12.941c-0.284,0.002 -0.555,0.118 -0.753,0.32 -0.198,0.202 -0.306,0.475 -0.3,0.756v12.66c-0.006,0.38 0.196,0.734 0.528,0.926 0.331,0.192 0.741,0.192 1.073,0 0.332,-0.192 0.533,-0.546 0.528,-0.926v-12.66c0.006,-0.285 -0.105,-0.56 -0.308,-0.764 -0.203,-0.203 -0.48,-0.315 -0.768,-0.312zM13.828,12.941c-0.285,0.002 -0.556,0.118 -0.754,0.32 -0.198,0.202 -0.306,0.475 -0.3,0.756v12.66c-0.005,0.38 0.196,0.734 0.528,0.926 0.332,0.192 0.742,0.192 1.073,0 0.332,-0.192 0.534,-0.546 0.528,-0.926v-12.66c0.006,-0.285 -0.105,-0.56 -0.308,-0.764 -0.202,-0.203 -0.48,-0.315 -0.767,-0.312z"
+      android:fillColor="#FFA3A3"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_percent.xml b/app/src/main/res/drawable/ic_percent.xml
new file mode 100644
index 00000000..037e89a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_percent.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="42"
+    android:viewportHeight="43">
+    <path
+        android:fillColor="@color/primary_red"
+        android:fillType="nonZero"
+        android:pathData="M15.4,10.571c-2.818,0 -5.133,2.344 -5.133,5.198 0,2.854 2.315,5.198 5.133,5.198s5.133,-2.344 5.133,-5.198c0,-2.854 -2.315,-5.198 -5.133,-5.198z" />
+    <path
+        android:fillColor="#FFF"
+        android:fillType="nonZero"
+        android:pathData="M15.4,13.406c1.305,0 2.333,1.041 2.333,2.363s-1.028,2.363 -2.333,2.363c-1.305,0 -2.333,-1.042 -2.333,-2.363 0,-1.322 1.028,-2.363 2.333,-2.363z" />
+    <path
+        android:fillColor="@color/primary_red"
+        android:fillType="nonZero"
+        android:pathData="M28.306,12.446c-0.317,0.043 -0.61,0.194 -0.831,0.429l-14.933,15.12c-0.39,0.35 -0.556,0.892 -0.43,1.404 0.126,0.513 0.523,0.912 1.03,1.036a1.39,1.39 0,0 0,1.383 -0.446l14.933,-15.12a1.43,1.43 0,0 0,0.284 -1.631,1.397 1.397,0 0,0 -1.436,-0.792zM26.6,21.912c-2.818,0 -5.133,2.344 -5.133,5.198 0,2.853 2.315,5.197 5.133,5.197s5.133,-2.344 5.133,-5.197c0,-2.854 -2.315,-5.198 -5.133,-5.198z" />
+    <path
+        android:fillColor="#FFF"
+        android:fillType="nonZero"
+        android:pathData="M26.6,24.747c1.305,0 2.333,1.041 2.333,2.363 0,1.321 -1.028,2.362 -2.333,2.362 -1.305,0 -2.333,-1.04 -2.333,-2.362s1.028,-2.363 2.333,-2.363z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_shake.xml b/app/src/main/res/drawable/ic_shake.xml
new file mode 100644
index 00000000..a3eb57d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shake.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M19.643,37.9997L7.07,37.9997c-0.388,0 -0.718,-0.285 -0.776,-0.671L3.152,16.7457c-0.034,-0.23 0.032,-0.461 0.18,-0.637 0.15,-0.176 0.367,-0.275 0.597,-0.275h18.857c0.23,0 0.446,0.1 0.597,0.275 0.15,0.176 0.215,0.407 0.179,0.637l-3.143,20.583c-0.058,0.386 -0.388,0.671 -0.776,0.671zM7.746,36.4167L18.97,36.4167l2.901,-19L4.845,17.4167l2.9,19z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M25.929,17.4167L0.786,17.4167C0.35,17.4167 0,17.0617 0,16.6247L0,13.4587C0,13.0197 0.35,12.6667 0.786,12.6667h25.143c0.433,0 0.785,0.353 0.785,0.792v3.166c0,0.437 -0.352,0.792 -0.785,0.792zM1.57,15.8337h23.572L25.142,14.2497L1.57,14.2497v1.584z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M22.786,14.25c-0.436,0 -0.786,-0.355 -0.786,-0.792 0,-4.802 -3.878,-8.708 -8.643,-8.708 -4.764,0 -8.643,3.906 -8.643,8.708 0,0.437 -0.352,0.792 -0.785,0.792 -0.434,0 -0.786,-0.355 -0.786,-0.792 0,-5.674 4.582,-10.291 10.214,-10.291 5.632,0 10.214,4.617 10.214,10.291 0,0.437 -0.352,0.792 -0.785,0.792z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M10.214,34.833c-0.107,0 -0.215,-0.022 -0.319,-0.068 -0.396,-0.177 -0.575,-0.646 -0.399,-1.045l12.572,-28.5c0.066,-0.149 0.174,-0.274 0.314,-0.358l7.857,-4.75c0.368,-0.223 0.855,-0.104 1.078,0.271 0.225,0.375 0.102,0.861 -0.27,1.086l-7.644,4.622 -12.47,28.272c-0.131,0.295 -0.419,0.47 -0.719,0.47z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M21.214,26.917H5.5c-0.435,0 -0.786,-0.355 -0.786,-0.792 0,-0.437 0.35,-0.792 0.786,-0.792h15.714c0.434,0 0.786,0.355 0.786,0.792 0,0.437 -0.352,0.792 -0.786,0.792z"
+      android:fillColor="#32C282"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shape.xml b/app/src/main/res/drawable/ic_shape.xml
new file mode 100644
index 00000000..d671f0d9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shape.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="35">
+  <path
+      android:pathData="M20,2.168L17.796,0 0,17.5 17.796,35 20,32.832 4.41,17.5z"
+      android:fillColor="#6D6D6D"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_undraw_happy_announcement_ac_67.xml b/app/src/main/res/drawable/ic_undraw_happy_announcement_ac_67.xml
new file mode 100644
index 00000000..f1775f2b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_undraw_happy_announcement_ac_67.xml
@@ -0,0 +1,104 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="560dp"
+    android:height="392dp"
+    android:viewportWidth="560"
+    android:viewportHeight="392">
+  <path
+      android:pathData="M25.373,150.677c0.533,33.139 12.83,36.726 27.933,33.27C70.56,180 84.72,167.623 91.7,151.25l4.813,-11.293c6.663,-15.633 -0.518,-33.747 -16.04,-40.458 -7.454,-3.223 -15.874,-3.331 -23.408,-0.302 -7.533,3.03 -13.563,8.95 -16.763,16.457 -15.488,6.128 -18.547,18.814 -14.928,35.024z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M122.378,84.15l4.604,-7.921c1.14,-1.96 1.333,-4.343 0.527,-6.467 -0.806,-2.124 -2.524,-3.755 -4.663,-4.429 -2.26,-0.712 -4.72,-0.268 -6.602,1.19 -1.882,1.46 -2.954,3.754 -2.878,6.16l0.27,8.515L92,141.495 103.799,144l18.579,-59.85zM7.379,230.932l-5.744,7.097c-1.421,1.756 -1.954,4.06 -1.447,6.255 0.507,2.195 1.999,4.039 4.049,5.005 2.167,1.02 4.697,0.939 6.793,-0.22 2.095,-1.159 3.497,-3.252 3.762,-5.617l0.937,-8.377L46,179.143 34.518,175l-27.14,55.932z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M43,290.538l0.842,10.105 0.198,2.357 55.996,-5.38c3.915,-0.44 7.384,-2.72 9.338,-6.137 1.954,-3.417 2.158,-7.56 0.55,-11.153l-18.06,-38.724 -6.237,-13.375L58.595,222c-22.29,17.041 -2.235,35.848 22.998,54.872 0.987,0.748 1.985,1.496 2.994,2.243L43,290.538z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M23.394,324.96c1.364,0.196 2.73,-0.337 3.607,-1.407L45,301.59l-1.022,-10.299 -6.137,-3.712c-1.016,-0.614 -2.249,-0.747 -3.37,-0.363 -1.123,0.384 -2.02,1.246 -2.456,2.357l-11.739,29.979c-0.444,1.134 -0.349,2.41 0.26,3.465 0.607,1.055 1.66,1.77 2.858,1.943z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M40,288.526L41.04,301l2.921,-0.28 53.075,-5.104c3.915,-0.442 7.384,-2.724 9.338,-6.145 1.954,-3.42 2.158,-7.567 0.55,-11.163l-14.94,-33.44v-3.243l-6.238,-13.388L58.714,222c-22.29,17.058 -2.235,35.883 22.998,54.926l-0.125,0.166L40,288.526z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M18.394,320.96c1.364,0.196 2.73,-0.337 3.607,-1.407L40,297.59l-1.022,-10.299 -6.137,-3.712c-1.016,-0.614 -2.249,-0.747 -3.37,-0.363 -1.123,0.384 -2.02,1.246 -2.456,2.357l-11.739,29.979c-0.444,1.134 -0.349,2.41 0.26,3.465 0.607,1.055 1.66,1.77 2.858,1.943z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M38,286.538L39.04,299l55.994,-5.38c3.915,-0.441 7.384,-2.721 9.339,-6.137 1.954,-3.416 2.16,-7.56 0.553,-11.152l-14.944,-33.408v-18.692L53.595,218c-23.167,17.71 -0.595,37.329 25.99,57.115L38,286.538z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M72.5,124.5m-15.5,0a15.5,15.5 0,1 1,31 0a15.5,15.5 0,1 1,-31 0"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M52,150.533L74.077,165 93,160.867l-10.513,-10.334v-15.5L65.667,134c-0.353,6.19 -3.962,11.854 -13.667,16.533z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M48.884,222.808L89.507,228l9.374,-43.615c4.355,-11.578 1.857,-21.806 -6.207,-30.94 -0.634,-3.166 -3.375,-5.476 -6.612,-5.574l-3.847,0.167c0.436,13.773 -9.742,10.456 -24.998,-1.038l-1.842,0.551c-4.923,1.472 -8.016,6.324 -7.262,11.392l1.68,11.305c0.712,4.481 1.818,8.891 3.306,13.18 4.165,12.41 2.677,25.547 -4.215,39.38z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M30,175.827L48.692,182 57,152.165l-2.814,-1.267c-4.843,-2.18 -10.563,-0.264 -13.075,4.381L30,175.827zM85,147.593L95.455,159 108,139.296 92.318,131z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M55,119.389c9.74,3.67 20.135,3.289 31,0V107H55v12.389zM542,333.718L531.236,338.205 459.478,240.384 407.454,340 394,337.308 433.467,200 479.212,200z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M556.548,356.834c-1.204,0.33 -2.489,0.164 -3.57,-0.463l-22.673,-13.14c-1.24,-0.72 -2.078,-1.979 -2.265,-3.407 -0.188,-1.429 0.295,-2.864 1.308,-3.882l2.026,-2.04 10.75,-0.902 16.436,15.882c1.217,1.176 1.711,2.92 1.295,4.566 -0.416,1.646 -1.68,2.939 -3.307,3.386zM380.452,360.834c1.204,0.33 2.489,0.164 3.57,-0.463l22.673,-13.14c1.24,-0.72 2.078,-1.979 2.265,-3.407 0.188,-1.429 -0.295,-2.864 -1.308,-3.882l-2.026,-2.04 -10.75,-0.902 -16.436,15.882c-1.217,1.176 -1.711,2.92 -1.295,4.566 0.416,1.646 1.68,2.939 3.307,3.386z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M403,57.357L398.45,60l-9.428,-14.833c-1.175,-1.848 -1.347,-4.135 -0.462,-6.13 0.885,-1.994 2.717,-3.447 4.911,-3.894 1.945,-0.396 3.972,0.04 5.56,1.196 1.589,1.156 2.584,2.92 2.731,4.84L403,57.356zM527,174.815l1.865,-4.815 16.678,6.03c2.079,0.752 3.656,2.45 4.227,4.554 0.57,2.104 0.065,4.349 -1.356,6.019 -1.26,1.48 -3.109,2.353 -5.071,2.395 -1.963,0.043 -3.85,-0.75 -5.174,-2.174L527,174.814z"
+      android:fillColor="#FFB9B9"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M456.5,98.5m-13.5,0a13.5,13.5 0,1 1,27 0a13.5,13.5 0,1 1,-27 0"
+      android:fillColor="#FFB9B9"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M468,126L449,126 449,105.76 465.286,104z"
+      android:fillColor="#FFB9B9"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M481.935,205H431c1.796,-28.395 3.218,-55.835 0,-71.425l2.962,-14.204c0.85,-4.08 4.694,-6.826 8.834,-6.309l6.97,0.87c4.719,8.29 10.423,8.21 16.978,0.894h8.394c2.26,0 4.426,0.909 6.01,2.521 1.582,1.613 2.449,3.795 2.404,6.053 2.187,10.004 2.914,20.272 2.16,30.484L481.934,205z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M396,57.595L403.216,54 442,117.821 431.177,134zM526.9,178l6.1,-5.178 -32.41,-45.705c-6.473,-9.129 -17.608,-13.666 -28.568,-11.64l-1.022,0.188 12.255,21.584 16.141,12.299L526.901,178z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M471.242,90.263s2.478,-5.585 -3.967,-8.123c0,0 -5.453,-9.138 -16.36,-3.046 0,0 -7.436,3.046 -7.436,11.169 0,8.122 -2.479,9.645 -2.479,9.645s3.691,-3.878 4.683,-6.924c0.991,-3.046 8.703,-3.737 11.677,-0.69 2.975,3.045 10.411,2.537 10.411,2.537L467.275,106s2.48,-6.6 3.47,-6.6c0.992,0 1.984,-9.137 0.497,-9.137z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M389,387.5a82.5,4.5 0,1 0,165 0a82.5,4.5 0,1 0,-165 0z"
+      android:fillColor="#E6E6E6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M16,387.5a43.5,2.5 0,1 0,87 0a43.5,2.5 0,1 0,-87 0z"
+      android:fillColor="#E6E6E6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M391.525,75.311l-264.297,23.67c-2.702,0.238 -5.087,-1.753 -5.333,-4.453l-5.876,-65.51c-0.239,-2.7 1.755,-5.084 4.456,-5.33L384.772,0.02c2.702,-0.238 5.087,1.753 5.333,4.453l5.876,65.51c0.239,2.7 -1.755,5.084 -4.456,5.33z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M158.5,58.5m-20.5,0a20.5,20.5 0,1 1,41 0a20.5,20.5 0,1 1,-41 0"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M205.138,40.249c-1.896,0.17 -3.294,1.812 -3.124,3.67 0.17,1.858 1.843,3.23 3.74,3.068l162.097,-14.235c1.23,-0.106 2.308,-0.848 2.828,-1.945s0.402,-2.383 -0.308,-3.372c-0.711,-0.989 -1.907,-1.53 -3.136,-1.421L205.138,40.249zM207.15,60.248c-1.23,0.106 -2.308,0.847 -2.829,1.945 -0.52,1.097 -0.402,2.383 0.309,3.372 0.71,0.99 1.907,1.531 3.137,1.42L369.85,52.753c1.23,-0.106 2.308,-0.848 2.828,-1.945s0.402,-2.383 -0.308,-3.372c-0.711,-0.989 -1.907,-1.53 -3.136,-1.421L207.15,60.248z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_undraw_personal_settings_re_i_6_w_4.xml b/app/src/main/res/drawable/ic_undraw_personal_settings_re_i_6_w_4.xml
new file mode 100644
index 00000000..1a54027c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_undraw_personal_settings_re_i_6_w_4.xml
@@ -0,0 +1,94 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="604dp"
+    android:height="546dp"
+    android:viewportWidth="604"
+    android:viewportHeight="546">
+  <path
+      android:pathData="M297.825,499.52c7.543,2.65 15.922,1.174 22.105,-3.895 7.742,-6.498 10.17,-17.201 12.145,-27.114l5.841,-29.321 -12.23,8.421c-8.796,6.056 -17.79,12.307 -23.88,21.08 -6.09,8.771 -8.746,20.747 -3.855,30.24"
+      android:fillColor="#E4E4E4"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M299.714,537.06c-1.54,-11.216 -3.124,-22.576 -2.041,-33.912 0.959,-10.067 4.03,-19.898 10.284,-27.963 3.319,-4.271 7.357,-7.931 11.934,-10.815 1.193,-0.753 2.292,1.138 1.104,1.888 -7.92,5.005 -14.045,12.395 -17.493,21.106 -3.809,9.686 -4.42,20.245 -3.764,30.535 0.396,6.222 1.239,12.404 2.085,18.578 0.139,0.58 -0.195,1.167 -0.764,1.345 -0.582,0.156 -1.181,-0.184 -1.345,-0.764v0.001z"
+      android:fillColor="#F2F2F2"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M310.794,519.063c3.235,4.918 8.8,7.792 14.683,7.58 7.434,-0.352 13.63,-5.539 19.206,-10.465l16.499,-14.566 -10.919,-0.523c-7.852,-0.376 -15.907,-0.729 -23.386,1.696 -7.48,2.424 -14.377,8.249 -15.744,15.99"
+      android:fillColor="#E4E4E4"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M295.362,543.506c7.412,-13.113 16.007,-27.687 31.368,-32.345 4.27,-1.29 8.748,-1.753 13.192,-1.362 1.401,0.12 1.051,2.28 -0.347,2.16 -7.45,-0.62 -14.885,1.348 -21.054,5.57 -5.937,4.04 -10.56,9.659 -14.471,15.616 -2.397,3.65 -4.543,7.453 -6.69,11.252 -0.686,1.214 -2.692,0.338 -1.998,-0.89z"
+      android:fillColor="#F2F2F2"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M541.365,384.558L0,384.558 0,0 541.365,0z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M44.099,157.945c-2.913,0 -5.275,2.362 -5.275,5.275 0,2.913 2.362,5.275 5.275,5.275h182.82c2.91,-0.006 5.265,-2.366 5.265,-5.275 0,-2.91 -2.356,-5.27 -5.265,-5.275H44.099zM44.099,189.594c-2.913,-0.006 -5.28,2.35 -5.286,5.264 -0.006,2.913 2.35,5.28 5.263,5.286h182.978c2.913,0 5.275,-2.362 5.275,-5.275 0,-2.913 -2.362,-5.275 -5.275,-5.275H44.099zM44.099,220.79c-2.913,-0.006 -5.28,2.351 -5.286,5.264 -0.006,2.913 2.35,5.28 5.263,5.286h41.176c2.913,0 5.275,-2.361 5.275,-5.275 0,-2.913 -2.362,-5.275 -5.275,-5.275H44.099z"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M541.365,384.558H0V0h541.365v384.558zM8.899,375.66h523.566V8.9H8.9v366.76z"
+      android:fillColor="#E5E5E5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M371.023,300.059c-5.238,-0.007 -9.49,4.23 -9.502,9.468 -0.01,5.238 4.224,9.494 9.462,9.509h90.6c3.392,0.003 6.527,-1.805 8.224,-4.742 1.698,-2.937 1.698,-6.556 0,-9.494 -1.697,-2.937 -4.832,-4.744 -8.225,-4.741h-90.56zM371.023,185.154c-5.238,-0.007 -9.49,4.231 -9.502,9.469 -0.01,5.237 4.224,9.493 9.462,9.508h90.6c3.392,0.003 6.527,-1.804 8.224,-4.741 1.698,-2.938 1.698,-6.557 0,-9.494 -1.697,-2.937 -4.832,-4.745 -8.225,-4.742h-90.56zM44.099,304.454c-1.885,-0.004 -3.628,0.997 -4.574,2.627 -0.946,1.63 -0.95,3.641 -0.011,5.275 0.939,1.634 2.678,2.643 4.562,2.647h182.978c2.913,0 5.275,-2.361 5.275,-5.274 0,-2.914 -2.362,-5.275 -5.275,-5.275H44.099zM44.099,335.65c-1.885,-0.004 -3.628,0.998 -4.574,2.628 -0.946,1.63 -0.95,3.64 -0.011,5.275 0.939,1.634 2.678,2.643 4.562,2.647h41.176c2.913,0 5.275,-2.362 5.275,-5.275 0,-2.913 -2.362,-5.275 -5.275,-5.275H44.099zM44.099,272.805c-2.913,0 -5.275,2.361 -5.275,5.275 0,2.913 2.362,5.274 5.275,5.274h182.82c2.91,-0.005 5.265,-2.365 5.265,-5.274 0,-2.91 -2.356,-5.27 -5.265,-5.275H44.099z"
+      android:fillColor="#E4E4E4"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M419.85,198.757c-0.382,2.765 0.48,5.558 2.356,7.626 1.875,2.068 4.57,3.2 7.359,3.09l9.036,19.568 13.231,-2.59 -13.149,-27.457c-0.506,-4.778 -4.506,-8.423 -9.311,-8.483 -4.805,-0.06 -8.896,3.482 -9.522,8.246z"
+      android:fillColor="#FFB6B6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M511.389,272.812L474.521,254.575 448.505,210.421 430.32,219.217 453.92,270.226 513.537,304.641z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M428.154,533.834L416.564,533.833 411.05,500.417 428.156,500.418z"
+      android:fillColor="#FFB6B6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M431.11,545.068l-37.37,-0.001v-0.473c0,-8.033 6.512,-14.545 14.545,-14.545h22.826l-0.001,15.019z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M543.841,512.577L535.755,520.879 507.969,501.514 519.904,489.261z"
+      android:fillColor="#FFB6B6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M553.952,518.298l-26.075,26.77 -0.339,-0.33c-5.754,-5.605 -5.875,-14.813 -0.271,-20.568v-0.001l15.926,-16.35 10.759,10.479zM442.483,334.961h-8.016c-20.839,22.771 -36.745,49.604 -46.722,78.815l-9.576,28.038 34.13,71.458 21.296,0.38 -24.34,-75.866 24.522,-32.52 1.236,65.373 78.93,41.371 15.796,-23.336 -64.227,-35.12 10.938,-55.605s22.006,-18.35 9.192,-47.04l-43.16,-15.948z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M547.982,262.19l-33.31,-14.589 -36.662,16.246s-10.382,5.906 -3.765,21.031l-39.778,50.083s0.073,0.02 50.065,15.948l45.104,-39.72c13.908,-12.248 20.79,-30.628 18.346,-49z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M542.392,223.952m-23.219,0a23.219,23.219 0,1 1,46.438 0a23.219,23.219 0,1 1,-46.438 0"
+      android:fillColor="#FFB6B6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M572.462,193.14c-5.33,-4.336 -13.594,-5.282 -19.095,-1.168 -9.594,-5.036 -22.56,-2.41 -29.438,5.964 -2.475,3.013 -4.229,7.089 -3.004,10.79 1.224,3.702 6.506,5.879 9.258,3.117l-0.049,1.138c5.063,5.07 6.728,12.613 4.272,19.343 -2.457,6.73 -8.592,11.426 -15.73,12.04l22.826,9.222c3.202,1.293 6.505,2.607 9.958,2.589 3.452,-0.018 7.132,-1.695 8.472,-4.877l2.89,8.858c5.671,-9.023 10.336,-18.64 13.911,-28.679 2.303,-6.472 4.166,-13.24 3.917,-20.104 -0.249,-6.865 -2.86,-13.898 -8.188,-18.233z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M390.109,309.457m-17.016,0a17.016,17.016 0,1 1,34.032 0a17.016,17.016 0,1 1,-34.032 0"
+      android:fillColor="#CACACA"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M443.049,194.643m-17.016,0a17.016,17.016 0,1 1,34.032 0a17.016,17.016 0,1 1,-34.032 0"
+      android:fillColor="#AF1014"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M443.484,189.304c-0.382,2.765 0.48,5.557 2.355,7.625 1.875,2.068 4.57,3.2 7.36,3.09l9.035,19.569 13.232,-2.59 -13.15,-27.457c-0.505,-4.778 -4.505,-8.423 -9.31,-8.484 -4.805,-0.06 -8.896,3.482 -9.522,8.247z"
+      android:fillColor="#FFB6B6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M535.023,263.359L498.154,245.122 472.138,200.968 453.954,209.764 477.553,260.772 537.171,295.187z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M638.732,545.794H278.554c-0.522,0 -0.945,-0.423 -0.945,-0.945s0.423,-0.946 0.945,-0.946h360.178c0.522,0 0.945,0.424 0.945,0.946s-0.423,0.945 -0.945,0.945z"
+      android:fillColor="#CACACA"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/rounded_rectangle_button_red.xml b/app/src/main/res/drawable/rounded_rectangle_button_red.xml
new file mode 100644
index 00000000..d8d40285
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle_button_red.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid
+        android:color="@color/primary_red" >
+    </solid>
+    <corners
+        android:radius="@dimen/rounded_rectangle_button_red_radius">
+    </corners>
+</shape>
diff --git a/app/src/main/res/layout/activity_catalog.xml b/app/src/main/res/layout/activity_catalog.xml
new file mode 100644
index 00000000..fe4a8348
--- /dev/null
+++ b/app/src/main/res/layout/activity_catalog.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white_two"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_catalog_activity"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:theme="@style/AppThemeWhiteActionBar.ActionBar"
+            app:titleTextColor="@color/brownish_grey">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/tv_action_bar_title"
+                    style="@style/GreyTitleStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Catalog" />
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/sw_live_order"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/spacing_normal"
+                    android:layout_gravity="end|center_vertical"
+                    android:background="@android:color/transparent"
+                    android:checked="true"
+                    android:theme="@style/MySwitch"
+                    android:thumb="@drawable/switch_selector"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tv_action_bar_title"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:switchMinWidth="@dimen/spacing_gigantic"
+                    android:visibility="gone"/>
+
+                <ImageView
+                    android:id="@+id/imageView6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:src="@drawable/ic_noun_delete"
+                    android:visibility="gone"/>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.appcompat.widget.Toolbar>
+
+        <FrameLayout
+            android:id="@+id/fragment_container_catalog"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </FrameLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_manager_work.xml b/app/src/main/res/layout/activity_manager_work.xml
index d83fb703..e74780e7 100644
--- a/app/src/main/res/layout/activity_manager_work.xml
+++ b/app/src/main/res/layout/activity_manager_work.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true">
 
     <RelativeLayout
@@ -28,7 +29,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Live Orders" />
+                    android:text="Live Orders"/>
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/sw_live_order"
diff --git a/app/src/main/res/layout/fragment_catalog_add.xml b/app/src/main/res/layout/fragment_catalog_add.xml
new file mode 100644
index 00000000..3274c341
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/spacing_normal">
+
+        <ImageView
+            android:id="@+id/imageView4"
+            android:layout_width="302dp"
+            android:layout_height="273dp"
+            android:layout_marginBottom="46dp"
+            android:src="@drawable/ic_undraw_personal_settings_re_i_6_w_4"
+            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:layout_marginBottom="27dp"
+            android:text="Let's Begin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_customization.xml b/app/src/main/res/layout/fragment_catalog_add_customization.xml
new file mode 100644
index 00000000..24c067c0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add_customization.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:itemCount="1"
+            tools:listitem="@layout/item_catalog_add_customization" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="37dp"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:background="@color/white_two"
+            android:paddingStart="@dimen/spacing_normal"
+            android:paddingEnd="@dimen/spacing_normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/recyclerView2">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableStart="@drawable/ic_noun_add_green"
+                android:drawablePadding="@dimen/spacing_tiny"
+                android:fontFamily="@font/josefinsans_regular"
+                android:text="More Add On group"
+                android:textColor="@color/greenish_teal"
+                android:textSize="12sp"
+                android:textStyle="normal"
+                android:layout_gravity="center_vertical"/>
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:layout_marginBottom="@dimen/spacing_normal"
+            android:text="Save Customization"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_group.xml b/app/src/main/res/layout/fragment_catalog_add_group.xml
new file mode 100644
index 00000000..b805e103
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add_group.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/spacing_normal"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalogue_menu_name"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="Group Name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_menu_name"
+                style="@style/CatalogOutlinedInput"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/chipGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_menu_name">
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Drinks" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Food" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Desert" />
+
+        </com.google.android.material.chip.ChipGroup>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/menu"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:hint="Icon Type"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/chipGroup">
+
+            <AutoCompleteTextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="@dimen/spacing_extra_small"
+                android:paddingBottom="@dimen/spacing_extra_small"
+                android:inputType="none"
+                android:singleLine="true"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/josefinsans_regular"
+            android:textColor="@color/brownish_grey"
+            android:textSize="7sp"
+            android:textStyle="normal"
+            android:layout_marginTop="@dimen/spacing_extra_tiny"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/menu"
+            android:text="Assign icons to your group." />
+
+        <Button
+            android:id="@+id/button3"
+            style="@style/CatalogRedRoundedButton"
+            android:text="Save Group"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_item.xml b/app/src/main/res/layout/fragment_catalog_add_item.xml
new file mode 100644
index 00000000..134b67b8
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add_item.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+        <ImageView
+            android:id="@+id/imageView5"
+            android:layout_width="match_parent"
+            android:layout_height="190dp"
+            android:background="@color/black"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="44dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_noun_add_image"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/josefinsans_regular"
+            android:letterSpacing="-0.02"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:textStyle="normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView3"
+            android:text="Upload Image (optional)" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalogue_menu_name"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:hint="Cuisine"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_menu_name"
+                style="@style/CatalogOutlinedInput"
+                android:hint="Select Group"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalogue_me"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:hint="Item Name"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_menu_name">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_mme"
+                style="@style/CatalogOutlinedInput"
+                android:hint="Sholey Kebab"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/checkBox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:buttonTint="@color/primary_red"
+            android:text="Veg"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
+
+        <CheckBox
+            android:id="@+id/checkBox3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:buttonTint="@color/primary_red"
+            android:text="Egg"
+            app:layout_constraintStart_toEndOf="@+id/checkBox2"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
+
+        <CheckBox
+            android:id="@+id/checkBox2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:buttonTint="@color/primary_red"
+            android:text="Non Veg"
+            app:layout_constraintStart_toEndOf="@+id/checkBox"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/chipGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/checkBox2">
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Breakfast" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Lunch" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Dinner" />
+
+        </com.google.android.material.chip.ChipGroup>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalo"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:hint="Description (optional)"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/chipGroup">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogme"
+                style="@style/CatalogOutlinedInput"
+                android:lines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout2"
+            android:layout_width="0dp"
+            android:layout_height="93dp"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:background="@drawable/background_catalog_add_variant"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalo">
+
+            <ImageView
+                android:id="@+id/imageView7"
+                android:layout_width="15dp"
+                android:layout_height="25dp"
+                android:layout_marginStart="80dp"
+                app:layout_constraintBottom_toTopOf="@+id/textView12"
+                app:layout_constraintEnd_toStartOf="@+id/imageView8"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintHorizontal_chainStyle="spread"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:src="@drawable/ic_drink_outlined" />
+
+            <ImageView
+                android:id="@+id/imageView8"
+                android:layout_width="19dp"
+                android:layout_height="31dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView7"
+                app:layout_constraintEnd_toStartOf="@+id/imageView9"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView7"
+                android:src="@drawable/ic_drink_outlined" />
+
+            <ImageView
+                android:id="@+id/imageView9"
+                android:layout_width="23dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="80dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView8"
+                android:src="@drawable/ic_drink_outlined" />
+
+            <TextView
+                android:id="@+id/textView12"
+                android:layout_width="match_parent"
+                android:layout_height="24dp"
+                android:layout_marginBottom="2dp"
+                android:fontFamily="@font/josefinsans_regular"
+                android:gravity="center_horizontal"
+                android:text="Add Size and type to items"
+                android:textColor="@color/brownish_grey"
+                android:textSize="10sp"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toTopOf="@+id/textView13"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/textView13"
+                android:layout_width="match_parent"
+                android:layout_height="22dp"
+                android:fontFamily="@font/josefinsans_regular"
+                android:gravity="center_horizontal"
+                android:text="Start adding Variation name ad price to the item"
+                android:textColor="@color/brownish_grey"
+                android:textSize="9sp"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout3"
+            android:layout_width="0dp"
+            android:layout_height="93dp"
+            android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_normal"
+            android:background="@drawable/background_catalog_add_customization"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/constraintLayout2">
+
+            <ImageView
+                android:id="@+id/imageView10"
+                android:layout_width="29dp"
+                android:layout_height="30dp"
+                android:layout_marginStart="80dp"
+                app:layout_constraintBottom_toTopOf="@+id/textView11"
+                app:layout_constraintEnd_toStartOf="@+id/imageView13"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:src="@drawable/ic_burgur" />
+
+            <ImageView
+                android:id="@+id/imageView11"
+                android:layout_width="16dp"
+                android:layout_height="19dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+                app:layout_constraintEnd_toStartOf="@+id/imageView12"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView13"
+                app:layout_constraintTop_toTopOf="@+id/imageView10"
+                android:src="@drawable/ic_shake" />
+
+            <ImageView
+                android:id="@+id/imageView12"
+                android:layout_width="19dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="80dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView11"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView11"
+                app:layout_constraintTop_toTopOf="@+id/imageView11"
+                android:src="@drawable/ic_fries" />
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="match_parent"
+                android:layout_height="24dp"
+                android:layout_marginBottom="1dp"
+                android:fontFamily="@font/josefinsans_regular"
+                android:gravity="center_horizontal"
+                android:text="Add Size and type to items"
+                android:textColor="@color/brownish_grey"
+                android:textSize="10sp"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toTopOf="@+id/textView14"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/textView14"
+                android:layout_width="match_parent"
+                android:layout_height="22dp"
+                android:fontFamily="@font/josefinsans_regular"
+                android:gravity="center_horizontal"
+                android:text="Start adding Variation name ad price to the item"
+                android:textColor="@color/brownish_grey"
+                android:textSize="9sp"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <ImageView
+                android:id="@+id/imageView13"
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+                app:layout_constraintEnd_toStartOf="@+id/imageView11"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView10"
+                app:layout_constraintTop_toTopOf="@+id/imageView10"
+                android:src="@drawable/ic_add_green_normal" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:text="Save Item"
+            android:layout_marginTop="@dimen/spacing_small"
+            tools:layout_editor_absoluteX="203dp"
+            tools:layout_editor_absoluteY="631dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/constraintLayout3"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_items.xml b/app/src/main/res/layout/fragment_catalog_add_items.xml
new file mode 100644
index 00000000..4592aad1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add_items.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/spacing_normal">
+
+        <ImageView
+            android:id="@+id/imageView4"
+            android:layout_width="280dp"
+            android:layout_height="196dp"
+            android:layout_marginBottom="170dp"
+            android:src="@drawable/ic_undraw_happy_announcement_ac_67"
+            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:layout_width="70dp"
+            android:text="Add Item"
+            android:layout_marginRight="@dimen/spacing_large"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="7dp"
+            android:layout_marginBottom="10dp"
+            android:fontFamily="@font/josefinsans_regular"
+            android:text="Lets add your first item to menu"
+            android:textColor="@color/primary_red"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView4"
+            app:layout_constraintStart_toStartOf="@+id/imageView4" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_variant.xml b/app/src/main/res/layout/fragment_catalog_add_variant.xml
new file mode 100644
index 00000000..b04e14c9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_add_variant.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/spacing_normal"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/item_catalog_add_variant">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+        <TextView
+            android:id="@+id/textView9"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Add more variants"
+            android:drawableStart="@drawable/ic_noun_add_red"
+            android:drawablePadding="@dimen/spacing_tiny"
+            android:fontFamily="@font/josefinsans_semibold"
+            android:textStyle="normal"
+            android:textColor="@color/primary_red"
+            android:textSize="6.5sp"
+            android:layout_marginTop="@dimen/spacing_normal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/recyclerView" />
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:text="Save Variants"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_details.xml b/app/src/main/res/layout/fragment_catalog_details.xml
new file mode 100644
index 00000000..6cc145c7
--- /dev/null
+++ b/app/src/main/res/layout/fragment_catalog_details.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/spacing_normal"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalogue_menu_name"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:hint="Menu Name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_menu_name"
+                style="@style/CatalogOutlinedInput"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_manager_catalogue_GST_number"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="52dp"
+            android:hint="GST Number (optional)"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etLayout_manager_catalogue_menu_name">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_catalog_GST_number"
+                style="@style/CatalogOutlinedInput"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/finance_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="etLayout_catalog_CGST, etLayout_catalog_SGST, etLayout_catalog_IGST"/>
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_catalog_CGST"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:hint="CGST"
+            app:expandedHintEnabled="false"
+            app:layout_constraintBottom_toBottomOf="@+id/etLayout_catalog_SGST"
+            app:layout_constraintEnd_toStartOf="@+id/etLayout_catalog_SGST"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_CGST"
+                style="@style/CatalogOutlinedInput"
+                android:drawableEnd="@drawable/ic_percent"
+                android:hint="0.0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_catalog_SGST"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:hint="SGST"
+            app:expandedHintEnabled="false"
+            app:layout_constraintBottom_toBottomOf="@+id/etLayout_catalog_IGST"
+            app:layout_constraintEnd_toStartOf="@+id/etLayout_catalog_IGST"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayout_catalog_CGST"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_SGST"
+                style="@style/CatalogOutlinedInput"
+                android:drawableEnd="@drawable/ic_percent"
+                android:hint="0.0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_catalog_IGST"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:hint="IGST"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayout_catalog_SGST"
+            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_IGST"
+                style="@style/CatalogOutlinedInput"
+                android:drawableEnd="@drawable/ic_percent"
+                android:hint="0.0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_catalog_service_charge"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:hint="Service Charge"
+            android:layout_marginTop="@dimen/spacing_normal"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toStartOf="@+id/etLayout_catalog_VAT_charge"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/barrier3">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_service_charge"
+                style="@style/CatalogOutlinedInput"
+                android:drawableEnd="@drawable/ic_percent"
+                android:hint="0.0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayout_catalog_VAT_charge"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="VAT Charge"
+            android:layout_marginTop="@dimen/spacing_normal"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayout_catalog_service_charge"
+            app:layout_constraintTop_toBottomOf="@+id/barrier3">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manager_catalogue_VAT_charge"
+                style="@style/CatalogOutlinedInput"
+                android:drawableEnd="@drawable/ic_percent"
+                android:hint="0.0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Button
+            android:id="@+id/button2"
+            style="@style/CatalogRedRoundedButton"
+            android:text="Create"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.chip.ChipGroup
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etLayout_catalog_service_charge">
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Cash" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="Card" />
+
+            <com.google.android.material.chip.Chip
+                style="@style/CustomChipChoice"
+                android:text="UPI" />
+
+        </com.google.android.material.chip.ChipGroup>
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/spacing_tiny"
+            android:fontFamily="@font/josefinsans_regular"
+            android:text="Financials"
+            android:textColor="@color/primary_red"
+            android:textSize="9sp"
+            android:textStyle="normal"
+            app:layout_constraintBottom_toTopOf="@+id/etLayout_manager_catalogue_GST_number"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="etLayout_catalog_CGST,etLayout_catalog_SGST,etLayout_catalog_IGST"
+            tools:layout_editor_absoluteX="16dp"
+            tools:layout_editor_absoluteY="196dp" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_catalog_add_customization.xml b/app/src/main/res/layout/item_catalog_add_customization.xml
new file mode 100644
index 00000000..adf6d2a8
--- /dev/null
+++ b/app/src/main/res/layout/item_catalog_add_customization.xml
@@ -0,0 +1,129 @@
+<?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"
+    android:background="@color/white_two"
+    android:padding="@dimen/spacing_normal"
+    android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_catalo"
+        style="@style/CatalogOutlinedInputLayout"
+        android:hint="Add On Group Name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaatalogme"
+            style="@style/CatalogOutlinedInput"
+            android:inputType="text"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_cao"
+        style="@style/CatalogOutlinedInputLayout"
+        android:layout_marginEnd="@dimen/spacing_small"
+        android:hint="Minimum Selection"
+        app:expandedHintEnabled="false"
+        app:layout_constraintBottom_toBottomOf="@+id/etLayger_cat"
+        app:layout_constraintEnd_toStartOf="@+id/etLayger_cat"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaalogme"
+            style="@style/CatalogOutlinedInput"
+            android:hint="0"
+            android:inputType="number"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_cat"
+        style="@style/CatalogOutlinedInputLayout"
+        android:layout_marginTop="@dimen/spacing_normal"
+        android:hint="Maximum Selection"
+        app:expandedHintEnabled="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/etLayger_cao"
+        app:layout_constraintTop_toBottomOf="@id/etLayger_catalo">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaataloe"
+            style="@style/CatalogOutlinedInput"
+            android:hint="0"
+            android:inputType="number"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_normal"
+        android:fontFamily="@font/josefinsans_regular"
+        android:text="Add first option to your Add On."
+        android:textColor="@color/primary_red"
+        android:textSize="7sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etLayger_cao" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_ao"
+        style="@style/CatalogOutlinedInputLayout"
+        android:hint="Field Name"
+        android:layout_marginEnd="@dimen/spacing_small"
+        app:layout_constraintBottom_toBottomOf="@+id/etLayger_at"
+        app:layout_constraintEnd_toStartOf="@+id/etLayger_at"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaaogme"
+            style="@style/CatalogOutlinedInput"
+            android:inputType="text"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_at"
+        style="@style/CatalogOutlinedInputLayout"
+        android:layout_marginTop="@dimen/spacing_tiny"
+        android:hint="Price"
+        app:expandedHintEnabled="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/etLayger_ao"
+        app:layout_constraintTop_toBottomOf="@+id/textView10">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaaaloe"
+            style="@style/CatalogOutlinedInput"
+            android:hint="0"
+            android:inputType="numberDecimal"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_normal"
+        android:drawableLeft="@drawable/ic_noun_add_red"
+        android:drawablePadding="@dimen/spacing_tiny"
+        android:fontFamily="@font/josefinsans_semibold"
+        android:textColor="@color/primary_red"
+        android:textSize="6.5sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etLayger_ao"
+        tools:text="Add more fields" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_catalog_add_variant.xml b/app/src/main/res/layout/item_catalog_add_variant.xml
new file mode 100644
index 00000000..e0450af4
--- /dev/null
+++ b/app/src/main/res/layout/item_catalog_add_variant.xml
@@ -0,0 +1,41 @@
+<?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">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLayger_catalo"
+        style="@style/CatalogOutlinedInputLayout"
+        android:hint="Item Type/Size"
+        android:layout_marginRight="@dimen/spacing_large"
+        app:layout_constraintEnd_toStartOf="@+id/etLaer_catalo"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaatalogme"
+            style="@style/CatalogOutlinedInput"
+            android:inputType="text"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/etLaer_catalo"
+        style="@style/CatalogOutlinedInputLayout"
+        android:hint="Price (Rs.)"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/etLayger_catalo"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_manaalogme"
+            style="@style/CatalogOutlinedInput"
+            android:inputType="numberDecimal"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7cbed5ee..42923a8e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -271,4 +271,5 @@
     <dimen name="width_button_verify_pay">250dp</dimen>
     <dimen name="height_button_verify_pay">40dp</dimen>
     <dimen name="auth_profile_size">90dp</dimen>
+    <dimen name="rounded_rectangle_button_red_radius">19dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7f7a6f45..61e45737 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -461,6 +461,17 @@
         <item name="android:textSize">@dimen/font_small</item>
     </style>
 
+    <style name="ButtonRedRounded" parent="Widget.AppCompat.Button">
+        <item name="android:fontFamily">@font/lucida_grande</item>
+        <item name="android:background">@drawable/rounded_rectangle_button_red</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:paddingStart">@dimen/spacing_small</item>
+        <item name="android:paddingEnd">@dimen/spacing_small</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">@dimen/font_small</item>
+    </style>
+
     <style name="ButtonLargeGreyTitle" parent="Widget.AppCompat.Button">
         <item name="android:fontFamily">@font/opensans</item>
         <item name="android:background">@drawable/bordered_card_brownish_grey</item>
@@ -736,4 +747,40 @@
         <item name="cornerRadius">@dimen/card_corner_radius_small</item>
     </style>
 
+    <style name="CustomChipChoice" parent="@style/Widget.MaterialComponents.Chip.Choice">
+        <item name="chipBackgroundColor">@color/background_color_chip_state_list</item>
+        <item name="android:textColor">@color/text_color_chip_state_list</item>
+        <item name="android:layout_marginRight">@dimen/spacing_small</item>
+        <item name="android:checkable">true</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="CatalogRedRoundedButton" parent="Widget.AppCompat.Button">
+        <item name="android:fontFamily">@font/lucida_grande</item>
+        <item name="android:background">@drawable/rounded_rectangle_button_red</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">@dimen/font_large</item>
+        <item name="android:layout_width">208dp</item>
+        <item name="android:layout_height">37.5dp</item>
+        <item name="android:shadowColor">#80ffffff</item>
+        <item name="android:shadowRadius">2</item>
+    </style>
+
+    <style name="CatalogOutlinedInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="CatalogOutlinedInput">
+        <item name="android:paddingTop">@dimen/spacing_extra_small</item>
+        <item name="android:paddingBottom">@dimen/spacing_extra_small</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
 </resources>
diff --git a/build.gradle b/build.gradle
index e4c5bbde..3120e23c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,8 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.gradlePlugin"
         classpath "io.objectbox:objectbox-gradle-plugin:$versions.objectBox"
-        classpath "com.google.gms:google-services:4.3.3"
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
+        classpath "com.google.gms:google-services:4.3.8"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         // Navigation Safe Args
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17e69515..5b653869 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 13 09:20:25 IST 2020
+#Mon Jul 19 14:35:04 IST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
index 2ada7d04..9d529d95 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -5,7 +5,7 @@ ext.versions = [
         publishVersion    : '1.3.2',
         publishVersionCode: 60,
 
-        gradlePlugin      : '3.5.3',
+        gradlePlugin      : '4.2.2',
 
         kotlin            : '1.4.10',
         ktx               : '1.1.0',

From 1544cad3bf1077bd049484344d4d0be021863d0d Mon Sep 17 00:00:00 2001
From: Prakhar <prakhar@everything.net.in>
Date: Fri, 30 Jul 2021 19:54:47 +0530
Subject: [PATCH 2/2] All screens are functional now, only connecting with the
 API is left

---
 app/build.gradle                              |   1 +
 .../app/checkin/data/network/WebApiService.kt |  17 +
 .../app/checkin/manager/CatalogRepository.kt  |  74 ++
 .../manager/activities/CatalogActivity.kt     |  15 +-
 .../adapters/CatalogCustomizationAdapter.kt   |  43 ++
 .../CatalogCustomizationFieldAdapter.kt       |  32 +
 .../manager/adapters/CatalogVariantAdapter.kt |  32 +
 .../CatalogAddCustomizationFragment.kt        |  47 +-
 .../manager/fragments/CatalogAddFragment.kt   |   8 +-
 .../fragments/CatalogAddGroupFragment.kt      |  59 +-
 .../fragments/CatalogAddItemFragment.kt       |  74 +-
 .../fragments/CatalogAddVariantFragment.kt    |  40 +-
 .../fragments/CatalogDetailsFragment.kt       |  40 +-
 .../CatalogGroupChooserDialogFragment.kt      |  33 +
 .../manager/models/CatalogMenuModel.kt        |  17 +
 .../manager/models/CustomizationFieldModel.kt |  15 +
 .../manager/models/CustomizationGroupModel.kt |  17 +
 .../manager/models/GroupMenuItemModel.kt      |  37 +
 .../manager/models/ItemCustomizationModel.kt  |   6 +
 .../manager/models/ItemVariantModel.kt        |   3 +
 .../checkin/manager/models/MenuGroupModel.kt  |  19 +
 .../manager/viewmodels/CatalogViewModel.kt    | 104 +++
 .../com/checkin/app/checkin/package-info.java |   4 +
 app/src/main/res/layout/activity_catalog.xml  |   2 +-
 .../main/res/layout/fragment_catalog_add.xml  |   4 +-
 .../fragment_catalog_add_customization.xml    |  12 +-
 .../res/layout/fragment_catalog_add_group.xml |  18 +-
 .../res/layout/fragment_catalog_add_item.xml  | 635 +++++++++---------
 .../res/layout/fragment_catalog_add_items.xml |   4 +-
 .../layout/fragment_catalog_add_variant.xml   |  11 +-
 .../res/layout/fragment_catalog_details.xml   |  25 +-
 .../layout/item_catalog_add_customization.xml | 217 +++---
 .../res/layout/item_catalog_add_variant.xml   |  80 ++-
 .../res/layout/item_catalog_group_type.xml    |   9 +
 .../res/layout/item_customization_field.xml   |  55 ++
 35 files changed, 1300 insertions(+), 509 deletions(-)
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/CatalogRepository.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationAdapter.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationFieldAdapter.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogVariantAdapter.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogGroupChooserDialogFragment.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/CatalogMenuModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationFieldModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationGroupModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/GroupMenuItemModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/ItemCustomizationModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/ItemVariantModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/models/MenuGroupModel.kt
 create mode 100644 app/src/main/java/com/checkin/app/checkin/manager/viewmodels/CatalogViewModel.kt
 create mode 100644 app/src/main/res/layout/item_catalog_group_type.xml
 create mode 100644 app/src/main/res/layout/item_customization_field.xml

diff --git a/app/build.gradle b/app/build.gradle
index f1813ee4..041cd493 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -210,6 +210,7 @@ dependencies {
     // Epoxy
     implementation "com.airbnb.android:epoxy:$versions.epoxy"
     kapt "com.airbnb.android:epoxy-processor:$versions.epoxy"
+    implementation "com.airbnb.android:epoxy-databinding:$versions.epoxy"
 
     // Lottie
 //    UNUSED RIGHT NOW
diff --git a/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt b/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
index 4961c629..a3412c16 100644
--- a/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
+++ b/app/src/main/java/com/checkin/app/checkin/data/network/WebApiService.kt
@@ -22,6 +22,8 @@ import com.checkin.app.checkin.auth.AuthRequestModel
 import com.checkin.app.checkin.auth.AuthResultModel
 import com.checkin.app.checkin.home.model.*
 import com.checkin.app.checkin.manager.models.*
+import com.checkin.app.checkin.manager.models.MenuGroupModel
+import com.checkin.app.checkin.manager.models.CatalogMenuModel
 import com.checkin.app.checkin.menu.models.*
 import com.checkin.app.checkin.misc.models.GenericDetailModel
 import com.checkin.app.checkin.misc.paytm.PaytmModel
@@ -420,6 +422,21 @@ interface WebApiService {
 
     @POST("menus/restaurants/{restaurant_id}/manage/items/")
     fun postChangeMenuAvailability(@Path("restaurant_id") restaurantId: Long, @Body msOrderStatus: List<InventoryAvailabilityModel>): Call<List<InventoryAvailabilityModel>>
+
+    @POST("/menus/restaurants/{restaurant_id}/")
+    fun postRestaurantMenu(@Path("restaurant_id") restaurantId: Long, @Body menu: CatalogMenuModel): Call<CatalogMenuModel>
+
+    @POST("/menus/groups/restaurants/{restaurant_id}/")
+    fun postMenuGroup(@Path("restaurant_id") restaurantId: Long, @Body menuGroup: MenuGroupModel): Call<MenuGroupModel>
+
+    @GET("/menus/items/groups/{group_id}/")
+    fun getGroupMenuItem(@Path("group_id") groupId: Long): Call<GroupMenuItemModel>
+
+    @POST("/menus/items/groups/{group_id}/")
+    fun postGroupMenuItem(@Path("group_id") groupId: Long, @Body groupMenuItem: GroupMenuItemModel): Call<GroupMenuItemModel>
+
+    @GET("menus/groups/restaurants/{restaurant_id}")
+    fun getMenuGroups(@Path("restaurant_id") restaurantId: Long): Call<List<MenuGroupModel>>
     // endregion
 
     // region PAYMENT
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/CatalogRepository.kt b/app/src/main/java/com/checkin/app/checkin/manager/CatalogRepository.kt
new file mode 100644
index 00000000..3fd1d9ea
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/CatalogRepository.kt
@@ -0,0 +1,74 @@
+package com.checkin.app.checkin.manager
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.LiveData
+import com.checkin.app.checkin.data.BaseRepository
+import com.checkin.app.checkin.data.network.ApiClient
+import com.checkin.app.checkin.data.network.ApiResponse
+import com.checkin.app.checkin.data.network.RetrofitLiveData
+import com.checkin.app.checkin.data.network.WebApiService
+import com.checkin.app.checkin.data.resource.NetworkBoundResource
+import com.checkin.app.checkin.data.resource.Resource
+import com.checkin.app.checkin.manager.models.MenuGroupModel
+import com.checkin.app.checkin.manager.models.CatalogMenuModel
+import com.checkin.app.checkin.manager.models.GroupMenuItemModel
+import com.checkin.app.checkin.utility.SingletonHolder
+import java.security.acl.Group
+
+class CatalogRepository private constructor(context: Context) : BaseRepository() {
+    private val mWebService: WebApiService = ApiClient.getApiService(context)
+
+    fun createMenu(restaurantId: Long, menu: CatalogMenuModel): LiveData<Resource<CatalogMenuModel>> {
+        return object : NetworkBoundResource<CatalogMenuModel, CatalogMenuModel>() {
+            override fun shouldUseLocalDb(): Boolean {
+                return false
+            }
+
+            override fun createCall(): LiveData<ApiResponse<CatalogMenuModel>> {
+                return RetrofitLiveData(mWebService.postRestaurantMenu(restaurantId, menu))
+            }
+        }.asLiveData
+    }
+
+    fun createMenuGroup(restaurantId: Long, menuGroup : MenuGroupModel): LiveData<Resource<MenuGroupModel>> {
+        return object : NetworkBoundResource<MenuGroupModel, MenuGroupModel>() {
+            override fun shouldUseLocalDb(): Boolean {
+                return false
+            }
+
+            override fun createCall(): LiveData<ApiResponse<MenuGroupModel>> {
+                return RetrofitLiveData(mWebService.postMenuGroup(restaurantId, menuGroup))
+            }
+        }.asLiveData
+
+    }
+
+    fun getMenuGroups(restaurantId: Long): LiveData<Resource<List<MenuGroupModel>>> {
+        return object : NetworkBoundResource<List<MenuGroupModel>, List<MenuGroupModel>>() {
+            override fun shouldUseLocalDb(): Boolean {
+                return false
+            }
+
+            override fun createCall(): LiveData<ApiResponse<List<MenuGroupModel>>> {
+                return RetrofitLiveData(mWebService.getMenuGroups(restaurantId))
+            }
+        }.asLiveData
+
+    }
+
+    fun createMenuItem(groupId: Long, menuItem : GroupMenuItemModel): LiveData<Resource<GroupMenuItemModel>> {
+        return object : NetworkBoundResource<GroupMenuItemModel, GroupMenuItemModel>() {
+            override fun shouldUseLocalDb(): Boolean {
+                return false
+            }
+
+            override fun createCall(): LiveData<ApiResponse<GroupMenuItemModel>> {
+                return RetrofitLiveData(mWebService.postGroupMenuItem(groupId, menuItem))
+            }
+        }.asLiveData
+
+    }
+
+    companion object : SingletonHolder<CatalogRepository, Application>({ CatalogRepository(it.applicationContext) })
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt b/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
index 84b2885b..f97f580e 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/activities/CatalogActivity.kt
@@ -1,17 +1,21 @@
 package com.checkin.app.checkin.manager.activities
 
 import android.os.Bundle
+import android.util.Log
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBar
 import com.checkin.app.checkin.R
 import com.checkin.app.checkin.databinding.ActivityCatalogBinding
 import com.checkin.app.checkin.manager.fragments.CatalogDetailsFragment
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
 import com.checkin.app.checkin.misc.activities.BaseActivity
 
 class CatalogActivity : BaseActivity() {
 
     private var _binding: ActivityCatalogBinding? = null
     val binding get() = _binding!!
+    private val mViewModel: CatalogViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -21,12 +25,17 @@ class CatalogActivity : BaseActivity() {
         val actionBar: ActionBar? = supportActionBar
         actionBar?.setHomeAsUpIndicator(R.drawable.ic_shape)
         actionBar?.setDisplayHomeAsUpEnabled(true)
-
+        setUpObservers(intent.getLongExtra(ManagerWorkActivity.KEY_RESTAURANT_PK, 0L))
         supportFragmentManager.beginTransaction()
             .replace(R.id.fragment_container_catalog, CatalogDetailsFragment.newInstance())
             .commit()
     }
 
+    private fun setUpObservers(shopPk: Long) {
+        mViewModel.shopPk = 12
+        Log.d("CatalogActivity", 12.toString())
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
@@ -41,4 +50,8 @@ class CatalogActivity : BaseActivity() {
         super.onDestroy()
         _binding = null
     }
+
+    companion object {
+        const val KEY_RESTAURANT_PK = "catalog.restaurant_pk"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationAdapter.kt b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationAdapter.kt
new file mode 100644
index 00000000..5c393f0a
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationAdapter.kt
@@ -0,0 +1,43 @@
+package com.checkin.app.checkin.manager.adapters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.checkin.app.checkin.databinding.ItemCatalogAddCustomizationBinding
+import com.checkin.app.checkin.manager.models.ItemCustomizationModel
+
+class CatalogCustomizationAdapter(val listener: CustomizationClickListener) : RecyclerView.Adapter<CatalogCustomizationAdapter.CatalogCustomizationViewHolder>() {
+    private lateinit var list: List<ItemCustomizationModel>
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatalogCustomizationViewHolder {
+        return CatalogCustomizationViewHolder(ItemCatalogAddCustomizationBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: CatalogCustomizationViewHolder, position: Int) {
+        holder.bind(list[position])
+        holder.binding.tvAddMoreFields.setOnClickListener {
+            listener.onItemClicked(position)
+        }
+    }
+
+    override fun getItemCount(): Int = list.size
+
+    fun setData(list: List<ItemCustomizationModel>) {
+        this.list = list
+        notifyDataSetChanged()
+    }
+
+    inner class CatalogCustomizationViewHolder(val binding: ItemCatalogAddCustomizationBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: ItemCustomizationModel) {
+            binding.customizationModel = item
+            val adapter = CatalogCustomizationFieldAdapter()
+            adapter.setData(item.listOfFields)
+            binding.rvFields.adapter = adapter
+        }
+    }
+}
+
+interface CustomizationClickListener {
+    fun onItemClicked(position: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationFieldAdapter.kt b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationFieldAdapter.kt
new file mode 100644
index 00000000..798118c5
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogCustomizationFieldAdapter.kt
@@ -0,0 +1,32 @@
+package com.checkin.app.checkin.manager.adapters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.checkin.app.checkin.databinding.ItemCustomizationFieldBinding
+import com.checkin.app.checkin.manager.models.CustomizationFieldModel
+
+class CatalogCustomizationFieldAdapter : RecyclerView.Adapter<CatalogCustomizationFieldAdapter.CatalogCustomizationFieldViewHolder>() {
+    private lateinit var list: List<CustomizationFieldModel>
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatalogCustomizationFieldViewHolder {
+        return CatalogCustomizationFieldViewHolder(ItemCustomizationFieldBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: CatalogCustomizationFieldViewHolder, position: Int) {
+        holder.bind(list[position])
+    }
+
+    override fun getItemCount(): Int = list.size
+
+    fun setData(list: List<CustomizationFieldModel>) {
+        this.list = list
+        notifyDataSetChanged()
+    }
+
+    class CatalogCustomizationFieldViewHolder(val binding: ItemCustomizationFieldBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: CustomizationFieldModel) {
+            binding.fieldModel = item
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogVariantAdapter.kt b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogVariantAdapter.kt
new file mode 100644
index 00000000..9a97827e
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/adapters/CatalogVariantAdapter.kt
@@ -0,0 +1,32 @@
+package com.checkin.app.checkin.manager.adapters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.checkin.app.checkin.databinding.ItemCatalogAddVariantBinding
+import com.checkin.app.checkin.manager.models.ItemVariantModel
+
+class CatalogVariantAdapter : RecyclerView.Adapter<CatalogVariantAdapter.CatalogVariantViewHolder>() {
+    private lateinit var list: List<ItemVariantModel>
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatalogVariantViewHolder {
+        return CatalogVariantViewHolder(ItemCatalogAddVariantBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: CatalogVariantViewHolder, position: Int) {
+        holder.bind(list[position])
+    }
+
+    override fun getItemCount(): Int = list.size
+
+    fun setData(list: List<ItemVariantModel>) {
+        this.list = list
+        notifyDataSetChanged()
+    }
+
+    class CatalogVariantViewHolder(val binding: ItemCatalogAddVariantBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: ItemVariantModel) {
+            binding.variant = item
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
index 49b525d8..9808b5ae 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddCustomizationFragment.kt
@@ -4,15 +4,26 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import com.checkin.app.checkin.R
 import com.checkin.app.checkin.databinding.FragmentCatalogAddCustomizationBinding
 import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.adapters.CatalogCustomizationAdapter
+import com.checkin.app.checkin.manager.adapters.CatalogVariantAdapter
+import com.checkin.app.checkin.manager.adapters.CustomizationClickListener
+import com.checkin.app.checkin.manager.models.CustomizationFieldModel
+import com.checkin.app.checkin.manager.models.ItemCustomizationModel
+import com.checkin.app.checkin.manager.models.ItemVariantModel
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
 import com.checkin.app.checkin.misc.fragments.BaseFragment
 
-class CatalogAddCustomizationFragment : BaseFragment() {
+ class CatalogAddCustomizationFragment : BaseFragment(), CustomizationClickListener {
 
     override val rootLayout: Int = R.layout.fragment_catalog_add_customization
+    private val mViewModel: CatalogViewModel by activityViewModels()
+    private lateinit var adapter: CatalogCustomizationAdapter
     private var _binding: FragmentCatalogAddCustomizationBinding? = null
     val binding get() = _binding!!
 
@@ -26,9 +37,32 @@ class CatalogAddCustomizationFragment : BaseFragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        adapter = CatalogCustomizationAdapter(this)
+        binding.rvCustomization.adapter = adapter
+        setUpObservers()
+        binding.tvAddGroup.setOnClickListener {
+            mViewModel.mCustomizationList.value?.add(ItemCustomizationModel())
+            mViewModel.mCustomizationList.value = mViewModel.mCustomizationList.value
+        }
+        binding.btnSaveCustomization.setOnClickListener {
+            postCustomizations()
+        }
+    }
+
+     private fun postCustomizations() {
+     }
+
+     private fun setUpObservers() {
+        mViewModel.mCustomizationList.observe(viewLifecycleOwner, Observer {
+            adapter.setData(it)
+        })
+    }
+
     override fun onStart() {
         super.onStart()
-        binding.button2.setOnClickListener {
+        binding.btnSaveCustomization.setOnClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
                 .replace(R.id.fragment_container_catalog, CatalogAddItemsFragment.newInstance())
                 .addToBackStack(null)
@@ -46,4 +80,11 @@ class CatalogAddCustomizationFragment : BaseFragment() {
     companion object {
         fun newInstance() = CatalogAddCustomizationFragment()
     }
-}
\ No newline at end of file
+
+     override fun onItemClicked(position: Int) {
+         mViewModel.mCustomizationList.value?.get(position)?.listOfFields?.add(
+             CustomizationFieldModel()
+         )
+         mViewModel.mCustomizationList.value = mViewModel.mCustomizationList.value
+     }
+ }
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
index 6b7755fd..7b85af6b 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddFragment.kt
@@ -5,10 +5,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.viewModels
+import androidx.fragment.app.viewModels
 import com.checkin.app.checkin.R
 import com.checkin.app.checkin.databinding.FragmentCatalogAddBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
 import com.checkin.app.checkin.manager.activities.ManagerWorkActivity
+import com.checkin.app.checkin.manager.viewmodels.ManagerWorkViewModel
 import com.checkin.app.checkin.misc.fragments.BaseFragment
 
 class CatalogAddFragment : BaseFragment() {
@@ -16,6 +19,7 @@ class CatalogAddFragment : BaseFragment() {
     override val rootLayout: Int = R.layout.fragment_catalog_add
     private var _binding: FragmentCatalogAddBinding? = null
     val binding get() = _binding!!
+    private val mViewModel: ManagerWorkViewModel by viewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -29,8 +33,8 @@ class CatalogAddFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.button2.setOnClickListener {
-            val intent = Intent(requireActivity(), CatalogActivity::class.java)
+        binding.btnBegin.setOnClickListener {
+            val intent = Intent(requireActivity(), CatalogActivity::class.java).apply { putExtra(CatalogActivity.KEY_RESTAURANT_PK, mViewModel.shopPk) }
             startActivity(intent)
         }
     }
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
index fa938b62..e3c276e7 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddGroupFragment.kt
@@ -4,16 +4,25 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import com.checkin.app.checkin.R
+import com.checkin.app.checkin.data.resource.Resource
 import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.models.MenuGroupModel
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
 import com.checkin.app.checkin.misc.fragments.BaseFragment
+import com.checkin.app.checkin.utility.Utils
+import com.google.android.material.chip.Chip
 
 class CatalogAddGroupFragment : BaseFragment() {
 
     override val rootLayout: Int = R.layout.fragment_catalog_add_group
     private var _binding: FragmentCatalogAddGroupBinding? = null
     val binding get() = _binding!!
+    private val mViewModel: CatalogViewModel by activityViewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -25,18 +34,56 @@ class CatalogAddGroupFragment : BaseFragment() {
         return binding.root
     }
 
-    override fun onStart() {
-        super.onStart()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val items = listOf("appetizer", "barbeque", "beer", "bread", "chinese",
+            "cocktail", "coffee", "continental", "dessert", "dumpling", "frappe",
+            "main", "mexican", "mocktail", "non-veg", "noodles", "pancake", "pasta",
+            "pizza", "rice", "rum", "salad", "sandwich", "shake", "shots", "snack",
+            "soda", "soup", "starter", "sweets", "tea", "vodka", "whisky", "wrap",
+            "chef_spl")
+        val adapter = ArrayAdapter(requireContext(), R.layout.item_catalog_group_type, items)
+        binding.menuGroupType.setAdapter(adapter)
         binding.button3.setOnClickListener {
-            requireActivity().supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container_catalog, CatalogAddItemFragment.newInstance())
-                .addToBackStack(null)
-                .commit()
+           createGroup()
         }
+    }
+
+    override fun onStart() {
+        super.onStart()
         (requireActivity() as CatalogActivity).binding.tvActionBarTitle.text = "Add Group"
 
     }
 
+    fun createGroup() {
+        val text = binding.etGroupName.text.toString()
+        when {
+            text.isNullOrEmpty() -> {
+                Utils.toast(requireActivity(), "Group name cannot be empty")
+                return
+            }
+            text.length > 50 -> {
+                Utils.toast(requireActivity(), "Group name cannot be longer than 50 characters")
+                return
+            }
+        }
+        if (binding.menuGroupType.text.isNullOrEmpty()) {
+            Utils.toast(requireActivity(), "Icon Type cannot be empty")
+            return
+        }
+        val category = binding.cgCategory.findViewById<Chip>(binding.cgCategory.checkedChipId).text.toString()
+        val type = binding.menuGroupType.text.toString()
+        mViewModel.createMenuGroup(MenuGroupModel(name = text, category = category, type = type))
+        mViewModel.getMenuGroup().observe(viewLifecycleOwner, Observer { input ->
+            if (input != null && input.status == Resource.Status.SUCCESS && input.data != null) {
+                mViewModel.groupPk = input.data.pk.toLong()
+                requireActivity().supportFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container_catalog, CatalogAddItemFragment.newInstance())
+                    .addToBackStack(null)
+                    .commit()
+            }
+        })
+    }
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
index bff75e93..7559ee84 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddItemFragment.kt
@@ -1,17 +1,28 @@
 package com.checkin.app.checkin.manager.fragments
 
+import android.app.Activity.RESULT_OK
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import com.checkin.app.checkin.R
 import com.checkin.app.checkin.databinding.FragmentCatalogAddItemBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.models.GroupMenuItemModel
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
+import com.checkin.app.checkin.misc.activities.SelectCropImageActivity
 import com.checkin.app.checkin.misc.fragments.BaseFragment
+import com.checkin.app.checkin.utility.Utils
+import java.io.File
 
 class CatalogAddItemFragment : BaseFragment() {
 
     override val rootLayout: Int = R.layout.fragment_catalog_add_item
+    private val mViewModel: CatalogViewModel by activityViewModels()
+    private lateinit var itemImage: File
     private var _binding: FragmentCatalogAddItemBinding? = null
     val binding get() = _binding!!
 
@@ -25,9 +36,70 @@ class CatalogAddItemFragment : BaseFragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        fetchGroupsList()
+        binding.etGroup.setOnClickListener {
+            showGroupChooser()
+        }
+        binding.containerImage.setOnClickListener {
+            addPic()
+        }
+        binding.btnSaveItem.setOnClickListener {
+            if (mViewModel.groupPk == null) {
+                Utils.toast(requireActivity(), "Add a group")
+                return@setOnClickListener
+            }
+            if (binding.etItemName.text.isNullOrEmpty()) {
+                Utils.toast(requireActivity(), "Add Item Name")
+                return@setOnClickListener
+            }
+            if (binding.etItemName.text.toString().length > 80) {
+                Utils.toast(requireActivity(), "Item name should be less than 80 chars")
+                return@setOnClickListener
+            }
+            val listOfCheckedChipsIDs: List<Int> = binding.cgAvailableMeal.checkedChipIds
+            val availableMeals = arrayListOf<String>()
+            listOfCheckedChipsIDs.forEach {
+                when(it) {
+                    R.id.chip_breakfast -> availableMeals.add("brkfst")
+                    R.id.chip_lunch -> availableMeals.add("lunch")
+                    R.id.chip_dinner -> availableMeals.add("dinner")
+                }
+            }
+            val costs = mViewModel.listOfPrice
+//            mViewModel.createItem(GroupMenuItemModel(availableMeals, costs, ))
+        }
+    }
+
+    private fun fetchGroupsList() {
+        mViewModel.getGroupsList()
+    }
+    private fun showGroupChooser() {
+        mViewModel.getGroupNames().observe(viewLifecycleOwner, Observer {
+            if (it != null) {
+                CatalogGroupChooserDialogFragment(it).show(requireActivity().supportFragmentManager, "group chooser dialog fragment")
+            }
+        })
+    }
+
+    fun addPic() {
+        val intent = Intent(requireContext(), SelectCropImageActivity::class.java)
+        intent.putExtra(SelectCropImageActivity.KEY_FILE_SIZE_IN_MB, 4L)
+        startActivityForResult(intent, SelectCropImageActivity.RC_CROP_IMAGE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == SelectCropImageActivity.RC_CROP_IMAGE && resultCode == RESULT_OK) {
+            if (data != null && data.extras != null) {
+                itemImage = data.extras!!.get(SelectCropImageActivity.KEY_IMAGE) as File
+            }
+        }
+    }
+
     override fun onStart() {
         super.onStart()
-        binding.button2.setOnClickListener {
+        binding.btnSaveItem.setOnClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
                 .replace(R.id.fragment_container_catalog, CatalogAddVariantFragment.newInstance())
                 .addToBackStack(null)
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
index bb545c6f..e19d17dc 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogAddVariantFragment.kt
@@ -4,15 +4,21 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import com.checkin.app.checkin.R
-import com.checkin.app.checkin.databinding.FragmentCatalogAddGroupBinding
 import com.checkin.app.checkin.databinding.FragmentCatalogAddVariantBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.adapters.CatalogVariantAdapter
+import com.checkin.app.checkin.manager.models.ItemVariantModel
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
 import com.checkin.app.checkin.misc.fragments.BaseFragment
 
 class CatalogAddVariantFragment : BaseFragment() {
 
     override val rootLayout: Int = R.layout.fragment_catalog_add_variant
+    private val mViewModel: CatalogViewModel by activityViewModels()
+    private lateinit var adapter: CatalogVariantAdapter
     private var _binding: FragmentCatalogAddVariantBinding? = null
     val binding get() = _binding!!
 
@@ -26,11 +32,39 @@ class CatalogAddVariantFragment : BaseFragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpObservers()
+        adapter = CatalogVariantAdapter()
+        binding.rvVariants.adapter = adapter
+        binding.tvAddMoreVariant.setOnClickListener {
+            mViewModel.mVariantList.value?.add(ItemVariantModel())
+            mViewModel.mVariantList.value = mViewModel.mVariantList.value
+        }
+        binding.btnSaveVariants.setOnClickListener {
+            mViewModel.listOfTypes = mViewModel.mVariantList.value?.map {
+                it.type
+            } as ArrayList<String>
+            mViewModel.listOfPrice = mViewModel.mVariantList.value?.map {
+                it.price
+            } as ArrayList<String>
+        }
+    }
+
+    private fun setUpObservers() {
+        mViewModel.mVariantList.observe(viewLifecycleOwner, Observer {
+            adapter.setData(it)
+        })
+    }
+
     override fun onStart() {
         super.onStart()
-        binding.button2.setOnClickListener {
+        binding.btnSaveVariants.setOnClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container_catalog, CatalogAddCustomizationFragment.newInstance())
+                .replace(
+                    R.id.fragment_container_catalog,
+                    CatalogAddCustomizationFragment.newInstance()
+                )
                 .addToBackStack(null)
                 .commit()
         }
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
index eb564f96..fe13ba4c 100644
--- a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogDetailsFragment.kt
@@ -1,20 +1,28 @@
 package com.checkin.app.checkin.manager.fragments
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.widget.doAfterTextChanged
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import com.checkin.app.checkin.R
+import com.checkin.app.checkin.data.resource.Resource
 import com.checkin.app.checkin.databinding.FragmentCatalogDetailsBinding
 import com.checkin.app.checkin.manager.activities.CatalogActivity
+import com.checkin.app.checkin.manager.models.CatalogMenuModel
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
 import com.checkin.app.checkin.misc.fragments.BaseFragment
+import com.checkin.app.checkin.utility.Utils
 
 class CatalogDetailsFragment : BaseFragment() {
 
     override val rootLayout: Int = R.layout.fragment_catalog_details
     private var _binding: FragmentCatalogDetailsBinding? = null
     val binding get() = _binding!!
+    private val mViewModel: CatalogViewModel by activityViewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -28,18 +36,38 @@ class CatalogDetailsFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.etCatalogGSTNumber.doAfterTextChanged {
+        binding.etGSTNumber.doAfterTextChanged {
             if (it.isNullOrEmpty()) {
                 binding.financeGroup.visibility = View.GONE
             } else {
                 binding.financeGroup.visibility = View.VISIBLE
             }
         }
-        binding.button2.setOnClickListener {
-            requireActivity().supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container_catalog, CatalogAddGroupFragment.newInstance())
-                .addToBackStack(null)
-                .commit()
+        binding.btnCreateMenu.setOnClickListener {
+            createMenu()
+        }
+    }
+
+    fun createMenu() {
+        val text = binding.etMenuName.text.toString()
+        when {
+            text.isNullOrEmpty() -> {
+                Utils.toast(requireActivity(), "Menu name cannot be empty")
+            }
+            text.length > 50 -> {
+                Utils.toast(requireActivity(), "Menu name cannot be longer than 50 characters")
+            }
+            else -> {
+                mViewModel.createMenu(CatalogMenuModel(name = text, isAvailable = true))
+                mViewModel.getMenu().observe(viewLifecycleOwner, Observer { input ->
+                    if (input != null && input.status == Resource.Status.SUCCESS && input.data != null) {
+                        requireActivity().supportFragmentManager.beginTransaction()
+                            .replace(R.id.fragment_container_catalog, CatalogAddGroupFragment.newInstance())
+                            .addToBackStack(null)
+                            .commit()
+                    }
+                })
+            }
         }
     }
 
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogGroupChooserDialogFragment.kt b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogGroupChooserDialogFragment.kt
new file mode 100644
index 00000000..60f18890
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/fragments/CatalogGroupChooserDialogFragment.kt
@@ -0,0 +1,33 @@
+package com.checkin.app.checkin.manager.fragments
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
+import com.checkin.app.checkin.R
+import com.checkin.app.checkin.manager.viewmodels.CatalogViewModel
+
+class CatalogGroupChooserDialogFragment(val items: List<String>): DialogFragment() {
+    private val mViewModel: CatalogViewModel by activityViewModels()
+    private lateinit var mBuilder: AlertDialog.Builder
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        mBuilder= AlertDialog.Builder(requireActivity())
+        mBuilder.setItems(items.toTypedArray(), DialogInterface.OnClickListener { _, position ->
+            mViewModel.setGroupPk(position)
+        })
+        mBuilder.setTitle("Choose Group")
+        mBuilder.setPositiveButton("Add Group", DialogInterface.OnClickListener { _, _ ->
+            requireActivity().supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container_catalog, CatalogAddGroupFragment.newInstance())
+                .addToBackStack(null)
+                .commit()
+        })
+        return mBuilder.create()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/CatalogMenuModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/CatalogMenuModel.kt
new file mode 100644
index 00000000..9e64a126
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/CatalogMenuModel.kt
@@ -0,0 +1,17 @@
+package com.checkin.app.checkin.manager.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class CatalogMenuModel(
+    @JsonProperty("created")
+    val created: String = "",
+    @JsonProperty("is_available")
+    val isAvailable: Boolean = false,
+    @JsonProperty("name")
+    val name: String = "",
+    @JsonProperty("pk")
+    val pk: Int = 0,
+    @JsonProperty("restaurant")
+    val restaurant: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationFieldModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationFieldModel.kt
new file mode 100644
index 00000000..a9ca5e68
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationFieldModel.kt
@@ -0,0 +1,15 @@
+package com.checkin.app.checkin.manager.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class CustomizationFieldModel(
+    @JsonProperty("cost")
+    var cost: String = "",
+    @JsonProperty("is_vegetarian")
+    val isVegetarian: Boolean = true,
+    @JsonProperty("name")
+    var name: String = "",
+    @JsonProperty("pk")
+    val pk: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationGroupModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationGroupModel.kt
new file mode 100644
index 00000000..559945bf
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/CustomizationGroupModel.kt
@@ -0,0 +1,17 @@
+package com.checkin.app.checkin.manager.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class CustomizationGroupModel(
+    @JsonProperty("max_select")
+    var maxSelect: Int = 0,
+    @JsonProperty("min_select")
+    var minSelect: Int = 0,
+    @JsonProperty("name")
+    var name: String = "",
+    @JsonProperty("pk")
+    val pk: Int = 0,
+    @JsonProperty("restaurant")
+    val restaurant: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/GroupMenuItemModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/GroupMenuItemModel.kt
new file mode 100644
index 00000000..f73a9096
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/GroupMenuItemModel.kt
@@ -0,0 +1,37 @@
+package com.checkin.app.checkin.manager.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class GroupMenuItemModel(
+    @JsonProperty("available_meals")
+    val availableMeals: List<String>,
+    @JsonProperty("costs")
+    val costs: List<String>,
+    @JsonProperty("created")
+    val created: String = "",
+    @JsonProperty("customizations")
+    val customizations: List<Int>,
+    @JsonProperty("description")
+    val description: String,
+    @JsonProperty("image")
+    val image: String,
+    @JsonProperty("ingredients")
+    val ingredients: List<String>,
+    @JsonProperty("is_available")
+    val isAvailable: Boolean,
+    @JsonProperty("item_type")
+    val itemType: Int,
+    @JsonProperty("menu")
+    val menu: Int,
+    @JsonProperty("modified")
+    val modified: String,
+    @JsonProperty("name")
+    val name: String,
+    @JsonProperty("pk")
+    val pk: Int,
+    @JsonProperty("tags")
+    val tags: List<String>,
+    @JsonProperty("types")
+    val types: List<String>
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/ItemCustomizationModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/ItemCustomizationModel.kt
new file mode 100644
index 00000000..13e6b0e0
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/ItemCustomizationModel.kt
@@ -0,0 +1,6 @@
+package com.checkin.app.checkin.manager.models
+
+data class ItemCustomizationModel(
+    var customizationGroupModel: CustomizationGroupModel = CustomizationGroupModel(),
+    var listOfFields: ArrayList<CustomizationFieldModel> = ArrayList()
+)
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/ItemVariantModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/ItemVariantModel.kt
new file mode 100644
index 00000000..e39e6888
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/ItemVariantModel.kt
@@ -0,0 +1,3 @@
+package com.checkin.app.checkin.manager.models
+
+data class ItemVariantModel(var type: String = "", var price: String = "")
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/models/MenuGroupModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/models/MenuGroupModel.kt
new file mode 100644
index 00000000..2fa7266e
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/models/MenuGroupModel.kt
@@ -0,0 +1,19 @@
+package com.checkin.app.checkin.manager.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class MenuGroupModel(
+    @JsonProperty("category")
+    val category: String = "",
+    @JsonProperty("icon")
+    val icon: String = "",
+    @JsonProperty("name")
+    val name: String = "",
+    @JsonProperty("pk")
+    val pk: Int = 0,
+    @JsonProperty("restaurant")
+    val restaurant: Int = 0,
+    @JsonProperty("type")
+    val type: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/manager/viewmodels/CatalogViewModel.kt b/app/src/main/java/com/checkin/app/checkin/manager/viewmodels/CatalogViewModel.kt
new file mode 100644
index 00000000..46477523
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/manager/viewmodels/CatalogViewModel.kt
@@ -0,0 +1,104 @@
+package com.checkin.app.checkin.manager.viewmodels
+
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import com.checkin.app.checkin.data.BaseViewModel
+import com.checkin.app.checkin.data.resource.Resource
+import com.checkin.app.checkin.manager.CatalogRepository
+import com.checkin.app.checkin.manager.models.*
+import com.checkin.app.checkin.utility.SourceMappedLiveData
+
+class CatalogViewModel(application: Application) : BaseViewModel(application) {
+    private val mCatalogRepository = CatalogRepository.getInstance(application)
+    private val mMenuGroupsList = createNetworkLiveData<List<MenuGroupModel>>()
+    private val mMenu = createNetworkLiveData<CatalogMenuModel>()
+    private val mMenuGroup = createNetworkLiveData<MenuGroupModel>()
+    private val mMenuItem = createNetworkLiveData<GroupMenuItemModel>()
+    val mVariantList = MutableLiveData<ArrayList<ItemVariantModel>>(ArrayList<ItemVariantModel>())
+    val mCustomizationList = MutableLiveData<ArrayList<ItemCustomizationModel>>(ArrayList<ItemCustomizationModel>())
+    var listOfTypes = ArrayList<String>()
+    var listOfPrice = ArrayList<String>()
+    var groupPk: Long = 0L
+    var shopPk: Long = 0L
+
+    fun createMenu(menu: CatalogMenuModel) {
+        mMenu.addSource(mCatalogRepository.createMenu(shopPk, menu), mMenu::setValue)
+    }
+
+    fun createItem(item: GroupMenuItemModel) {
+        mMenuItem.addSource(mCatalogRepository.createMenuItem(groupPk!!, item), mMenuItem::setValue)
+    }
+
+    fun getMenu(): LiveData<Resource<CatalogMenuModel>> {
+        return mMenu
+    }
+
+    fun createMenuGroup(menuGroup: MenuGroupModel) {
+        mMenuGroup.addSource(mCatalogRepository.createMenuGroup(shopPk, menuGroup), mMenuGroup::setValue)
+    }
+
+    fun getMenuGroup(): LiveData<Resource<MenuGroupModel>> {
+        return mMenuGroup
+    }
+
+    fun getMenuItem() {
+
+    }
+
+    fun getGroupsList() {
+        mMenuGroupsList.addSource(mCatalogRepository.getMenuGroups(shopPk), mMenuGroupsList::setValue)
+    }
+
+    fun getGroupNames(): LiveData<List<String>> {
+        return Transformations.map(mMenuGroupsList) { input ->
+            if (input != null && input.data != null && input.status == Resource.Status.SUCCESS) {
+                val list = ArrayList<String>()
+                input.data?.forEach {
+                    list.add(it.name)
+                }
+                return@map list
+            }
+            return@map null
+        }
+    }
+
+    fun setGroupPk(position: Int) {
+        groupPk = mMenuGroupsList.value?.data?.get(position)?.pk?.toLong() ?: 0L
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    override fun updateResults() {
+        TODO("Not yet implemented")
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/package-info.java b/app/src/main/java/com/checkin/app/checkin/package-info.java
index ae4c484c..881422ee 100644
--- a/app/src/main/java/com/checkin/app/checkin/package-info.java
+++ b/app/src/main/java/com/checkin/app/checkin/package-info.java
@@ -1,8 +1,12 @@
 package com.checkin.app.checkin;
 
+import com.airbnb.epoxy.EpoxyDataBindingPattern;
 import com.airbnb.epoxy.PackageModelViewConfig;
 import com.checkin.app.checkin.misc.epoxy.BaseEpoxyModel;
 
+@EpoxyDataBindingPattern(rClass = R.class, layoutPrefix = "epoxy_item")
+
+
 @PackageModelViewConfig(defaultBaseModelClass = BaseEpoxyModel.class, rClass = R.class)
 interface EpoxyConfig {
 }
diff --git a/app/src/main/res/layout/activity_catalog.xml b/app/src/main/res/layout/activity_catalog.xml
index fe4a8348..73f5897c 100644
--- a/app/src/main/res/layout/activity_catalog.xml
+++ b/app/src/main/res/layout/activity_catalog.xml
@@ -58,7 +58,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:src="@drawable/ic_noun_delete"
+                    android:src="@drawable/ic_noun_delete"
                     android:visibility="gone"/>
 
 
diff --git a/app/src/main/res/layout/fragment_catalog_add.xml b/app/src/main/res/layout/fragment_catalog_add.xml
index 3274c341..6c01d820 100644
--- a/app/src/main/res/layout/fragment_catalog_add.xml
+++ b/app/src/main/res/layout/fragment_catalog_add.xml
@@ -18,13 +18,13 @@
             android:layout_height="273dp"
             android:layout_marginBottom="46dp"
             android:src="@drawable/ic_undraw_personal_settings_re_i_6_w_4"
-            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintBottom_toTopOf="@+id/btn_begin"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent" />
 
         <Button
-            android:id="@+id/button2"
+            android:id="@+id/btn_begin"
             style="@style/CatalogRedRoundedButton"
             android:layout_marginBottom="27dp"
             android:text="Let's Begin"
diff --git a/app/src/main/res/layout/fragment_catalog_add_customization.xml b/app/src/main/res/layout/fragment_catalog_add_customization.xml
index 24c067c0..45cf63c0 100644
--- a/app/src/main/res/layout/fragment_catalog_add_customization.xml
+++ b/app/src/main/res/layout/fragment_catalog_add_customization.xml
@@ -13,9 +13,10 @@
         android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView2"
+            android:id="@+id/rv_customization"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -31,23 +32,24 @@
             android:paddingEnd="@dimen/spacing_normal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/recyclerView2">
+            app:layout_constraintTop_toBottomOf="@id/rv_customization">
 
             <TextView
+                android:id="@+id/tv_add_group"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_noun_add_green"
                 android:drawablePadding="@dimen/spacing_tiny"
                 android:fontFamily="@font/josefinsans_regular"
                 android:text="More Add On group"
                 android:textColor="@color/greenish_teal"
                 android:textSize="12sp"
-                android:textStyle="normal"
-                android:layout_gravity="center_vertical"/>
+                android:textStyle="normal" />
         </LinearLayout>
 
         <Button
-            android:id="@+id/button2"
+            android:id="@+id/btn_save_customization"
             style="@style/CatalogRedRoundedButton"
             android:layout_marginBottom="@dimen/spacing_normal"
             android:text="Save Customization"
diff --git a/app/src/main/res/layout/fragment_catalog_add_group.xml b/app/src/main/res/layout/fragment_catalog_add_group.xml
index b805e103..dd8c886f 100644
--- a/app/src/main/res/layout/fragment_catalog_add_group.xml
+++ b/app/src/main/res/layout/fragment_catalog_add_group.xml
@@ -23,33 +23,39 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_menu_name"
+                android:id="@+id/et_group_name"
                 style="@style/CatalogOutlinedInput"
                 android:inputType="text"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.chip.ChipGroup
-            android:id="@+id/chipGroup"
+            android:id="@+id/cg_category"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_normal"
+            app:singleSelection="true"
+            app:selectionRequired="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_menu_name">
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_drink"
                 style="@style/CustomChipChoice"
+                android:checked="true"
                 android:text="Drinks" />
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_food"
                 style="@style/CustomChipChoice"
                 android:text="Food" />
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_dessert"
                 style="@style/CustomChipChoice"
-                android:text="Desert" />
+                android:text="Dessert" />
 
         </com.google.android.material.chip.ChipGroup>
 
@@ -63,15 +69,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/chipGroup">
+            app:layout_constraintTop_toBottomOf="@+id/cg_category">
 
             <AutoCompleteTextView
+                android:id="@+id/menu_group_type"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="@dimen/spacing_extra_small"
                 android:paddingBottom="@dimen/spacing_extra_small"
                 android:inputType="none"
-                android:singleLine="true"/>
+                android:singleLine="true"
+                android:editable="false"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_catalog_add_item.xml b/app/src/main/res/layout/fragment_catalog_add_item.xml
index 134b67b8..f16264bb 100644
--- a/app/src/main/res/layout/fragment_catalog_add_item.xml
+++ b/app/src/main/res/layout/fragment_catalog_add_item.xml
@@ -11,338 +11,357 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
-
-        <ImageView
-            android:id="@+id/imageView5"
-            android:layout_width="match_parent"
-            android:layout_height="190dp"
-            android:background="@color/black"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/imageView3"
-            android:layout_width="44dp"
-            android:layout_height="36dp"
-            android:src="@drawable/ic_noun_add_image"
-            app:layout_constraintBottom_toBottomOf="@+id/imageView5"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/textView7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/josefinsans_regular"
-            android:letterSpacing="-0.02"
-            android:textColor="@color/white"
-            android:textSize="10sp"
-            android:layout_marginTop="@dimen/spacing_normal"
-            android:textStyle="normal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageView3"
-            android:text="Upload Image (optional)" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/etLayout_manager_catalogue_menu_name"
-            style="@style/CatalogOutlinedInputLayout"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginTop="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:hint="Cuisine"
-            app:expandedHintEnabled="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_menu_name"
-                style="@style/CatalogOutlinedInput"
-                android:hint="Select Group"
-                android:inputType="text"
-                android:singleLine="true" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/etLayout_manager_catalogue_me"
-            style="@style/CatalogOutlinedInputLayout"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginTop="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:hint="Item Name"
-            app:expandedHintEnabled="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_menu_name">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_mme"
-                style="@style/CatalogOutlinedInput"
-                android:hint="Sholey Kebab"
-                android:inputType="text"
-                android:singleLine="true" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <CheckBox
-            android:id="@+id/checkBox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:buttonTint="@color/primary_red"
-            android:text="Veg"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
-
-        <CheckBox
-            android:id="@+id/checkBox3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:buttonTint="@color/primary_red"
-            android:text="Egg"
-            app:layout_constraintStart_toEndOf="@+id/checkBox2"
-            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
-
-        <CheckBox
-            android:id="@+id/checkBox2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:buttonTint="@color/primary_red"
-            android:text="Non Veg"
-            app:layout_constraintStart_toEndOf="@+id/checkBox"
-            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me" />
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/chipGroup"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/checkBox2">
-
-            <com.google.android.material.chip.Chip
-                style="@style/CustomChipChoice"
-                android:text="Breakfast" />
-
-            <com.google.android.material.chip.Chip
-                style="@style/CustomChipChoice"
-                android:text="Lunch" />
-
-            <com.google.android.material.chip.Chip
-                style="@style/CustomChipChoice"
-                android:text="Dinner" />
-
-        </com.google.android.material.chip.ChipGroup>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/etLayout_manager_catalo"
-            style="@style/CatalogOutlinedInputLayout"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginTop="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:hint="Description (optional)"
-            app:expandedHintEnabled="false"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/chipGroup">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogme"
-                style="@style/CatalogOutlinedInput"
-                android:lines="1" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout2"
-            android:layout_width="0dp"
-            android:layout_height="93dp"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginTop="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:background="@drawable/background_catalog_add_variant"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalo">
+            android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
 
             <ImageView
-                android:id="@+id/imageView7"
-                android:layout_width="15dp"
-                android:layout_height="25dp"
-                android:layout_marginStart="80dp"
-                app:layout_constraintBottom_toTopOf="@+id/textView12"
-                app:layout_constraintEnd_toStartOf="@+id/imageView8"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintHorizontal_chainStyle="spread"
+                android:id="@+id/imageView5"
+                android:layout_width="match_parent"
+                android:layout_height="190dp"
+                android:background="@color/black"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:src="@drawable/ic_drink_outlined" />
-
-            <ImageView
-                android:id="@+id/imageView8"
-                android:layout_width="19dp"
-                android:layout_height="31dp"
-                app:layout_constraintBottom_toBottomOf="@+id/imageView7"
-                app:layout_constraintEnd_toStartOf="@+id/imageView9"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/imageView7"
-                android:src="@drawable/ic_drink_outlined" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-                android:id="@+id/imageView9"
-                android:layout_width="23dp"
-                android:layout_height="38dp"
-                android:layout_marginEnd="80dp"
-                app:layout_constraintBottom_toBottomOf="@+id/imageView8"
+                android:id="@+id/imageView3"
+                android:layout_width="44dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_noun_add_image"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView5"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/imageView8"
-                android:src="@drawable/ic_drink_outlined" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:id="@+id/textView12"
-                android:layout_width="match_parent"
-                android:layout_height="24dp"
-                android:layout_marginBottom="2dp"
+                android:id="@+id/textView7"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_normal"
                 android:fontFamily="@font/josefinsans_regular"
-                android:gravity="center_horizontal"
-                android:text="Add Size and type to items"
-                android:textColor="@color/brownish_grey"
+                android:letterSpacing="-0.02"
+                android:text="Upload Image (optional)"
+                android:textColor="@color/white"
                 android:textSize="10sp"
                 android:textStyle="normal"
-                app:layout_constraintBottom_toTopOf="@+id/textView13"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/textView13"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView3" />
+
+            <View
+                android:id="@+id/container_image"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="@+id/imageView5"
+                app:layout_constraintEnd_toEndOf="@+id/imageView5"
+                app:layout_constraintStart_toStartOf="@+id/imageView5"
+                app:layout_constraintTop_toTopOf="@+id/imageView5" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/etLayout_group"
+                style="@style/CatalogOutlinedInputLayout"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_normal"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:hint="Cuisine"
+                app:expandedHintEnabled="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_group"
+                    style="@style/CatalogOutlinedInput"
+                    android:editable="false"
+                    android:hint="Select Group"
+                    android:inputType="none"
+                    android:singleLine="true" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/etLayout_manager_catalogue_me"
+                style="@style/CatalogOutlinedInputLayout"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_normal"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:hint="Item Name"
+                app:expandedHintEnabled="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/etLayout_group">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_item_name"
+                    style="@style/CatalogOutlinedInput"
+                    android:hint="Sholey Kebab"
+                    android:inputType="text"
+                    android:singleLine="true" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <RadioGroup
+                android:id="@+id/rg_veg"
                 android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:fontFamily="@font/josefinsans_regular"
-                android:gravity="center_horizontal"
-                android:text="Start adding Variation name ad price to the item"
-                android:textColor="@color/brownish_grey"
-                android:textSize="9sp"
-                android:textStyle="normal"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_me">
+
+                <RadioButton
+                    android:id="@+id/rb_veg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/spacing_normal"
+                    android:layout_marginEnd="@dimen/spacing_normal"
+                    android:buttonTint="@color/primary_red"
+                    android:checked="true"
+                    android:text="Veg" />
+
+                <RadioButton
+                    android:id="@+id/rb_non_veg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacing_normal"
+                    android:buttonTint="@color/primary_red"
+                    android:text="Non Veg" />
+
+                <RadioButton
+                    android:id="@+id/rb_egg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:buttonTint="@color/primary_red"
+                    android:text="Egg" />
+
+            </RadioGroup>
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/cg_available_meal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginEnd="@dimen/spacing_normal"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout3"
-            android:layout_width="0dp"
-            android:layout_height="93dp"
-            android:layout_marginStart="@dimen/spacing_normal"
-            android:layout_marginTop="@dimen/spacing_normal"
-            android:layout_marginEnd="@dimen/spacing_normal"
-            android:background="@drawable/background_catalog_add_customization"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout2">
-
-            <ImageView
-                android:id="@+id/imageView10"
-                android:layout_width="29dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="80dp"
-                app:layout_constraintBottom_toTopOf="@+id/textView11"
-                app:layout_constraintEnd_toStartOf="@+id/imageView13"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:src="@drawable/ic_burgur" />
-
-            <ImageView
-                android:id="@+id/imageView11"
-                android:layout_width="16dp"
-                android:layout_height="19dp"
-                app:layout_constraintBottom_toBottomOf="@+id/imageView10"
-                app:layout_constraintEnd_toStartOf="@+id/imageView12"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/imageView13"
-                app:layout_constraintTop_toTopOf="@+id/imageView10"
-                android:src="@drawable/ic_shake" />
-
-            <ImageView
-                android:id="@+id/imageView12"
-                android:layout_width="19dp"
-                android:layout_height="19dp"
-                android:layout_marginEnd="80dp"
-                app:layout_constraintBottom_toBottomOf="@+id/imageView11"
+                app:layout_constraintTop_toBottomOf="@id/rg_veg"
+                app:selectionRequired="true">
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_breakfast"
+                    style="@style/CustomChipChoice"
+                    android:checked="true"
+                    android:text="Breakfast" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_lunch"
+                    style="@style/CustomChipChoice"
+                    android:text="Lunch" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_dinner"
+                    style="@style/CustomChipChoice"
+                    android:text="Dinner" />
+
+            </com.google.android.material.chip.ChipGroup>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/etLayout_manager_catalo"
+                style="@style/CatalogOutlinedInputLayout"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:hint="Description (optional)"
+                app:expandedHintEnabled="false"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/imageView11"
-                app:layout_constraintTop_toTopOf="@+id/imageView11"
-                android:src="@drawable/ic_fries" />
-
-            <TextView
-                android:id="@+id/textView11"
-                android:layout_width="match_parent"
-                android:layout_height="24dp"
-                android:layout_marginBottom="1dp"
-                android:fontFamily="@font/josefinsans_regular"
-                android:gravity="center_horizontal"
-                android:text="Add Size and type to items"
-                android:textColor="@color/brownish_grey"
-                android:textSize="10sp"
-                android:textStyle="normal"
-                app:layout_constraintBottom_toTopOf="@+id/textView14"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/cg_available_meal">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_description"
+                    style="@style/CatalogOutlinedInput"
+                    android:lines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout2"
+                android:layout_width="0dp"
+                android:layout_height="93dp"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_normal"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:background="@drawable/background_catalog_add_variant"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/textView14"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:fontFamily="@font/josefinsans_regular"
-                android:gravity="center_horizontal"
-                android:text="Start adding Variation name ad price to the item"
-                android:textColor="@color/brownish_grey"
-                android:textSize="9sp"
-                android:textStyle="normal"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalo">
+
+                <ImageView
+                    android:id="@+id/imageView7"
+                    android:layout_width="15dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="80dp"
+                    android:src="@drawable/ic_drink_outlined"
+                    app:layout_constraintBottom_toTopOf="@+id/textView12"
+                    app:layout_constraintEnd_toStartOf="@+id/imageView8"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="spread"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/imageView8"
+                    android:layout_width="19dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/ic_drink_outlined"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView7"
+                    app:layout_constraintEnd_toStartOf="@+id/imageView9"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView7" />
+
+                <ImageView
+                    android:id="@+id/imageView9"
+                    android:layout_width="23dp"
+                    android:layout_height="38dp"
+                    android:layout_marginEnd="80dp"
+                    android:src="@drawable/ic_drink_outlined"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView8"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView8" />
+
+                <TextView
+                    android:id="@+id/textView12"
+                    android:layout_width="match_parent"
+                    android:layout_height="24dp"
+                    android:layout_marginBottom="2dp"
+                    android:fontFamily="@font/josefinsans_regular"
+                    android:gravity="center_horizontal"
+                    android:text="Add Size and type to items"
+                    android:textColor="@color/brownish_grey"
+                    android:textSize="10sp"
+                    android:textStyle="normal"
+                    app:layout_constraintBottom_toTopOf="@+id/textView13"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <TextView
+                    android:id="@+id/textView13"
+                    android:layout_width="match_parent"
+                    android:layout_height="22dp"
+                    android:fontFamily="@font/josefinsans_regular"
+                    android:gravity="center_horizontal"
+                    android:text="Start adding Variation name ad price to the item"
+                    android:textColor="@color/brownish_grey"
+                    android:textSize="9sp"
+                    android:textStyle="normal"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout3"
+                android:layout_width="0dp"
+                android:layout_height="93dp"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_normal"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:background="@drawable/background_catalog_add_customization"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout2">
+
+                <ImageView
+                    android:id="@+id/imageView10"
+                    android:layout_width="29dp"
+                    android:layout_height="30dp"
+                    android:layout_marginStart="80dp"
+                    android:src="@drawable/ic_burgur"
+                    app:layout_constraintBottom_toTopOf="@+id/textView11"
+                    app:layout_constraintEnd_toStartOf="@+id/imageView13"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/imageView11"
+                    android:layout_width="16dp"
+                    android:layout_height="19dp"
+                    android:src="@drawable/ic_shake"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+                    app:layout_constraintEnd_toStartOf="@+id/imageView12"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView13"
+                    app:layout_constraintTop_toTopOf="@+id/imageView10" />
+
+                <ImageView
+                    android:id="@+id/imageView12"
+                    android:layout_width="19dp"
+                    android:layout_height="19dp"
+                    android:layout_marginEnd="80dp"
+                    android:src="@drawable/ic_fries"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView11"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView11"
+                    app:layout_constraintTop_toTopOf="@+id/imageView11" />
+
+                <TextView
+                    android:id="@+id/textView11"
+                    android:layout_width="match_parent"
+                    android:layout_height="24dp"
+                    android:layout_marginBottom="1dp"
+                    android:fontFamily="@font/josefinsans_regular"
+                    android:gravity="center_horizontal"
+                    android:text="Add Size and type to items"
+                    android:textColor="@color/brownish_grey"
+                    android:textSize="10sp"
+                    android:textStyle="normal"
+                    app:layout_constraintBottom_toTopOf="@+id/textView14"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <TextView
+                    android:id="@+id/textView14"
+                    android:layout_width="match_parent"
+                    android:layout_height="22dp"
+                    android:fontFamily="@font/josefinsans_regular"
+                    android:gravity="center_horizontal"
+                    android:text="Start adding Variation name ad price to the item"
+                    android:textColor="@color/brownish_grey"
+                    android:textSize="9sp"
+                    android:textStyle="normal"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <ImageView
+                    android:id="@+id/imageView13"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:src="@drawable/ic_add_green_normal"
+                    app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+                    app:layout_constraintEnd_toStartOf="@+id/imageView11"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/imageView10"
+                    app:layout_constraintTop_toTopOf="@+id/imageView10" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <Button
+                android:id="@+id/btn_save_item"
+                style="@style/CatalogRedRoundedButton"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:text="Save Item"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout3"
+                tools:layout_editor_absoluteX="203dp"
+                tools:layout_editor_absoluteY="631dp" />
 
-            <ImageView
-                android:id="@+id/imageView13"
-                android:layout_width="6dp"
-                android:layout_height="6dp"
-                app:layout_constraintBottom_toBottomOf="@+id/imageView10"
-                app:layout_constraintEnd_toStartOf="@+id/imageView11"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/imageView10"
-                app:layout_constraintTop_toTopOf="@+id/imageView10"
-                android:src="@drawable/ic_add_green_normal" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <Button
-            android:id="@+id/button2"
-            style="@style/CatalogRedRoundedButton"
-            android:text="Save Item"
-            android:layout_marginTop="@dimen/spacing_small"
-            tools:layout_editor_absoluteX="203dp"
-            tools:layout_editor_absoluteY="631dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout3"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_catalog_add_items.xml b/app/src/main/res/layout/fragment_catalog_add_items.xml
index 4592aad1..b0663033 100644
--- a/app/src/main/res/layout/fragment_catalog_add_items.xml
+++ b/app/src/main/res/layout/fragment_catalog_add_items.xml
@@ -18,13 +18,13 @@
             android:layout_height="196dp"
             android:layout_marginBottom="170dp"
             android:src="@drawable/ic_undraw_happy_announcement_ac_67"
-            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintBottom_toTopOf="@+id/btn_create_menu"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent" />
 
         <Button
-            android:id="@+id/button2"
+            android:id="@+id/btn_create_menu"
             style="@style/CatalogRedRoundedButton"
             android:layout_width="70dp"
             android:text="Add Item"
diff --git a/app/src/main/res/layout/fragment_catalog_add_variant.xml b/app/src/main/res/layout/fragment_catalog_add_variant.xml
index b04e14c9..e9216fc0 100644
--- a/app/src/main/res/layout/fragment_catalog_add_variant.xml
+++ b/app/src/main/res/layout/fragment_catalog_add_variant.xml
@@ -15,18 +15,19 @@
 
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+            android:id="@+id/rv_variants"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:listitem="@layout/item_catalog_add_variant">
+            tools:listitem="@layout/item_catalog_add_variant"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
 
         </androidx.recyclerview.widget.RecyclerView>
 
         <TextView
-            android:id="@+id/textView9"
+            android:id="@+id/tv_add_more_variant"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Add more variants"
@@ -38,10 +39,10 @@
             android:textSize="6.5sp"
             android:layout_marginTop="@dimen/spacing_normal"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/recyclerView" />
+            app:layout_constraintTop_toBottomOf="@id/rv_variants" />
 
         <Button
-            android:id="@+id/button2"
+            android:id="@+id/btn_save_variants"
             style="@style/CatalogRedRoundedButton"
             android:text="Save Variants"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_catalog_details.xml b/app/src/main/res/layout/fragment_catalog_details.xml
index 6cc145c7..8924314d 100644
--- a/app/src/main/res/layout/fragment_catalog_details.xml
+++ b/app/src/main/res/layout/fragment_catalog_details.xml
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_menu_name"
+                android:id="@+id/et_menu_name"
                 style="@style/CatalogOutlinedInput"
                 android:inputType="text"
                 android:singleLine="true" />
@@ -40,7 +40,7 @@
             app:layout_constraintTop_toBottomOf="@id/etLayout_manager_catalogue_menu_name">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_catalog_GST_number"
+                android:id="@+id/et_GST_number"
                 style="@style/CatalogOutlinedInput"
                 android:inputType="number"
                 android:singleLine="true" />
@@ -51,7 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
-            app:constraint_referenced_ids="etLayout_catalog_CGST, etLayout_catalog_SGST, etLayout_catalog_IGST"/>
+            app:constraint_referenced_ids="etLayout_catalog_CGST, etLayout_catalog_SGST, etLayout_catalog_IGST" />
 
 
         <com.google.android.material.textfield.TextInputLayout
@@ -69,7 +69,7 @@
             app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_CGST"
+                android:id="@+id/et_CGST"
                 style="@style/CatalogOutlinedInput"
                 android:drawableEnd="@drawable/ic_percent"
                 android:hint="0.0"
@@ -91,7 +91,7 @@
             app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_SGST"
+                android:id="@+id/et_SGST"
                 style="@style/CatalogOutlinedInput"
                 android:drawableEnd="@drawable/ic_percent"
                 android:hint="0.0"
@@ -111,7 +111,7 @@
             app:layout_constraintTop_toBottomOf="@+id/etLayout_manager_catalogue_GST_number">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_IGST"
+                android:id="@+id/et_IGST"
                 style="@style/CatalogOutlinedInput"
                 android:drawableEnd="@drawable/ic_percent"
                 android:hint="0.0"
@@ -122,9 +122,9 @@
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/etLayout_catalog_service_charge"
             style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_normal"
             android:layout_marginEnd="@dimen/spacing_small"
             android:hint="Service Charge"
-            android:layout_marginTop="@dimen/spacing_normal"
             app:expandedHintEnabled="false"
             app:layout_constraintEnd_toStartOf="@+id/etLayout_catalog_VAT_charge"
             app:layout_constraintHorizontal_bias="0.5"
@@ -132,7 +132,7 @@
             app:layout_constraintTop_toBottomOf="@+id/barrier3">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_service_charge"
+                android:id="@+id/et_service_charge"
                 style="@style/CatalogOutlinedInput"
                 android:drawableEnd="@drawable/ic_percent"
                 android:hint="0.0"
@@ -143,8 +143,8 @@
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/etLayout_catalog_VAT_charge"
             style="@style/CatalogOutlinedInputLayout"
-            android:hint="VAT Charge"
             android:layout_marginTop="@dimen/spacing_normal"
+            android:hint="VAT Charge"
             app:expandedHintEnabled="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -152,7 +152,7 @@
             app:layout_constraintTop_toBottomOf="@+id/barrier3">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_manager_catalogue_VAT_charge"
+                android:id="@+id/et_VAT_charge"
                 style="@style/CatalogOutlinedInput"
                 android:drawableEnd="@drawable/ic_percent"
                 android:hint="0.0"
@@ -161,7 +161,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <Button
-            android:id="@+id/button2"
+            android:id="@+id/btn_create_menu"
             style="@style/CatalogRedRoundedButton"
             android:text="Create"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -179,14 +179,17 @@
             app:layout_constraintTop_toBottomOf="@id/etLayout_catalog_service_charge">
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_cash"
                 style="@style/CustomChipChoice"
                 android:text="Cash" />
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_card"
                 style="@style/CustomChipChoice"
                 android:text="Card" />
 
             <com.google.android.material.chip.Chip
+                android:id="@+id/chip_UPI"
                 style="@style/CustomChipChoice"
                 android:text="UPI" />
 
diff --git a/app/src/main/res/layout/item_catalog_add_customization.xml b/app/src/main/res/layout/item_catalog_add_customization.xml
index adf6d2a8..0472cd34 100644
--- a/app/src/main/res/layout/item_catalog_add_customization.xml
+++ b/app/src/main/res/layout/item_catalog_add_customization.xml
@@ -1,129 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout 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"
-    android:background="@color/white_two"
-    android:padding="@dimen/spacing_normal"
-    android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_catalo"
-        style="@style/CatalogOutlinedInputLayout"
-        android:hint="Add On Group Name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <data>
+        <variable
+            name="customization_model"
+            type="com.checkin.app.checkin.manager.models.ItemCustomizationModel" />
+    </data>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaatalogme"
-            style="@style/CatalogOutlinedInput"
-            android:inputType="text"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_cao"
-        style="@style/CatalogOutlinedInputLayout"
-        android:layout_marginEnd="@dimen/spacing_small"
-        android:hint="Minimum Selection"
-        app:expandedHintEnabled="false"
-        app:layout_constraintBottom_toBottomOf="@+id/etLayger_cat"
-        app:layout_constraintEnd_toStartOf="@+id/etLayger_cat"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white_two"
+        android:padding="@dimen/spacing_normal"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaalogme"
-            style="@style/CatalogOutlinedInput"
-            android:hint="0"
-            android:inputType="number"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_catalo"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="Add On Group Name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_cat"
-        style="@style/CatalogOutlinedInputLayout"
-        android:layout_marginTop="@dimen/spacing_normal"
-        android:hint="Maximum Selection"
-        app:expandedHintEnabled="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/etLayger_cao"
-        app:layout_constraintTop_toBottomOf="@id/etLayger_catalo">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaatalogme"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={customization_model.customizationGroupModel.name}"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaataloe"
-            style="@style/CatalogOutlinedInput"
-            android:hint="0"
-            android:inputType="number"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_cao"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:hint="Minimum Selection"
+            app:expandedHintEnabled="false"
+            app:layout_constraintBottom_toBottomOf="@+id/etLayger_cat"
+            app:layout_constraintEnd_toStartOf="@+id/etLayger_cat"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent">
 
-    <TextView
-        android:id="@+id/textView10"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_normal"
-        android:fontFamily="@font/josefinsans_regular"
-        android:text="Add first option to your Add On."
-        android:textColor="@color/primary_red"
-        android:textSize="7sp"
-        android:textStyle="normal"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/etLayger_cao" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaalogme"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={``+customization_model.customizationGroupModel.minSelect}"
+                android:hint="0"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_ao"
-        style="@style/CatalogOutlinedInputLayout"
-        android:hint="Field Name"
-        android:layout_marginEnd="@dimen/spacing_small"
-        app:layout_constraintBottom_toBottomOf="@+id/etLayger_at"
-        app:layout_constraintEnd_toStartOf="@+id/etLayger_at"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_cat"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:hint="Maximum Selection"
+            app:expandedHintEnabled="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayger_cao"
+            app:layout_constraintTop_toBottomOf="@id/etLayger_catalo">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaaogme"
-            style="@style/CatalogOutlinedInput"
-            android:inputType="text"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaataloe"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={``+customization_model.customizationGroupModel.maxSelect}"
+                android:hint="0"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_at"
-        style="@style/CatalogOutlinedInputLayout"
-        android:layout_marginTop="@dimen/spacing_tiny"
-        android:hint="Price"
-        app:expandedHintEnabled="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/etLayger_ao"
-        app:layout_constraintTop_toBottomOf="@+id/textView10">
+        <TextView
+            android:id="@+id/textView10"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:fontFamily="@font/josefinsans_regular"
+            android:text="Add first option to your Add On."
+            android:textColor="@color/primary_red"
+            android:textSize="7sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etLayger_cao" />
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaaaloe"
-            style="@style/CatalogOutlinedInput"
-            android:hint="0"
-            android:inputType="numberDecimal"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_fields"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:listitem="@layout/item_customization_field"
+            tools:itemCount="1"
+            android:layout_marginEnd="1dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="@+id/etLayger_cat"
+            app:layout_constraintStart_toStartOf="@+id/etLayger_cao"
+            app:layout_constraintTop_toBottomOf="@+id/textView10" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_normal"
-        android:drawableLeft="@drawable/ic_noun_add_red"
-        android:drawablePadding="@dimen/spacing_tiny"
-        android:fontFamily="@font/josefinsans_semibold"
-        android:textColor="@color/primary_red"
-        android:textSize="6.5sp"
-        android:textStyle="normal"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/etLayger_ao"
-        tools:text="Add more fields" />
+        <TextView
+            android:id="@+id/tv_add_more_fields"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_normal"
+            android:drawableLeft="@drawable/ic_noun_add_red"
+            android:drawablePadding="@dimen/spacing_tiny"
+            android:fontFamily="@font/josefinsans_semibold"
+            android:textColor="@color/primary_red"
+            android:textSize="6.5sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/rv_fields"
+            android:text="Add more fields" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_catalog_add_variant.xml b/app/src/main/res/layout/item_catalog_add_variant.xml
index e0450af4..c4cca73a 100644
--- a/app/src/main/res/layout/item_catalog_add_variant.xml
+++ b/app/src/main/res/layout/item_catalog_add_variant.xml
@@ -1,41 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout 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">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLayger_catalo"
-        style="@style/CatalogOutlinedInputLayout"
-        android:hint="Item Type/Size"
-        android:layout_marginRight="@dimen/spacing_large"
-        app:layout_constraintEnd_toStartOf="@+id/etLaer_catalo"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <data>
+        <variable
+            name="variant"
+            type="com.checkin.app.checkin.manager.models.ItemVariantModel" />
+    </data>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaatalogme"
-            style="@style/CatalogOutlinedInput"
-            android:inputType="text"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/spacing_normal">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/etLaer_catalo"
-        style="@style/CatalogOutlinedInputLayout"
-        android:hint="Price (Rs.)"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/etLayger_catalo"
-        app:layout_constraintTop_toTopOf="parent">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_catalo"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="Item Type/Size"
+            android:layout_marginRight="@dimen/spacing_large"
+            app:layout_constraintEnd_toStartOf="@+id/etLaer_catalo"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_manaalogme"
-            style="@style/CatalogOutlinedInput"
-            android:inputType="numberDecimal"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaatalogme"
+                style="@style/CatalogOutlinedInput"
+                android:inputType="text"
+                android:text="@={variant.type}"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLaer_catalo"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="Price (Rs.)"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayger_catalo"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaalogme"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={variant.price}"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_catalog_group_type.xml b/app/src/main/res/layout/item_catalog_group_type.xml
new file mode 100644
index 00000000..b74625e3
--- /dev/null
+++ b/app/src/main/res/layout/item_catalog_group_type.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:padding="16dp"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_customization_field.xml b/app/src/main/res/layout/item_customization_field.xml
new file mode 100644
index 00000000..5cdbd7f7
--- /dev/null
+++ b/app/src/main/res/layout/item_customization_field.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+        <variable
+            name="field_model"
+            type="com.checkin.app.checkin.manager.models.CustomizationFieldModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_ao"
+            style="@style/CatalogOutlinedInputLayout"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:hint="Field Name"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/etLayger_at"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaaogme"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={field_model.name}"
+                android:inputType="text"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/etLayger_at"
+            style="@style/CatalogOutlinedInputLayout"
+            android:hint="Price"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/etLayger_ao"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_manaaaloe"
+                style="@style/CatalogOutlinedInput"
+                android:text="@={field_model.cost}"
+                android:hint="0"
+                android:inputType="numberDecimal"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file