From a165eea0a8922a768d61b1fa86fa72b1cc839a1c Mon Sep 17 00:00:00 2001
From: ShiftHackZ <dmitriy@moroz.cc>
Date: Fri, 14 Jul 2023 10:57:12 +0300
Subject: [PATCH] AdMob compliance - patch 1

---
 feature/ads/src/main/res/values/strings.xml   |  4 ++++
 .../res/layout/native_small_ad_view.xml       | 21 ++++++++++++-------
 .../ads/src/playstore/res/values/strings.xml  |  2 +-
 .../presentation/widget/ad/AdMobBanner.kt     |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 feature/ads/src/main/res/values/strings.xml

diff --git a/feature/ads/src/main/res/values/strings.xml b/feature/ads/src/main/res/values/strings.xml
new file mode 100644
index 000000000..78e3a9e63
--- /dev/null
+++ b/feature/ads/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ads_by_admob" translatable="false">Ads by AdMob:</string>
+</resources>
diff --git a/feature/ads/src/playstore/res/layout/native_small_ad_view.xml b/feature/ads/src/playstore/res/layout/native_small_ad_view.xml
index e626b63f7..7b7fefc67 100644
--- a/feature/ads/src/playstore/res/layout/native_small_ad_view.xml
+++ b/feature/ads/src/playstore/res/layout/native_small_ad_view.xml
@@ -13,21 +13,25 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <!--        <TextView-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="Ad"-->
-        <!--            android:textSize="15sp" />-->
-
+        <TextView
+            android:id="@+id/adTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ads_by_admob"
+            android:textSize="12sp"
+            android:layout_marginHorizontal="2dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/nativeAdSmallImage"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:contentDescription="@null"
+            android:layout_marginTop="2dp"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/adTextView"
             tools:background="#0000ff" />
 
         <TextView
@@ -37,9 +41,10 @@
             android:layout_marginHorizontal="@dimen/ad_banner_horizontal_margin"
             android:textSize="15sp"
             android:textStyle="bold"
+            android:layout_marginTop="2dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/nativeAdSmallImage"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/adTextView"
             tools:text="Ad Title" />
 
         <TextView
diff --git a/feature/ads/src/playstore/res/values/strings.xml b/feature/ads/src/playstore/res/values/strings.xml
index 959972f2b..0ebb87423 100644
--- a/feature/ads/src/playstore/res/values/strings.xml
+++ b/feature/ads/src/playstore/res/values/strings.xml
@@ -4,4 +4,4 @@
         <item>C9C5D8A36DEA8198DBA016A7DB56B989</item>
         <item>CB6E1AB0A31C323FB3334D10A1F74492</item>
     </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/ad/AdMobBanner.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/ad/AdMobBanner.kt
index 8549d6a4e..94d1ef0a4 100644
--- a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/ad/AdMobBanner.kt
+++ b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/ad/AdMobBanner.kt
@@ -11,7 +11,7 @@ import com.shifthackz.aisdv1.domain.feature.ad.AdFeature
 fun AdMobBanner(
     modifier: Modifier = Modifier,
     adFeature: AdFeature,
-    adFactory: (Context) -> AdFeature.Ad
+    adFactory: (Context) -> AdFeature.Ad,
 ) {
     val ad = adFactory(LocalContext.current)
     if (ad.isEmpty) return