Merge pull request #761 from qonversion/kamo/dev-464-preload-images

Author: SpertsyanKM

config/detekt/baseline.xml

@@ -51,6 +51,8 @@
     <ID>MagicNumber:ApiErrorMapper.kt$ApiErrorMapper$20303</ID>
     <ID>MagicNumber:ApiErrorMapper.kt$ApiErrorMapper$20399</ID>
     <ID>MagicNumber:ApiInteractorImpl.kt$418</ID>
+    <ID>MagicNumber:ImagePreloaderImpl.kt$ImagePreloaderImpl$200</ID>
+    <ID>MagicNumber:ImagePreloaderImpl.kt$ImagePreloaderImpl$299</ID>
     <ID>MagicNumber:LogLevel.kt$LogLevel.Error$30</ID>
     <ID>MagicNumber:LogLevel.kt$LogLevel.Info$10</ID>
     <ID>MagicNumber:LogLevel.kt$LogLevel.Warning$20</ID>
@@ -146,6 +148,7 @@
     <ID>SwallowedException:ExceptionHandler.kt$ExceptionHandler$catch (e: Exception) { "" }</ID>
     <ID>SwallowedException:FacebookAttribution.kt$FacebookAttribution$catch (e: Exception) { null }</ID>
     <ID>SwallowedException:FallbackUtils.kt$FallbackUtils$catch (e: Exception) { false }</ID>
+    <ID>SwallowedException:ImagePreloaderImpl.kt$ImagePreloaderImpl$catch (e: Exception) { urlString to null }</ID>
     <ID>SwallowedException:OtherFragment.kt$OtherFragment$catch (e: Exception) { binding.progressBar.visibility = View.GONE Toast.makeText(context, getString(R.string.error_checking_fallback), Toast.LENGTH_SHORT).show() }</ID>
     <ID>SwallowedException:PurchasesCache.kt$PurchasesCache$catch (e: IOException) { setOf() }</ID>
     <ID>SwallowedException:RemoteConfigsAdapter.kt$RemoteConfigsAdapter$catch (e: Exception) { payloadJson.toString() }</ID>
@@ -164,6 +167,7 @@
     <ID>TooGenericExceptionCaught:FacebookAttribution.kt$FacebookAttribution$e: Exception</ID>
     <ID>TooGenericExceptionCaught:FallbackServiceImpl.kt$FallbackServiceImpl$e: Exception</ID>
     <ID>TooGenericExceptionCaught:FallbackUtils.kt$FallbackUtils$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:ImagePreloaderImpl.kt$ImagePreloaderImpl$e: Exception</ID>
     <ID>TooGenericExceptionCaught:JsonSerializer.kt$JsonSerializer$cause: NullPointerException</ID>
     <ID>TooGenericExceptionCaught:NetworkClientImpl.kt$NetworkClientImpl$cause: Exception</ID>
     <ID>TooGenericExceptionCaught:NoCodesInternal.kt$NoCodesInternal$e: Exception</ID>

nocodes/src/main/java/io/qonversion/nocodes/NoCodes.kt

@@ -2,6 +2,7 @@ package io.qonversion.nocodes
 
 import android.util.Log
 import io.qonversion.nocodes.dto.LogLevel
+import io.qonversion.nocodes.dto.NoCodesTheme
 import io.qonversion.nocodes.interfaces.NoCodesDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegateWithCallbacks
@@ -145,4 +146,16 @@ interface NoCodes {
      * @param locale the custom locale code, or null to use system default.
      */
     fun setLocale(locale: String?)
+
+    /**
+     * Set the theme mode for No-Code screens.
+     * Controls how screens adapt to light/dark themes.
+     *
+     * You may set theme both *after* Qonversion No-Codes SDK initializing with [NoCodes.setTheme]
+     * and *while* Qonversion No-Codes initializing via [NoCodesConfig.Builder.setTheme]
+     *
+     * @param theme the desired theme mode. Use [NoCodesTheme.Auto] to follow device settings,
+     *              [NoCodesTheme.Light] to force light theme, or [NoCodesTheme.Dark] to force dark theme.
+     */
+    fun setTheme(theme: NoCodesTheme)
 }

