Skip to content

Commit 7385b03

Browse files
Nicholas Ventimigliacopybara-github
Nicholas Ventimiglia
authored and
copybara-github
committed
Moved Jetpack Compose utility module into the Sample project.
PiperOrigin-RevId: 875350776
1 parent 176d52e commit 7385b03

12 files changed

Lines changed: 17 additions & 46 deletions

File tree

‎kotlin/advanced/JetpackComposeDemo/app/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ dependencies {
5454
implementation("androidx.navigation:navigation-runtime-ktx:2.8.9")
5555
implementation("com.google.android.gms:play-services-ads:25.0.0")
5656
implementation("com.google.android.ump:user-messaging-platform:4.0.0")
57-
implementation(project(":compose-util"))
5857
implementation("androidx.navigation:navigation-compose:2.8.9")
5958
debugImplementation("androidx.compose.ui:ui-tooling")
6059
}

‎kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/AdManagerBannerScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import com.google.android.gms.ads.AdRequest
3636
import com.google.android.gms.ads.AdSize
3737
import com.google.android.gms.ads.LoadAdError
3838
import com.google.android.gms.ads.admanager.AdManagerAdView
39-
import com.google.android.gms.compose_util.AdManagerBannerAd
4039
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.ADMANAGER_ADAPTIVE_BANNER_AD_UNIT_ID
4140
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.TAG
41+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.AdManagerBannerAd
4242
import com.google.android.gms.example.jetpackcomposedemo.ui.theme.JetpackComposeDemoTheme
4343

4444
@Composable

‎kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/BannerScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import com.google.android.gms.ads.AdRequest
3636
import com.google.android.gms.ads.AdSize
3737
import com.google.android.gms.ads.AdView
3838
import com.google.android.gms.ads.LoadAdError
39-
import com.google.android.gms.compose_util.BannerAd
4039
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.BANNER_AD_UNIT_ID
4140
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.TAG
41+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.BannerAd
4242
import com.google.android.gms.example.jetpackcomposedemo.ui.theme.JetpackComposeDemoTheme
4343

4444
@Composable

‎kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/LazyBannerScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ import com.google.android.gms.ads.AdRequest
5151
import com.google.android.gms.ads.AdSize
5252
import com.google.android.gms.ads.AdView
5353
import com.google.android.gms.ads.LoadAdError
54-
import com.google.android.gms.compose_util.BannerAd
5554
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.BANNER_AD_UNIT_ID
5655
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.TAG
56+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.BannerAd
5757
import com.google.android.gms.example.jetpackcomposedemo.ui.theme.JetpackComposeDemoTheme
5858
import kotlin.coroutines.resume
5959
import kotlinx.coroutines.async

‎kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/NativeScreen.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ import com.google.android.gms.ads.AdLoader
4848
import com.google.android.gms.ads.AdRequest
4949
import com.google.android.gms.ads.LoadAdError
5050
import com.google.android.gms.ads.nativead.NativeAd
51-
import com.google.android.gms.compose_util.NativeAdAttribution
52-
import com.google.android.gms.compose_util.NativeAdBodyView
53-
import com.google.android.gms.compose_util.NativeAdButton
54-
import com.google.android.gms.compose_util.NativeAdCallToActionView
55-
import com.google.android.gms.compose_util.NativeAdHeadlineView
56-
import com.google.android.gms.compose_util.NativeAdIconView
57-
import com.google.android.gms.compose_util.NativeAdMediaView
58-
import com.google.android.gms.compose_util.NativeAdPriceView
59-
import com.google.android.gms.compose_util.NativeAdStarRatingView
60-
import com.google.android.gms.compose_util.NativeAdStoreView
61-
import com.google.android.gms.compose_util.NativeAdView
6251
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.NATIVE_AD_UNIT_ID
6352
import com.google.android.gms.example.jetpackcomposedemo.GoogleMobileAdsApplication.Companion.TAG
53+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdAttribution
54+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdBodyView
55+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdButton
56+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdCallToActionView
57+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdHeadlineView
58+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdIconView
59+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdMediaView
60+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdPriceView
61+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdStarRatingView
62+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdStoreView
63+
import com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils.NativeAdView
6464
import com.google.android.gms.example.jetpackcomposedemo.ui.theme.JetpackComposeDemoTheme
6565

6666
// [START ad_listener]

kotlin/advanced/JetpackComposeDemo/compose-util/src/main/java/com/google/android/gms/compose_util/AdManagerBannerAd.kt renamed to kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/compose_utils/AdManagerBannerAd.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.gms.compose_util
17+
package com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils
1818

1919
import androidx.compose.foundation.layout.Box
2020
import androidx.compose.foundation.layout.wrapContentSize

kotlin/advanced/JetpackComposeDemo/compose-util/src/main/java/com/google/android/gms/compose_util/BannerAd.kt renamed to kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/compose_utils/BannerAd.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.gms.compose_util
17+
package com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils
1818

1919
import androidx.compose.foundation.layout.Box
2020
import androidx.compose.foundation.layout.wrapContentSize

kotlin/advanced/JetpackComposeDemo/compose-util/src/main/java/com/google/android/gms/compose_util/NativeAdView.kt renamed to kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/compose_utils/NativeAdView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.gms.compose_util
17+
package com.google.android.gms.example.jetpackcomposedemo.formats.compose_utils
1818

1919
import android.view.ViewGroup
2020
import android.widget.ImageView

‎kotlin/advanced/JetpackComposeDemo/compose-util/consumer-rules.pro‎

Whitespace-only changes.

‎kotlin/advanced/JetpackComposeDemo/compose-util/proguard-rules.pro‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)