ability to add and link barcodeless products

app/src/main/AndroidManifest.xml

@@ -36,6 +36,18 @@
                 android:name=".activities.AddAbstractProductActivity"
                 android:exported="false"
                 android:theme="@style/Theme.BarcodeScannerForEmployees"/>
+        <activity
+                android:name=".activities.ExpiryCalendarActivity"
+                android:exported="false"
+                android:theme="@style/Theme.BarcodeScannerForEmployees"/>
+        <activity
+                android:name=".activities.ExpiryCalendarGroupActivity"
+                android:exported="false"
+                android:theme="@style/Theme.BarcodeScannerForEmployees"/>
+        <activity
+                android:name=".activities.FindBarcodelessAbstractProduct"
+                android:exported="false"
+                android:theme="@style/Theme.BarcodeScannerForEmployees"/>
         <activity
                 android:name=".activities.FullscreenActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
@@ -49,7 +61,7 @@
         
         <provider
                 android:name="androidx.core.content.FileProvider"
-                android:authorities="com.google.firebase.components.activities.MainActivity.provider;com.google.firebase.components.activities.FullscreenActivity.provider;com.google.firebase.components.activities.AddAbstractProductActivity.provider;com.google.firebase.components.activities.AddProductActivity.provider"
+                android:authorities="com.google.firebase.components.activities.MainActivity.provider;com.google.firebase.components.activities.FullscreenActivity.provider;com.google.firebase.components.activities.AddAbstractProductActivity.provider;com.google.firebase.components.activities.AddProductActivity.provider;com.google.firebase.components.activities.ExpiryCalendarActivity.provider;com.google.firebase.components.activities.FindBarcodelessAbstractProduct.provider;com.google.firebase.components.activities.ExpiryCalendarGroupActivity.provider"
                 android:exported="false"
                 android:grantUriPermissions="true">
             <meta-data

app/src/main/java/org/foxarmy/barcodescannerforemployees/DBStorageController.kt

@@ -200,6 +200,49 @@ class DBStorageController(context: Context) : SQLiteOpenHelper(context, DATABASE
         db.insert(ProductContract.ProductEntry.TABLE_NAME, null, values)
     }
 
