Skip to content

fix(liveness): Minor UI Fixes #103

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
merged 5 commits into from
Dec 4, 2023
Merged

fix(liveness): Minor UI Fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3b5f97
ui fixes
tylerjroach Dec 1, 2023
7a73ded
typo
tylerjroach Dec 1, 2023
3622e7d
only allow onComplete or onError to return. Not both
tylerjroach Dec 1, 2023
fa5cb4f
only allow onComplete or onError to return. Not both
tylerjroach Dec 1, 2023
ff382fd
lint
tylerjroach Dec 4, 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
9 changes: 6 additions & 3 deletions liveness/src/main/java/com/amplifyframework/ui/liveness/ui/FaceLivenessDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,12 @@ fun FaceLivenessDetector(
disableStartView,
onChallengeComplete = {
scope.launch {
isFinished = true
resetOrientation()
currentOnComplete.call()
// if we are already finished, we already provided a result in complete or failed
if (!isFinished) {
isFinished = true
resetOrientation()
currentOnComplete.call()
}
}
},
onChallengeFailed = {
Expand Down
3 changes: 1 addition & 2 deletions liveness/src/main/java/com/amplifyframework/ui/liveness/ui/InstructionMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ import com.amplifyframework.ui.liveness.model.LivenessCheckState
livenessCheckState: LivenessCheckState
) {
val instructionText = livenessCheckState.instructionId?.let { stringResource(it) } ?: return
val showProgress = livenessCheckState is LivenessCheckState.Success
if (livenessCheckState.isActionable) {
FaceOvalInstructionMessage(message = instructionText)
} else {
InstructionMessage(message = instructionText, showProgress = showProgress)
InstructionMessage(message = instructionText, showProgress = true)
}
}
@Composable
Expand Down
3 changes: 3 additions & 0 deletions samples/liveness/app/src/main/java/com/amplifyframework/ui/sample/liveness/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class MainViewModel : ViewModel() {
}

fun fetchSessionResult(sessionId: String) {
if (_resultData.value != null) return //we already have result, likely timeout

_fetchingResult.value = true
viewModelScope.launch {
try {
Expand Down Expand Up @@ -125,6 +127,7 @@ class MainViewModel : ViewModel() {
fun reportErrorResult(exception: FaceLivenessDetectionException) {
sessionId.value?.let {
_resultData.value = ResultData(it, error = exception)
_fetchingResult.value = false
}
}

Expand Down
13 changes: 7 additions & 6 deletions ...les/liveness/app/src/main/java/com/amplifyframework/ui/sample/liveness/ui/ResultScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,16 @@ private fun getDisplayError(error: FaceLivenessDetectionException): DisplayError
is FaceLivenessDetectionException.SessionTimedOutException -> {
DisplayError(
title = stringResource(id = R.string.error_timed_out_title),
message = if (error.message.contains("did not match oval", true)) {
stringResource(id = R.string.error_timed_out_face_fit_message)
} else {
stringResource(id = R.string.error_timed_out_session_message)
}
message = stringResource(id = R.string.error_timed_out_session_message)
)
}
else -> {
if (error.message.contains("failed during countdown", ignoreCase = true)) {
if (error.message.contains("did not match oval", true)) {
DisplayError(
title = stringResource(id = R.string.error_timed_out_title),
message = stringResource(id = R.string.error_timed_out_face_fit_message)
)
} else if (error.message.contains("failed during countdown", ignoreCase = true)) {
DisplayError(
title = stringResource(id = R.string.error_failure_during_countdown_title),
message = stringResource(id = R.string.error_failure_during_countdown_message)
Expand Down