Skip to content
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

♻️ Refactor tts screen and auto deletion #36

Merged
merged 10 commits into from
Nov 15, 2023
Merged

♻️ Refactor tts screen and auto deletion #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a76ec0
:recycle: Refactor tts screen and auto deletion
prime2do Nov 10, 2023
b1037f2
:lipstick: Refactor button activation
prime2do Nov 11, 2023
306de3f
:recycle: Refactor code for button color
prime2do Nov 11, 2023
265c975
:lipstick: Solve vertical alignment of button
prime2do Nov 13, 2023
894d517
:lipstick: Refactor minor details
prime2do Nov 13, 2023
91efc5b
:lipstick: Refactor button arrangement
prime2do Nov 13, 2023
f2cb2b3
:lipstick: Adjust button height
prime2do Nov 15, 2023
39251e5
:lipstick: Refactor focused textfield color
prime2do Nov 15, 2023
e10b244
:fire: Remove preview code
prime2do Nov 15, 2023
e2d2df6
:recycle: Refactor conditionals in TextToSpeechButton & TextClearButton
sukchan-0811 Nov 15, 2023
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
96 changes: 85 additions & 11 deletions ...tend/app/src/main/java/com/example/speechbuddy/compose/texttospeech/TextToSpeechScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.example.speechbuddy.compose.texttospeech
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -13,6 +14,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
Expand Down Expand Up @@ -83,7 +85,7 @@ fun TextToSpeechScreen(
modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.height(300.dp),
.height(200.dp),
textStyle = MaterialTheme.typography.bodyMedium,
shape = RoundedCornerShape(10.dp),
colors = TextFieldDefaults.outlinedTextFieldColors(
paul2126 marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -94,9 +96,19 @@ fun TextToSpeechScreen(

Spacer(modifier = Modifier.height(20.dp))

TextToSpeechButton(buttonStatus = uiState.buttonStatus,
onPlay = { viewModel.ttsStart(context) },
onStop = { viewModel.ttsStop() })
Row {
TextToSpeechButton(
buttonStatus = uiState.buttonStatus,
onPlay = { viewModel.ttsStart(context) },
onStop = { viewModel.ttsStop() }
)

TextClearButton(
buttonStatus = uiState.buttonStatus,
onPlay = { viewModel.clearText() },
onStop = {}
)
}
}
}
}
Expand All @@ -107,16 +119,22 @@ private fun TextToSpeechButton(
buttonStatus: ButtonStatusType, onPlay: () -> Unit, onStop: () -> Unit
) {
val textToSpeechButtonColors = ButtonDefaults.buttonColors(
containerColor = Color.Transparent, contentColor = MaterialTheme.colorScheme.onBackground
containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.onBackground
)

when (buttonStatus) {
ButtonStatusType.PLAY -> Button(
onClick = onPlay, colors = textToSpeechButtonColors
onClick = onPlay,
modifier = Modifier.size(
width = 200.dp,
height = 50.dp
),
colors = textToSpeechButtonColors
) {
Text(
style = MaterialTheme.typography.headlineMedium,
text = stringResource(id = R.string.play_text)
text = stringResource(id = R.string.play_text),
style = MaterialTheme.typography.headlineMedium
)
Icon(
Icons.Filled.PlayArrow,
Expand All @@ -126,11 +144,16 @@ private fun TextToSpeechButton(
}

ButtonStatusType.STOP -> Button(
onClick = onStop, colors = textToSpeechButtonColors
onClick = onStop,
modifier = Modifier.size(
width = 200.dp,
height = 50.dp
),
colors = textToSpeechButtonColors
) {
Text(
style = MaterialTheme.typography.headlineMedium,
text = stringResource(id = R.string.stop_text)
text = stringResource(id = R.string.stop_text),
style = MaterialTheme.typography.headlineMedium
)
Icon(
painterResource(R.drawable.stop_icon),
Expand All @@ -139,4 +162,55 @@ private fun TextToSpeechButton(
)
}
}
}

@Composable
fun TextClearButton(
buttonStatus: ButtonStatusType, onPlay: () -> Unit, onStop: () -> Unit
) {
when (buttonStatus) {
ButtonStatusType.PLAY -> Button(
onClick = onPlay,
modifier = Modifier.size(
width = 200.dp,
height = 50.dp
),
colors = ButtonDefaults.buttonColors(
containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.onBackground
)
) {
Text(
text = stringResource(id = R.string.clear_text),
style = MaterialTheme.typography.headlineMedium
)
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(id = R.string.clear_text),
modifier = Modifier.size(36.dp)
)
}

ButtonStatusType.STOP -> Button(
onClick = onStop,
modifier = Modifier.size(
width = 200.dp,
height = 50.dp
),
colors = ButtonDefaults.buttonColors(
containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.outline
)
) {
Text(
text = stringResource(id = R.string.clear_text),
style = MaterialTheme.typography.headlineMedium
)
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(id = R.string.clear_text),
modifier = Modifier.size(36.dp)
)
}
}
}
7 changes: 3 additions & 4 deletions frontend/app/src/main/java/com/example/speechbuddy/viewmodel/TextToSpeechViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class TextToSpeechViewModel @Inject internal constructor(
textInput = input
}

private fun clearText() {
textInput = ""
}
fun clearText() {
textInput = ""
}

fun ttsStop() {
textToSpeech?.stop()
Expand Down Expand Up @@ -79,7 +79,6 @@ private fun clearText() {
buttonStatus = ButtonStatusType.PLAY
)
}
clearText()
}

@Deprecated("Deprecated in Java")
Expand Down
1 change: 1 addition & 0 deletions frontend/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<string name="tts_text">소리로 말해보아요</string>
<string name="tts_explain">키보드로 텍스트를 입력해주세요</string>
<string name="play_text">재생하기</string>
<string name="clear_text">지우기</string>
<string name="menu_talk_with_symbol">상징으로 말하기</string>
<string name="menu_tts">음성으로 말하기</string>
<string name="menu_add_symbol">새 상징 만들기</string>
Expand Down