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

Jump to bottom

IDE-183 Fix testComputeDialogValue #5030

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

IDE-183 Fix testComputeDialogValue #5030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 30 additions & 12 deletions catroid/src/main/java/org/catrobat/catroid/utils/TextBlockUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catroid: An on-device visual programming system for Android devices
* Copyright (C) 2010-2022 The Catrobat Team
* Copyright (C) 2010-2024 The Catrobat Team
* (<http://developer.catrobat.org/credits>)
*
* This program is free software: you can redistribute it and/or modify
Expand All @@ -25,15 +25,18 @@ package org.catrobat.catroid.utils
import android.graphics.Point
import android.graphics.Rect
import com.google.mlkit.nl.languageid.LanguageIdentification
import com.google.mlkit.nl.languageid.LanguageIdentifier
import com.google.mlkit.vision.text.Text
import com.huawei.hms.mlsdk.langdetect.MLLangDetectorFactory
import com.huawei.hms.mlsdk.langdetect.local.MLLocalLangDetector
import com.huawei.hms.mlsdk.langdetect.local.MLLocalLangDetectorSetting
import com.huawei.hms.mlsdk.text.MLText
import org.catrobat.catroid.CatroidApplication
import org.catrobat.catroid.ProjectManager
import org.catrobat.catroid.camera.VisualDetectionHandler.coordinatesFromRelativePosition
import org.catrobat.catroid.common.ScreenValues.currentScreenResolution
import org.catrobat.catroid.stage.StageActivity
import org.koin.java.KoinJavaComponent.get
import kotlin.math.roundToInt

object TextBlockUtil {
Expand All @@ -44,12 +47,25 @@ object TextBlockUtil {
private var imageWidth = 0
private var imageHeight = 0
private const val MAX_TEXT_SIZE = 100
private var languageIdentifierGoogle = LanguageIdentification.getClient()
private var languageDetectorFactoryHuawei: MLLangDetectorFactory = MLLangDetectorFactory.getInstance()
var languageDetectorSettingHuawei: MLLocalLangDetectorSetting = MLLocalLangDetectorSetting.Factory()
.setTrustedThreshold(TRUSTED_THRESHOLD)
.create()
var languageIdentifierHuawei: MLLocalLangDetector = languageDetectorFactoryHuawei.getLocalLangDetector(languageDetectorSettingHuawei)
private var languageIdentifierGoogle: LanguageIdentifier? = null
private var languageIdentifierHuawei: MLLocalLangDetector? = null

init {
val context = CatroidApplication.getAppContext()
val mobileServiceAvailability = get(MobileServiceAvailability::class.java)
if (mobileServiceAvailability.isGmsAvailable(context)) {
languageIdentifierGoogle = LanguageIdentification.getClient()
} else if (mobileServiceAvailability.isHmsAvailable(context)) {
val languageDetectorFactoryHuawei: MLLangDetectorFactory =
MLLangDetectorFactory.getInstance()
val languageDetectorSettingHuawei: MLLocalLangDetectorSetting =
MLLocalLangDetectorSetting.Factory()
.setTrustedThreshold(TRUSTED_THRESHOLD)
.create()
languageIdentifierHuawei =
languageDetectorFactoryHuawei.getLocalLangDetector(languageDetectorSettingHuawei)
}
}

fun setTextBlocksGoogle(text: List<Text.TextBlock>, width: Int, height: Int) {
imageWidth = width
Expand All @@ -61,9 +77,10 @@ object TextBlockUtil {
text.forEachIndexed { index, textBlock ->
textBlock.text.let { textBlocks.add(index, it) }
textBlock.boundingBox?.let { textBlockBoundingBoxes.add(index, it) }
languageIdentifierGoogle.identifyLanguage(textBlock.text).addOnSuccessListener { languageCode ->
textBlockLanguages[index] = languageCode
}
languageIdentifierGoogle?.identifyLanguage(textBlock.text)
?.addOnSuccessListener { languageCode ->
textBlockLanguages[index] = languageCode
}
}
}

Expand All @@ -77,8 +94,9 @@ object TextBlockUtil {
text.forEachIndexed { index, textBlock ->
textBlock.stringValue?.let { textBlocks.add(index, it) }
textBlock.border?.let { textBlockBoundingBoxes.add(index, it) }
val firstBestDetectTask = languageIdentifierHuawei.firstBestDetect(textBlock.stringValue)
firstBestDetectTask.addOnSuccessListener { languageCode ->
val firstBestDetectTask =
languageIdentifierHuawei?.firstBestDetect(textBlock.stringValue)
firstBestDetectTask?.addOnSuccessListener { languageCode ->
textBlockLanguages[index] = languageCode
}
}
Expand Down