nocodes/src/main/java/io/qonversion/nocodes/NoCodesConfig.kt

@@ -3,6 +3,7 @@ package io.qonversion.nocodes
 import android.app.Application
 import android.content.Context
 import io.qonversion.nocodes.dto.LogLevel
+import io.qonversion.nocodes.dto.NoCodesTheme
 import io.qonversion.nocodes.interfaces.NoCodesDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegateWithCallbacks
@@ -32,6 +33,7 @@ class NoCodesConfig internal constructor(
     internal val purchaseDelegate: PurchaseDelegate?,
     internal val purchaseDelegateWithCallbacks: PurchaseDelegateWithCallbacks?,
     internal val locale: String?,
+    internal val theme: NoCodesTheme,
 ) {
 
     /**
@@ -57,6 +59,7 @@ class NoCodesConfig internal constructor(
         private var logTag = DEFAULT_LOG_TAG
         private var customFallbackFileName: String? = null
         private var locale: String? = null
+        private var theme: NoCodesTheme = NoCodesTheme.Auto
 
         /**
          * Provide a delegate to be notified about the no-code screens events.
@@ -171,6 +174,18 @@ class NoCodesConfig internal constructor(
             this.locale = locale
         }
 
+        /**
+         * Set the theme mode for No-Code screens.
+         * Controls how screens adapt to light/dark themes.
+         *
+         * @param theme the desired theme mode. Use [NoCodesTheme.Auto] to follow device settings,
+         *              [NoCodesTheme.Light] to force light theme, or [NoCodesTheme.Dark] to force dark theme.
+         * @return builder instance for chain calls.
+         */
+        fun setTheme(theme: NoCodesTheme): Builder = apply {
+            this.theme = theme
+        }
+
         /**
          * Generate [NoCodesConfig] instance with all the provided configurations.
          * This method also validates some of the provided data.
@@ -197,6 +212,7 @@ class NoCodesConfig internal constructor(
                 purchaseDelegate,
                 purchaseDelegateWithCallbacks,
                 locale,
+                theme,
             )
         }
     }

nocodes/src/main/java/io/qonversion/nocodes/dto/NoCodesTheme.kt

@@ -0,0 +1,23 @@
+package io.qonversion.nocodes.dto
+
+/**
+ * Enum representing the theme mode for No-Code screens.
+ * Use this to control how screens adapt to light/dark themes.
+ */
+enum class NoCodesTheme(val value: String) {
+    /**
+     * Automatically follow the device's system appearance (default).
+     * The screen will use light theme in light mode and dark theme in dark mode.
+     */
+    Auto("auto"),
+
+    /**
+     * Force light theme regardless of device settings.
+     */
+    Light("light"),
+
+    /**
+     * Force dark theme regardless of device settings.
+     */
+    Dark("dark")
+}

nocodes/src/main/java/io/qonversion/nocodes/internal/NoCodesInternal.kt

@@ -2,6 +2,7 @@ package io.qonversion.nocodes.internal
 
 import io.qonversion.nocodes.NoCodes
 import io.qonversion.nocodes.dto.LogLevel
+import io.qonversion.nocodes.dto.NoCodesTheme
 import io.qonversion.nocodes.interfaces.NoCodesDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegate
 import io.qonversion.nocodes.interfaces.PurchaseDelegateWithCallbacks
@@ -73,4 +74,8 @@ internal class NoCodesInternal(
     override fun setLocale(locale: String?) {
         internalConfig.customLocale = locale
     }
+
+    override fun setTheme(theme: NoCodesTheme) {
+        internalConfig.theme = theme
+    }
 }

nocodes/src/main/java/io/qonversion/nocodes/internal/di/controllers/ControllersAssemblyImpl.kt

@@ -35,7 +35,8 @@ internal class ControllersAssemblyImpl(
             miscAssembly.noCodesDelegateProvider(),
             miscAssembly.jsonSerializer(),
             mappersAssembly.actionMapper(),
-            { miscAssembly.customLocale() }
+            { miscAssembly.customLocale() },
+            { miscAssembly.theme() }
         )
     }
 }

