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
10 changes: 0 additions & 10 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -356,16 +356,6 @@
android:exported="false"
android:label="@string/support_us"
android:parentActivityName=".ui.screens.support.SupportActivity" />
<activity
android:name=".ui.screens.quiz.QuizActivity"
android:exported="false"
android:label="@string/quiz_title"
android:parentActivityName=".ui.screens.quiz.QuizActivity" />

<receiver
android:name=".notifications.receivers.QuizReminderReceiver"
android:exported="false" />

<service
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
android:enabled="false"
Expand Down
62 changes: 0 additions & 62 deletions app/src/main/assets/quiz_questions.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,25 @@ public class NativeAdLoader {
private static final String TAG = "NativeAdLoader";

public static void load(@NonNull Context context, @NonNull ViewGroup container) {
load(context, container, R.layout.ad_home_banner_large, null);
load(context, container, R.layout.ad_home_banner_large, new AdRequest.Builder().build(), null);
}

public static void load(@NonNull Context context, @NonNull ViewGroup container, @LayoutRes int layoutRes) {
load(context, container, layoutRes, null);
load(context, container, layoutRes, new AdRequest.Builder().build(), null);
}

public static void load(@NonNull Context context,
@NonNull ViewGroup container,
@LayoutRes int layoutRes,
@androidx.annotation.Nullable AdListener listener) {
load(context, container, layoutRes, new AdRequest.Builder().build(), listener);
}

public static void load(@NonNull Context context,
@NonNull ViewGroup container,
@LayoutRes int layoutRes,
@NonNull AdRequest adRequest,
@androidx.annotation.Nullable AdListener listener) {
AdLoader.Builder builder = new AdLoader.Builder(context, context.getString(R.string.native_ad_banner_unit_id))
.forNativeAd(nativeAd -> {
LayoutInflater inflater = LayoutInflater.from(context);
Expand All @@ -66,7 +74,7 @@ public void onAdFailedToLoad(@NonNull LoadAdError loadAdError) {
});

AdLoader adLoader = builder.build();
adLoader.loadAd(new AdRequest.Builder().build());
adLoader.loadAd(adRequest);
}

private static void populateNativeAdView(@NonNull NativeAd nativeAd, @NonNull NativeAdView adView) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

/**
* Custom view that acts as a drop-in replacement for AdView and loads
* a native ad using {@link NativeAdLoader} when {@link #loadAd(AdRequest)} is called.
* a native ad using {@link NativeAdLoader} when {@link #loadAd()} is called.
*/
public class NativeAdBannerView extends FrameLayout {

Expand All @@ -39,18 +39,26 @@ public NativeAdBannerView(@NonNull Context context, @Nullable AttributeSet attrs

private void init(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
if (attrs != null) {
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NativeAdBannerView, defStyleAttr, 0); // FIXME: 'TypedArray' used without 'try'-with-resources statement
layoutRes = a.getResourceId(R.styleable.NativeAdBannerView_nativeAdLayout, R.layout.ad_home_banner_large);
a.recycle();
try (TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NativeAdBannerView, defStyleAttr, 0)) {
layoutRes = a.getResourceId(R.styleable.NativeAdBannerView_nativeAdLayout, R.layout.ad_home_banner_large);
}
}
}

public void loadAd(AdRequest adRequest) {
loadAd(adRequest, null);
public void loadAd() {
loadAd(new AdRequest.Builder().build(), null);
}

public void loadAd(AdRequest adRequest, @Nullable AdListener listener) { // FIXME: Parameter 'adRequest' is never used
NativeAdLoader.load(getContext(), this, layoutRes, listener);
public void loadAd(@Nullable AdListener listener) {
loadAd(new AdRequest.Builder().build(), listener);
}

public void loadAd(@NonNull AdRequest request) {
loadAd(request, null);
}

public void loadAd(@NonNull AdRequest request, @Nullable AdListener listener) {
NativeAdLoader.load(getContext(), this, layoutRes, request, listener);
}

public void setNativeAdLayout(@LayoutRes int layoutRes) {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@
import com.android.volley.toolbox.Volley;
import com.d4rk.androidtutorials.java.data.repository.DefaultHomeRepository;
import com.d4rk.androidtutorials.java.data.repository.DefaultMainRepository;
import com.d4rk.androidtutorials.java.data.repository.DefaultQuizRepository;
import com.d4rk.androidtutorials.java.data.repository.DefaultSupportRepository;
import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
import com.d4rk.androidtutorials.java.data.repository.MainRepository;
import com.d4rk.androidtutorials.java.data.repository.QuizRepository;
import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
import com.d4rk.androidtutorials.java.data.source.DefaultHomeLocalDataSource;
import com.d4rk.androidtutorials.java.data.source.DefaultHomeRemoteDataSource;
import com.d4rk.androidtutorials.java.data.source.DefaultQuizLocalDataSource;
import com.d4rk.androidtutorials.java.data.source.HomeLocalDataSource;
import com.d4rk.androidtutorials.java.data.source.HomeRemoteDataSource;
import com.d4rk.androidtutorials.java.data.source.QuizLocalDataSource;
import com.d4rk.androidtutorials.java.domain.about.GetCurrentYearUseCase;
import com.d4rk.androidtutorials.java.domain.about.GetVersionStringUseCase;
import com.d4rk.androidtutorials.java.domain.help.LaunchReviewFlowUseCase;
Expand All @@ -34,7 +30,6 @@
import com.d4rk.androidtutorials.java.domain.main.GetDefaultTabPreferenceUseCase;
import com.d4rk.androidtutorials.java.domain.main.MarkStartupScreenShownUseCase;
import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
import com.d4rk.androidtutorials.java.domain.quiz.LoadQuizQuestionsUseCase;
import com.d4rk.androidtutorials.java.domain.settings.ApplyConsentUseCase;
import com.d4rk.androidtutorials.java.domain.settings.GetDarkModeUseCase;
import com.d4rk.androidtutorials.java.domain.settings.OnPreferenceChangedUseCase;
Expand Down Expand Up @@ -211,24 +206,6 @@ public SetConsentAcceptedUseCase provideSetConsentAcceptedUseCase(SettingsReposi
return new SetConsentAcceptedUseCase(repository);
}

@Provides
@Singleton
public QuizLocalDataSource provideQuizLocalDataSource(Application application, ExecutorService executorService) {
AssetManager manager = application.getAssets();
return new DefaultQuizLocalDataSource(manager, executorService);
}

@Provides
@Singleton
public QuizRepository provideQuizRepository(QuizLocalDataSource local) {
return new DefaultQuizRepository(local);
}

@Provides
public LoadQuizQuestionsUseCase provideLoadQuizQuestionsUseCase(QuizRepository repository) {
return new LoadQuizQuestionsUseCase(repository);
}

@Provides
@Singleton
public StartupRepository provideStartupRepository(Application application) {
Expand Down

This file was deleted.

Loading
Loading