Implement Network Monitor in Native Ads Composable

teogor · Oct 27, 2023 · 2fd20e8 · 2fd20e8
1 parent 78dfe78
commit 2fd20e8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/app/src/main/kotlin/dev/teogor/ceres/ads/HomeNativeAd.kt b/app/src/main/kotlin/dev/teogor/ceres/ads/HomeNativeAd.kt
@@ -27,7 +27,6 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -43,7 +42,6 @@ import com.google.android.gms.ads.nativead.NativeAd
 import com.skydoves.landscapist.ImageOptions
 import com.skydoves.landscapist.glide.GlideImage
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dev.teogor.ceres.core.foundation.compositions.LocalNetworkMonitor
 import dev.teogor.ceres.monetisation.admob.DemoAdUnitIds
 import dev.teogor.ceres.monetisation.admob.annotations.AdProperty
 import dev.teogor.ceres.monetisation.admob.formats.nativead.NativeAd
@@ -146,19 +144,6 @@ class HomeNativeAdBeta : NativeAdManager() {
     )
     .build()
 
-  @Composable
-  override fun IsOnline(
-    displayAd: @Composable () -> Unit,
-  ) {
-    val networkMonitor = LocalNetworkMonitor.current
-    val isOffline by remember {
-      derivedStateOf { networkMonitor.isOffline }
-    }
-    if (!isOffline) {
-      displayAd()
-    }
-  }
-
   @Composable
   override fun Display() {
     IsOnline {

diff --git a/core/foundation/src/main/kotlin/dev/teogor/ceres/core/foundation/NetworkMonitor.kt b/core/foundation/src/main/kotlin/dev/teogor/ceres/core/foundation/NetworkMonitor.kt
@@ -37,11 +37,11 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dev.teogor.ceres.core.foundation.utils.getSystemService
-import javax.inject.Inject
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.conflate
+import javax.inject.Inject
 
 private var Impl: NetworkConnectivityImpl? = null
 

diff --git a/monetisation/admob/build.gradle.kts b/monetisation/admob/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
 
   api(project(":monetisation:ads"))
   implementation(project(":core:runtime"))
-  implementation(project(":core:network"))
+  implementation(project(":core:foundation"))
   implementation(project(":ui:designsystem"))
 
   implementation(libs.androidx.compose.foundation)

diff --git a/monetisation/admob/src/main/kotlin/dev/teogor/ceres/monetisation/admob/AdMobInitializer.kt b/monetisation/admob/src/main/kotlin/dev/teogor/ceres/monetisation/admob/AdMobInitializer.kt
@@ -23,7 +23,6 @@ import android.content.Context
 import android.provider.Settings
 import com.google.android.gms.ads.MobileAds
 import com.google.android.gms.ads.RequestConfiguration
-import dev.teogor.ceres.core.network.ConnectivityManagerNetworkMonitor
 import dev.teogor.ceres.core.runtime.AppMetadataManager
 import dev.teogor.ceres.monetisation.ads.AdsControl
 import dev.teogor.ceres.monetisation.ads.AdsControlProvider
@@ -35,8 +34,6 @@ import java.security.NoSuchAlgorithmException
 
 object AdMobInitializer {
 
-  private var connectivityManager: ConnectivityManagerNetworkMonitor? = null
-
   fun configureAdsControl(adsControl: AdsControl) {
     AdsControlProvider.initialize(adsControl)
   }

diff --git a/...b/src/main/kotlin/dev/teogor/ceres/monetisation/admob/formats/nativead/NativeAdManager.kt b/...b/src/main/kotlin/dev/teogor/ceres/monetisation/admob/formats/nativead/NativeAdManager.kt
@@ -17,7 +17,10 @@
 package dev.teogor.ceres.monetisation.admob.formats.nativead
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import dev.teogor.ceres.core.foundation.compositions.LocalNetworkMonitor
 
 /**
  * Abstract class representing a Native Ad Manager.
@@ -55,8 +58,13 @@ abstract class NativeAdManager {
   open fun IsOnline(
     displayAd: @Composable () -> Unit,
   ) {
-    // TODO connectivity flow
-    displayAd()
+    val networkMonitor = LocalNetworkMonitor.current
+    val isOffline by remember {
+      derivedStateOf { networkMonitor.isOffline }
+    }
+    if (!isOffline) {
+      displayAd()
+    }
   }
 }