nocodes/src/main/java/io/qonversion/nocodes/internal/di/misc/MiscAssembly.kt

@@ -1,5 +1,6 @@
 package io.qonversion.nocodes.internal.di.misc
 
+import io.qonversion.nocodes.dto.NoCodesTheme
 import io.qonversion.nocodes.internal.common.serializers.Serializer
 import io.qonversion.nocodes.internal.logger.Logger
 import io.qonversion.nocodes.internal.networkLayer.retryDelayCalculator.RetryDelayCalculator
@@ -19,6 +20,11 @@ internal interface MiscAssembly {
      */
     fun customLocale(): String?
 
+    /**
+     * Returns the current theme setting for No-Code screens.
+     */
+    fun theme(): NoCodesTheme
+
     fun jsonSerializer(): Serializer
 
     fun exponentialDelayCalculator(): RetryDelayCalculator

nocodes/src/main/java/io/qonversion/nocodes/internal/di/misc/MiscAssemblyImpl.kt

@@ -1,6 +1,7 @@
 package io.qonversion.nocodes.internal.di.misc
 
 import android.app.Application
+import io.qonversion.nocodes.dto.NoCodesTheme
 import io.qonversion.nocodes.internal.common.serializers.JsonSerializer
 import io.qonversion.nocodes.internal.common.serializers.Serializer
 import io.qonversion.nocodes.internal.dto.config.InternalConfig
@@ -39,6 +40,8 @@ internal class MiscAssemblyImpl(
 
     override fun customLocale(): String? = internalConfig.customLocale
 
+    override fun theme(): NoCodesTheme = internalConfig.theme
+
     override fun jsonSerializer(): Serializer = JsonSerializer()
 
     override fun exponentialDelayCalculator(): RetryDelayCalculator =

nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssembly.kt

@@ -1,11 +1,14 @@
 package io.qonversion.nocodes.internal.di.services
 
 import io.qonversion.nocodes.internal.screen.service.FallbackService
+import io.qonversion.nocodes.internal.screen.service.ImagePreloader
 import io.qonversion.nocodes.internal.screen.service.ScreenService
 
 internal interface ServicesAssembly {
 
     fun screenService(): ScreenService
 
     fun fallbackService(): FallbackService?
+
+    fun imagePreloader(): ImagePreloader
 }

nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssemblyImpl.kt

@@ -6,6 +6,8 @@ import io.qonversion.nocodes.internal.di.misc.MiscAssembly
 import io.qonversion.nocodes.internal.di.network.NetworkAssembly
 import io.qonversion.nocodes.internal.screen.service.FallbackService
 import io.qonversion.nocodes.internal.screen.service.FallbackServiceImpl
+import io.qonversion.nocodes.internal.screen.service.ImagePreloader
+import io.qonversion.nocodes.internal.screen.service.ImagePreloaderImpl
 import io.qonversion.nocodes.internal.screen.service.ScreenService
 import io.qonversion.nocodes.internal.screen.service.ScreenServiceImpl
 import io.qonversion.nocodes.internal.utils.FallbackUtils
@@ -18,12 +20,17 @@ internal class ServicesAssemblyImpl(
     private val effectiveFallbackFileName: String
 ) : ServicesAssembly {
 
+    private val imagePreloaderInstance by lazy {
+        ImagePreloaderImpl()
+    }
+
     private val screenServiceInstance by lazy {
         ScreenServiceImpl(
             networkAssembly.requestConfigurator(),
             networkAssembly.exponentialApiInteractor(),
             mappersAssembly.screenMapper(),
             fallbackService(),
+            imagePreloader(),
             miscAssembly.logger()
         )
     }
@@ -45,4 +52,8 @@ internal class ServicesAssemblyImpl(
             miscAssembly.logger()
         )
     }
+
+    override fun imagePreloader(): ImagePreloader {
+        return imagePreloaderInstance
+    }
 }