Decode base64 data for images and provide bitmap data for remote image types #3202

Lentumunai-Mark · 2024-04-18T06:49:50Z

IMPORTANT: Where possible all PRs must be linked to a Github issue

Related to this issue

Engineer Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have updated the CHANGELOG.md file for any notable changes to the codebase
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

I have verified Unit tests have been written for any new feature(s) and edge cases
I have verified any strings visible on UI components are in the strings.xml file
I have verifed the CHANGELOG.md file has any notable changes to the codebase
I have verified the solution has been implemented in a configurable and generic way for reuseable components
I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

Signed-off-by: Lentumunai-Mark <[email protected]>

… load-Binary-Images

codecov · 2024-04-18T10:18:31Z

Codecov Report

Attention: Patch coverage is 6.25000% with 45 lines in your changes are missing coverage. Please review.

Project coverage is 30.0%. Comparing base (ac82739) to head (0730d1d).
Report is 38 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##              main   #3202     +/-   ##
=========================================
+ Coverage     29.6%   30.0%   +0.3%     
- Complexity     658     672     +14     
=========================================
  Files          239     240      +1     
  Lines        11204   11302     +98     
  Branches      1948    1971     +23     
=========================================
+ Hits          3323    3397     +74     
- Misses        7447    7462     +15     
- Partials       434     443      +9

