diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index ab00b81..fb14031 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -230,7 +230,7 @@ class HemoCubeFragment : Fragment() {
activity?.runOnUiThread {
binding.btnPlacebuffer.visibility = View.GONE
binding.btnSamplestart.visibility = View.VISIBLE
- binding.tvSubtitle4.text = "Place Sample"
+ binding.tvSubtitle4.text = R.string.place_sample.toString()
}
isUsingExistingBuffer = true
}
@@ -307,37 +307,36 @@ class HemoCubeFragment : Fragment() {
activity?.runOnUiThread {
binding.btnPlacebuffer.visibility = View.VISIBLE
}
- hemoCubeViewModel.messages.postValue("Start")
+ hemoCubeViewModel.messages.postValue(R.string.start.toString())
}
stringData.contains("#BS") -> {
- hemoCubeViewModel.messages.postValue("Buffer Started")
+ hemoCubeViewModel.messages.postValue(R.string.buffer_started.toString())
}
stringData.contains("#BC") -> {
activity?.runOnUiThread {
- binding.tvSubtitle4.text = "Buffer Completed"
+ binding.tvSubtitle4.text = R.string.buffer_completed.toString()
binding.btnSamplestart.visibility = View.VISIBLE
}
}
stringData.contains("#SS") -> {
activity?.runOnUiThread {
- binding.tvSubtitle4.text = "Sample Started"
+ binding.tvSubtitle4.text = R.string.sample_started.toString()
binding.btnSamplestart.visibility = View.GONE
}
}
stringData.contains("#SC") -> {
- hemoCubeViewModel.messages.postValue("Sample Completed \nGathering data")
+ hemoCubeViewModel.messages.postValue(R.string.sample_completed.toString() +"\n" + R.string.gathering_data.toString())
fetchResult()
testingTrace.stop()
}
resultData.contains("REND") -> {
hemoCubeViewModel.messages.postValue(
- "Data collected \n" +
- " Processing data"
+ R.string.data_collected_processing_data.toString()
)
val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
var bufferIntensity = resultLines[1].split(' ')[1].trim()
@@ -410,7 +409,7 @@ class HemoCubeFragment : Fragment() {
private fun processResult() {
try {
- hemoCubeViewModel.messages.postValue("processing result")
+ hemoCubeViewModel.messages.postValue(R.string.processing_result.toString())
val deviceLog = resultData
val pInfo = requireActivity().packageManager.getPackageInfo(
@@ -431,7 +430,7 @@ class HemoCubeFragment : Fragment() {
) {
validationError = true
activity?.runOnUiThread {
- binding.errorMessage.text = "Error: Invalid Test. Improper buffer reading (low)"
+ binding.errorMessage.text = R.string.error_improper_buffer_low.toString()
binding.errorMessage.visibility = View.VISIBLE
}
}
@@ -444,7 +443,7 @@ class HemoCubeFragment : Fragment() {
validationError = true
activity?.runOnUiThread {
binding.errorMessage.text =
- "Error: Invalid Test. Improper buffer reading (high)"
+ R.string.error_improper_buffer_high.toString()
binding.errorMessage.visibility = View.VISIBLE
binding.btnSubmit.isEnabled = true
binding.btnSubmit.isClickable = true
@@ -472,7 +471,7 @@ class HemoCubeFragment : Fragment() {
if (fittedAbs1!! <= fittedAbs2!!) {
validationError = true
activity?.runOnUiThread {
- binding.errorMessage.text = "Error: Invalid Test. Problem with de-oxygenation"
+ binding.errorMessage.text = R.string.error_invalid_test.toString()
binding.errorMessage.visibility = View.VISIBLE
}
}
@@ -480,7 +479,7 @@ class HemoCubeFragment : Fragment() {
if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
validationError = true
activity?.runOnUiThread {
- binding.errorMessage.text = "Error: Negative Abs. Retake Blank Reading"
+ binding.errorMessage.text = R.string.error_negative_abs.toString()
binding.errorMessage.visibility = View.VISIBLE
}
}
@@ -541,7 +540,7 @@ class HemoCubeFragment : Fragment() {
} catch (e: Exception) {
Toast.makeText(
requireContext(),
- "Error while processing device data",
+ R.string.error_processing_device_data,
Toast.LENGTH_SHORT
).show()
Firebase.crashlytics.recordException(e)
@@ -553,28 +552,28 @@ class HemoCubeFragment : Fragment() {
hemoCubeViewModel.messages.postValue("result classification")
if (calculatedRatio != null) {
if (calculatedRatio < 0.05)
- return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
+ return R.string.error_repeat_test_higher_volume.toString()
if (calculatedRatio in 0.05..0.155)
- return "Normal"
+ return R.string.normal.toString()
if (calculatedRatio in 0.155..0.175)
- return "Negative Borderline. Repeat Test"
+ return R.string.negative_borderline.toString()
if (calculatedRatio in 0.175..0.22)
- return "Sickle Cell Trait"
+ return R.string.sickle_cell_trait.toString()
if (calculatedRatio in 0.22..0.25)
- return "Positive for Sickle Cell. HPLC for Confirmation"
+ return R.string.positive_for_sickle_cell.toString()
if (calculatedRatio in 0.25..0.35)
- return "Sickle Cell Disease"
+ return R.string.sickle_cell_disease.toString()
if (calculatedRatio > 0.35)
- return "Inconclusive. Repeat with test with lower volume of blood"
+ return R.string.error_repeat_test_lower_volume.toString()
} else {
- return "INVALID"
+ return R.string.invalid.toString()
}
} catch (e: Exception) {
showToast(R.string.error_classification)
Firebase.crashlytics.recordException(e)
- return "ERROR"
+ return R.string.error.toString()
}
- return "INVALID"
+ return R.string.invalid.toString()
}
private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
@@ -582,24 +581,24 @@ class HemoCubeFragment : Fragment() {
hemoCubeViewModel.messages.postValue("result classification")
if (predictedDenovixRatio != null) {
if (predictedDenovixRatio in 0.0..0.16)
- return "Normal"
+ return R.string.normal.toString()
if (predictedDenovixRatio in 0.16..0.165)
- return "Negative Borderline"
+ return R.string.negative_borderline.toString()
if (predictedDenovixRatio in 0.165..0.235)
- return "Sickle Cell Trait"
+ return R.string.sickle_cell_trait.toString()
if (predictedDenovixRatio in 0.235..0.24)
- return "Positive Borderline"
+ return R.string.positive_borderline.toString()
if (predictedDenovixRatio in 0.24..1.0)
- return "Sickle Cell Disease"
+ return R.string.sickle_cell_disease.toString()
} else {
- return "INVALID"
+ return R.string.invalid.toString()
}
} catch (e: Exception) {
showToast(R.string.error_classification)
Firebase.crashlytics.recordException(e)
- return "ERROR"
+ return R.string.error.toString()
}
- return "INVALID"
+ return R.string.invalid.toString()
}
private fun showToast(messageResId: Int) {
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index d3ea82c..28cf949 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -235,4 +235,25 @@
कृपया सही पासवर्ड दर्ज करें
गलत पासवर्ड
गलत उपयोगकर्ता आईडी
+ अमान्य टेस्ट. डी-ऑक्सीजनेशन समस्या
+ त्रुटि: नेगेटिव ऍब्स॰. ब्लैंक रीडिंग पुनः लें
+ त्रुटि: अमान्य टेस्ट. बफर रीडिंग सही नहीं (उच्च)
+ त्रुटि: अमान्य टेस्ट. बफर रीडिंग सही नहीं (न्यून)
+ उपकरण डेटा प्रोसेस करते समय त्रुटि
+ अमान्य. वाल्यूम कम है - पुनः टेस्ट करें
+ अमान्य. बहुत कम एब्स॰ - उच्च वाल्यूम के साथ पुनः टेस्ट करें
+ सिकल सेल के लिए सकारात्मक. पुनः सत्यापन के लिए HPLC
+ डिवाइस में कुछ गड़बड़ है, कृपया डिवाइस को बहुत और टेस्ट करने के लिए बाहर निकालें और फिर से कनेक्ट करें
+ प्रोसेसिंग परिणाम
+ डेटा संग्रहित हो रहा है, डेटा प्रोसेसिंग हो रहा है
+ सैम्पल पूरा हुआ
+ डेटा एकत्र किया जा रहा है
+ सैम्पल शुरू हुआ
+ बफर पूरा हुआ
+ बफर शुरू हुआ
+ शुरू
+ सैम्पल रखें
+ अमान्य
+ त्रुटि
+
\ No newline at end of file
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index d4b1f23..1babc00 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -235,4 +235,25 @@
ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್ವರ್ಡ್ ನಮೂದಿಸಿ
ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್
ತಪ್ಪಾದ ಬಳಕೆದಾರ ಐಡಿ
+ ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಡಿ-ಆಕ್ಸಿಜನೇಷನ್ ಸಮಸ್ಯೆ
+ ದೋಷ: ನೆಗೆಟಿವ್ ಆಬ್ಸ್. ಬ್ಲ್ಯಾಂಕ್ ರೀಡಿಂಗ್ ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಿ
+ ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಹೈ)
+ ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಲೋ)
+ ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುವಾಗ ದೋಷ
+ ಅಮಾನ್ಯ. ರೇಟ್ ಹೆಚ್ಚುವ ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್ ಮಾಡಿ
+ ಅಮಾನ್ಯ. ಅತ್ಯಂತ ಕಡಿಮೆ ಅಭ್ಸರ್ಬೆನ್ಸ್ - ಹೆಚ್ಚು ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್
+ ಸಿಕ್ಲ್ ಸೆಲ್ ಸಾಕಾರಿ. HPLC ದೃಢೀಕರಣಕ್ಕಾಗಿ
+ ಸಾಧನದಲ್ಲಿ ಏನಾದರೂ ತಪ್ಪಾಗಿದೆ, ದಯವಿಟ್ಟು ಸಾಧನವನ್ನು ಹತ್ತಿರಕ್ಕೆ ತರಿಸಿ ಮತ್ತೆ ಬಳಸಿ ಬಳಸಿ ಬಳಸಿ ಪರೀಕ್ಷಿಸಿ
+ ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ ಫಲಿತ
+ ಸಮಿತಿ ಸೇರಿಸಿದ ಡೇಟಾ, ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ
+ ನಮೂನೆ ಪೂರ್ಣಗೊಂಡಿದೆ
+ ಡೇಟಾ ಸಂಗ್ರಹಿಸುತ್ತಿದೆ
+ ನಮೂನೆ ಪ್ರಾರಂಭವಾಗಿದೆ
+ ಬಫರ್ ಪೂರ್ಣಗೊಂಡಿದೆ
+ ಬಫರ್ ಪ್ರಾರಂಭವಾಗಿದೆ
+ ಆರಂಭ
+ ನಮೂನೆ ಇಟ್ಟುಕೊಳ್ಳಿ
+ ಅಮಾನ್ಯ
+ ದೋಷ
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d69a4c0..e8ef341 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,7 +119,7 @@
\*Result to be confirmed with laboratory test
\*Result to be confirmed with laboratory test as age of the patient is less than 5 years
Positive Borderline
- Negative Borderline
+ Negative Borderline, Repeat Test
Is Patient under any medication or treatment?
Is Patient undergoing any blood transfusion?
Scan Aadhaar\nCard
@@ -235,4 +235,25 @@
Please enter a proper password
Wrong Password
Wrong UserID
+ Invalid Test. Problem with de-oxygenation
+ Error: Negative Abs. Retake Blank Reading
+ Error: Invalid Test. Improper buffer reading (high)
+ Error: Invalid Test. Improper buffer reading (low)
+ error while processing device data
+ Inconclusive. Repeat with test with lower volume of blood
+ Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume
+ Positive for Sickle Cell. HPLC for Confirmation
+ Something is wrong with the device, please disconnect and reconnect the device and test the user again
+ processing result
+ Data collected, Processing data
+ Sample Completed
+ Gathering data
+ Sample Started
+ Buffer Completed
+ Buffer Started
+ Start
+ Place Sample
+ Invalid
+ Error
+
\ No newline at end of file