Merge pull request #230 from EyeSeeTea/feature-widp/configure_image_r…

…esize_to_download [WIDP] configure image resize to download
EyeSeeTea · Jan 21, 2025 · 206bfa5 · 206bfa5
2 parents 74f5efc + 828faf7
commit 206bfa5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -88,7 +88,7 @@ android {
         val mapboxAccessToken = System.getenv("MAPBOX_ACCESS_TOKEN") ?: defMapboxToken
         val bitriseSentryDSN = System.getenv("SENTRY_DSN") ?: ""
 
-        buildConfigField("String", "SDK_VERSION", "\"" + "1.10.1-eyeseetea-fork-2" + "\"")
+        buildConfigField("String", "SDK_VERSION", "\"" + libs.versions.dhis2sdk.get() + "\"")
         buildConfigField("String", "MAPBOX_ACCESS_TOKEN", "\"" + mapboxAccessToken + "\"")
         buildConfigField("String", "MATOMO_URL", "\"https://usage.analytics.dhis2.org/matomo.php\"")
         buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}")

diff --git a/app/src/main/java/org/dhis2/data/server/ServerModule.kt b/app/src/main/java/org/dhis2/data/server/ServerModule.kt
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.D2Manager
 import org.hisp.dhis.android.core.D2Manager.blockingInstantiateD2
+import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
 
 @Module
 class ServerModule {
@@ -191,6 +192,7 @@ class ServerModule {
                 .networkInterceptors(interceptors)
                 .writeTimeoutInSeconds(10 * 60)
                 .context(context)
+                .fileResizerDimension(FileResizerHelper.Dimension.MEDIUM)
                 .build()
         }
     }

diff --git a/dhis2-android-sdk b/dhis2-android-sdk
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ ndk = "21.4.7075529"
 sdk = "34"
 minSdk = "21"
 vCode = "136"
-vName = "3.0.1-widp-fork-1"
+vName = "3.0.1-widp-fork-2"
 kotlinCompilerExtensionVersion = "1.5.6"
 dhis2AndroidSdkCode = "294"
 gradle = "8.2.2"
@@ -12,7 +12,7 @@ hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'
 designSystem = "0.3.0"
-dhis2sdk = "1.10.1"
+dhis2sdk = "1.10.1-eyeseetea-fork-2"
 ruleEngine = "3.0.0"
 expressionParser = "1.1.0"
 appcompat = "1.6.1"
+12 −0		core/src/main/java/org/hisp/dhis/android/core/D2Configuration.java
+1 −0		core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
+3 −2		core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDIModule.kt
+6 −5		core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+2 −0		core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadParams.kt
+3 −3		core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
+14 −0		core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/GetDimension.kt
+2 −0		core/src/test/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloaderShould.kt
+25 −0		core/src/test/java/org/hisp/dhis/android/core/fileresource/internal/getDimensionShould.kt