+    fun findAmountOfProductsWithExpiryDate(db: SQLiteDatabase, date: Long): Int {
+        var amount = 0
+
+        val projection = arrayOf(
+            ProductContract.ProductEntry.ABSTRACT_PRODUCT_ID,
+            ProductContract.ProductEntry.AMOUNT,
+            ProductContract.ProductEntry.DATE_OF_PRODUCTION,
+        )
+
+        val selection = "${ProductContract.ProductEntry.EXPIRY_DATE} = ?"
+        val selectionArgs = arrayOf(date.toString())
+
+        val cursor = db.query(ProductContract.ProductEntry.TABLE_NAME, projection, selection, selectionArgs, null, null, null)
+
+        with(cursor) {
+            while (moveToNext()) {
+                amount++
+            }
+        }
+
+        return amount
+    }
+
+    fun findAllExpiryDates(db:SQLiteDatabase): Set<Long> {
+        val dates: MutableSet<Long> = mutableSetOf<Long>()
+
+        val projection = arrayOf(
+            ProductContract.ProductEntry.EXPIRY_DATE
+        )
+
+        val orderBy = "${ProductContract.ProductEntry.EXPIRY_DATE} ASC"
+
+        val cursor = db.query(ProductContract.ProductEntry.TABLE_NAME, projection, null, null, null, null, orderBy)
+
+        with(cursor) {
+            while (moveToNext()) {
+                dates.add(getLong(getColumnIndexOrThrow(ProductContract.ProductEntry.EXPIRY_DATE)))
+            }
+        }
+
+        return dates
+    }
+
     fun findAbstractProductByBarcode (db: SQLiteDatabase, barcode: String) : AbstractProduct? {
         var abstractProduct: AbstractProduct? = null
         val projection = arrayOf(

app/src/main/java/org/foxarmy/barcodescannerforemployees/Parser.kt

@@ -13,8 +13,9 @@ class Parser constructor() {
                 val found = foundByRegex.groupValues[0]
                 text = text.replace(found, "")
                 netWeight = stripNetWeight(found)
-//                }
                 return Triple(text, netWeight, found)
+            } else {
+                return Triple(text, 0.0, "")
             }
         }
         return Triple("", 0.0, "")
@@ -40,7 +41,9 @@ class Parser constructor() {
             "мл" -> { 3 }
             "шт" -> { 4 }
 
-            else -> { -1 }
+            else -> {
+                4
+            }
         }
 
         return AbstractProduct(0, "", name, netWeight, "", 0, unitNumber)

app/src/main/java/org/foxarmy/barcodescannerforemployees/Utils.kt

@@ -5,11 +5,11 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.Matrix
 import android.net.Uri
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
-import androidx.core.graphics.scale
 import com.google.firebase.components.BuildConfig
 import java.io.File
 import java.io.FileOutputStream
@@ -33,8 +33,12 @@ fun generateThumbnailForImage(context: Context, imageHash: String) {
     val imageFile = File(picturesDir, "$imageHash.png")
     val imageContent = imageFile.inputStream().readBytes()
     var img = BitmapFactory.decodeByteArray(imageContent, 0, imageContent.size)
-    img = img.scale(img.width/4,img.height/4)
+
-    img.compress(Bitmap.CompressFormat.WEBP_LOSSY, 25, FileOutputStream(thumbnailFile))
+    val matrix = Matrix();
+    matrix.postRotate(90f)
+    val scaled = Bitmap.createScaledBitmap(img, img.width/4, img.height/4, true)
+    val rotated = Bitmap.createBitmap(scaled, 0, 0, scaled.width, scaled.height, matrix, true)
+    rotated.compress(Bitmap.CompressFormat.WEBP_LOSSY, 25, FileOutputStream(thumbnailFile))
 }
 
 @OptIn(ExperimentalStdlibApi::class)

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/AddAbstractProductActivity.kt

@@ -1,8 +1,5 @@
 package org.foxarmy.barcodescannerforemployees.activities
 
-//import com.google.mlkit.vision.codescanner.GmsBarcodeScannerOptions
-//import com.google.mlkit.vision.codescanner.GmsBarcodeScanning
-
 import android.content.ContentValues
 import android.content.DialogInterface
 import android.content.Intent
@@ -35,6 +32,7 @@ class AddAbstractProductActivity : AppCompatActivity() {
     private lateinit var scanButton: Button
 
     private lateinit var barcodeText: EditText
+    private lateinit var noBarcodeCheckBox: CheckBox
     private lateinit var productNameText: TextView
     private lateinit var netWeightText: TextView
     private lateinit var unitTypeSpinner: Spinner
@@ -45,6 +43,7 @@ class AddAbstractProductActivity : AppCompatActivity() {
     private lateinit var pictureFile: File
     private lateinit var picturesPath: File
     private var barcode: String = ""
+    private var action: String = "new"
 
     private var scanningBarcode = false
 
@@ -53,11 +52,6 @@ class AddAbstractProductActivity : AppCompatActivity() {
 
         setContentView(R.layout.fragment_add_abstract_product)
 
-        val extras = intent.extras
-        abstractProduct = extras!!.get("abstractProduct") as AbstractProduct?
-        if (abstractProduct != null) {
-            barcode = abstractProduct!!.barcode
-        }
 
         picturesPath = File(filesDir, "pictures")
         val thumbnailsDir = File(cacheDir, "thumbnails")
@@ -70,6 +64,7 @@ class AddAbstractProductActivity : AppCompatActivity() {
         scanButton = findViewById(R.id.scan_button)
 
         barcodeText = findViewById(R.id.barcodeTextEdit)
+        noBarcodeCheckBox = findViewById(R.id.noBarcodeCheckBox)
         productNameText = findViewById(R.id.productName)
         netWeightText = findViewById(R.id.netWeight)
         unitTypeSpinner = findViewById(R.id.unitTypeSpinner)
@@ -79,19 +74,33 @@ class AddAbstractProductActivity : AppCompatActivity() {
         fillupCategorySpinner()
         fillupUnitsSpinner()
 
+        noBarcodeCheckBox.setOnClickListener {
+            if (noBarcodeCheckBox.isChecked) {
+                barcodeText.setText("")
+            }
+        }
+
         barcodeText.addTextChangedListener {
             this.barcode = barcodeText.text.toString()
         }
 
-        if (abstractProduct?.name == "" && abstractProduct?.barcode != "") {
+        val extras = intent.extras
-            performRequest(abstractProduct?.barcode!!)
+        action = extras!!.get("action") as String
+        when (action) {
+            "update" -> {
+                abstractProduct = extras.get("abstractProduct") as AbstractProduct?
+            }
+            "new_from_barcode" -> {
+                abstractProduct = extras.get("abstractProduct") as AbstractProduct?
+                barcode = abstractProduct!!.barcode
+                performRequest(abstractProduct!!.barcode)
+            }
         }
 
         if (abstractProduct != null) {
             val imageThumbnailUri = getImageUri(this, File(thumbnailsDir, "${abstractProduct!!.imageHash}.webp"))
             pictureFile = File(picturesPath, "${abstractProduct!!.imageHash}.png]")
             imageView.setImageURI(imageThumbnailUri)
-            imageView.rotation = 90f
             barcodeText.setText(abstractProduct!!.barcode)
             productNameText.text = abstractProduct!!.name
             netWeightText.text = abstractProduct!!.netWeight.toString()
@@ -102,12 +111,12 @@ class AddAbstractProductActivity : AppCompatActivity() {
         saveButton.setOnClickListener {
             val productName = productNameText.text.toString()
             val netWeight = netWeightText.text
-            if (abstractProduct == null && (!this::pictureFile.isInitialized || !pictureFile.exists())) {
+            if (action != "update" && (!this::pictureFile.isInitialized || !pictureFile.exists())) {
                 Toast.makeText(this, getString(R.string.product_picture_request), Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
 
-            if (barcode == "") {
+            if (barcode == "" && !noBarcodeCheckBox.isChecked) {
                 Toast.makeText(this, getString(R.string.product_barcode_request), Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
@@ -130,15 +139,15 @@ class AddAbstractProductActivity : AppCompatActivity() {
                 put(AbstractProductContract.AbstractProductEntry.UNIT, unitTypeSpinner.selectedItemPosition)
             }
 
-            if (abstractProduct == null) {
+            if (action == "update") {
-                db.insert(AbstractProductContract.AbstractProductEntry.TABLE_NAME, null, values)
-            } else {
                 db.update(
                     AbstractProductContract.AbstractProductEntry.TABLE_NAME,
                     values,
                     "${BaseColumns._ID} = ?",
                     arrayOf(abstractProduct!!.id.toString())
                 )
+            } else if (action == "new" || action == "new_from_barcode"){
+                db.insert(AbstractProductContract.AbstractProductEntry.TABLE_NAME, null, values)
             }
 
             finish()
@@ -166,11 +175,11 @@ class AddAbstractProductActivity : AppCompatActivity() {
             ) != null
         ) {
             AlertDialog.Builder(this)
-                .setMessage("You've got an abstract product with such barcode in your database")
+                .setMessage(getString(R.string.abstract_product_already_exists))
-                .setPositiveButton("Quit") { _: DialogInterface, _: Int ->
+                .setPositiveButton(getString(R.string.quit)) { _: DialogInterface, _: Int ->
                     finish()
                 }
-                .setNegativeButton("Edit existing") { _: DialogInterface, _: Int ->
+                .setNegativeButton(getString(R.string.edit_existing)) { _: DialogInterface, _: Int ->
                     val addProductIntent = Intent(this, AddAbstractProductActivity::class.java)
                     val extras = Bundle()
                     val existingAbstractProduct = DBStorageController(this).findAbstractProductByBarcode(
@@ -190,7 +199,7 @@ class AddAbstractProductActivity : AppCompatActivity() {
             }
             if (requester.response == "Not found 404") {
                 runOnUiThread {
-                    Toast.makeText(this, "Product not found. Please, try again or type manually", Toast.LENGTH_LONG)
+                    Toast.makeText(this, getString(R.string.no_product_in_online_database), Toast.LENGTH_LONG)
                         .show()
                 }
                 return@thread
@@ -303,11 +312,11 @@ class AddAbstractProductActivity : AppCompatActivity() {
             if (result.contents == null) {
                 Toast.makeText(this, getString(R.string.cancelled), Toast.LENGTH_SHORT).show()
             } else {
-                scanningBarcode = false
                 val scannedBarcode = result.contents
                 barcodeText.setText(scannedBarcode)
                 performRequest(scannedBarcode)
             }
+            scanningBarcode = false
         }
     }
 

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/AddCategoryActivity.kt

@@ -6,10 +6,11 @@ import android.os.Bundle
 import android.provider.BaseColumns
 import android.widget.Button
 import android.widget.EditText
+import android.widget.Toast
 import org.foxarmy.barcodescannerforemployees.CategoriesContract
-import org.foxarmy.barcodescannerforemployees.dataclasses.Category
 import org.foxarmy.barcodescannerforemployees.DBStorageController
 import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.dataclasses.Category
 
 class AddCategoryActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -27,6 +28,11 @@ class AddCategoryActivity : Activity() {
         findViewById<Button>(R.id.saveButton).setOnClickListener {
             val db = DBStorageController(this).writableDatabase
 
+            if (categoryNameTextEdit.text.toString() == "") {
+                Toast.makeText(this, getString(R.string.category_name_required), Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+
             if (category.id == 0) { // Inserting new category
                 val values = ContentValues().apply {
                     put(CategoriesContract.CategoryEntry.CATEGORY_NAME, categoryNameTextEdit.text.toString())

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/AddProductActivity.kt

@@ -1,13 +1,16 @@
 package org.foxarmy.barcodescannerforemployees.activities
 
-import android.app.DatePickerDialog
+import android.app.Activity
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.widget.addTextChangedListener
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
@@ -23,19 +26,18 @@ import java.util.*
 class AddProductActivity : AppCompatActivity() {
 
     private lateinit var scanButton: Button
+    private lateinit var noBarcodeButton: Button
     private lateinit var abstractProductView: AbstractProductView
     private lateinit var expiryDateRadioButton: RadioButton
     private lateinit var shelfLifeRadioButton: RadioButton
 
-    private lateinit var expiryDateTextView: TextView
+    private lateinit var expiryDatePicker: DatePicker
-    private lateinit var expiryDateSelectButton: Button
 
-    private lateinit var shelfLifeTextView: TextView
     private lateinit var shelfLifeTextEdit: EditText
 
     private lateinit var amountTextEdit: EditText
 
-    private lateinit var dateOfProductionSelectButton: Button
+    private lateinit var dateOfProductionDatePicker: DatePicker
     private lateinit var saveProductButton: Button
 
     private var expiryDateOverShelfLife: Boolean? = null
@@ -49,19 +51,19 @@ class AddProductActivity : AppCompatActivity() {
         setContentView(R.layout.fragment_add_product)
 
         scanButton = findViewById(R.id.scanButton)
+        noBarcodeButton = findViewById(R.id.noBarcodeButton)
         abstractProductView = findViewById(R.id.abstractProductView)
         expiryDateRadioButton = findViewById(R.id.expiryDateRadio)
         shelfLifeRadioButton = findViewById(R.id.shelfLifeRadio)
 
-        expiryDateTextView = findViewById(R.id.expiryDateTextView)
+        expiryDatePicker = findViewById(R.id.expiryDatePicker)
-        expiryDateSelectButton = findViewById(R.id.selectExpiryDateButton)
 
-        shelfLifeTextView = findViewById(R.id.shelfLife)
         shelfLifeTextEdit = findViewById(R.id.shelfLifeTextEdit)
 
         amountTextEdit = findViewById(R.id.amountTextEdit)
+        amountTextEdit.setText("1")
 
-        dateOfProductionSelectButton = findViewById(R.id.selectDateOfProductionButton)
+        dateOfProductionDatePicker = findViewById(R.id.dateOfProductionDatePicker)
         saveProductButton = findViewById(R.id.saveProductButton)
 
         val extras = intent.extras
@@ -78,13 +80,16 @@ class AddProductActivity : AppCompatActivity() {
             update()
         } else {
             product = Product(0, 0, 0, 0, 0)
-            abstractProduct = AbstractProduct(0, "", "", 0.0, "", 0, 0)
         }
 
         scanButton.setOnClickListener {
             requestPermissionLauncher.launch(android.Manifest.permission.CAMERA)
         }
 
+        noBarcodeButton.setOnClickListener {
+            intentLauncher.launch(Intent(this, FindBarcodelessAbstractProduct::class.java))
+        }
+
         expiryDateRadioButton.setOnClickListener {
             expiryDateOverShelfLife = true
             update()
@@ -95,32 +100,14 @@ class AddProductActivity : AppCompatActivity() {
             update()
         }
 
-        dateOfProductionSelectButton.setOnClickListener {
+        dateOfProductionDatePicker.setOnDateChangedListener { _, year, monthOfYear, dayOfMonth ->
-            val c = Calendar.getInstance()
+            product!!.dateOfProduction = SimpleDateFormat("dd.MM.yyyy").parse("$dayOfMonth.$monthOfYear.$year")!!.time / 1000
-            val year = c.get(Calendar.YEAR)
+            update()
-            val month = c.get(Calendar.MONTH)
-            val day = c.get(Calendar.DAY_OF_MONTH)
-
-            val dpd = DatePickerDialog(this, { _, y, m, d ->
-                product!!.dateOfProduction = SimpleDateFormat("dd.MM.yyyy").parse("$d.${m+1}.$y")!!.time / 1000
-                update()
-            }, year, month, day)
-
-            dpd.show()
         }
 
-        expiryDateSelectButton.setOnClickListener {
+        expiryDatePicker.setOnDateChangedListener { _, year, monthOfYear, dayOfMonth ->
-            val c = Calendar.getInstance()
+            product!!.dateOfExpiry = SimpleDateFormat("dd.MM.yyyy").parse("$dayOfMonth.$monthOfYear.$year")!!.time / 1000
-            val year = c.get(Calendar.YEAR)
+            update()
-            val month = c.get(Calendar.MONTH)
-            val day = c.get(Calendar.DAY_OF_MONTH)
-
-            val dpd = DatePickerDialog(this, { _, y, m, d ->
-                product!!.dateOfExpiry = SimpleDateFormat("dd.MM.yyyy").parse("$d.${m+1}.$y")!!.time / 1000
-                update()
-            }, year, month, day)
-
-            dpd.show()
         }
 
         amountTextEdit.addTextChangedListener {
@@ -130,6 +117,11 @@ class AddProductActivity : AppCompatActivity() {
         }
 
         saveProductButton.setOnClickListener {
+            if (abstractProduct == null) {
+                Toast.makeText(this, getString(R.string.abstract_product_request), Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+
             if (expiryDateOverShelfLife == null) {
                 Toast.makeText(this, getString(R.string.shell_life_or_expiry_date_request), Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
@@ -163,27 +155,35 @@ class AddProductActivity : AppCompatActivity() {
 
             finish()
         }
+        update()
+
+        val today = SimpleDateFormat("dd.MM.yyyy").format(Calendar.getInstance().time).split(".")
+
+
+        dateOfProductionDatePicker.updateDate(today[2].toInt(), today[1].toInt(), today[0].toInt())
+        expiryDatePicker.updateDate(today[2].toInt(), today[1].toInt(), today[0].toInt())
     }
 
+    private val intentLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val selectedAbstractProduct = (result.data?.extras!!.getParcelable("abstractProduct") as AbstractProduct?)!!
+                product!!.abstractProductId = selectedAbstractProduct.id
+                abstractProduct = selectedAbstractProduct
+                displayAbstractProduct(selectedAbstractProduct, "")
+            }
+        }
+
     private fun update () {
         if (expiryDateOverShelfLife == true) {
-            expiryDateTextView.visibility = View.VISIBLE
+            expiryDatePicker.visibility = View.VISIBLE
-            expiryDateSelectButton.visibility = View.VISIBLE
 
             shelfLifeTextEdit.visibility = View.INVISIBLE
-            shelfLifeTextView.visibility = View.INVISIBLE
         } else if (expiryDateOverShelfLife == false){
-            expiryDateTextView.visibility = View.INVISIBLE
+            expiryDatePicker.visibility = View.INVISIBLE
-            expiryDateSelectButton.visibility = View.INVISIBLE
 
             shelfLifeTextEdit.visibility = View.VISIBLE
-            shelfLifeTextView.visibility = View.VISIBLE
         }
-        val dateOfProductionParsed = SimpleDateFormat("dd.MM.yyyy").format(Date(product!!.dateOfProduction * 1000))
-        findViewById<TextView>(R.id.dateOfProductionTextView).text = "${getString(R.string.date_of_production)}: $dateOfProductionParsed"
-
-        val expiryDateParsed = SimpleDateFormat("dd.MM.yyyy").format(Date(product!!.dateOfExpiry * 1000))
-        expiryDateTextView.text = "${getString(R.string.expiry_date)}: $expiryDateParsed"
 
         if (amountTextEdit.text.toString() == "") {
             amountTextEdit.setText(product!!.amount.toString())
@@ -206,9 +206,25 @@ class AddProductActivity : AppCompatActivity() {
         product!!.dateOfExpiry = c.timeInMillis / 1000
     }
 
-    private fun displayAbstractProduct(abstractProduct: AbstractProduct) {
+    private fun displayAbstractProduct(abstractProduct: AbstractProduct?, scannedBarcode: String) {
-        abstractProductView.abstractProduct = abstractProduct
+        if (abstractProduct == null) {
-        abstractProductView.update()
+            AlertDialog.Builder(this)
+                .setMessage(getString(R.string.abstract_product_does_not_exist))
+                .setPositiveButton(R.string.yes) { _, _ ->
+                    val addAbstractProductIntent = Intent(this, AddAbstractProductActivity::class.java)
+                    val extras = Bundle()
+                    extras.putParcelable("abstractProduct", AbstractProduct(0, scannedBarcode, "", 0.0, "", 0, 0))
+                    extras.putString("action", "new_from_barcode")
+                    addAbstractProductIntent.putExtras(extras)
+                    ContextCompat.startActivity(this, addAbstractProductIntent, extras)
+                }
+                .setNegativeButton(R.string.no) {_, _ ->
+
+                }.show()
+        } else {
+            abstractProductView.abstractProduct = abstractProduct
+            abstractProductView.update()
+        }
     }
 
     @RequiresApi(Build.VERSION_CODES.R)
@@ -230,8 +246,11 @@ class AddProductActivity : AppCompatActivity() {
             } else {
                 val scannedBarcode = result.contents
                 abstractProduct = DBStorageController(this).findAbstractProductByBarcode(DBStorageController(this).readableDatabase, scannedBarcode)
-                displayAbstractProduct(abstractProduct!!)
+
-                product?.abstractProductId = abstractProduct!!.id
+                displayAbstractProduct(abstractProduct, scannedBarcode)
+                if (abstractProduct != null) {
+                    product?.abstractProductId = abstractProduct!!.id
+                }
             }
         }
     }

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/ExpiryCalendarActivity.kt

@@ -0,0 +1,43 @@
+package org.foxarmy.barcodescannerforemployees.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import org.foxarmy.barcodescannerforemployees.DBStorageController
+import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.databinding.ActivityExpiryCalendarBinding
+import org.foxarmy.barcodescannerforemployees.views.ExpiryGroupView
+
+class ExpiryCalendarActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityExpiryCalendarBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.fragment_expiry_dates)
+
+        fillUp()
+    }
+
+    fun displayDate(date:Long) {
+        val expiryCalendarGroupActivityIntent = Intent(this, ExpiryCalendarGroupActivity::class.java)
+        val extras = Bundle()
+        extras.putLong("date", date)
+        expiryCalendarGroupActivityIntent.putExtras(extras)
+        ContextCompat.startActivity(this, expiryCalendarGroupActivityIntent, extras)
+    }
+
+    private fun fillUp() {
+        val dates = DBStorageController(this).findAllExpiryDates(DBStorageController(this).readableDatabase)
+
+        val container = findViewById<LinearLayout>(R.id.datesLinearLayout)
+
+        dates.forEach { date ->
+            val newDate = ExpiryGroupView(this, this as Context, date)
+            container.addView(newDate)
+        }
+    }
+}

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/ExpiryCalendarGroupActivity.kt

@@ -0,0 +1,25 @@
+package org.foxarmy.barcodescannerforemployees.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.databinding.ActivityExpiryCalendarGroupBinding
+import org.foxarmy.barcodescannerforemployees.fragments.ShelfFragment
+
+class ExpiryCalendarGroupActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityExpiryCalendarGroupBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityExpiryCalendarGroupBinding.inflate(layoutInflater)
+
+        val date = intent.extras!!.getLong("date")
+
+        val ft = supportFragmentManager.beginTransaction()
+        ft.replace(R.id.content, ShelfFragment.newInstance(date))
+        ft.commit()
+        setContentView(binding.root)
+
+    }
+}

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/FindBarcodelessAbstractProduct.kt

@@ -0,0 +1,34 @@
+package org.foxarmy.barcodescannerforemployees.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.databinding.ActivityFindBarcodelessAbstractProductBinding
+import org.foxarmy.barcodescannerforemployees.dataclasses.AbstractProduct
+import org.foxarmy.barcodescannerforemployees.fragments.StorageFragment
+
+class FindBarcodelessAbstractProduct() : AppCompatActivity() {
+    private lateinit var binding: ActivityFindBarcodelessAbstractProductBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityFindBarcodelessAbstractProductBinding.inflate(layoutInflater)
+
+        val ft = supportFragmentManager.beginTransaction()
+        val fragment = StorageFragment.newInstance("barcodeless", arrayOf(""))
+        ft.replace(R.id.content, fragment)
+        ft.commit()
+
+        setContentView(binding.root)
+    }
+
+    fun selected(abstractProduct: AbstractProduct) {
+        val data = Intent()
+        data.putExtra("abstractProduct", abstractProduct)
+        setResult(Activity.RESULT_OK, data)
+        finish()
+    }
+}

app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/MainActivity.kt

@@ -32,6 +32,13 @@ class MainActivity : AppCompatActivity() {
         setupViewPager(binding.tabViewpager)
         binding.tabTablayout.setupWithViewPager(binding.tabViewpager)
 
+        binding.expiryCalendarFab.setOnClickListener { _ ->
+            val expiryCalendarIntent = Intent(this, ExpiryCalendarActivity::class.java)
+            val extras = Bundle()
+            expiryCalendarIntent.putExtras(extras)
+            ContextCompat.startActivity(this, expiryCalendarIntent, extras)
+        }
+
         binding.newElementFab.setOnClickListener { view ->
             val currentPosition = binding.tabTablayout.selectedTabPosition
             val fragment = adapter.getItem(currentPosition)
@@ -43,6 +50,7 @@ class MainActivity : AppCompatActivity() {
                     // I reuse the same stuff for editing and adding new product.
                     // if abstractProduct == null, it means that we need to create new object
                     extras.putParcelable("abstractProduct", null)
+                    extras.putString("action", "new")
                     addAbstractProductIntent.putExtras(extras)
                     ContextCompat.startActivity(this, addAbstractProductIntent, extras)
                 }
@@ -50,7 +58,7 @@ class MainActivity : AppCompatActivity() {
                 "CategoriesFragment" -> {
                     val addCategoryIntent = Intent(this, AddCategoryActivity::class.java)
                     val extras = Bundle()
-                    extras.putParcelable("category", Category(0, "New category"))
+                    extras.putParcelable("category", Category(0, ""))
                     addCategoryIntent.putExtras(extras)
                     ContextCompat.startActivity(this, addCategoryIntent, extras)
                 }
@@ -69,13 +77,14 @@ class MainActivity : AppCompatActivity() {
     private fun setupViewPager(viewpager: ViewPager) {
         adapter = ViewPagerAdapter(supportFragmentManager)
 
-        adapter.addFragment(CategoriesFragment(), getString(R.string.categories_title))
+        adapter.addFragment(StorageFragment.newInstance("", arrayOf("")), getString(R.string.storage_title))
-        adapter.addFragment(StorageFragment(), getString(R.string.storage_title))
         adapter.addFragment(ShelfFragment(), getString(R.string.shelf_title))
+        adapter.addFragment(CategoriesFragment(), getString(R.string.categories_title))
+
         //TODO: settings fragments
 
         // setting adapter to view pager.
-        viewpager.setAdapter(adapter)
+        viewpager.adapter = adapter
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -151,4 +160,14 @@ class MainActivity : AppCompatActivity() {
             else -> super.onOptionsItemSelected(item)
         }
     }
+
+    fun filterAbstractProductsByCategory(id: Int) {
+        binding.tabViewpager.setCurrentItem(0, true)
+
+        val currentPosition = binding.tabTablayout.selectedTabPosition
+        val fragment = adapter.getItem(currentPosition)
+
+        val storageFragment = fragment as StorageFragment
+        storageFragment.filterByCategory(id)
+    }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/AddAbstractProductFragment.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import org.foxarmy.barcodescannerforemployees.R
 import org.foxarmy.barcodescannerforemployees.databinding.FragmentAddAbstractProductBinding
 
 class AddAbstractProductFragment : Fragment() {
@@ -16,6 +15,6 @@ class AddAbstractProductFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentAddAbstractProductBinding.inflate(layoutInflater)
-        return inflater.inflate(R.layout.fragment_add_abstract_product, container, false)
+        return binding.root
     }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/AddProductFragment.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import org.foxarmy.barcodescannerforemployees.R
 import org.foxarmy.barcodescannerforemployees.databinding.FragmentAddProductBinding
 
 class AddProductFragment : Fragment() {
@@ -16,6 +15,6 @@ class AddProductFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentAddProductBinding.inflate(layoutInflater)
-        return inflater.inflate(R.layout.fragment_add_product, container, false)
+        return binding.root
     }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/ExpiryDatesFragment.kt

@@ -0,0 +1,21 @@
+package org.foxarmy.barcodescannerforemployees.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.foxarmy.barcodescannerforemployees.databinding.FragmentExpiryDatesBinding
+
+class ExpiryDatesFragment : Fragment() {
+    private lateinit var binding: FragmentExpiryDatesBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentExpiryDatesBinding.inflate(layoutInflater)
+
+        return binding.root
+    }
+}

app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/ShelfFragment.kt

@@ -1,5 +1,6 @@
 package org.foxarmy.barcodescannerforemployees.fragments
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.provider.BaseColumns
@@ -28,6 +29,8 @@ class ShelfFragment : Fragment() {
 
     private lateinit var binding: FragmentShelfBinding
     private var updateInProgress = false
+    private var filterBy = ""
+    private var filter = ""
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -37,6 +40,12 @@ class ShelfFragment : Fragment() {
 
         fillUpSortBySpinner()
 
+        val filterByDate = arguments?.getLong("filterByExpiryDate") as Long?
+        if (filterByDate != null) {
+            filter = filterByDate.toString()
+            filterBy = "expiryDate"
+        }
+
         binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 updateContent()
@@ -135,7 +144,20 @@ class ShelfFragment : Fragment() {
                 }
             }
 
-            val cursor = db.query(ProductContract.ProductEntry.TABLE_NAME, projection, null, null, null, null, orderBy)
+            var selection: String? = null
+            var selectionArgs: Array<String>? = null
+
+            when (filterBy) {
+                "expiryDate" -> {
+                    selection = "${ProductContract.ProductEntry.EXPIRY_DATE} = ?"
+                    selectionArgs = arrayOf(filter)
+                }
+
+                "" -> {}
+            }
+
+
+            val cursor = db.query(ProductContract.ProductEntry.TABLE_NAME, projection, selection, selectionArgs, null, null, orderBy)
 
             val products = mutableListOf<Product>()
 
@@ -206,4 +228,16 @@ class ShelfFragment : Fragment() {
             updateContent()
         }
     }
+
+    companion object {
+
+        fun newInstance(date: Long):ShelfFragment = ShelfFragment().apply {
+            val fragment = ShelfFragment()
+            val args = Bundle()
+            args.putLong("filterByExpiryDate", date)
+            fragment.setArguments(args)
+
+            return fragment
+        }
+    }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/StorageFragment.kt

@@ -6,10 +6,7 @@ import android.provider.BaseColumns
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
+import android.widget.*
-import android.widget.ArrayAdapter
-import android.widget.ImageView
-import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import androidx.fragment.app.Fragment
@@ -17,6 +14,7 @@ import org.foxarmy.barcodescannerforemployees.AbstractProductContract
 import org.foxarmy.barcodescannerforemployees.DBStorageController
 import org.foxarmy.barcodescannerforemployees.R
 import org.foxarmy.barcodescannerforemployees.activities.AddAbstractProductActivity
+import org.foxarmy.barcodescannerforemployees.activities.FindBarcodelessAbstractProduct
 import org.foxarmy.barcodescannerforemployees.databinding.FragmentStorageBinding
 import org.foxarmy.barcodescannerforemployees.dataclasses.AbstractProduct
 import org.foxarmy.barcodescannerforemployees.generateThumbnailForImage
@@ -26,7 +24,8 @@ import kotlin.concurrent.thread
 class StorageFragment : Fragment() {
 
     private lateinit var binding: FragmentStorageBinding
-
+    private var filterBy = ""
+    private lateinit var filter: Array<String>
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -45,6 +44,14 @@ class StorageFragment : Fragment() {
             }
         }
 
+        binding.dropFiltersButton.setOnClickListener {
+            filterBy = ""
+            updateContent()
+        }
+
+        filterBy = arguments?.getString("filterBy")!!
+        filter = arguments?.getStringArray("filter")!!
+
         return binding.root
     }
 
@@ -94,6 +101,7 @@ class StorageFragment : Fragment() {
                 val addProductIntent = Intent(requireContext(), AddAbstractProductActivity::class.java)
                 val extras = Bundle()
                 extras.putParcelable("abstractProduct", view.abstractProduct)
+                extras.putString("action", "update")
                 addProductIntent.putExtras(extras)
                 ContextCompat.startActivity(requireContext(), addProductIntent, extras)
             }
@@ -128,7 +136,22 @@ class StorageFragment : Fragment() {
                 }
             }
 
-            val cursor = db.query(AbstractProductContract.AbstractProductEntry.TABLE_NAME, projection, null, null, null, null, orderBy)
+            var selection = ""
+            var selectionArgs: Array<String>? = null
+
+            when (filterBy) {
+                "category" -> {
+                    selection = "${AbstractProductContract.AbstractProductEntry.CATEGORY} = ?"
+                    selectionArgs = filter
+                }
+                "barcodeless" -> {
+                    selection = "${AbstractProductContract.AbstractProductEntry.BARCODE} = '' "
+                    selectionArgs = null
+                }
+            }
+
+
+            val cursor = db.query(AbstractProductContract.AbstractProductEntry.TABLE_NAME, projection, selection, selectionArgs, null, null, orderBy)
 
             with (cursor) {
                 while(moveToNext()) {
@@ -150,6 +173,16 @@ class StorageFragment : Fragment() {
                         product
                     )
 
+                    if (filterBy == "barcodeless") {
+                        abstractProduct.setOnClickListener {
+                            (activity as FindBarcodelessAbstractProduct).selected(abstractProduct.abstractProduct)
+                        }
+                        abstractProduct.findViewById<TextView>(R.id.productNameView).setOnClickListener {
+                            (activity as FindBarcodelessAbstractProduct).selected(abstractProduct.abstractProduct)
+
+                        }
+                    }
+
                     activity!!.runOnUiThread{
                         grv.addView(abstractProduct)
                     }
@@ -163,4 +196,22 @@ class StorageFragment : Fragment() {
 
         updateContent()
     }
+
+    fun filterByCategory(id: Int) {
+        filterBy = "category"
+        filter = arrayOf("$id")
+        updateContent()
+    }
+    companion object {
+
+        fun newInstance(filterBy: String, filter: Array<String>):StorageFragment = StorageFragment().apply {
+            val fragment = StorageFragment()
+            val args = Bundle()
+            args.putString("filterBy", filterBy)
+            args.putStringArray("filter", filter)
+            fragment.setArguments(args)
+
+            return fragment
+        }
+    }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/views/AbstractProductView.kt

@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.startActivity
@@ -71,6 +72,10 @@ class AbstractProductView: LinearLayout {
             this.background = ContextCompat.getDrawable(context, if (isProductSelected) R.drawable.outline_selected else R.drawable.outline)
             true
         }
+
+        productNameField!!.setOnClickListener {
+            Toast.makeText(activity, productNameField!!.text, Toast.LENGTH_SHORT).show()
+        }
     }
 
     fun update() {
@@ -80,7 +85,7 @@ class AbstractProductView: LinearLayout {
         thumbnailsDir.mkdirs()
         val imageUri = getImageUri(activity, File(thumbnailsDir, "${abstractProduct.imageHash}.webp"))
         productPicture!!.setImageURI(imageUri)
-        productPicture!!.rotation = 90f
+//        productPicture!!.rotation = 90f
 
         productNameField!!.text = abstractProduct.name
         netWeightField!!.text = abstractProduct.netWeight.toString()

app/src/main/java/org/foxarmy/barcodescannerforemployees/views/CategoryView.kt

@@ -6,9 +6,10 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import org.foxarmy.barcodescannerforemployees.dataclasses.Category
 import org.foxarmy.barcodescannerforemployees.DBStorageController
 import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.activities.MainActivity
+import org.foxarmy.barcodescannerforemployees.dataclasses.Category
 
 class CategoryView : LinearLayout {
     var category: Category
@@ -35,5 +36,8 @@ class CategoryView : LinearLayout {
             this.background = ContextCompat.getDrawable(context, if (isCategorySelected) R.drawable.outline_selected else R.drawable.outline)
             true
         }
+        setOnClickListener {
+            (activity as MainActivity).filterAbstractProductsByCategory(category.id)
+        }
     }
 }

app/src/main/java/org/foxarmy/barcodescannerforemployees/views/ExpiryGroupView.kt

@@ -0,0 +1,37 @@
+package org.foxarmy.barcodescannerforemployees.views
+
+import android.app.Activity
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import org.foxarmy.barcodescannerforemployees.DBStorageController
+import org.foxarmy.barcodescannerforemployees.R
+import org.foxarmy.barcodescannerforemployees.activities.ExpiryCalendarActivity
+import java.text.SimpleDateFormat
+
+class ExpiryGroupView : LinearLayout {
+
+    private var representingDate: Long? = null
+
+    constructor(activity: Activity, context: Context, representingDate: Long) : super(context) {
+
+        val inflater: LayoutInflater = activity.layoutInflater
+        inflater.inflate(R.layout.expiry_group_view, this)
+
+        this.representingDate = representingDate
+
+        this.background = ContextCompat.getDrawable(context,R.drawable.outline)
+
+        var amount = DBStorageController(context).findAmountOfProductsWithExpiryDate(DBStorageController(context).readableDatabase, representingDate)
+
+        findViewById<TextView>(R.id.representingDateTextView).text = SimpleDateFormat("dd.MM.yyyy").format(representingDate * 1000)
+        findViewById<TextView>(R.id.amountTextView).text = amount.toString()
+
+        setOnClickListener {
+            (activity as ExpiryCalendarActivity).displayDate(representingDate)
+//            (activity as MainActivity).filterAbstractProductsByCategory(category.id)
+        }
+    }
+}

app/src/main/java/org/foxarmy/barcodescannerforemployees/views/ProductView.kt

@@ -88,14 +88,18 @@ class ProductView: LinearLayout {
 
     @RequiresApi(Build.VERSION_CODES.O)
     fun update () {
-        val linkedAbstractProduct: AbstractProduct = DBStorageController(activity).findAbstractProductById(DBStorageController(activity).readableDatabase, product.abstractProductId)!!
+        val linkedAbstractProduct: AbstractProduct? = DBStorageController(activity).findAbstractProductById(DBStorageController(activity).readableDatabase, product.abstractProductId)
+
+        if(linkedAbstractProduct == null) {
+            return
+        }
 
         val thumbnailsDir = File(activity.cacheDir, "thumbnails")
         thumbnailsDir.mkdirs()
         val pictureFile = File(thumbnailsDir, "${linkedAbstractProduct.imageHash}.webp")
         val imageUri = getImageUri(activity, pictureFile)
         productImageView.setImageURI(imageUri)
-        productImageView.rotation = 90f
+//        productImageView.rotation = 90f
 
         productNameTextView.text = linkedAbstractProduct.name
         productNetWeightTextView.text = linkedAbstractProduct.netWeight.toString()

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

@@ -6,5 +6,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".fragments.AddAbstractProductFragment">
-    <include layout="@layout/content_add_abstract_product" android:id="@+id/include_content"/>
+    <include layout="@layout/fragment_add_abstract_product" android:id="@+id/include_content"/>
 </androidx.core.widget.NestedScrollView>

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

@@ -4,19 +4,18 @@
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/main"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        tools:context=".activities.AddCategoryActivity">
+        tools:context=".activities.AddCategoryActivity" android:layout_gravity="center">
 
     <EditText
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:inputType="text"
-            android:text="@string/sample_category"
             android:ems="10"
             android:id="@+id/newCategoryName" app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="20dp"/>
+            android:layout_marginTop="20dp" android:hint="@string/sample_category"/>
     <Button
             android:text="@string/saveButton"
             android:layout_width="wrap_content"

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView
         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="match_parent"
         tools:context=".fragments.AddProductFragment">
-    <include layout="@layout/content_add_product" android:id="@+id/include_content"/>
+    <include layout="@layout/fragment_add_product" android:id="@+id/include_content"/>
 </androidx.core.widget.NestedScrollView>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".fragments.ExpiryDatesFragment">
+    <include layout="@layout/fragment_expiry_dates" android:id="@+id/include_content"/>
+</androidx.core.widget.NestedScrollView>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".fragments.ShelfFragment"
+        android:id="@+id/content">
+
+</androidx.core.widget.NestedScrollView>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".fragments.ShelfFragment"
+        android:id="@+id/content">
+
+</androidx.core.widget.NestedScrollView>

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

@@ -50,5 +50,12 @@
             android:layout_marginEnd="@dimen/fab_margin"
             android:layout_marginBottom="16dp"
             app:srcCompat="@android:drawable/ic_input_add"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true" app:srcCompat="@android:drawable/ic_menu_my_calendar"
+            android:id="@+id/expiryCalendarFab" android:layout_gravity="bottom|end"
+            tools:layout_editor_absoluteY="742dp" tools:layout_editor_absoluteX="337dp"
+            android:layout_marginBottom="84dp" android:layout_marginRight="16dp"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,14 +0,0 @@
-<?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"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/addAbstractProductLayout">
-
-        <androidx.fragment.app.FragmentContainerView
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" app:navGraph="@navigation/nav_graph_add_abstract_product"
-                app:defaultNavHost="true" android:id="@+id/fragmentContainerView"/>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,14 +0,0 @@
-<?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"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/addProductLayout">
-
-        <androidx.fragment.app.FragmentContainerView
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" app:navGraph="@navigation/nav_graph_add_product"
-                app:defaultNavHost="true" android:id="@+id/fragmentContainerView"/>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+            android:text="TextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/representingDateTextView" android:layout_weight="1"
+            android:textSize="45sp"/>
+    <TextView
+            android:text="TextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/amountTextView" android:layout_weight="1"
+            android:textSize="45sp" android:textAlignment="textEnd"/>
+</LinearLayout>

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

@@ -17,7 +17,7 @@
                 android:text="@string/scan_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/categoryTextView"
-                android:layout_marginTop="15dp" android:layout_marginStart="5dp"/>
+                android:layout_marginTop="40dp" android:layout_marginStart="5dp"/>
         <ImageView
                 android:src="@android:drawable/ic_menu_camera"
                 android:layout_width="0dp"
@@ -61,35 +61,42 @@
                 android:inputType="text"
                 android:ems="10"
                 android:id="@+id/barcodeTextEdit" app:layout_constraintTop_toBottomOf="@+id/imageView"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginTop="8dp" android:hint="Barcode" android:textColorHint="#737373"
-                android:layout_marginStart="5dp" android:layout_marginEnd="5dp"/>
+                android:layout_marginStart="5dp"/>
+        <CheckBox
+                android:text="@string/no_barcode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" android:id="@+id/noBarcodeCheckBox"
+                app:layout_constraintStart_toEndOf="@+id/barcodeTextEdit"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" android:layout_marginTop="8dp"
+                app:layout_constraintEnd_toEndOf="parent"/>
         <TextView
                 android:text="@string/category"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/categoryTextView"
                 app:layout_constraintTop_toBottomOf="@+id/netWeight"
-                android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginTop="30dp" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="8dp"/>
         <Spinner
-                android:layout_width="match_parent"
+                android:layout_width="140dp"
-                android:layout_height="wrap_content" android:id="@+id/categorySpinner"
+                android:layout_height="50dp" android:id="@+id/categorySpinner"
                 app:layout_constraintStart_toEndOf="@+id/categoryTextView"
                 app:layout_constraintTop_toBottomOf="@+id/netWeight" android:layout_marginStart="8dp"
-                android:layout_marginTop="18dp"/>
+                android:layout_marginTop="18dp" android:outlineProvider="bounds"/>
         <Button
                 android:text="@string/saveButton"
                 android:layout_width="100dp"
                 android:layout_height="50dp" android:id="@+id/saveButton"
                 app:layout_constraintTop_toBottomOf="@+id/categoryTextView"
-                android:layout_marginTop="15dp" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="40dp" app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginEnd="5dp"/>
         <Button
                 android:text="@string/takePicture"
                 android:layout_width="100dp"
                 android:layout_height="55dp" android:id="@+id/takePictureButton"
                 app:layout_constraintTop_toBottomOf="@+id/categoryTextView"
-                android:layout_marginTop="15dp"
+                android:layout_marginTop="40dp"
                 app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -21,83 +21,77 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/scanButton" android:layout_weight="1"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/abstractProductView" android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/abstractProductView" android:layout_marginTop="16dp"/>
+                android:layout_marginStart="32dp"/>
+        <Button
+                android:text="@string/no_barcode_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" android:id="@+id/noBarcodeButton"
+                app:layout_constraintTop_toBottomOf="@+id/abstractProductView"
+                app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="16dp"
+                android:layout_marginEnd="32dp"/>
         <TextView
                 android:text="@string/date_of_production"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/dateOfProductionTextView"
                 app:layout_constraintTop_toBottomOf="@+id/scanButton"
-                android:layout_marginTop="16dp" app:layout_constraintStart_toStartOf="parent"/>
+                android:layout_marginTop="48dp" app:layout_constraintStart_toStartOf="parent"
-        <Button
-                android:text="@string/select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/selectDateOfProductionButton"
-                app:layout_constraintTop_toBottomOf="@+id/scanButton"
-                app:layout_constraintStart_toEndOf="@+id/dateOfProductionTextView"
                 app:layout_constraintEnd_toEndOf="parent"/>
         <RadioGroup
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@+id/selectDateOfProductionButton"
+                android:layout_height="wrap_content"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
-                android:orientation="horizontal" android:id="@+id/radioGroup">
+                android:orientation="horizontal" android:id="@+id/radioGroup"
+                app:layout_constraintTop_toBottomOf="@+id/dateOfProductionDatePicker" android:layout_marginTop="16dp">
             <RadioButton
                     android:text="@string/expiry_date"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" android:id="@+id/expiryDateRadio"/>
+                    android:layout_height="match_parent" android:id="@+id/expiryDateRadio"/>
             <RadioButton
                     android:text="@string/shelf_life"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" android:id="@+id/shelfLifeRadio"/>
         </RadioGroup>
-        <TextView
+        <DatePicker
-                android:text="Expiry date: "
+                android:layout_width="247dp"
-                android:layout_width="wrap_content"
+                android:layout_height="100dp" android:id="@+id/expiryDatePicker"
-                android:layout_height="wrap_content" android:id="@+id/expiryDateTextView"
+                android:datePickerMode="spinner"
-                app:layout_constraintTop_toBottomOf="@+id/radioGroup" app:layout_constraintStart_toStartOf="parent"
+                android:calendarViewShown="false"
-                android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:visibility="invisible"/>
+                app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
-        <Button
+                app:layout_constraintHorizontal_bias="0.505" android:layout_marginTop="12dp"
-                android:text="Select"
+                app:layout_constraintTop_toBottomOf="@+id/radioGroup" android:visibility="gone"/>
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/selectExpiryDateButton"
-                app:layout_constraintTop_toBottomOf="@+id/radioGroup"
-                app:layout_constraintStart_toEndOf="@+id/expiryDateTextView" android:layout_marginStart="16dp"
-                android:visibility="invisible"/>
-        <TextView
-                android:text="Shelf life:"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/shelfLife"
-                app:layout_constraintTop_toBottomOf="@+id/radioGroup"
-                android:layout_marginTop="16dp" app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="16dp" android:visibility="invisible"/>
         <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:inputType="numberDecimal"
                 android:ems="10"
                 android:id="@+id/shelfLifeTextEdit" app:layout_constraintTop_toBottomOf="@+id/radioGroup"
-                app:layout_constraintStart_toEndOf="@+id/expiryDateTextView" android:layout_marginStart="16dp"
+                android:visibility="gone" app:layout_constraintEnd_toEndOf="parent"
-                android:visibility="invisible"/>
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/amountText"
-                app:layout_constraintTop_toBottomOf="@+id/shelfLifeTextEdit"
                 app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="16dp"
-                android:text="@string/amount"/>
+                android:hint="@string/shelf_life"/>
         <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:inputType="numberSigned"
                 android:ems="10"
                 android:id="@+id/amountTextEdit"
-                app:layout_constraintTop_toBottomOf="@+id/selectExpiryDateButton"
+                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/amountText"/>
+                android:hint="@string/amount" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/expiryDatePicker" android:layout_marginTop="12dp"/>
         <Button
                 android:text="@string/saveButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/saveProductButton"
                 app:layout_constraintTop_toBottomOf="@+id/amountTextEdit" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="16dp"/>
+        <DatePicker
+                android:layout_width="247dp"
+                android:layout_height="100dp" android:id="@+id/dateOfProductionDatePicker"
+                android:datePickerMode="spinner"
+                android:calendarViewShown="false"
+                app:layout_constraintTop_toBottomOf="@+id/dateOfProductionTextView"
+                app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="16dp" app:layout_constraintHorizontal_bias="0.505"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" android:id="@+id/layout">
+
+        <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/scrollView">
+            <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" android:id="@+id/datesLinearLayout">
+            </LinearLayout>
+        </ScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+                                       android:layout_width="match_parent"
+                                       android:layout_height="match_parent">
+</androidx.core.widget.NestedScrollView>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
-             android:layout_height="match_parent">
+             android:layout_height="match_parent"
+             android:background="#141218">
 
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"

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

@@ -22,12 +22,21 @@
                 android:layout_height="32dp" android:id="@+id/spinner"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/sortByTextView"
-                app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintEnd_toStartOf="@+id/dropFiltersButton" android:layout_marginEnd="10dp"
         />
+        <Button
+                android:text="@string/drop_filters"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" android:id="@+id/dropFiltersButton"
+                app:layout_constraintStart_toEndOf="@+id/spinner"
+                app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp" app:layout_constraintTop_toTopOf="parent"/>
         <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@+id/spinner"
+                android:layout_height="wrap_content"
-                android:id="@+id/scrollView2">
+                android:id="@+id/scrollView2"
+                app:layout_constraintTop_toBottomOf="@+id/dropFiltersButton">
             <androidx.gridlayout.widget.GridLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" android:id="@+id/contentGridLayout" app:columnCount="2"

app/src/main/res/navigation/nav_graph_add_abstract_product.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation 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:id="@+id/nav_graph_add_abstract_product"
-            app:startDestination="@id/addAbstractProductFragment">
-
-    <fragment android:id="@+id/addAbstractProductFragment"
-              android:name="org.foxarmy.barcodescannerforemployees.fragments.AddAbstractProductFragment"
-              android:label="activity_add_abstract_product" tools:layout="@layout/fragment_add_abstract_product"/>
-</navigation>

app/src/main/res/navigation/nav_graph_add_product.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation 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:id="@+id/nav_graph_add_product"
-            app:startDestination="@id/addProductFragment">
-
-    <fragment android:id="@+id/addProductFragment"
-              android:name="org.foxarmy.barcodescannerforemployees.fragments.AddProductFragment"
-              android:label="activity_add_product" tools:layout="@layout/fragment_add_product"/>
-</navigation>

app/src/main/res/values-ru/strings.xml

@@ -77,4 +77,16 @@
         <item>Имя</item>
         <item>Категория</item>
     </string-array>
+    <string name="abstract_product_does_not_exist">Абстрактный продукт с таким штрихкодом не существует. Хотите его добавить?. </string>
+    <string name="drop_filters">Убрать фильтры</string>
+    <string name="category_name_required">Требуется название категории</string>
+    <string name="abstract_product_already_exists">Такой абстрактный продукт в ваше базе данных уже есть</string>
+    <string name="quit">Выйти</string>
+    <string name="edit_existing">Редактировать существующий</string>
+    <string name="no_product_in_online_database">Продукт не найден в онлайн базе данных. Попробуйте снова, если это
+        ошибка сканирования или введите данные вручную
+    </string>
+    <string name="abstract_product_request">Пожалуйста, отсканируйте штрихкод, чтобы добавить продукт</string>
+    <string name="no_barcode">No barcode present</string>
+    <string name="no_barcode_button">No barcode</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -75,4 +75,16 @@
     <string name="expired">Expired</string>
     <string name="barcode">Barcode</string>
     <string name="scan_label">Scan</string>
+    <string name="abstract_product_does_not_exist">Abstract product with such barcode does not exist. Do you want to add one?</string>
+    <string name="drop_filters">Drop filters</string>
+    <string name="category_name_required">Category name required</string>
+    <string name="abstract_product_already_exists">You\'ve got an abstract product with such barcode in your database.</string>
+    <string name="quit">Quit</string>
+    <string name="edit_existing">Edit existing</string>
+    <string name="no_product_in_online_database">Product not found. Please, try again if you beleive barcode scanned
+        wrongly or type manually
+    </string>
+    <string name="abstract_product_request">Please, scan a barcode in order to add product</string>
+    <string name="no_barcode">No barcode present</string>
+    <string name="no_barcode_button">No barcode</string>
 </resources>