Skip to content

Commit 3315fce

Browse files
Bump sdk to latest (#233)
1 parent 82d556a commit 3315fce

File tree

6 files changed

+50
-23
lines changed

6 files changed

+50
-23
lines changed

TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/MainFragment.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
3535

3636
private lateinit var customPid: Button
3737
private lateinit var containerCreativeSizes: View
38+
private lateinit var containerPlacementId: View
3839
private lateinit var radioGroupCreativeSizes: RadioGroup
3940
private lateinit var radioGroupProvider: RadioGroup
4041
private lateinit var integrationsRecyclerView: RecyclerView
@@ -72,6 +73,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
7273
val containerFormat: RadioGroup = binding.containerFormat
7374
radioGroupProvider = binding.containerProvider
7475
radioGroupCreativeSizes = binding.radiogroupCreativeSize
76+
containerPlacementId = binding.containerPlacementId
7577
containerCreativeSizes = binding.containerCreativeSize
7678
integrationsRecyclerView = binding.integrationsRecyclerView
7779

@@ -341,10 +343,10 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
341343
}
342344

343345
private fun setDirectIntegrationConstraints() {
344-
customPid.visibility = if (SessionDataSource.selectedProvider == ProviderType.DIRECT) {
346+
containerPlacementId.visibility = if (SessionDataSource.selectedProvider == ProviderType.DIRECT) {
345347
View.VISIBLE
346348
} else {
347-
View.INVISIBLE
349+
View.GONE
348350
}
349351
when {
350352
SessionDataSource.selectedProvider != ProviderType.DIRECT && SessionDataSource.selectedFormat == FormatType.INFEED -> {
@@ -360,7 +362,7 @@ class MainFragment : BaseFragment(), RadioGroup.OnCheckedChangeListener {
360362
val limitedProviders = listOf(ProviderType.SMART, ProviderType.PREBID)
361363
if (limitedProviders.contains(SessionDataSource.selectedProvider)) {
362364
containerCreativeSizes.visibility = View.GONE
363-
} else {
365+
} else if (SessionDataSource.selectedFormat != FormatType.INFEED) {
364366
containerCreativeSizes.visibility = View.VISIBLE
365367
}
366368
}

TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/mediation/adapter/SmartNativeRecyclerViewAdapter.kt

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import kotlinx.coroutines.Dispatchers
1717
import kotlinx.coroutines.launch
1818
import tv.teads.adapter.smart.nativead.TeadsSmartViewBinder
1919
import tv.teads.sdk.TeadsMediationSettings
20-
import tv.teads.sdk.renderer.AdScale
2120
import tv.teads.sdk.utils.userConsent.TCFVersion
2221
import tv.teads.teadssdkdemo.R
2322
import tv.teads.teadssdkdemo.component.GenericRecyclerViewAdapter

TeadsSDKDemo/app/src/main/res/layout/fragment_main.xml

+37-17
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6+
android:animateLayoutChanges="true"
67
android:orientation="vertical">
78

89
<LinearLayout
@@ -136,6 +137,42 @@
136137
android:textColor="@color/textColorNoBg" />
137138
</RadioGroup>
138139

140+
<LinearLayout
141+
android:id="@+id/container_placement_id"
142+
android:layout_width="match_parent"
143+
android:layout_height="wrap_content"
144+
android:layout_marginTop="@dimen/list_item_margin"
145+
android:orientation="vertical">
146+
147+
<TextView
148+
android:id="@+id/text_pid"
149+
android:layout_width="match_parent"
150+
android:layout_height="wrap_content"
151+
android:layout_marginStart="4dp"
152+
android:text="@string/placement_id"
153+
android:textColor="@color/titleTextColor"
154+
android:textSize="24sp"
155+
android:textStyle="bold" />
156+
157+
<androidx.appcompat.widget.AppCompatButton
158+
android:id="@+id/customButton"
159+
android:layout_width="match_parent"
160+
android:layout_height="@dimen/main_radio_button_height"
161+
android:layout_marginStart="4dp"
162+
android:layout_marginTop="8dp"
163+
android:layout_marginEnd="4dp"
164+
android:background="@drawable/custom_button_selector"
165+
android:button="@android:color/transparent"
166+
android:fontFamily="sans-serif"
167+
android:gravity="center"
168+
android:tag="0"
169+
android:text="@string/custom"
170+
android:textAllCaps="false"
171+
android:textColor="@color/textColorNoBg"
172+
android:textStyle="normal" />
173+
174+
</LinearLayout>
175+
139176
<LinearLayout
140177
android:id="@+id/container_creative_size"
141178
android:layout_width="match_parent"
@@ -215,23 +252,6 @@
215252

216253
</LinearLayout>
217254

218-
<androidx.appcompat.widget.AppCompatButton
219-
android:id="@+id/customButton"
220-
android:layout_width="match_parent"
221-
android:layout_height="@dimen/main_radio_button_height"
222-
android:layout_marginStart="4dp"
223-
android:layout_marginTop="8dp"
224-
android:layout_marginEnd="4dp"
225-
android:background="@drawable/custom_button_selector"
226-
android:button="@android:color/transparent"
227-
android:fontFamily="sans-serif"
228-
android:gravity="center"
229-
android:tag="0"
230-
android:text="@string/custom"
231-
android:textAllCaps="false"
232-
android:textColor="@color/textColorNoBg"
233-
android:textStyle="normal" />
234-
235255
<TextView
236256
android:id="@+id/text_integration"
237257
android:layout_width="match_parent"

TeadsSDKDemo/app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<string name="square">Square</string>
8282
<string name="vertical">Vertical</string>
8383
<string name="creative_sizes">Creative Sizes</string>
84+
<string name="placement_id">Placemend ID</string>
8485
<string name="landscape">Landscape</string>
8586
<string name="custom">Change PID</string>
8687
<string name="smart">Smart</string>

TeadsSDKDemo/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
android.useAndroidX=true
2020
org.gradle.jvmargs=-Xms1024m -Xmx4096m
2121

22-
VERSION_NAME=5.1.5
23-
VERSION_CODE=130
22+
VERSION_NAME=5.1.6
23+
VERSION_CODE=131

TeadsSDKDemo/webviewhelper/proguard-rules.pro

+5
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@
2323
# If you keep the line number information, uncomment this to
2424
# hide the original source file name.
2525
#-renamesourcefileattribute SourceFile
26+
27+
-keep class tv.teads.webviewhelper.SyncAdWebView$Listener { *; }
28+
-keep class tv.teads.webviewhelper.SyncAdWebView { *; }
29+
-keep class tv.teads.webviewhelper.baseView.ObservableWebView { *; }
30+
-dontwarn java.lang.invoke.StringConcatFactory

0 commit comments

Comments
 (0)