Skip to content

- Photo Logging feedbacks #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinPassio merged 1 commit into from
Feb 19, 2025
Merged

- Photo Logging feedbacks #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions ...i-module/src/main/java/ai/passio/nutrition/uimodule/ui/foodcreator/ScanBarcodeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import ai.passio.nutrition.uimodule.databinding.FragmentScanBarcodeBinding
import ai.passio.nutrition.uimodule.ui.base.BaseFragment
import ai.passio.nutrition.uimodule.ui.base.BaseToolbar
import ai.passio.nutrition.uimodule.ui.model.BarcodeScanResult
import ai.passio.nutrition.uimodule.ui.model.copy
import ai.passio.nutrition.uimodule.ui.util.PermissionUtil
import ai.passio.nutrition.uimodule.ui.util.toast
import ai.passio.passiosdk.core.camera.PassioCameraViewProvider
Expand Down Expand Up @@ -142,6 +141,7 @@ internal class ScanBarcodeFragment : BaseFragment<ScanBarcodeViewModel>(),
scanningMessage.visibility = View.GONE
showBarcodeInSystemView()
viewItem.setOnClickListener {
//use barcode only
barcodeScanResult?.let {
barcodeScanResult.record = null
sendResult(barcodeScanResult)
Expand All @@ -150,6 +150,7 @@ internal class ScanBarcodeFragment : BaseFragment<ScanBarcodeViewModel>(),
}
}
importExisting.setOnClickListener {
//import existing data
barcodeScanResult?.let {
sendResult(it)
// viewModel.navigateBack()
Expand All @@ -162,20 +163,12 @@ internal class ScanBarcodeFragment : BaseFragment<ScanBarcodeViewModel>(),
scanningMessage.visibility = View.GONE
showCustomFoodAlreadyExistView()
viewItem.setOnClickListener {
barcodeScanResult?.let {
barcodeScanResult.barcode = ""
barcodeScanResult.record?.let {
barcodeScanResult.record?.barcode = ""
barcodeScanResult.resultType = BarcodeResultType.NEW_BARCODE
barcodeScanResult.record = barcodeScanResult.record?.copy()
}
sendResult(barcodeScanResult)
// sharedViewModel.detailsFoodRecord(it)
// viewModel.navigateToFoodDetails()
}
//Create new item, do not import this item or barcode
viewModel.navigateBack()
}

importExisting.setOnClickListener {
//edit existing
barcodeScanResult?.let {
// barcodeScanResult.barcode = ""
sendResult(it)
Expand Down
18 changes: 16 additions & 2 deletions ...module/src/main/java/ai/passio/nutrition/uimodule/ui/image/EditNutritionFactsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch

internal class EditNutritionFactsViewModel : BaseViewModel() {
Expand Down Expand Up @@ -158,7 +159,11 @@ internal class EditNutritionFactsViewModel : BaseViewModel() {
weightGram = imageFoodResult.record.nutrientsSelectedSize().weight.gramsValue()
weightGramUnit = Grams.symbol

updateNutrientsOnUI()
viewModelScope.launch(Dispatchers.IO)
{
delay(400)
updateNutrientsOnUI()
}


_editFoodModelLD.postValue(this.imageFoodResult)
Expand Down Expand Up @@ -292,10 +297,19 @@ internal class EditNutritionFactsViewModel : BaseViewModel() {

fun updateMissingFromBarcode(barcodeScanResult: BarcodeScanResult) {


if (barcodeScanResult.resultType == BarcodeResultType.CUSTOM_FOOD_ALREADY_EXIST) {
imageFoodResult.isCustomFood =
barcodeScanResult.resultType == BarcodeResultType.CUSTOM_FOOD_ALREADY_EXIST
}
else{
barcodeScanResult.record?.id = imageFoodResult.record.id
barcodeScanResult.record?.uuid = imageFoodResult.record.uuid
barcodeScanResult.record?.refCode = imageFoodResult.record.refCode
}
barcodeScanResult.record?.let {
imageFoodResult.record = it
}
imageFoodResult.isCustomFood = barcodeScanResult.resultType == BarcodeResultType.CUSTOM_FOOD_ALREADY_EXIST
imageFoodResult.record.barcode = barcodeScanResult.barcode

editFoodRecord(imageFoodResult to getEditFoodRecordIndex())
Expand Down
1 change: 1 addition & 0 deletions passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/ui/voice/VoiceLoggingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ internal class VoiceLoggingFragment : BaseFragment<VoiceLoggingViewModel>() {
with(binding)
{
toolbar.setup(getString(R.string.voice_logging), baseToolbarListener)
toolbar.hideRightIcon()


prepareRecognizer()
Expand Down