Fix issues and update logic

tananaev · Jun 19, 2024 · d6ebce5 · d6ebce5
1 parent 9c3672d
commit d6ebce5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     compileSdk 34
     defaultConfig {
         applicationId "com.tananaev.logcat"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 34
         versionCode 16
         versionName "2.2"

diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
 
@@ -12,6 +13,11 @@
             </intent-filter>
         </activity>
 
+        <property
+            android:name="android.adservices.AD_SERVICES_CONFIG"
+            android:resource="@xml/gma_ad_services_config"
+            tools:replace="android:resource" />
+
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="ca-app-pub-9061647223840223~6856100115"/>

diff --git a/app/src/google/java/com/tananaev/logcat/GoogleActivity.kt b/app/src/google/java/com/tananaev/logcat/GoogleActivity.kt
@@ -2,6 +2,7 @@ package com.tananaev.logcat
 
 import android.os.Bundle
 import android.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.AdView
 import com.google.android.gms.ads.MobileAds
@@ -18,7 +19,14 @@ class GoogleActivity : MainActivity() {
         MobileAds.initialize(this) {}
         setContentView(R.layout.activity_google)
         super.onCreate(savedInstanceState)
-        findViewById<AdView>(R.id.ad_view).loadAd(AdRequest.Builder().build())
+        adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+                if (adapter.itemCount > 0) {
+                    findViewById<AdView>(R.id.ad_view).loadAd(AdRequest.Builder().build())
+                    adapter.unregisterAdapterDataObserver(this)
+                }
+            }
+        })
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/com/tananaev/logcat/MainActivity.kt b/app/src/main/java/com/tananaev/logcat/MainActivity.kt
@@ -52,7 +52,7 @@ import java.security.spec.X509EncodedKeySpec
 abstract class MainActivity : AppCompatActivity() {
 
     private lateinit var recyclerView: RecyclerView
-    private lateinit var adapter: LineAdapter
+    protected lateinit var adapter: LineAdapter
     private lateinit var keyPair: KeyPair
     private var readerTask: ReaderTask? = null
     private var statusItem: MenuItem? = null