diff --git a/Assignments/.gitignore b/Assignments/MP1_CalebFontenot/.gitignore similarity index 100% rename from Assignments/.gitignore rename to Assignments/MP1_CalebFontenot/.gitignore diff --git a/Assignments/.idea/.gitignore b/Assignments/MP1_CalebFontenot/.idea/.gitignore similarity index 100% rename from Assignments/.idea/.gitignore rename to Assignments/MP1_CalebFontenot/.idea/.gitignore diff --git a/Assignments/.idea/compiler.xml b/Assignments/MP1_CalebFontenot/.idea/compiler.xml similarity index 100% rename from Assignments/.idea/compiler.xml rename to Assignments/MP1_CalebFontenot/.idea/compiler.xml diff --git a/Assignments/.idea/deploymentTargetDropDown.xml b/Assignments/MP1_CalebFontenot/.idea/deploymentTargetDropDown.xml similarity index 100% rename from Assignments/.idea/deploymentTargetDropDown.xml rename to Assignments/MP1_CalebFontenot/.idea/deploymentTargetDropDown.xml diff --git a/Assignments/.idea/discord.xml b/Assignments/MP1_CalebFontenot/.idea/discord.xml similarity index 100% rename from Assignments/.idea/discord.xml rename to Assignments/MP1_CalebFontenot/.idea/discord.xml diff --git a/Assignments/.idea/gradle.xml b/Assignments/MP1_CalebFontenot/.idea/gradle.xml similarity index 100% rename from Assignments/.idea/gradle.xml rename to Assignments/MP1_CalebFontenot/.idea/gradle.xml diff --git a/Assignments/.idea/migrations.xml b/Assignments/MP1_CalebFontenot/.idea/migrations.xml similarity index 100% rename from Assignments/.idea/migrations.xml rename to Assignments/MP1_CalebFontenot/.idea/migrations.xml diff --git a/Assignments/.idea/misc.xml b/Assignments/MP1_CalebFontenot/.idea/misc.xml similarity index 100% rename from Assignments/.idea/misc.xml rename to Assignments/MP1_CalebFontenot/.idea/misc.xml diff --git a/Assignments/MP1_CalebFontenot/.idea/vcs.xml b/Assignments/MP1_CalebFontenot/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Assignments/MP1_CalebFontenot/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assignments/MP1_CalebFontenot/AndroidProgramming3e.zip b/Assignments/MP1_CalebFontenot/AndroidProgramming3e.zip new file mode 100644 index 0000000..146cb80 Binary files /dev/null and b/Assignments/MP1_CalebFontenot/AndroidProgramming3e.zip differ diff --git a/Assignments/Test1/.gitignore b/Assignments/MP1_CalebFontenot/Test1/.gitignore similarity index 100% rename from Assignments/Test1/.gitignore rename to Assignments/MP1_CalebFontenot/Test1/.gitignore diff --git a/Assignments/Test1/.idea/.gitignore b/Assignments/MP1_CalebFontenot/Test1/.idea/.gitignore similarity index 100% rename from Assignments/Test1/.idea/.gitignore rename to Assignments/MP1_CalebFontenot/Test1/.idea/.gitignore diff --git a/Assignments/Test1/.idea/compiler.xml b/Assignments/MP1_CalebFontenot/Test1/.idea/compiler.xml similarity index 100% rename from Assignments/Test1/.idea/compiler.xml rename to Assignments/MP1_CalebFontenot/Test1/.idea/compiler.xml diff --git a/Assignments/Test1/.idea/deploymentTargetDropDown.xml b/Assignments/MP1_CalebFontenot/Test1/.idea/deploymentTargetDropDown.xml similarity index 100% rename from Assignments/Test1/.idea/deploymentTargetDropDown.xml rename to Assignments/MP1_CalebFontenot/Test1/.idea/deploymentTargetDropDown.xml diff --git a/Assignments/Test1/.idea/gradle.xml b/Assignments/MP1_CalebFontenot/Test1/.idea/gradle.xml similarity index 100% rename from Assignments/Test1/.idea/gradle.xml rename to Assignments/MP1_CalebFontenot/Test1/.idea/gradle.xml diff --git a/Assignments/Test1/.idea/misc.xml b/Assignments/MP1_CalebFontenot/Test1/.idea/misc.xml similarity index 100% rename from Assignments/Test1/.idea/misc.xml rename to Assignments/MP1_CalebFontenot/Test1/.idea/misc.xml diff --git a/Assignments/Test1/app/.gitignore b/Assignments/MP1_CalebFontenot/Test1/app/.gitignore similarity index 100% rename from Assignments/Test1/app/.gitignore rename to Assignments/MP1_CalebFontenot/Test1/app/.gitignore diff --git a/Assignments/Test1/app/build.gradle b/Assignments/MP1_CalebFontenot/Test1/app/build.gradle similarity index 100% rename from Assignments/Test1/app/build.gradle rename to Assignments/MP1_CalebFontenot/Test1/app/build.gradle diff --git a/Assignments/Test1/app/proguard-rules.pro b/Assignments/MP1_CalebFontenot/Test1/app/proguard-rules.pro similarity index 100% rename from Assignments/Test1/app/proguard-rules.pro rename to Assignments/MP1_CalebFontenot/Test1/app/proguard-rules.pro diff --git a/Assignments/Test1/app/src/androidTest/java/com/calebfontenot/test1/ExampleInstrumentedTest.java b/Assignments/MP1_CalebFontenot/Test1/app/src/androidTest/java/com/calebfontenot/test1/ExampleInstrumentedTest.java similarity index 100% rename from Assignments/Test1/app/src/androidTest/java/com/calebfontenot/test1/ExampleInstrumentedTest.java rename to Assignments/MP1_CalebFontenot/Test1/app/src/androidTest/java/com/calebfontenot/test1/ExampleInstrumentedTest.java diff --git a/Assignments/Test1/app/src/main/AndroidManifest.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/AndroidManifest.xml similarity index 100% rename from Assignments/Test1/app/src/main/AndroidManifest.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/AndroidManifest.xml diff --git a/Assignments/Test1/app/src/main/java/com/calebfontenot/test1/HelloWorld.java b/Assignments/MP1_CalebFontenot/Test1/app/src/main/java/com/calebfontenot/test1/HelloWorld.java similarity index 100% rename from Assignments/Test1/app/src/main/java/com/calebfontenot/test1/HelloWorld.java rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/java/com/calebfontenot/test1/HelloWorld.java diff --git a/Assignments/Test1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/Assignments/Test1/app/src/main/res/drawable/ic_launcher_background.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/drawable/ic_launcher_background.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/Assignments/Test1/app/src/main/res/layout/activity_hello.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/layout/activity_hello.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/layout/activity_hello.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/layout/activity_hello.xml diff --git a/Assignments/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/Assignments/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/Assignments/Test1/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/Assignments/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from Assignments/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/Assignments/Test1/app/src/main/res/values-night/themes.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values-night/themes.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/values-night/themes.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values-night/themes.xml diff --git a/Assignments/Test1/app/src/main/res/values/colors.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/colors.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/values/colors.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/colors.xml diff --git a/Assignments/Test1/app/src/main/res/values/strings.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/strings.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/values/strings.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/strings.xml diff --git a/Assignments/Test1/app/src/main/res/values/themes.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/themes.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/values/themes.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/values/themes.xml diff --git a/Assignments/Test1/app/src/main/res/xml/backup_rules.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/xml/backup_rules.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/xml/backup_rules.xml diff --git a/Assignments/Test1/app/src/main/res/xml/data_extraction_rules.xml b/Assignments/MP1_CalebFontenot/Test1/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from Assignments/Test1/app/src/main/res/xml/data_extraction_rules.xml rename to Assignments/MP1_CalebFontenot/Test1/app/src/main/res/xml/data_extraction_rules.xml diff --git a/Assignments/Test1/app/src/test/java/com/calebfontenot/test1/ExampleUnitTest.java b/Assignments/MP1_CalebFontenot/Test1/app/src/test/java/com/calebfontenot/test1/ExampleUnitTest.java similarity index 100% rename from Assignments/Test1/app/src/test/java/com/calebfontenot/test1/ExampleUnitTest.java rename to Assignments/MP1_CalebFontenot/Test1/app/src/test/java/com/calebfontenot/test1/ExampleUnitTest.java diff --git a/Assignments/Test1/build.gradle b/Assignments/MP1_CalebFontenot/Test1/build.gradle similarity index 100% rename from Assignments/Test1/build.gradle rename to Assignments/MP1_CalebFontenot/Test1/build.gradle diff --git a/Assignments/Test1/gradle.properties b/Assignments/MP1_CalebFontenot/Test1/gradle.properties similarity index 100% rename from Assignments/Test1/gradle.properties rename to Assignments/MP1_CalebFontenot/Test1/gradle.properties diff --git a/Assignments/Test1/gradle/wrapper/gradle-wrapper.jar b/Assignments/MP1_CalebFontenot/Test1/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from Assignments/Test1/gradle/wrapper/gradle-wrapper.jar rename to Assignments/MP1_CalebFontenot/Test1/gradle/wrapper/gradle-wrapper.jar diff --git a/Assignments/Test1/gradle/wrapper/gradle-wrapper.properties b/Assignments/MP1_CalebFontenot/Test1/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from Assignments/Test1/gradle/wrapper/gradle-wrapper.properties rename to Assignments/MP1_CalebFontenot/Test1/gradle/wrapper/gradle-wrapper.properties diff --git a/Assignments/Test1/gradlew b/Assignments/MP1_CalebFontenot/Test1/gradlew similarity index 100% rename from Assignments/Test1/gradlew rename to Assignments/MP1_CalebFontenot/Test1/gradlew diff --git a/Assignments/Test1/gradlew.bat b/Assignments/MP1_CalebFontenot/Test1/gradlew.bat similarity index 100% rename from Assignments/Test1/gradlew.bat rename to Assignments/MP1_CalebFontenot/Test1/gradlew.bat diff --git a/Assignments/Test1/settings.gradle b/Assignments/MP1_CalebFontenot/Test1/settings.gradle similarity index 100% rename from Assignments/Test1/settings.gradle rename to Assignments/MP1_CalebFontenot/Test1/settings.gradle diff --git a/Assignments/app/.gitignore b/Assignments/MP1_CalebFontenot/app/.gitignore similarity index 100% rename from Assignments/app/.gitignore rename to Assignments/MP1_CalebFontenot/app/.gitignore diff --git a/Assignments/app/build.gradle b/Assignments/MP1_CalebFontenot/app/build.gradle similarity index 100% rename from Assignments/app/build.gradle rename to Assignments/MP1_CalebFontenot/app/build.gradle diff --git a/Assignments/app/proguard-rules.pro b/Assignments/MP1_CalebFontenot/app/proguard-rules.pro similarity index 100% rename from Assignments/app/proguard-rules.pro rename to Assignments/MP1_CalebFontenot/app/proguard-rules.pro diff --git a/Assignments/app/src/androidTest/java/com/calebfontenot/quizchapter2/ExampleInstrumentedTest.java b/Assignments/MP1_CalebFontenot/app/src/androidTest/java/com/calebfontenot/quizchapter2/ExampleInstrumentedTest.java similarity index 100% rename from Assignments/app/src/androidTest/java/com/calebfontenot/quizchapter2/ExampleInstrumentedTest.java rename to Assignments/MP1_CalebFontenot/app/src/androidTest/java/com/calebfontenot/quizchapter2/ExampleInstrumentedTest.java diff --git a/Assignments/app/src/main/AndroidManifest.xml b/Assignments/MP1_CalebFontenot/app/src/main/AndroidManifest.xml similarity index 100% rename from Assignments/app/src/main/AndroidManifest.xml rename to Assignments/MP1_CalebFontenot/app/src/main/AndroidManifest.xml diff --git a/Assignments/MP1_CalebFontenot/app/src/main/java/com/calebfontenot/quizchapter2/MainActivity.java b/Assignments/MP1_CalebFontenot/app/src/main/java/com/calebfontenot/quizchapter2/MainActivity.java new file mode 100644 index 0000000..9796055 --- /dev/null +++ b/Assignments/MP1_CalebFontenot/app/src/main/java/com/calebfontenot/quizchapter2/MainActivity.java @@ -0,0 +1,142 @@ +package com.calebfontenot.quizchapter2; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +public class MainActivity extends AppCompatActivity { + private Button trueButton; + private Button falseButton; + private Button nextButton; + private Button previousButton; + private Button resetButton; + private TextView mQuestionTextView; + private TextView mScoreTextView; + private final String TAG = "QuizController"; + private long answersCorrect = 0, answersIncorrect = 0; + private Question[] mQuestionBank = new Question[] + { + new Question(R.string.question_australia, true), + new Question(R.string.question_oceans, true), + new Question(R.string.question_mideast, false), + new Question(R.string.question_africa, false), + new Question(R.string.question_asia, true), + }; + private int mCurrentIndex = 0; + + @Override + protected void onCreate(Bundle savedInstanceState) { + Log.i(TAG,"Calling onCreate..."); + mQuestionTextView = (TextView) + findViewById(R.id.question_text_view); + int question = + mQuestionBank[mCurrentIndex].getmTextResId(); + //mQuestionTextView.setText(question); + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + mQuestionTextView = findViewById(R.id.question_text_view); + trueButton = findViewById(R.id.true_button); + falseButton = findViewById(R.id.false_button); + nextButton = findViewById(R.id.next_button); + previousButton = findViewById(R.id.previous_button); + mScoreTextView = findViewById(R.id.score_counter); + resetButton = findViewById(R.id.reset_score_button); + updateScores(); + + trueButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Log.i(TAG,"Calling trueButton event listener"); + Question q = mQuestionBank[MainActivity.this.mCurrentIndex]; + if (q.ismAnswerTrue()) { + Toast.makeText(MainActivity.this, R.string.correct_toast, Toast.LENGTH_SHORT).show(); + answersCorrect++; + updateScores(); + } else { + Toast.makeText(MainActivity.this, R.string.incorrect_toast, Toast.LENGTH_SHORT).show(); + answersIncorrect++; + updateScores(); + } + } + }); + + falseButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Log.i(TAG,"Calling falseButton event listener"); + Question q = mQuestionBank[MainActivity.this.mCurrentIndex]; + if (!q.ismAnswerTrue()) { + Toast.makeText(MainActivity.this, R.string.correct_toast, Toast.LENGTH_SHORT).show(); + answersCorrect++; + updateScores(); + } else { + Toast.makeText(MainActivity.this, R.string.incorrect_toast, Toast.LENGTH_SHORT).show(); + answersIncorrect++; + updateScores(); + } + } + }); + + View.OnClickListener nextQuestionHandler = new View.OnClickListener() { + @Override + public void onClick(View v) { + Log.i(TAG,"Calling nextButton event listener"); + updateScores(); + Question q = mQuestionBank[MainActivity.this.mCurrentIndex]; + int idOfQuestion = q.getmTextResId(); + if(MainActivity.this.mCurrentIndex == mQuestionBank.length - 1) { + MainActivity.this.mCurrentIndex = 0; + } else { + MainActivity.this.mCurrentIndex++; + } + Log.i(TAG, "mCurrentIndex is: " + mCurrentIndex); + MainActivity.this.mQuestionTextView.setText(idOfQuestion); + } + }; + + nextButton.setOnClickListener(nextQuestionHandler); + mQuestionTextView.setOnClickListener(nextQuestionHandler); + + + previousButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.i(TAG, "Calling previousButton event listener"); + updateScores(); + Question q = mQuestionBank[MainActivity.this.mCurrentIndex]; + int idOfQuestion = q.getmTextResId(); + if (MainActivity.this.mCurrentIndex <= 0) { + MainActivity.this.mCurrentIndex = mQuestionBank.length - 1; + } else { + MainActivity.this.mCurrentIndex--; + } + Log.i(TAG, "mCurrentIndex is: " + mCurrentIndex); + MainActivity.this.mQuestionTextView.setText(idOfQuestion); + } + }); + + resetButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.i(TAG, "Resetting scores!"); + answersCorrect = answersIncorrect = 0; + updateScores(); + } + }); + } + + private void updateScores() { + String score = "Answers correct: " + answersCorrect + "\n" + + "Answers incorrect: " + answersIncorrect + "\n" + + "Question number: " + (MainActivity.this.mCurrentIndex + 1) + " out of " + mQuestionBank.length; + Log.i(TAG, score); + MainActivity.this.mScoreTextView.setText(score); + } + +} \ No newline at end of file diff --git a/Assignments/app/src/main/java/com/calebfontenot/quizchapter2/Question.java b/Assignments/MP1_CalebFontenot/app/src/main/java/com/calebfontenot/quizchapter2/Question.java similarity index 100% rename from Assignments/app/src/main/java/com/calebfontenot/quizchapter2/Question.java rename to Assignments/MP1_CalebFontenot/app/src/main/java/com/calebfontenot/quizchapter2/Question.java diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_left.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_left.png new file mode 100644 index 0000000..60186ca Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_left.png differ diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_right.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_right.png new file mode 100644 index 0000000..5eb216a Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-hdpi/arrow_right.png differ diff --git a/Assignments/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from Assignments/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to Assignments/MP1_CalebFontenot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_left.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_left.png new file mode 100644 index 0000000..7a48ab4 Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_left.png differ diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_right.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_right.png new file mode 100644 index 0000000..eb411b8 Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xhdpi/arrow_right.png differ diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_left.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_left.png new file mode 100644 index 0000000..76d1e07 Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_left.png differ diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_right.png b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_right.png new file mode 100644 index 0000000..16115d8 Binary files /dev/null and b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable-xxhdpi/arrow_right.png differ diff --git a/Assignments/app/src/main/res/drawable/ic_launcher_background.xml b/Assignments/MP1_CalebFontenot/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Assignments/app/src/main/res/drawable/ic_launcher_background.xml rename to Assignments/MP1_CalebFontenot/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/Assignments/MP1_CalebFontenot/app/src/main/res/layout/activity_main.xml b/Assignments/MP1_CalebFontenot/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..440cfa2 --- /dev/null +++ b/Assignments/MP1_CalebFontenot/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,84 @@ + + + + + + + + + + +