Flag	Coverage Δ
geowidget	`47.2% <ø> (ø)`
quest	`5.6% <0.0%> (+0.2%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
.../fhircore/engine/util/extension/BitmapExtension.kt	`75.0% <100.0%> (+15.0%)`	⬆️
...ister/fhircore/quest/ui/shared/components/Image.kt	`0.0% <0.0%> (ø)`
...ster/fhircore/quest/ui/profile/ProfileViewModel.kt	`7.9% <0.0%> (-0.6%)`	⬇️
...fhircore/quest/util/extensions/LoadRemoteImages.kt	`0.0% <0.0%> (ø)`

... and 6 files with indirect coverage changes

Signed-off-by: Lentumunai-Mark <[email protected]>

pld · 2024-04-30T15:56:43Z

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/Image.kt

@@ -183,8 +182,8 @@ fun ClickableImageIcon(
                .fillMaxSize(0.9f),
            bitmap = imageConfig.decodedBitmap!!.asImageBitmap(),
            contentDescription = null,
-            contentScale = ContentScale.Crop,
-            colorFilter = ColorFilter.tint(tint ?: imageProperties.imageConfig?.color.parseColor()),


why are we removing this?

@Lentumunai-Mark Removing the color filter might interfere with the configuration of the icon color.

pld · 2024-04-30T15:57:42Z

...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/LoadRemoteImages.kt

+              .interpolate(computedValuesMap)
+              .extractLogicalIdUuid()
+          runBlocking {
+            withTimeout(2000) {


why do we need the timeout? Let's move the delay amount to a constant if we keep this

The delay should not be required.

Refactor the implementation to remove the timeout

Run blocking will block the operation on the current thread which is okay if this is run on Dispatcher.IO context.

ellykits · 2024-05-03T11:26:26Z

...oid/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/BitmapExtension.kt

+fun String.base64toBitmap(offset: Int = 0): Bitmap {
+  val decodedBytes = Base64.decode(this, Base64.DEFAULT)
+  return BitmapFactory.decodeByteArray(decodedBytes, offset, decodedBytes.size)
+}


Move this to StringExtensions

ellykits · 2024-05-03T11:28:05Z

...engine/src/test/java/org/smartregister/fhircore/engine/util/extension/BitmapExtensionTest.kt

+    assertEquals(83, bitmap.width)
+    assertEquals(83, bitmap.height)


Can we make other assertions alongside the width & height?

ellykits · 2024-05-03T11:30:08Z

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/Image.kt

@@ -183,8 +182,8 @@ fun ClickableImageIcon(
                .fillMaxSize(0.9f),
            bitmap = imageConfig.decodedBitmap!!.asImageBitmap(),
            contentDescription = null,
-            contentScale = ContentScale.Crop,
-            colorFilter = ColorFilter.tint(tint ?: imageProperties.imageConfig?.color.parseColor()),


@Lentumunai-Mark Removing the color filter might interfere with the configuration of the icon color.

ellykits · 2024-05-03T11:31:28Z

...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/LoadRemoteImages.kt

+              .interpolate(computedValuesMap)
+              .extractLogicalIdUuid()
+          runBlocking {
+            withTimeout(2000) {


The delay should not be required.

ellykits · 2024-05-03T11:37:01Z

...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/LoadRemoteImages.kt

+                imageProps.imageConfig?.decodedBitmap =
+                  binary.data
+                    .decodeToString()
+                    .tryDecodeJson<ImageConfiguration>()


This can be decoded to Binary resource, the new data class used for data serialization (ImageConfiguration) is not needed.

ellykits · 2024-05-03T11:49:54Z

...oid/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/BitmapExtension.kt

+fun String.base64toBitmap(offset: Int = 0): Bitmap {
+  val decodedBytes = Base64.decode(this, Base64.DEFAULT)
+  return BitmapFactory.decodeByteArray(decodedBytes, offset, decodedBytes.size)
+}


If you re-use this functionality

viewModelScope.launch(dispatcherProvider.io()) { registerRepository.loadResource<Binary>(resourceId.extractLogicalIdUuid())?.let { binary -> it.menuIconConfig!!.decodedBitmap = binary.data.decodeToBitmap() } }

The extension will no longer be necessary. Where resourceId is the image configuration reference.

ellykits · 2024-05-03T11:51:14Z

...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/LoadRemoteImages.kt

+  registerRepository: RegisterRepository,
+  computedValuesMap: Map<String, Any>,
+) {
+  fun loadIcons(view: ViewProperties) {


Convert this to ViewPropertiesExtension (rename the class too)
fun ViewProperties.loadIcons()

ellykits · 2024-05-03T11:52:08Z

...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/LoadRemoteImages.kt

+              .interpolate(computedValuesMap)
+              .extractLogicalIdUuid()
+          runBlocking {
+            withTimeout(2000) {


Run blocking will block the operation on the current thread which is okay if this is run on Dispatcher.IO context.

Lentumunai-Mark · 2024-05-08T12:29:39Z

closing this in favor of #3242

Lentumunai-Mark and others added 3 commits April 18, 2024 09:45

Supply bitmap data for remote image.

b26e6ce

Signed-off-by: Lentumunai-Mark <[email protected]>

Merge branch 'main' into load-Binary-Images

50ff434

Merge branch 'main' into load-Binary-Images

c2c52e5

dubdabasoduba requested review from Rkareko and dubdabasoduba April 18, 2024 07:22

dubdabasoduba assigned Lentumunai-Mark Apr 18, 2024

Lentumunai-Mark added 2 commits April 18, 2024 11:28

run spotless Apply

3fb54de

Signed-off-by: Lentumunai-Mark <[email protected]>

Merge branch 'load-Binary-Images' of github.com:opensrp/fhircore into…

9cec148

… load-Binary-Images

Lentumunai-Mark and others added 3 commits April 21, 2024 14:14

Add remote images test.

ea9e2dc

Signed-off-by: Lentumunai-Mark <[email protected]>

Merge branch 'main' into load-Binary-Images

425823a

Merge branch 'main' into load-Binary-Images

26fa2a5

dubdabasoduba added this to the Sprint 8 (Apr 8th - April 22nd) milestone Apr 22, 2024

ndegwamartin modified the milestones: Sprint 8 (Apr 8th - April 19th), Sprint 9 (April 22nd - May 3rd ) Apr 23, 2024

dubdabasoduba added 2 commits April 29, 2024 16:37

Merge branch 'main' into load-Binary-Images

c7b3397

Merge branch 'main' into load-Binary-Images

3575c24

pld reviewed Apr 30, 2024

View reviewed changes

Lentumunai-Mark requested a review from ellykits May 3, 2024 09:36

Merge branch 'main' into load-Binary-Images

a774f56

ellykits requested changes May 3, 2024

View reviewed changes

Merge branch 'main' into load-Binary-Images

0730d1d

dubdabasoduba modified the milestones: Sprint 9 (April 22nd - May 3rd ), Sprint 10 (May 6th - May 20th) May 6, 2024

Lentumunai-Mark closed this May 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Decode base64 data for images and provide bitmap data for remote image types #3202

Decode base64 data for images and provide bitmap data for remote image types #3202

Lentumunai-Mark commented Apr 18, 2024 •

edited

Loading

codecov bot commented Apr 18, 2024 •

edited

Loading

pld Apr 30, 2024

ellykits May 3, 2024

pld Apr 30, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

ellykits May 3, 2024

Lentumunai-Mark commented May 8, 2024

		assertEquals(83, bitmap.width)
		assertEquals(83, bitmap.height)

Decode base64 data for images and provide bitmap data for remote image types #3202

Decode base64 data for images and provide bitmap data for remote image types #3202

Conversation

Lentumunai-Mark commented Apr 18, 2024 • edited Loading

codecov bot commented Apr 18, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lentumunai-Mark commented May 8, 2024

Lentumunai-Mark commented Apr 18, 2024 •

edited

Loading

codecov bot commented Apr 18, 2024 •

edited

Loading