Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ For **iOS**, complete the steps in AdMob's instructions:

## Installation
* [![Stable Release](https://img.shields.io/github/v/release/LexiLabs-App/basic-ads?filter=!*.*.*-*&label=stable&color=65c663)](https://central.sonatype.com/artifact/app.lexilabs.basic/basic-ads)
[![Kotlin](https://img.shields.io/badge/Kotlin-2.1.21-7f52ff.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/Kotlin-2.3.0-7f52ff.svg?style=flat&logo=kotlin)](https://kotlinlang.org)

* [![Latest Release](https://img.shields.io/maven-central/v/app.lexilabs.basic/basic-ads?color=yellow&label=latest)](https://central.sonatype.com/artifact/app.lexilabs.basic/basic-ads)
[![Kotlin](https://img.shields.io/badge/Kotlin-2.3.0-7f52ff.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
Expand Down
1 change: 1 addition & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ Here's a list of the Basic-Ads dependency versions for each release after 0.2.0:
| 1.1.0-beta02 | 2.3.0 | 1.9.3 | 1.9.1 | 24.9.0 / 12.14.0 | 4.0.0 / 3.1.0 |
| 1.1.0-beta03 | 2.3.0 | 1.9.3 | 1.9.1 | 24.9.0 / 12.14.0 | 4.0.0 / 3.1.0 |
| 1.1.0 | 2.3.0 | 1.9.3 | 1.9.1 | 24.9.0 / 12.14.0 | 4.0.0 / 3.1.0 |
| 1.1.1 | 2.3.0 | 1.10.0 | 1.9.1 | 24.9.0 / 12.14.0 | 4.0.0 / 3.1.0 |
4 changes: 2 additions & 2 deletions basic-ads/api/basic-ads.api
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,9 @@ public abstract class app/lexilabs/basic/ads/nativead/NativeAdTemplate : app/lex
public final fun AdChoices (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Advertiser (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Attribution (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Body (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Body (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun CallToAction (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Headline (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Headline (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Icon (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
public final fun Media (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/ScaleType;Landroidx/compose/runtime/Composer;II)V
public final fun NativeAdButton-jB83MbM (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;JJLandroidx/compose/ui/graphics/Shape;Landroidx/compose/runtime/Composer;II)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public actual abstract class NativeAdTemplate public actual constructor(

@Composable
public actual fun SupervisorScope.Body(
body: String,
modifier: Modifier
) {
val nativeAdView = LocalNativeAdView.current ?: throw IllegalStateException("NativeAdView null")
Expand All @@ -119,7 +120,11 @@ public actual abstract class NativeAdTemplate public actual constructor(
AndroidView(
factory = {
nativeAdView.bodyView = localComposeView
localComposeView
localComposeView.apply {
setContent {
BasicText(body)
}
}
},
modifier = modifier,
)
Expand All @@ -143,6 +148,7 @@ public actual abstract class NativeAdTemplate public actual constructor(

@Composable
public actual fun SupervisorScope.Headline(
headline: String,
modifier: Modifier
) {
val nativeAdView = LocalNativeAdView.current ?: throw IllegalStateException("NativeAdView null")
Expand All @@ -151,7 +157,11 @@ public actual abstract class NativeAdTemplate public actual constructor(
AndroidView(
factory = {
nativeAdView.headlineView = localComposeView
localComposeView
localComposeView.apply {
setContent {
BasicText(headline)
}
}
},
modifier = modifier,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ public class NativeAdDefault public constructor(
Attribution(text = "ad")
Row { nativeAdData.icon?.let { Icon() } }
Column {
nativeAdData.headline?.let { Headline() }
nativeAdData.headline?.let { Headline(it) }
nativeAdData.starRating?.let { BasicText("Rated $it") }
}

nativeAdData.body?.let { Body() }
nativeAdData.body?.let { Body(it) }

Row(Modifier.align(Alignment.End).padding(5.dp)) {
nativeAdData.price?.let { BasicText(it) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public expect abstract class NativeAdTemplate public constructor(

@Composable
public fun SupervisorScope.Body(
body: String,
modifier: Modifier = Modifier
)

Expand All @@ -56,6 +57,7 @@ public expect abstract class NativeAdTemplate public constructor(

@Composable
public fun SupervisorScope.Headline(
headline: String,
modifier: Modifier = Modifier
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public actual abstract class NativeAdTemplate public actual constructor(
@OptIn(ExperimentalForeignApi::class)
@Composable
public actual fun SupervisorScope.Body(
body: String,
modifier: Modifier
) {
UIKitView(
Expand Down Expand Up @@ -160,6 +161,7 @@ public actual abstract class NativeAdTemplate public actual constructor(

@Composable
public actual fun SupervisorScope.Headline(
headline: String,
modifier: Modifier
) {
UIKitView(
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# BUILD INFO
ads = "1.1.0"
ads = "1.1.1"
build-sdk-compile = "36"
build-sdk-min = "24"
build-sdk-target = "36"
Expand All @@ -13,14 +13,14 @@ cocoapods-ump = "3.1.0"
# DEPENDENCIES
bcv = "0.18.1"
dokka = "2.1.0" #"2.0.0"
compose = "1.9.3"
compose = "1.10.0"
google-play-services-ads = "24.9.0"
android-core = "1.17.0"
annotations = "1.9.1"
kover = "0.9.4"
logging = "0.2.6"
android-ump = "4.0.0"
maven-publish = "0.35.0"
maven-publish = "0.36.0"
# REMEDIATION
remediate-okhttp = "5.3.2"
remediate-bitbucket = "0.9.6"
Expand Down
Loading