Merge pull request #2 from devintaing/dev

Author: devintaing

.idea/deploymentTargetSelector.xml

@@ -1,8 +1,70 @@
-# PersonalityQuiz
-A Java-based Android app that asks users a series of questions to determine their personality. It enhances interactivity by incorporating mobile-specific features such as the camera, accelerometer, and more.
+# 💭 PersonalityQuiz
+A Java-based Android app that asks users a series of questions to determine their personality. It enhances interactivity by incorporating mobile-specific features such as the accelerometer.
 
-## CS175-01 Group 8
+## 👥 CS175-01 Group 8
 - [Brandon Sanchez](https://github.com/brandon-sanchez)
 - [Devin Taing](https://github.com/devintaing)
 - [Eric Long](https://github.com/ericlong12)
 - [Kyle Arikata](https://github.com/kylearikata)
+
+## 🔗 Important Links
+- [APK Download](https://github.com/devintaing/PersonalityQuiz/releases) (view the ["Downloading the App"](https://github.com/devintaing/PersonalityQuiz/edit/dev/README.md#-shake-to-skip-accelerometer-integration) section for help with installation)
+- [Project Backlog](https://docs.google.com/spreadsheets/d/1Yh7YWv1ij3hMdGFTxcD8oCcrrIPNbpqg3QgYvqhxIGo/edit?usp=sharing) (see individual/group contributions)
+
+## 📱 User Guide
+
+### ✅ Hardware Requirements
+1. Android device running Android API 29+ (app was tested on API 29 and 35)
+2. Device with accelerometer (only necessary if you want to be able to [skip questions](https://github.com/devintaing/PersonalityQuiz/edit/dev/README.md#-shake-to-skip-accelerometer-integration))
+
+---
+
+### 📥 Downloading the App
+1. Visit the [Releases Page](https://github.com/devintaing/PersonalityQuiz/releases).
+2. Under the latest release, click **"Assets"**.
+3. Download the `.apk` file to your Android device.
+
+---
+
+### 🕹️ How to Play
+1. Launch the **PersonalityQuiz** app.
+2. Tap **"Start Quiz"** from the main menu.
+3. Choose what type of quiz you want to take.
+4. Answer each question honestly.
+5. View your result at the end of the quiz!
+
+## Additional Functionality
+
+### 🔄 Shake to Skip (Accelerometer Integration)
+- **Feature:** Shake your device to skip any question.
+- **Requirement:** Device must have an accelerometer.
+
+<img width="250" alt="Demo of accelerometer integration" src="https://github.com/user-attachments/assets/e2489d6e-5b03-42bf-a0ca-e720a9eb8f47" />
+
+---
+
+### 📊 View Previous Results
+- **Feature:** Access your past quiz results.
+
+<img width="250" alt="Demo of viewing previous results" src="https://github.com/user-attachments/assets/6c62c162-6453-4494-b378-c6b2d0046465" />
+
+---
+
+### ⏯️ Resume In-Progress Quiz
+- **Feature:** Resume an unfinished/in-progress quiz.
+
+<img width="250" alt="Demo of resume functionality" src="https://github.com/user-attachments/assets/5b29e9f6-6bd2-4ae1-89d8-9a8c68345489" />
+
+---
+
+### 🗑️ Uninstall From Within the App
+- **Feature:** Easily uninstall the app from the main menu.
+
+<img width="250" alt="Demo of uninstall functionality" src="https://github.com/user-attachments/assets/d04d7944-b69d-45c7-8653-fffe085e13e5" />
+
+---
+
+### 🌙 Dark Mode + Light Mode Support
+- **Feature:** Theme change based on device setting.
+
+<img width="250" alt="Demo of dark mode and light mode functionality" src="https://github.com/user-attachments/assets/4f0b95f5-8a53-4028-ab2a-8070bd8a1662" />

README.md

@@ -44,5 +44,5 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-    implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
+    implementation(libs.mpandroidchart)
 }

app/build.gradle.kts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
@@ -13,28 +13,38 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PersonalityQuiz"
-        tools:targetApi="31">
-
-        <!-- Start Screen Is Here -->
+        tools:targetApi="31" >
+        <activity
+            android:name=".PreviousResultsActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name=".SelectionActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" /> <!-- Start Screen Is Here -->
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-
-        <!-- This is where the quiz takes place -->
+        </activity> <!-- This is where the quiz takes place -->
         <activity
             android:name=".QuizActivity"
-            android:exported="false" />
-
-        <!-- Shows the results from the one questions quiz  -->
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" /> <!-- Shows the results from the one questions quiz -->
         <activity
             android:name=".ResultActivity"
-            android:exported="false" />
-
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,26 @@
+package edu.sjsu.android.personalityquiz;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+public class ButtonTouchAnimationHelper {
+
+    @SuppressLint("ClickableViewAccessibility")
+    public static void setupTouchAnimation(View view, Context context) {
+        Animation scaleUp = AnimationUtils.loadAnimation(context, R.anim.scale_up);
+        Animation scaleDown = AnimationUtils.loadAnimation(context, R.anim.scale_down);
+
+        view.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                v.startAnimation(scaleUp);
+            } else if (event.getAction() == MotionEvent.ACTION_UP) {
+                v.startAnimation(scaleDown);
+            }
+            return false;
+        });
+    }
+}

app/src/main/assets/Disney.db

@@ -1,36 +1,71 @@
 package edu.sjsu.android.personalityquiz;
 
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.widget.Button;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 import edu.sjsu.android.personalityquiz.databinding.ActivityMainBinding;
 
 public class MainActivity extends AppCompatActivity {
     private ActivityMainBinding binding;
+    private static final String PREFS_NAME = "QuizPrefs";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        Button startQuizButton = findViewById(R.id.startQuizButton);
-        startQuizButton.setOnClickListener(view -> {
-            Intent intent = new Intent(MainActivity.this, QuizActivity.class);
-            startActivity(intent);
-        });
-
+        binding.startQuizButton.setOnClickListener(v -> checkForResumeOrStartNew());
+        binding.previousResultsButton.setOnClickListener(v -> viewPreviousResults());
         binding.uninstallButton.setOnClickListener(v -> uninstall());
     }
 
-    /**
-     * Function that allows the app to be uninstalled.
-     */
+    private void checkForResumeOrStartNew() {
+        SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+        boolean inProgress = prefs.getBoolean("quiz_in_progress", false);
+
+        if (inProgress) {
+            new AlertDialog.Builder(this)
+                    .setTitle("Resume Quiz?")
+                    .setMessage("Would you like to resume your previous quiz or start a new one?")
+                    .setPositiveButton("Resume", (dialog, which) -> resumeQuiz())
+                    .setNegativeButton("Start New", (dialog, which) -> startNewQuiz())
+                    .setCancelable(false)
+                    .show();
+        } else {
+            startNewQuiz();
+        }
+    }
+
+    private void resumeQuiz() {
+        Intent intent = new Intent(MainActivity.this, QuizActivity.class);
+        intent.putExtra("RESUME_QUIZ", true);
+        startActivity(intent);
+    }
+
+    private void startNewQuiz() {
+        SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+        prefs.edit().clear().apply();
+
+        Intent intent = new Intent(MainActivity.this, SelectionActivity.class);
+        startActivity(intent);
+    }
+
     private void uninstall() {
         Intent delete = new Intent(Intent.ACTION_DELETE, Uri.parse("package:" + getPackageName()));
         startActivity(delete);
     }
+
+    private void viewPreviousResults() {
+        Intent intent = new Intent(MainActivity.this, PreviousResultsActivity.class);
+        startActivity(intent);
+        finish();
+    }
 }