Skip to content

delete languageext #38

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

Closed
wants to merge 5 commits into from
Closed

delete languageext #38

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
0bb2a03
chore(deps): model 2.0.91
jo-elimu Apr 11, 2025
8a49cf1
Delete LanguageExt.kt
jo-elimu Apr 11, 2025
dd251b7
refactor: get locale from language enum
jo-elimu Apr 11, 2025
c324eae
chore: improve log tag
jo-elimu Apr 11, 2025
4100e9f
refactor: log more locale details
jo-elimu Apr 11, 2025
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ material = "1.12.0"
hilt = "2.56.1"
kotlinAndroidPlugin = "2.0.0"
grgit = "5.3.0"
elimuModel = "model-2.0.89"
elimuModel = "model-2.0.91"
elimuProvider = "1.2.35"

[libraries]
Expand Down
24 changes: 0 additions & 24 deletions utils/src/main/java/ai/elimu/common/utils/LanguageExt.kt
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions utils/src/main/java/ai/elimu/common/utils/di/TextToSpeechWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package ai.elimu.common.utils.di

import ai.elimu.common.utils.toLanguage
import ai.elimu.common.utils.toLocale
import ai.elimu.content_provider.utils.SharedDataKeys
import ai.elimu.model.v2.enums.Language
import android.content.Context
import android.net.Uri
import android.speech.tts.TextToSpeech
import android.util.Log

class TextToSpeechWrapper(context: Context, contentProviderId: String) {
lateinit var tts: TextToSpeech
private val TAG = "TextToSpeech"
private val TAG = "TextToSpeechWrapper"

init {
val uri = Uri.parse("content://" + contentProviderId
Expand All @@ -37,7 +36,12 @@ class TextToSpeechWrapper(context: Context, contentProviderId: String) {
tts.setSpeechRate(0.5f)

if (contentProviderLanguage.isNotEmpty()) {
tts.setLanguage(contentProviderLanguage.lowercase().toLanguage().toLocale())
val language: Language = Language.valueOf(contentProviderLanguage)
Log.d(TAG, "language: ${language}")
Log.d(TAG, "language.locale: ${language.locale}")
Log.d(TAG, "language.locale.language: ${language.locale.language}")
Log.d(TAG, "language.locale.country: ${language.locale.country}")
tts.setLanguage(language.locale)
}
Comment on lines +39 to 45
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add error handling for Language.valueOf operation.

The direct use of Language.valueOf() simplifies the code by replacing the previously used extension methods. However, this method will throw an IllegalArgumentException if contentProviderLanguage doesn't match any enum constant, which could crash the app.

Consider adding a try-catch block to gracefully handle this situation:

if (contentProviderLanguage.isNotEmpty()) {
-    val language: Language = Language.valueOf(contentProviderLanguage)
-    Log.d(TAG, "language: ${language}")
-    Log.d(TAG, "language.locale: ${language.locale}")
-    Log.d(TAG, "language.locale.language: ${language.locale.language}")
-    Log.d(TAG, "language.locale.country: ${language.locale.country}")
-    tts.setLanguage(language.locale)
+    try {
+        val language: Language = Language.valueOf(contentProviderLanguage)
+        Log.d(TAG, "language: $language")
+        Log.d(TAG, "language.locale: ${language.locale}")
+        Log.d(TAG, "language.locale.language: ${language.locale.language}")
+        Log.d(TAG, "language.locale.country: ${language.locale.country}")
+        tts.setLanguage(language.locale)
+    } catch (e: IllegalArgumentException) {
+        Log.e(TAG, "Unsupported language: $contentProviderLanguage", e)
+        // Fallback to a default language or handle appropriately
+    }
}

This change will help ensure that our educational software remains robust when deployed to help out-of-school children learn reading, writing, and math skills.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
val language: Language = Language.valueOf(contentProviderLanguage)
Log.d(TAG, "language: ${language}")
Log.d(TAG, "language.locale: ${language.locale}")
Log.d(TAG, "language.locale.language: ${language.locale.language}")
Log.d(TAG, "language.locale.country: ${language.locale.country}")
tts.setLanguage(language.locale)
}
if (contentProviderLanguage.isNotEmpty()) {
try {
val language: Language = Language.valueOf(contentProviderLanguage)
Log.d(TAG, "language: $language")
Log.d(TAG, "language.locale: ${language.locale}")
Log.d(TAG, "language.locale.language: ${language.locale.language}")
Log.d(TAG, "language.locale.country: ${language.locale.country}")
tts.setLanguage(language.locale)
} catch (e: IllegalArgumentException) {
Log.e(TAG, "Unsupported language: $contentProviderLanguage", e)
// Fallback to a default language or handle appropriately
}
}

} else {
Log.e(TAG, "TTS initialization failed with status: $status")
Expand Down
Loading