From 3315fce1323565bd15e22220981ea84dc4b37e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Bonaf=C3=A9?=
 <99195905+github-lucas-bon@users.noreply.github.com>
Date: Fri, 11 Oct 2024 15:37:22 +0200
Subject: [PATCH] Bump sdk to latest (#233)

---
 .../tv/teads/teadssdkdemo/MainFragment.kt     |  8 +--
 .../adapter/SmartNativeRecyclerViewAdapter.kt |  1 -
 .../app/src/main/res/layout/fragment_main.xml | 54 +++++++++++++------
 .../app/src/main/res/values/strings.xml       |  1 +
 TeadsSDKDemo/gradle.properties                |  4 +-
 TeadsSDKDemo/webviewhelper/proguard-rules.pro |  5 ++
 6 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/MainFragment.kt b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/MainFragment.kt
index e3887843..4f73f187 100644
--- a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/MainFragment.kt
+++ b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/MainFragment.kt
@@ -35,6 +35,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
 
     private lateinit var customPid: Button
     private lateinit var containerCreativeSizes: View
+    private lateinit var containerPlacementId: View
     private lateinit var radioGroupCreativeSizes: RadioGroup
     private lateinit var radioGroupProvider: RadioGroup
     private lateinit var integrationsRecyclerView: RecyclerView
@@ -72,6 +73,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
         val containerFormat: RadioGroup = binding.containerFormat
         radioGroupProvider = binding.containerProvider
         radioGroupCreativeSizes = binding.radiogroupCreativeSize
+        containerPlacementId = binding.containerPlacementId
         containerCreativeSizes = binding.containerCreativeSize
         integrationsRecyclerView = binding.integrationsRecyclerView
 
@@ -341,10 +343,10 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
     }
 
     private fun setDirectIntegrationConstraints() {
-        customPid.visibility = if (SessionDataSource.selectedProvider == ProviderType.DIRECT) {
+        containerPlacementId.visibility = if (SessionDataSource.selectedProvider == ProviderType.DIRECT) {
             View.VISIBLE
         } else {
-            View.INVISIBLE
+            View.GONE
         }
         when {
             SessionDataSource.selectedProvider != ProviderType.DIRECT && SessionDataSource.selectedFormat == FormatType.INFEED -> {
@@ -360,7 +362,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
         val limitedProviders = listOf(ProviderType.SMART, ProviderType.PREBID)
         if (limitedProviders.contains(SessionDataSource.selectedProvider)) {
             containerCreativeSizes.visibility = View.GONE
-        } else {
+        } else if (SessionDataSource.selectedFormat != FormatType.INFEED) {
             containerCreativeSizes.visibility = View.VISIBLE
         }
     }
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/mediation/adapter/SmartNativeRecyclerViewAdapter.kt b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/mediation/adapter/SmartNativeRecyclerViewAdapter.kt
index bae07736..ed0cd09a 100644
--- a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/mediation/adapter/SmartNativeRecyclerViewAdapter.kt
+++ b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/mediation/adapter/SmartNativeRecyclerViewAdapter.kt
@@ -17,7 +17,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import tv.teads.adapter.smart.nativead.TeadsSmartViewBinder
 import tv.teads.sdk.TeadsMediationSettings
-import tv.teads.sdk.renderer.AdScale
 import tv.teads.sdk.utils.userConsent.TCFVersion
 import tv.teads.teadssdkdemo.R
 import tv.teads.teadssdkdemo.component.GenericRecyclerViewAdapter
diff --git a/TeadsSDKDemo/app/src/main/res/layout/fragment_main.xml b/TeadsSDKDemo/app/src/main/res/layout/fragment_main.xml
index fac96754..7f581781 100644
--- a/TeadsSDKDemo/app/src/main/res/layout/fragment_main.xml
+++ b/TeadsSDKDemo/app/src/main/res/layout/fragment_main.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
     android:orientation="vertical">
 
     <LinearLayout
@@ -136,6 +137,42 @@
                 android:textColor="@color/textColorNoBg" />
         </RadioGroup>
 
+        <LinearLayout
+            android:id="@+id/container_placement_id"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/list_item_margin"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_pid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:text="@string/placement_id"
+                android:textColor="@color/titleTextColor"
+                android:textSize="24sp"
+                android:textStyle="bold" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/customButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/main_radio_button_height"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="4dp"
+                android:background="@drawable/custom_button_selector"
+                android:button="@android:color/transparent"
+                android:fontFamily="sans-serif"
+                android:gravity="center"
+                android:tag="0"
+                android:text="@string/custom"
+                android:textAllCaps="false"
+                android:textColor="@color/textColorNoBg"
+                android:textStyle="normal" />
+
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/container_creative_size"
             android:layout_width="match_parent"
@@ -215,23 +252,6 @@
 
         </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/customButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_radio_button_height"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="4dp"
-            android:background="@drawable/custom_button_selector"
-            android:button="@android:color/transparent"
-            android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:tag="0"
-            android:text="@string/custom"
-            android:textAllCaps="false"
-            android:textColor="@color/textColorNoBg"
-            android:textStyle="normal" />
-
         <TextView
             android:id="@+id/text_integration"
             android:layout_width="match_parent"
diff --git a/TeadsSDKDemo/app/src/main/res/values/strings.xml b/TeadsSDKDemo/app/src/main/res/values/strings.xml
index 4986f329..0299085a 100644
--- a/TeadsSDKDemo/app/src/main/res/values/strings.xml
+++ b/TeadsSDKDemo/app/src/main/res/values/strings.xml
@@ -81,6 +81,7 @@
     <string name="square">Square</string>
     <string name="vertical">Vertical</string>
     <string name="creative_sizes">Creative Sizes</string>
+    <string name="placement_id">Placemend ID</string>
     <string name="landscape">Landscape</string>
     <string name="custom">Change PID</string>
     <string name="smart">Smart</string>
diff --git a/TeadsSDKDemo/gradle.properties b/TeadsSDKDemo/gradle.properties
index bc165da9..52e5aabf 100644
--- a/TeadsSDKDemo/gradle.properties
+++ b/TeadsSDKDemo/gradle.properties
@@ -19,5 +19,5 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xms1024m -Xmx4096m
 
-VERSION_NAME=5.1.5
-VERSION_CODE=130
+VERSION_NAME=5.1.6
+VERSION_CODE=131
diff --git a/TeadsSDKDemo/webviewhelper/proguard-rules.pro b/TeadsSDKDemo/webviewhelper/proguard-rules.pro
index 185e76ab..c3487c22 100644
--- a/TeadsSDKDemo/webviewhelper/proguard-rules.pro
+++ b/TeadsSDKDemo/webviewhelper/proguard-rules.pro
@@ -23,3 +23,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keep class tv.teads.webviewhelper.SyncAdWebView$Listener { *; }
+-keep class tv.teads.webviewhelper.SyncAdWebView { *; }
+-keep class tv.teads.webviewhelper.baseView.ObservableWebView { *; }
+-dontwarn java.lang.invoke.StringConcatFactory