Commit 9d0aa68d authored by Karolina Radačovská's avatar Karolina Radačovská
Browse files

fix: Add previous button to cook mode screen 



Signed-off-by: default avatarKarolina Radačovská <553691@muni.cz>
parent 0c98ea42

app/src/main/java/cz/muni/fi/pv239/nomnom/ui/components/button/basicButton/CustomButton.kt

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package cz.muni.fi.pv239.nomnom.ui.components.button.basicButton 
import androidx.compose.material3.Button

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.text.style.TextAlign

import cz.muni.fi.pv239.nomnom.ui.components.text.CustomText

import cz.muni.fi.pv239.nomnom.ui.components.text.TextType
@@ -18,7 +19,7 @@ fun CustomButton( 
        modifier = modifier.then(ButtonStyle.setButtonStyle(buttonType))

    ) {

        CustomText(

            text = text, textType = setTextType(buttonType),

            text = text, textType = setTextType(buttonType), textAlign = TextAlign.Center

        )

    }

}

app/src/main/java/cz/muni/fi/pv239/nomnom/ui/screens/CookModeScreen.kt

+15 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ import android.content.pm.PackageManager 
import android.util.Log

import androidx.activity.compose.rememberLauncherForActivityResult

import androidx.activity.result.contract.ActivityResultContracts

import cz.muni.fi.pv239.nomnom.view_model.TimerViewModel

import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box
@@ -36,15 +35,14 @@ import androidx.compose.ui.graphics.Color 
import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.text.style.TextAlign

import androidx.compose.ui.unit.dp

import androidx.lifecycle.viewmodel.compose.viewModel

import androidx.core.content.ContextCompat

import androidx.lifecycle.viewmodel.compose.viewModel

import androidx.navigation.NavHostController

import cz.muni.fi.pv239.nomnom.data.Recipe

import cz.muni.fi.pv239.nomnom.speech_processing.SpeechProcessingService

import cz.muni.fi.pv239.nomnom.speech_processing.StepNavigationCallback

import cz.muni.fi.pv239.nomnom.ui.components.button.basicButton.ButtonType

import cz.muni.fi.pv239.nomnom.ui.components.button.basicButton.CustomButton

import cz.muni.fi.pv239.nomnom.ui.components.button.iconButton.MicrophoneIconButton

import cz.muni.fi.pv239.nomnom.ui.components.text.CustomText

import cz.muni.fi.pv239.nomnom.ui.components.text.TextType

import cz.muni.fi.pv239.nomnom.ui.cookmode.CookingDoneAnimation
@@ -54,6 +52,7 @@ import cz.muni.fi.pv239.nomnom.ui.cookmode.RecipeStepsPager 
import cz.muni.fi.pv239.nomnom.ui.cookmode.TimerDialog

import cz.muni.fi.pv239.nomnom.ui.cookmode.TimesUpAnimation

import cz.muni.fi.pv239.nomnom.view_model.RecipesViewModel

import cz.muni.fi.pv239.nomnom.view_model.TimerViewModel



@Composable

fun CookModeScreen(
@@ -206,9 +205,20 @@ fun CookModeScreen( 
                Row(

                    modifier = Modifier

                        .fillMaxWidth()

                        .padding(horizontal = 16.dp),

                    horizontalArrangement = Arrangement.spacedBy(12.dp)

                        .padding(horizontal = 8.dp),

                    horizontalArrangement = Arrangement.spacedBy(8.dp)

                ) {

                    CustomButton(

                        text = "Previous Step",

                        buttonType = ButtonType.secondary,

                        onClick = {

                            if (currentStep > 0) {

                                currentStep--

                                speechProcessingService.updateCurrentStep(currentStep)

                            }

                        },

                        modifier = Modifier.weight(1f)

                    )

                    CustomButton(

                        text = "End Cook Mode",

                        buttonType = ButtonType.secondary,