Refactor activities into fragments and add navigation

app/src/main/AndroidManifest.xml

@@ -257,15 +257,6 @@
             android:exported="false"
             android:label="@string/grid_view"
             android:parentActivityName=".ui.screens.android.lessons.views.grid.GirdViewActivity" />
-        <activity
-            android:name=".ui.screens.settings.SettingsActivity"
-            android:exported="false"
-            android:label="@string/settings"
-            android:parentActivityName=".ui.screens.settings.SettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".ui.screens.help.HelpActivity"
             android:exported="false"
@@ -276,11 +267,6 @@
             android:exported="false"
             android:label="@string/switches"
             android:parentActivityName=".ui.screens.android.lessons.buttons.switches.SwitchActivity" />
-        <activity
-            android:name=".ui.screens.support.SupportActivity"
-            android:exported="false"
-            android:label="@string/support_us"
-            android:parentActivityName=".ui.screens.support.SupportActivity" />
         <activity
             android:name=".ui.screens.android.lessons.buttons.buttons.ButtonsActivity"
             android:exported="false"
@@ -322,11 +308,6 @@
             android:exported="false"
             android:label="@string/navigation_drawer"
             android:parentActivityName=".ui.screens.android.lessons.navigation.drawer.NavigationDrawerActivity" />
-        <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"

app/src/main/java/com/d4rk/androidtutorials/java/notifications/workers/QuizReminderWorker.java

@@ -4,17 +4,17 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
+import androidx.navigation.NavDeepLinkBuilder;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
 import com.d4rk.androidtutorials.java.R;
-import com.d4rk.androidtutorials.java.ui.screens.quiz.QuizActivity;
+import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
 
 /**
  * Worker that displays the daily quiz reminder notification.
@@ -39,9 +39,11 @@ public Result doWork() {
         );
         manager.createNotificationChannel(channel);
 
-        Intent intent = new Intent(getApplicationContext(), QuizActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(
-                getApplicationContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE);
+        PendingIntent pendingIntent = new NavDeepLinkBuilder(getApplicationContext())
+                .setComponentName(MainActivity.class)
+                .setGraph(R.navigation.mobile_navigation)
+                .setDestination(R.id.navigation_quiz)
+                .createPendingIntent();
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), channelId)
                 .setSmallIcon(R.drawable.ic_check_circle)

app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BottomSheetMenuFragment.java

@@ -12,7 +12,7 @@
 import com.d4rk.androidtutorials.java.BuildConfig;
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.BottomSheetMenuBinding;
-import com.d4rk.androidtutorials.java.ui.screens.settings.SettingsActivity;
+import androidx.navigation.fragment.NavHostFragment;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 public class BottomSheetMenuFragment extends BottomSheetDialogFragment {
@@ -26,8 +26,12 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         binding = BottomSheetMenuBinding.inflate(inflater, container, false);
 
         binding.menuSettings.setOnClickListener(v -> {
-            Intent intent = new Intent(requireContext(), SettingsActivity.class);
-            startActivity(intent);
+            NavHostFragment navHostFragment = (NavHostFragment) requireActivity()
+                    .getSupportFragmentManager()
+                    .findFragmentById(R.id.nav_host_fragment_activity_main);
+            if (navHostFragment != null) {
+                navHostFragment.getNavController().navigate(R.id.navigation_settings);
+            }
             dismiss();
         });
 

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java

@@ -35,7 +35,6 @@
 import com.d4rk.androidtutorials.java.ui.components.navigation.BottomSheetMenuFragment;
 import com.d4rk.androidtutorials.java.ui.screens.startup.StartupActivity;
 import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
-import com.d4rk.androidtutorials.java.ui.screens.support.SupportActivity;
 import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
@@ -254,7 +253,9 @@ public boolean onCreateOptionsMenu(android.view.Menu menu) {
     @Override
     public boolean onOptionsItemSelected(android.view.MenuItem item) {
         if (item.getItemId() == R.id.support) {
-            startActivity(new Intent(this, SupportActivity.class));
+            if (navController != null) {
+                navController.navigate(R.id.navigation_support);
+            }
             return true;
         }
         return super.onOptionsItemSelected(item);

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizActivity.java → app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizFragment.java

@@ -1,60 +1,54 @@
 package com.d4rk.androidtutorials.java.ui.screens.quiz;
 
 import android.os.Bundle;
-import android.view.MenuItem;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.fragment.NavHostFragment;
 
+import com.airbnb.lottie.LottieAnimationView;
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.data.model.QuizQuestion;
-import com.d4rk.androidtutorials.java.databinding.ActivityQuizBinding;
+import com.d4rk.androidtutorials.java.databinding.FragmentQuizBinding;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-import com.airbnb.lottie.LottieAnimationView;
 
-/**
- * Activity that displays a simple multiple-choice quiz.
- */
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
-public class QuizActivity extends AppCompatActivity {
+public class QuizFragment extends Fragment {
 
-    private ActivityQuizBinding binding;
+    private FragmentQuizBinding binding;
     private QuizViewModel viewModel;
 
+    @Nullable
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = ActivityQuizBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        binding = FragmentQuizBinding.inflate(inflater, container, false);
 
-        EdgeToEdgeDelegate edgeToEdgeDelegate = new EdgeToEdgeDelegate(this);
+        EdgeToEdgeDelegate edgeToEdgeDelegate = new EdgeToEdgeDelegate(requireActivity());
         edgeToEdgeDelegate.applyEdgeToEdge(binding.container);
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
         viewModel = new ViewModelProvider(this).get(QuizViewModel.class);
         if (viewModel.getTotalQuestions() == 0) {
-            new MaterialAlertDialogBuilder(this)
+            new MaterialAlertDialogBuilder(requireContext())
                     .setMessage(R.string.quiz_no_more_questions)
-                    .setPositiveButton(android.R.string.ok, (d, w) -> finish())
+                    .setPositiveButton(android.R.string.ok, (d, w) -> NavHostFragment.findNavController(this).popBackStack())
                     .setCancelable(false)
                     .show();
-            return;
+        } else {
+            showQuestion(viewModel.getCurrentQuestion());
+            binding.buttonNext.setOnClickListener(v -> onNextClicked());
         }
-        showQuestion(viewModel.getCurrentQuestion());
 
-        binding.buttonNext.setOnClickListener(v -> onNextClicked());
+        return binding.getRoot();
     }
 
     private void onNextClicked() {
@@ -94,24 +88,21 @@ private void showQuestion(QuizQuestion question) {
     private void showResult() {
         int score = viewModel.getScore().getValue();
         int total = viewModel.getTotalQuestions();
-        View view = LayoutInflater.from(this).inflate(R.layout.dialog_quiz_result, null, false);
+        View view = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_quiz_result, null, false);
         TextView textResult = view.findViewById(R.id.text_result);
         textResult.setText(getString(R.string.quiz_finished, score, total));
         LottieAnimationView animationView = view.findViewById(R.id.animation_success);
         animationView.playAnimation();
-        new MaterialAlertDialogBuilder(this)
+        new MaterialAlertDialogBuilder(requireContext())
                 .setView(view)
-                .setPositiveButton(android.R.string.ok, (d, w) -> finish())
+                .setPositiveButton(android.R.string.ok, (d, w) -> NavHostFragment.findNavController(this).popBackStack())
                 .setCancelable(false)
                 .show();
     }
 
     @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
     }
 }