VoiceStudio is the open-source, fully-local ElevenLabs alternative — voice cloning, voice design, video dubbing, dictation, transcription & audiobook creation in 646 languages.
Python aiaudiobookcudadubbingelevenlabs-alternativehuggingfacelocal-firstmlxomnivoice-studiospeech-to-texttext-to-speechtranscriptiontranslatettsvoice-aivoice-cloningvoice-generationvoicestudioworkflow
feat(android): Dub tiles, animated glyph on job cards, single-card pickers
debpalash12961b10aba6
diff --git a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/Components.kt b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/Components.ktindex 36bcc5068..52c6ef710 100644--- a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/Components.kt+++ b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/Components.kt@@ -103,11 +103,20 @@ fun Modifier.dismissKeyboardOnTap(): Modifier = composed {}}}-@Composable private fun PickerRow(label: String, value: String, enabled: Boolean = true, onClick: () -> Unit) {+@Composable private fun PickerRow(label: String, value: String, enabled: Boolean = true, tile: Boolean = false, onClick: () -> Unit) {val dismiss=rememberKeyboardDismiss()val description=tr("mobile.android.selection",mapOf("label" to tr(label),"value" to value))- Surface(onClick={dismiss();onClick()},enabled=enabled,color=role("surface"),shape=MaterialTheme.shapes.small,modifier=Modifier.fillMaxWidth().heightIn(min=VSTheme.touchTarget).semantics {contentDescription=description}) {- Row(Modifier.padding(VSTheme.inset),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(VSTheme.gap)) {+ Surface(onClick={dismiss();onClick()},enabled=enabled,color=role("surface"),shape=if(tile) MaterialTheme.shapes.large else MaterialTheme.shapes.small,modifier=Modifier.fillMaxWidth().heightIn(min=VSTheme.touchTarget).semantics {contentDescription=description}) {+ if(tile) Row(Modifier.padding(VSTheme.inset),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(VSTheme.gap)) {+ Surface(shape=CircleShape,color=role("messageSurface"),modifier=Modifier.size(40.dp)) {+ Box(contentAlignment=Alignment.Center) {Icon(rowIcon(label),contentDescription=null,tint=role("messageAction"))}+ }+ Column(Modifier.weight(1f)) {+ Text(tr(label),style=MaterialTheme.typography.labelSmall,color=role("textMuted"),maxLines=1,overflow=TextOverflow.Ellipsis)+ Text(value,style=MaterialTheme.typography.titleSmall,maxLines=2,overflow=TextOverflow.Ellipsis)+ }+ Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight,contentDescription=null,tint=role("textMuted"))+ } else Row(Modifier.padding(VSTheme.inset),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(VSTheme.gap)) {Icon(rowIcon(label),contentDescription=null,tint=role("textMuted"))Text(tr(label),style=MaterialTheme.typography.labelLarge,maxLines=1,overflow=TextOverflow.Ellipsis)Text(value,Modifier.weight(1f),color=role("textMuted"),style=MaterialTheme.typography.labelLarge,textAlign=TextAlign.End,maxLines=1,overflow=TextOverflow.Ellipsis)@@ -118,14 +127,14 @@ fun Modifier.dismissKeyboardOnTap(): Modifier = composed {@Composable fun Picker(label: String, value: String, choices: List<Pair<String, String>>, change: (String) -> Unit) =ChoicePicker(label,value,choices.map {Choice(it.first,it.second)},change=change)-@Composable fun ChoicePicker(label: String, value: String, choices: List<Choice>, compact: Boolean = false, change: (String) -> Unit) {+@Composable fun ChoicePicker(label: String, value: String, choices: List<Choice>, compact: Boolean = false, tile: Boolean = false, change: (String) -> Unit) {var open by rememberSaveable { mutableStateOf(false) }var query by rememberSaveable { mutableStateOf("") }if(compact) {val valueLabel=choices.firstOrNull {it.id==value}?.title ?: tr(label)val description=tr("mobile.android.selection",mapOf("label" to tr(label),"value" to valueLabel))AssistChip(onClick={open=true},enabled=choices.isNotEmpty(),label={Text(valueLabel,Modifier.fillMaxWidth(),textAlign=androidx.compose.ui.text.style.TextAlign.Center,maxLines=1,overflow=TextOverflow.Ellipsis)},modifier=Modifier.fillMaxWidth().heightIn(min=VSTheme.touchTarget).semantics {contentDescription=description})- } else PickerRow(label,choices.firstOrNull {it.id==value}?.title ?: tr("mobile.android.choose"),choices.isNotEmpty()) {open=true}+ } else PickerRow(label,choices.firstOrNull {it.id==value}?.title ?: tr("mobile.android.choose"),choices.isNotEmpty(),tile) {open=true}if(open) AlertDialog(modifier=Modifier.dismissKeyboardOnTap(),shape=MaterialTheme.shapes.large,onDismissRequest={open=false}, title={Text(tr(label))}, containerColor=role("surfaceOverlay"),text={ Column(verticalArrangement=Arrangement.spacedBy(VSTheme.gap)) {Field("mobile.android.search", query, {query=it})@@ -150,12 +159,13 @@ fun Modifier.dismissKeyboardOnTap(): Modifier = composed {}}, confirmButton={TextButton(shape=MaterialTheme.shapes.small,onClick={open=false}) {Text(tr("common.close"))}})}@OptIn(ExperimentalLayoutApi::class)-@Composable fun MultiPicker(label: String, selected: List<String>, choices: List<Pair<String,String>>, change: (List<String>) -> Unit) {+@Composable fun MultiPicker(label: String, selected: List<String>, choices: List<Pair<String,String>>, tile: Boolean = false, change: (List<String>) -> Unit) {var open by rememberSaveable {mutableStateOf(false)}var draft by rememberSaveable {mutableStateOf(emptyList<String>())}var query by rememberSaveable {mutableStateOf("")}val dismiss=rememberKeyboardDismiss()- Group {PickerRow(label,selected.mapNotNull {id -> choices.firstOrNull {it.first==id}?.second}.joinToString().ifBlank {tr("mobile.android.choose")},choices.isNotEmpty()) {draft=selected;query="";open=true}}+ val trigger: @Composable () -> Unit = {PickerRow(label,selected.mapNotNull {id -> choices.firstOrNull {it.first==id}?.second}.joinToString().ifBlank {tr("mobile.android.choose")},choices.isNotEmpty(),tile) {draft=selected;query="";open=true}}+ if(tile) trigger() else Group {trigger()}FlowRow(horizontalArrangement=Arrangement.spacedBy(VSTheme.gap)) {choices.filter {it.first in selected}.forEach {(id,name) ->val remove=tr("mobile.android.remove_selection",mapOf("name" to name))diff --git a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/DubScreen.kt b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/DubScreen.ktindex 0aba8e975..413f63cf5 100644--- a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/DubScreen.kt+++ b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/DubScreen.kt@@ -13,6 +13,7 @@ import androidx.compose.ui.semantics.*import androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.platform.LocalContext+import androidx.compose.ui.unit.dpimport androidx.work.WorkManagerimport androidx.work.WorkInfoimport com.voicestudio.mobile.features.*@@ -108,17 +109,14 @@ import java.io.File}Screen {ScreenTitle("mobile.tabs.dub")- StepHeading("mobile.simple.source",VSIcons.Video)if(copying || catalog==null) InlineLoading()DubSourceCard(!copying) {picker.launch(arrayOf("video/*","audio/*"))}if(filePath!=null) {SelectedDubSource(sourceName ?: File(filePath!!).name) {File(filePath!!).delete();filePath=null;sourceName=null}}Field("mobile.dub.paste_url",link,{link=it})- StepHeading("mobile.simple.languages",VSIcons.Globe)- MultiPicker("mobile.dub.target_languages",targets,languages) {targets=it}- StepHeading("mobile.simple.voice",Icons.Default.Person)- Group {Picker("mobile.speak.voice",voice,dubVoiceChoices(state.profiles,tr("mobile.simple.default_voice")),{voice=it})}+ MultiPicker("mobile.dub.target_languages",targets,languages,tile=true) {targets=it}+ ChoicePicker("mobile.speak.voice",voice,dubVoiceChoices(state.profiles,tr("mobile.simple.default_voice")).map {Choice(it.first,it.second)},tile=true) {voice=it}Action("mobile.simple.dub",!state.busy&&!copying&&voice!=DubVoiceChoice.UNSELECTED&&languages.any {it.first in targets}&&(filePath!=null||link.isNotBlank())) {val current = vm.api ?: return@Actionval draftHost = state.hostUrl ?: return@Action@@ -139,6 +137,7 @@ import java.io.Fileval stage=info.displayStage()Group {Column(Modifier.fillMaxWidth().padding(VSTheme.inset),verticalArrangement=Arrangement.spacedBy(VSTheme.gap)) {val value=if(info.state==WorkInfo.State.SUCCEEDED) 100 else info.progress.getInt("percent",0)+ if(!info.state.isFinished) DubGlyph(44.dp,active=true)Row(Modifier.fillMaxWidth(),verticalAlignment=Alignment.CenterVertically) {if(info.state==WorkInfo.State.FAILED) {val params=runCatching {kotlinx.serialization.json.Json.decodeFromString<Map<String,String>>(info.outputData.getString("error_params") ?: "{}")}.getOrDefault(emptyMap())diff --git a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/PhoneDubScreen.kt b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/PhoneDubScreen.ktindex 60f468979..affc9aefe 100644--- a/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/PhoneDubScreen.kt+++ b/mobile/android/features/src/main/kotlin/com/voicestudio/mobile/features/dub/PhoneDubScreen.kt@@ -12,6 +12,7 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dpimport androidx.work.WorkManagerimport com.voicestudio.mobile.designsystem.*import com.voicestudio.mobile.data.PhoneDubWorker@@ -74,14 +75,11 @@ import java.io.FileScreen {ScreenTitle(if(libraryOnly) "projects.title" else "mobile.tabs.dub")if(projectId==null && !libraryOnly) {- StepHeading("mobile.simple.source",VSIcons.Video)DubSourceCard(!copying&&!state.busy) {picker.launch(arrayOf("audio/*","video/*"))}path?.let {source ->SelectedDubSource(sourceName ?: File(source).name) {File(source).delete();path=null;sourceName=null}}if(copying||catalog==null) InlineLoading()- StepHeading("mobile.simple.languages",VSIcons.Globe)- MultiPicker("mobile.dub.target_languages",targets,languages) {targets=it}- StepHeading("mobile.simple.voice",Icons.Default.Person)- ChoicePicker("mobile.speak.voice",voice,listOf(Choice("",tr("mobile.simple.reference")))+phone.voices.map {Choice(it.id,it.name)},compact=true) {voice=it}+ MultiPicker("mobile.dub.target_languages",targets,languages,tile=true) {targets=it}+ ChoicePicker("mobile.speak.voice",voice,listOf(Choice("",tr("mobile.simple.reference")))+phone.voices.map {Choice(it.id,it.name)},tile=true) {voice=it}Row(Modifier.fillMaxWidth(),verticalAlignment=Alignment.CenterVertically) {Box(Modifier.weight(1f)) {ConsentCheck("mobile.simple.voice_consent",consent) {consent=it}}Info("mobile.voices.consent_title","mobile.voices.consent_body")@@ -116,6 +114,7 @@ import java.io.Fileval stage=active?.progress?.getString("stage") ?: record.checkpoint.stageGroup {Column(Modifier.fillMaxWidth().padding(VSTheme.inset),verticalArrangement=Arrangement.spacedBy(VSTheme.gap)) {+ DubGlyph(44.dp,active=active!=null)Text(record.request.title,maxLines=1,overflow=TextOverflow.Ellipsis)Row(Modifier.fillMaxWidth(),verticalAlignment=Alignment.CenterVertically) {if(stage.contains("stage_")||stage in setOf("mobile.simple.mixing","mobile.simple.exporting","mobile.simple.cancelled"))