-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into andy/revert-foreground-service-types
- Loading branch information
Showing
31 changed files
with
3,907 additions
and
3,001 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
WordPress/src/main/java/org/wordpress/android/datasets/AsyncTaskExecutor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package org.wordpress.android.datasets | ||
|
|
||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.withContext | ||
|
|
||
| /** | ||
| * Helper class to handle asynchronous I/O tasks using coroutines | ||
| * @see <a href="https://github.com/wordpress-mobile/WordPress-Android/pull/20937">Introduction</a> | ||
| */ | ||
| object AsyncTaskExecutor { | ||
| /** | ||
| * Execute a data loading task in the IO thread and handle the result on the main thread | ||
| */ | ||
| @JvmStatic | ||
| fun <T> executeIo(scope: CoroutineScope, backgroundTask: () -> T, callback: AsyncTaskCallback<T>) { | ||
| execute(scope, Dispatchers.IO, backgroundTask, callback) | ||
| } | ||
|
|
||
| /** | ||
| * Execute a data loading task in the default thread and handle the result on the main thread | ||
| */ | ||
| @JvmStatic | ||
| fun <T> executeDefault(scope: CoroutineScope, backgroundTask: () -> T, callback: AsyncTaskCallback<T>) { | ||
| execute(scope, Dispatchers.Default, backgroundTask, callback) | ||
| } | ||
|
|
||
| private fun <T> execute( | ||
| scope: CoroutineScope, | ||
| dispatcher: CoroutineDispatcher, | ||
| backgroundTask: () -> T, | ||
| callback: AsyncTaskCallback<T> | ||
| ) { | ||
| scope.launch(dispatcher) { | ||
| // handle the background task | ||
| val result = backgroundTask() | ||
|
|
||
| withContext(Dispatchers.Main) { | ||
| // handle the result on the main thread | ||
| callback.onTaskFinished(result) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| interface AsyncTaskCallback<T> { | ||
| fun onTaskFinished(result: T) | ||
| } | ||
| } | ||
|
|
33 changes: 0 additions & 33 deletions
33
WordPress/src/main/java/org/wordpress/android/datasets/AsyncTaskHandler.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
WordPress/src/main/java/org/wordpress/android/ui/voicetocontent/MicToStopIcon.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package org.wordpress.android.ui.voicetocontent | ||
|
|
||
| import android.content.res.Configuration | ||
| import androidx.compose.animation.AnimatedContent | ||
| import androidx.compose.animation.ExperimentalAnimationApi | ||
| import androidx.compose.animation.animateColorAsState | ||
| import androidx.compose.animation.core.tween | ||
| import androidx.compose.animation.fadeIn | ||
| import androidx.compose.animation.fadeOut | ||
| import androidx.compose.animation.with | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.material.ContentAlpha | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.ColorFilter | ||
| import androidx.compose.ui.graphics.painter.Painter | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Devices | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import org.wordpress.android.R | ||
| import org.wordpress.android.ui.compose.theme.AppTheme | ||
|
|
||
| @OptIn(ExperimentalAnimationApi::class) | ||
| @Suppress("DEPRECATION") | ||
| @Composable | ||
| fun MicToStopIcon(model: RecordingPanelUIModel) { | ||
| val isEnabled = model.isEnabled | ||
| var isMic by remember { mutableStateOf(true) } | ||
| val isLight = !isSystemInDarkTheme() | ||
|
|
||
| val circleColor by animateColorAsState( | ||
| targetValue = if (!isEnabled) MaterialTheme.colors.onSurface.copy(alpha = 0.3f) | ||
| else if (isMic) MaterialTheme.colors.primary | ||
| else if (isLight) Color.Black | ||
| else Color.White, label = "" | ||
| ) | ||
|
|
||
| val iconColor by animateColorAsState( | ||
| targetValue = if (!isEnabled) MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.disabled) | ||
| else if (isMic) Color.White | ||
| else if (isLight) Color.White | ||
| else Color.Black, label = "" | ||
| ) | ||
|
|
||
| val micIcon: Painter = painterResource(id = R.drawable.ic_mic_none_24) | ||
| val stopIcon: Painter = painterResource(id = R.drawable.v2c_stop) | ||
|
|
||
| Box( | ||
| contentAlignment = Alignment.Center, | ||
| modifier = Modifier | ||
| .size(100.dp) | ||
| .background(Color.Transparent) // Ensure transparent background | ||
| .clickable( | ||
| enabled = isEnabled, | ||
| onClick = { | ||
| if (model.hasPermission) { | ||
| if (isMic) { | ||
| model.onMicTap?.invoke() | ||
| } else { | ||
| model.onStopTap?.invoke() | ||
| } | ||
| // isMic = !isMic | ||
| } else { | ||
| model.onRequestPermission?.invoke() | ||
| } | ||
| isMic = !isMic | ||
| } | ||
| ) | ||
| ) { | ||
| Box( | ||
| modifier = Modifier | ||
| .size(100.dp) | ||
| .background(circleColor, shape = CircleShape) | ||
| ) | ||
| if (model.hasPermission) { | ||
| AnimatedContent( | ||
| targetState = isMic, | ||
| transitionSpec = { | ||
| fadeIn(animationSpec = tween(300)) with fadeOut(animationSpec = tween(300)) | ||
| }, label = "" | ||
| ) { targetState -> | ||
| val icon: Painter = if (targetState) micIcon else stopIcon | ||
| val iconSize = if (targetState) 50.dp else 35.dp | ||
| Image( | ||
| painter = icon, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(iconSize), | ||
| colorFilter = ColorFilter.tint(iconColor) | ||
| ) | ||
| } | ||
| } else { | ||
| // Display mic icon statically if permission is not granted | ||
| Image( | ||
| painter = micIcon, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(50.dp), | ||
| colorFilter = ColorFilter.tint(iconColor) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Preview(showBackground = true, device = Devices.PIXEL_4_XL) | ||
| @Preview(showBackground = true, device = Devices.PIXEL_4_XL, uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
| @Composable | ||
| fun ExistingLayoutPreview() { | ||
| AppTheme { | ||
| MicToStopIcon( | ||
| RecordingPanelUIModel( | ||
| isEligibleForFeature = true, | ||
| onMicTap = {}, | ||
| onStopTap = {}, | ||
| hasPermission = true, | ||
| onRequestPermission = {}, | ||
| actionLabel = R.string.voice_to_content_base_header_label, isEnabled = false | ||
| ) | ||
| ) | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
...ess/src/main/java/org/wordpress/android/ui/voicetocontent/PrepareVoiceToContentUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package org.wordpress.android.ui.voicetocontent | ||
|
|
||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import org.wordpress.android.fluxc.model.SiteModel | ||
| import org.wordpress.android.fluxc.model.jetpackai.JetpackAIAssistantFeature | ||
| import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIAssistantFeatureResponse | ||
| import org.wordpress.android.fluxc.store.jetpackai.JetpackAIStore | ||
| import javax.inject.Inject | ||
|
|
||
| class PrepareVoiceToContentUseCase @Inject constructor( | ||
| private val jetpackAIStore: JetpackAIStore | ||
| ) { | ||
| suspend fun execute(site: SiteModel): PrepareVoiceToContentResult = | ||
| withContext(Dispatchers.IO) { | ||
| when (val response = jetpackAIStore.fetchJetpackAIAssistantFeature(site)) { | ||
| is JetpackAIAssistantFeatureResponse.Success -> { | ||
| PrepareVoiceToContentResult.Success(model = response.model) | ||
| } | ||
| is JetpackAIAssistantFeatureResponse.Error -> { | ||
| PrepareVoiceToContentResult.Error | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| sealed class PrepareVoiceToContentResult { | ||
| data class Success(val model: JetpackAIAssistantFeature) : PrepareVoiceToContentResult() | ||
| data object Error : PrepareVoiceToContentResult() | ||
| } |
Oops, something went wrong.