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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -37,7 +36,6 @@ public HomeViewModel(GetDailyTipUseCase getDailyTipUseCase,
GetPlayStoreUrlUseCase getPlayStoreUrlUseCase,
GetAppPlayStoreUrlUseCase getAppPlayStoreUrlUseCase) {
this.getDailyTipUseCase = getDailyTipUseCase;
this.getPromotedAppsUseCase = getPromotedAppsUseCase;
this.getPlayStoreUrlUseCase = getPlayStoreUrlUseCase;
this.getAppPlayStoreUrlUseCase = getAppPlayStoreUrlUseCase;

Expand Down
13 changes: 9 additions & 4 deletions app/src/main/res/layout/activity_android_start_project.xml
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts_build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts_code.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts_debugging.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts_general.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions app/src/main/res/layout/activity_shortcuts_refractoring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>