Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bf687ad

Browse files
Merge pull request #153 from MihaiCristianCondrea/codex/fix-fixme-comments-and-remove-quiz-references-0nksme
Remove quiz feature and resolve FIXMEs
2 parents a7dd831 + 77cad2e commit bf687ad

File tree

56 files changed

+86
-6471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+86
-6471
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,6 @@
356356
android:exported="false"
357357
android:label="@string/support_us"
358358
android:parentActivityName=".ui.screens.support.SupportActivity" />
359-
<activity
360-
android:name=".ui.screens.quiz.QuizActivity"
361-
android:exported="false"
362-
android:label="@string/quiz_title"
363-
android:parentActivityName=".ui.screens.quiz.QuizActivity" />
364-
365-
<receiver
366-
android:name=".notifications.receivers.QuizReminderReceiver"
367-
android:exported="false" />
368-
369359
<service
370360
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
371361
android:enabled="false"

‎app/src/main/assets/quiz_questions.json‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/NativeAdLoader.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,25 @@ public class NativeAdLoader {
2929
private static final String TAG = "NativeAdLoader";
3030

3131
public static void load(@NonNull Context context, @NonNull ViewGroup container) {
32-
load(context, container, R.layout.ad_home_banner_large, null);
32+
load(context, container, R.layout.ad_home_banner_large, newAdRequest.Builder().build(), null);
3333
}
3434

3535
public static void load(@NonNull Context context, @NonNull ViewGroup container, @LayoutRes int layoutRes) {
36-
load(context, container, layoutRes, null);
36+
load(context, container, layoutRes, newAdRequest.Builder().build(), null);
3737
}
3838

3939
public static void load(@NonNull Context context,
4040
@NonNull ViewGroup container,
4141
@LayoutRes int layoutRes,
4242
@androidx.annotation.Nullable AdListener listener) {
43+
load(context, container, layoutRes, new AdRequest.Builder().build(), listener);
44+
}
45+
46+
public static void load(@NonNull Context context,
47+
@NonNull ViewGroup container,
48+
@LayoutRes int layoutRes,
49+
@NonNull AdRequest adRequest,
50+
@androidx.annotation.Nullable AdListener listener) {
4351
AdLoader.Builder builder = new AdLoader.Builder(context, context.getString(R.string.native_ad_banner_unit_id))
4452
.forNativeAd(nativeAd -> {
4553
LayoutInflater inflater = LayoutInflater.from(context);
@@ -66,7 +74,7 @@ public void onAdFailedToLoad(@NonNull LoadAdError loadAdError) {
6674
});
6775

6876
AdLoader adLoader = builder.build();
69-
adLoader.loadAd(newAdRequest.Builder().build());
77+
adLoader.loadAd(adRequest);
7078
}
7179

7280
private static void populateNativeAdView(@NonNull NativeAd nativeAd, @NonNull NativeAdView adView) {

‎app/src/main/java/com/d4rk/androidtutorials/java/ads/views/NativeAdBannerView.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

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

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

48-
public void loadAd(AdRequestadRequest) {
49-
loadAd(adRequest, null);
48+
public void loadAd() {
49+
loadAd(newAdRequest.Builder().build(), null);
5050
}
5151

52-
public void loadAd(AdRequest adRequest, @Nullable AdListener listener) { // FIXME: Parameter 'adRequest' is never used
53-
NativeAdLoader.load(getContext(), this, layoutRes, listener);
52+
public void loadAd(@Nullable AdListener listener) {
53+
loadAd(new AdRequest.Builder().build(), listener);
54+
}
55+
56+
public void loadAd(@NonNull AdRequest request) {
57+
loadAd(request, null);
58+
}
59+
60+
public void loadAd(@NonNull AdRequest request, @Nullable AdListener listener) {
61+
NativeAdLoader.load(getContext(), this, layoutRes, request, listener);
5462
}
5563

5664
public void setNativeAdLayout(@LayoutRes int layoutRes) {

‎app/src/main/java/com/d4rk/androidtutorials/java/data/model/QuizQuestion.java‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultQuizRepository.java‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/data/repository/QuizRepository.java‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultQuizLocalDataSource.java‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/data/source/QuizLocalDataSource.java‎

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

‎app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@
77
import com.android.volley.toolbox.Volley;
88
import com.d4rk.androidtutorials.java.data.repository.DefaultHomeRepository;
99
import com.d4rk.androidtutorials.java.data.repository.DefaultMainRepository;
10-
import com.d4rk.androidtutorials.java.data.repository.DefaultQuizRepository;
1110
import com.d4rk.androidtutorials.java.data.repository.DefaultSupportRepository;
1211
import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
1312
import com.d4rk.androidtutorials.java.data.repository.MainRepository;
14-
import com.d4rk.androidtutorials.java.data.repository.QuizRepository;
1513
import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
1614
import com.d4rk.androidtutorials.java.data.source.DefaultHomeLocalDataSource;
1715
import com.d4rk.androidtutorials.java.data.source.DefaultHomeRemoteDataSource;
18-
import com.d4rk.androidtutorials.java.data.source.DefaultQuizLocalDataSource;
1916
import com.d4rk.androidtutorials.java.data.source.HomeLocalDataSource;
2017
import com.d4rk.androidtutorials.java.data.source.HomeRemoteDataSource;
21-
import com.d4rk.androidtutorials.java.data.source.QuizLocalDataSource;
2218
import com.d4rk.androidtutorials.java.domain.about.GetCurrentYearUseCase;
2319
import com.d4rk.androidtutorials.java.domain.about.GetVersionStringUseCase;
2420
import com.d4rk.androidtutorials.java.domain.help.LaunchReviewFlowUseCase;
@@ -34,7 +30,6 @@
3430
import com.d4rk.androidtutorials.java.domain.main.GetDefaultTabPreferenceUseCase;
3531
import com.d4rk.androidtutorials.java.domain.main.MarkStartupScreenShownUseCase;
3632
import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
37-
import com.d4rk.androidtutorials.java.domain.quiz.LoadQuizQuestionsUseCase;
3833
import com.d4rk.androidtutorials.java.domain.settings.ApplyConsentUseCase;
3934
import com.d4rk.androidtutorials.java.domain.settings.GetDarkModeUseCase;
4035
import com.d4rk.androidtutorials.java.domain.settings.OnPreferenceChangedUseCase;
@@ -211,24 +206,6 @@ public SetConsentAcceptedUseCase provideSetConsentAcceptedUseCase(SettingsReposi
211206
return new SetConsentAcceptedUseCase(repository);
212207
}
213208

214-
@Provides
215-
@Singleton
216-
public QuizLocalDataSource provideQuizLocalDataSource(Application application, ExecutorService executorService) {
217-
AssetManager manager = application.getAssets();
218-
return new DefaultQuizLocalDataSource(manager, executorService);
219-
}
220-
221-
@Provides
222-
@Singleton
223-
public QuizRepository provideQuizRepository(QuizLocalDataSource local) {
224-
return new DefaultQuizRepository(local);
225-
}
226-
227-
@Provides
228-
public LoadQuizQuestionsUseCase provideLoadQuizQuestionsUseCase(QuizRepository repository) {
229-
return new LoadQuizQuestionsUseCase(repository);
230-
}
231-
232209
@Provides
233210
@Singleton
234211
public StartupRepository provideStartupRepository(Application application) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /