Merge pull request #143 from MihaiCristianCondrea/codex/create-two-native-ad-designs-for-lesson

MihaiCristianCondrea · web-flow · commit 00200833fd83 · 2025-09-11T09:59:22.000+03:00
Add custom native ads for start project lesson
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java
@@ -24,7 +24,6 @@
 public class HomeViewModel extends ViewModel {
 
     private final GetDailyTipUseCase getDailyTipUseCase;
-    private final GetPromotedAppsUseCase getPromotedAppsUseCase;
     private final GetPlayStoreUrlUseCase getPlayStoreUrlUseCase;
     private final GetAppPlayStoreUrlUseCase getAppPlayStoreUrlUseCase;
 
@@ -37,7 +36,6 @@ public HomeViewModel(GetDailyTipUseCase getDailyTipUseCase,
                          GetPlayStoreUrlUseCase getPlayStoreUrlUseCase,
                          GetAppPlayStoreUrlUseCase getAppPlayStoreUrlUseCase) {
         this.getDailyTipUseCase = getDailyTipUseCase;
-        this.getPromotedAppsUseCase = getPromotedAppsUseCase;
         this.getPlayStoreUrlUseCase = getPlayStoreUrlUseCase;
         this.getAppPlayStoreUrlUseCase = getAppPlayStoreUrlUseCase;
 
diff --git a/app/src/main/res/layout/activity_android_start_project.xml b/app/src/main/res/layout/activity_android_start_project.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:id="@+id/constraint_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -69,12 +70,14 @@
                     android:contentDescription="@string/im_step1_desc" />
             </com.google.android.material.card.MaterialCardView>
 
-            <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+            <com.google.android.gms.ads.AdView
                 android:id="@+id/ad_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                app:layout_constraintTop_toBottomOf="@id/card_view_first_step" />
+                app:layout_constraintTop_toBottomOf="@id/card_view_first_step"
+                ads:adSize="MEDIUM_RECTANGLE"
+                ads:adUnitId="@string/ad_banner_unit_id" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_second_step"
@@ -166,12 +169,14 @@
                 app:lottie_rawRes="@raw/anim_programmer"
                 app:lottie_speed="0.5" />
 
-            <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+            <com.google.android.gms.ads.AdView
                 android:id="@+id/ad_view_bottom"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
-                app:layout_constraintTop_toBottomOf="@id/lottie_animation" />
+                app:layout_constraintTop_toBottomOf="@id/lottie_animation"
+                ads:adSize="LARGE_BANNER"
+                ads:adUnitId="@string/ad_banner_unit_id" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts.xml b/app/src/main/res/layout/activity_shortcuts.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -28,10 +29,12 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:targetApi="26" />
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_build.xml b/app/src/main/res/layout/activity_shortcuts_build.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -114,12 +115,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_code.xml b/app/src/main/res/layout/activity_shortcuts_code.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -273,12 +274,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_debugging.xml b/app/src/main/res/layout/activity_shortcuts_debugging.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -273,12 +274,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_general.xml b/app/src/main/res/layout/activity_shortcuts_general.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -250,12 +251,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml b/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -595,12 +596,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_refractoring.xml b/app/src/main/res/layout/activity_shortcuts_refractoring.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -273,12 +274,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_version_control.xml b/app/src/main/res/layout/activity_shortcuts_version_control.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -135,12 +136,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+    <com.google.android.gms.ads.AdView
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id" />
 </androidx.constraintlayout.widget.ConstraintLayout>
