v1.0.4

ogzkesk · Jul 6, 2023 · fffb3f8 · fffb3f8
1 parent 9296c98
commit fffb3f8
Show file tree

Hide file tree

Showing 13 changed files with 290 additions and 53 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/src/main/java/com/ogzkesk/ad/ui/screens/home/Native.kt b/app/src/main/java/com/ogzkesk/ad/ui/screens/home/Native.kt
@@ -49,6 +49,7 @@ fun Native() {
                         onLoadNativeTemplatesClick = {
                             viewModel.loadNativeSmallTemplate(context)
                             viewModel.loadNativeMediumTemplate(context)
+                            viewModel.loadNativeMedium2Template(context)
                             viewModel.loadNativeLargeTemplate(context)
                         }
                     )
@@ -68,6 +69,13 @@ fun Native() {
                     )
                 }
                 item { Spacer(modifier = Modifier.height(16.dp)) }
+                item {
+                    EonNativeAdView(
+                        nativeAdView = uiState.medium2NativeView,
+                        darkModeSupport = true
+                    )
+                }
+                item { Spacer(modifier = Modifier.height(16.dp)) }
                 item {
                     EonNativeAdView(
                         nativeAdView = uiState.largeNativeView,

diff --git a/app/src/main/java/com/ogzkesk/ad/ui/screens/home/NativeViewModel.kt b/app/src/main/java/com/ogzkesk/ad/ui/screens/home/NativeViewModel.kt
@@ -44,6 +44,19 @@ class NativeViewModel @Inject constructor() : ViewModel() {
         )
     }
 
+    fun loadNativeMedium2Template(context: Context) {
+        EonAd.getInstance().loadNativeAdTemplate(
+            context = context,
+            adUnitId = BuildConfig.ad_native_id,
+            type = NativeAdTemplate.MEDIUM_2,
+            onFailedToLoad = {},
+            onNativeAdLoaded = { view ->
+                println("EonNativeAd -- ViewModel Medium Loaded :: $view")
+                _uiState.value = _uiState.value.copy(medium2NativeView = view)
+            },
+        )
+    }
+
     fun loadNativeLargeTemplate(context: Context) {
         EonAd.getInstance().loadNativeAdTemplate(
             context = context,
@@ -83,6 +96,7 @@ class NativeViewModel @Inject constructor() : ViewModel() {
     data class UiState(
         val smallNativeView: View? = null,
         val mediumNativeView: View? = null,
+        val medium2NativeView: View? = null,
         val largeNativeView: View? = null,
         val error: EonAdError? = null
     )

diff --git a/eonad/build.gradle b/eonad/build.gradle
@@ -76,7 +76,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.ogzkesk'
                 artifactId = 'eonad'
-                version = '1.0.3'
+                version = '1.0.4'
             }
         }
     }

diff --git a/eonad/src/main/java/com/ogzkesk/eonad/Util.kt b/eonad/src/main/java/com/ogzkesk/eonad/Util.kt
@@ -139,5 +139,6 @@ internal fun mapBannerAdSize(adSize : BannerAdSize) : AdSize {
 enum class NativeAdTemplate {
     SMALL,
     MEDIUM,
+    MEDIUM_2,
     LARGE
 }
diff --git a/eonad/src/main/java/com/ogzkesk/eonad/ui/EonNativeAdView.kt b/eonad/src/main/java/com/ogzkesk/eonad/ui/EonNativeAdView.kt
@@ -32,9 +32,7 @@ fun EonNativeAdView(
             modifier = modifier
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(8.dp))
-                .border(0.6.dp, Color(0xFF9C9C9C), RoundedCornerShape(8.dp))
-                .windowInsetsPadding(WindowInsets.navigationBars)
-                .windowInsetsPadding(WindowInsets.statusBars),
+                .border(0.6.dp, Color(0xFF9C9C9C), RoundedCornerShape(8.dp)),
             factory = { nativeAdView },
             update = {
                 try {
@@ -50,9 +48,7 @@ fun EonNativeAdView(
             modifier = modifier
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(8.dp))
-                .border(0.6.dp, Color(0xFF9C9C9C), RoundedCornerShape(8.dp))
-                .windowInsetsPadding(WindowInsets.navigationBars)
-                .windowInsetsPadding(WindowInsets.statusBars),
+                .border(0.6.dp, Color(0xFF9C9C9C), RoundedCornerShape(8.dp)),
             factory = { nativeAdView }
         )
     }

diff --git a/eonad/src/main/java/com/ogzkesk/eonad/ui/NativeAdUi.kt b/eonad/src/main/java/com/ogzkesk/eonad/ui/NativeAdUi.kt
@@ -7,6 +7,7 @@ import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.facebook.shimmer.ShimmerFrameLayout
 import com.google.android.gms.ads.nativead.NativeAd
@@ -72,19 +73,22 @@ internal class NativeAdUi(private val nativeAd: NativeAd?) {
                 val advertiser = adView.findViewById<TextView>(R.id.ad_advertiser)
                 val icon = adView.findViewById<ImageView>(R.id.ad_icon)
                 val callToAction = adView.findViewById<Button>(R.id.ad_call_to_action)
+                val body = adView.findViewById<TextView>(R.id.ad_body)
                 val adImage = adView.findViewById<FrameLayout>(R.id.ad_view_container)
                     .findViewById<ImageView>(R.id.ad_image)
 
                 headLine.text = nativeAd.headline
                 advertiser.text = nativeAd.advertiser
                 callToAction.text = nativeAd.callToAction
+                body.text = nativeAd.body
                 nativeAd.icon?.drawable?.let { draw -> icon.setImageDrawable(draw) }
                 if (nativeAd.images.isNotEmpty()) {
                     nativeAd.images[0].drawable?.let { adImage.setImageDrawable(it) }
                 }
 
                 headlineView = headLine
                 advertiserView = advertiser
+                bodyView = body
                 iconView = icon
                 callToActionView = callToAction
                 imageView = adImage
@@ -98,6 +102,47 @@ internal class NativeAdUi(private val nativeAd: NativeAd?) {
         }
     }
 
+    private fun populateMedium2NativeView(context: Context): View {
+
+        val loadingView = (context as Activity).layoutInflater.inflate(
+            R.layout.admob_native_medium_two,
+            null
+        ) as FrameLayout
+
+        return if(nativeAd != null) {
+            NativeAdView(context).apply {
+                val adView = (context).layoutInflater.inflate(
+                    R.layout.admob_native_medium_two,
+                    null
+                ) as FrameLayout
+
+                val headLine = adView.findViewById<TextView>(R.id.ad_headline)
+                val advertiser = adView.findViewById<TextView>(R.id.ad_advertiser)
+                val body = adView.findViewById<TextView>(R.id.ad_body)
+                val icon = adView.findViewById<ImageView>(R.id.ad_icon)
+                val callToAction = adView.findViewById<Button>(R.id.ad_call_to_action)
+
+                headLine.text = nativeAd.headline
+                advertiser.text = nativeAd.advertiser
+                callToAction.text = nativeAd.callToAction
+                body.text = nativeAd.body
+                nativeAd.icon?.drawable?.let { draw -> icon.setImageDrawable(draw) }
+
+                headlineView = headLine
+                advertiserView = advertiser
+                bodyView = body
+                iconView = icon
+                callToActionView = callToAction
+
+                removeAllViews()
+                setNativeAd(nativeAd)
+                addView(adView)
+            }
+        } else {
+            loadingView
+        }
+    }
+
     private fun populateLargeNativeView(context: Context): View {
         val loadingView = (context as Activity).layoutInflater.inflate(
             R.layout.admob_native_large,
@@ -148,14 +193,15 @@ internal class NativeAdUi(private val nativeAd: NativeAd?) {
         return when (type) {
             NativeAdTemplate.SMALL -> populateSmallNativeView(context).apply { show(this) }
             NativeAdTemplate.MEDIUM -> populateMediumNativeView(context).apply { show(this) }
+            NativeAdTemplate.MEDIUM_2 -> populateMedium2NativeView(context).apply { show(this) }
             NativeAdTemplate.LARGE -> populateLargeNativeView(context).apply { show(this) }
         }
     }
 
     private fun show(view: View) {
         val shimmer = view.findViewById<ShimmerFrameLayout>(R.id.shimmer_view_container)
         val adView = view.findViewById<FrameLayout>(R.id.ad_view_container)
-        shimmer.isVisible = nativeAd == null
-        adView.isVisible = nativeAd != null
+        shimmer.isGone = nativeAd != null
+        adView.isGone = nativeAd == null
     }
 }
diff --git a/eonad/src/main/res/drawable/ad_img_bg.xml b/eonad/src/main/res/drawable/ad_img_bg.xml
@@ -2,4 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="8dp"/>
+    <solid android:color="?android:attr/selectableItemBackground"/>
+
 </shape>
diff --git a/eonad/src/main/res/layout/admob_native_large.xml b/eonad/src/main/res/layout/admob_native_large.xml
@@ -87,16 +87,20 @@
             android:textStyle="normal"
             tools:text="Ad description..." />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/ad_image"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:strokeColor="@null"
-            android:layout_marginHorizontal="8dp"
-            app:shapeAppearance="@style/ShapeForLarge"
-            android:adjustViewBounds="true"
-            android:foreground="?android:attr/selectableItemBackground"
-            tools:src="@tools:sample/avatars" />
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/ad_image"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:adjustViewBounds="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                tools:src="@tools:sample/avatars" />
+
+        </FrameLayout>
+
 
 
         <Button

diff --git a/eonad/src/main/res/layout/admob_native_medium.xml b/eonad/src/main/res/layout/admob_native_medium.xml
@@ -88,14 +88,14 @@
 
                         <TextView
                             android:id="@+id/ad_body"
-                            android:textSize="12sp"
-                            tools:text="Ad body....."
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_marginHorizontal="8dp"
                             android:layout_marginVertical="4dp"
-                            android:maxLines="3"
                             android:ellipsize="end"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            android:maxLines="3"
+                            android:textSize="12sp"
+                            tools:text="Ad body....." />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -122,15 +122,16 @@
 
             </FrameLayout>
 
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/ad_image"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                app:strokeColor="@null"
-                android:layout_weight="0.5"
-                android:scaleType="centerCrop"
-                app:shapeAppearance="@style/ShapeForMedium"
-                tools:src="@tools:sample/avatars" />
+
+                <ImageView
+                    android:id="@+id/ad_image"
+                    android:layout_width="0dp"
+                    android:layout_height="180dp"
+                    android:foreground="?android:attr/selectableItemBackground"
+                    android:scaleType="centerCrop"
+                    android:layout_weight="0.5"
+                    tools:src="@tools:sample/avatars" />
+
 
         </LinearLayout>
-Original file line number
+Diff line change
@@ Expand Up @@
     enum class NativeAdTemplate {
         SMALL,
         MEDIUM,
+        MEDIUM_2,
         LARGE
     }