Refactor and update dependencies

This commit includes several changes:

- Updates Hilt and Mockito Core dependencies.
- Refactors `FaqItem` in `HelpActivity.java` to a record.
- Simplifies response body handling in `RetrofitActivity.java`.
- Removes unused fields in test classes.
- Adds null checks for method invocations in test classes.
- Adds `tools:ignore="VectorRaster"` to `bg_contact_support_icon.xml`.
- Adds `tools:targetApi="26"` for `android:tooltipText` in `item_android_studio_lesson.xml`.

Author: MihaiCristianCondrea

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java

@@ -15,8 +15,6 @@
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.gson.annotations.SerializedName;
 
-import java.util.Map;
-
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -79,19 +77,12 @@ protected void onDestroy() {
     }
 
     private void displayTodoTitle(@NonNull Response<Todo> response) {
-        Object body = response.body();
-        if (body instanceof Todo) {
-            Todo todo = (Todo) body;
+        Todo todo = response.body();
+        if (todo != null) {
             if (todo.title != null && !todo.title.isEmpty()) {
                 binding.textViewResult.setText(todo.title);
                 return;
             }
-        } else if (body instanceof Map<?, ?> map) {
-            Object title = map.get("title");
-            if (title != null) {
-                binding.textViewResult.setText(String.valueOf(title));
-                return;
-            }
         }
         showGeneralErrorMessage();
     }

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java

@@ -10,6 +10,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
@@ -29,12 +30,12 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.play.core.review.ReviewInfo;
 
-import dagger.hilt.android.AndroidEntryPoint;
-import me.zhanghai.android.fastscroll.FastScrollerBuilder;
-
 import java.util.Arrays;
 import java.util.List;
 
+import dagger.hilt.android.AndroidEntryPoint;
+import me.zhanghai.android.fastscroll.FastScrollerBuilder;
+
 @AndroidEntryPoint
 public class HelpActivity extends BaseActivity {
 
@@ -235,16 +236,7 @@ private void toggleFaqItem(ItemHelpFaqBinding binding) {
         ViewCompat.setStateDescription(binding.questionContainer, stateDescription);
     }
 
-    private static final class FaqItem {
-        @StringRes
-        private final int questionResId;
-        @StringRes
-        private final int answerResId;
-
-        private FaqItem(@StringRes int questionResId, @StringRes int answerResId) {
-            this.questionResId = questionResId;
-            this.answerResId = answerResId;
-        }
+    private record FaqItem(@StringRes int questionResId, @StringRes int answerResId) {
     }
 
     @Override

app/src/main/res/drawable/bg_contact_support_icon.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="289dp"
     android:height="289dp"
     android:viewportWidth="289"
-    android:viewportHeight="289">
+    android:viewportHeight="289"
+    tools:ignore="VectorRaster">
 
     <path
         android:fillColor="?attr/colorSecondaryContainer"

app/src/main/res/layout/item_android_studio_lesson.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView 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"
     android:id="@+id/lesson_card"
     style="@style/Widget.Material3.CardView.Outlined"
     android:layout_width="match_parent"
@@ -54,6 +55,7 @@
             android:contentDescription="@string/lesson_open_in_browser"
             android:tooltipText="@string/lesson_open_in_browser"
             android:visibility="gone"
-            app:icon="@drawable/ic_open_in_new" />
+            app:icon="@drawable/ic_open_in_new"
+            tools:targetApi="26" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 </com.google.android.material.card.MaterialCardView>

app/src/test/java/com/d4rk/androidtutorials/java/ads/managers/AppOpenAdManagerTest.java

@@ -31,17 +31,16 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Unit tests for {@link AppOpenAd.AppOpenAdManager}.
+ * Unit tests for AppOpenAd.AppOpenAdManager.
  */
 public class AppOpenAdManagerTest {
 
     private Class<?> managerClass;
     private Object manager;
-    private Application application;
 
     @Before
     public void setUp() throws Exception {
-        application = mock(Application.class);
+        Application application = mock(Application.class);
         when(application.getApplicationContext()).thenReturn(application);
 
         managerClass = findManagerClass();
@@ -143,7 +142,11 @@ private Class<?> findManagerClass() {
     private boolean invokeIsAdAvailable() throws Exception {
         Method method = managerClass.getDeclaredMethod("isAdAvailable");
         method.setAccessible(true);
-        return (boolean) method.invoke(manager);
+        Object result = method.invoke(manager);
+        if (result instanceof Boolean) {
+            return (boolean) result;
+        }
+        throw new IllegalStateException("isAdAvailable method did not return a boolean value.");
     }
 
     private void invokeShowAdIfAvailable(Activity activity, OnShowAdCompleteListener listener)

app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepositoryTest.java

@@ -36,7 +36,6 @@ public class DefaultMainRepositoryTest {
 
     private Context context;
     private FakeSharedPreferences defaultPrefs;
-    private FakeSharedPreferences startupPrefs;
     private AppUpdateManager updateManager;
     private MockedStatic<PreferenceManager> prefManager;
     private MockedStatic<AppUpdateManagerFactory> updateManagerFactory;
@@ -46,7 +45,7 @@ public class DefaultMainRepositoryTest {
     public void setUp() {
         context = mock(Context.class);
         defaultPrefs = new FakeSharedPreferences();
-        startupPrefs = new FakeSharedPreferences();
+        FakeSharedPreferences startupPrefs = new FakeSharedPreferences();
         updateManager = mock(AppUpdateManager.class);
 
         prefManager = mockStatic(PreferenceManager.class);

app/src/test/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModelTest.java

@@ -34,10 +34,8 @@ public class MainViewModelTest {
     private ApplyThemeSettingsUseCase applyThemeSettingsUseCase;
     private GetBottomNavLabelVisibilityUseCase getBottomNavLabelVisibilityUseCase;
     private GetDefaultTabPreferenceUseCase getDefaultTabPreferenceUseCase;
-    private ApplyLanguageSettingsUseCase applyLanguageSettingsUseCase;
     private ShouldShowStartupScreenUseCase shouldShowStartupScreenUseCase;
     private MarkStartupScreenShownUseCase markStartupScreenShownUseCase;
-    private GetAppUpdateManagerUseCase getAppUpdateManagerUseCase;
     private MainViewModel viewModel;
 
     private final String[] themeValues = {"MODE_NIGHT_FOLLOW_SYSTEM", "MODE_NIGHT_NO", "MODE_NIGHT_YES"};
@@ -49,10 +47,10 @@ public void setUp() {
         applyThemeSettingsUseCase = Mockito.mock(ApplyThemeSettingsUseCase.class);
         getBottomNavLabelVisibilityUseCase = Mockito.mock(GetBottomNavLabelVisibilityUseCase.class);
         getDefaultTabPreferenceUseCase = Mockito.mock(GetDefaultTabPreferenceUseCase.class);
-        applyLanguageSettingsUseCase = Mockito.mock(ApplyLanguageSettingsUseCase.class);
+        ApplyLanguageSettingsUseCase applyLanguageSettingsUseCase = Mockito.mock(ApplyLanguageSettingsUseCase.class);
         shouldShowStartupScreenUseCase = Mockito.mock(ShouldShowStartupScreenUseCase.class);
         markStartupScreenShownUseCase = Mockito.mock(MarkStartupScreenShownUseCase.class);
-        getAppUpdateManagerUseCase = Mockito.mock(GetAppUpdateManagerUseCase.class);
+        GetAppUpdateManagerUseCase getAppUpdateManagerUseCase = Mockito.mock(GetAppUpdateManagerUseCase.class);
 
         viewModel = new MainViewModel(
                 applyThemeSettingsUseCase,
@@ -144,7 +142,11 @@ private int callVisibilityMode(String value) throws Exception {
         Method method = MainViewModel.class.getDeclaredMethod(
                 "getVisibilityMode", String.class, String[].class);
         method.setAccessible(true);
-        return (Integer) method.invoke(null, value, bottomNavBarLabelsValues);
+        Object result = method.invoke(null, value, bottomNavBarLabelsValues);
+        if (result == null) {
+            throw new NullPointerException("Method invocation returned null");
+        }
+        return (Integer) result;
     }
 
     @Test

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ library = "1.3.0"
 libraryVersion = "1.4.0"
 lifecycle = "2.9.4"
 lottie = "6.6.9"
-mockitoCore = "5.19.0"
+mockitoCore = "5.20.0"
 mockitoInline = "5.2.0"
 navigationUi = "2.9.5"
 preference = "1.2.1"
@@ -29,7 +29,7 @@ multidex = "2.0.1"
 playServicesAds = "24.6.0"
 playServicesOssLicenses = "17.3.0"
 codeview = "1.3.9"
-hilt = "2.57.1"
+hilt = "2.57.2"
 room = "2.8.1"
 glide = "5.0.5"
 retrofit = "3.0.0"