From b2ea4070699a33503b32d6311a07c9986953058d Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Tue, 15 Jun 2021 10:46:27 -0400
Subject: [PATCH 01/10] Created button that simply checks if a file exists and
 creates and writes to it if not.

---
 .../activities/MainActivity.java              | 17 +++++++++-
 .../models/Weapon.java                        | 34 ++++++++++++++++++-
 app/src/main/res/layout/activity_main.xml     |  8 +++++
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 2799b43..fc05420 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -3,6 +3,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
@@ -30,6 +31,7 @@ public class MainActivity extends AppCompatActivity {
     TextView mTextViewDPSSustained;
 
     Button mButton;
+    Button mButtonSaveWeapon;
 
     private Weapon mWeapon = new Weapon();
 
@@ -51,6 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mTextViewTimeSpentReloading = findViewById(R.id.textViewTimeSpentReloading);
 
         mButton = findViewById(R.id.autoScanButton);
+        mButtonSaveWeapon = findViewById(R.id.saveWeapon);
 
         initListeners();
     }
@@ -86,6 +89,13 @@ public void onClick(View v) {
                 startActivityForResult(intent, 1);
             }
         });
+
+        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveWeapon();
+            }
+        });
     }
 
     @Override
@@ -105,7 +115,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void updateWeapon() {
-        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("") && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
+        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
+                && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
             int damage = Integer.parseInt(mEditTextDamage.getText().toString());
             float reloadTime = Float.parseFloat(mEditTextReloadTime.getText().toString());
             float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
@@ -129,4 +140,8 @@ protected void updateTextViews() {
         mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
         mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
     }
+
+    private void saveWeapon(){
+        mWeapon.saveWeapon(getApplicationContext());
+    }
 }
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java
index 8c763b7..8bbdb48 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java
@@ -1,5 +1,11 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.models;
 
+import android.content.Context;
+import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.Serializable;
 
 import androidx.annotation.NonNull;
@@ -19,7 +25,7 @@ public Weapon() {
     @Override
     public String toString() {
         return "damage " + mDamage + ", accuracy " + mAccuracy + ", handling "
-                + mHandling + ", reloadTime " + mReloadTime + ", fireRate" + mFireRate + ", magazineSize" + mMagazineSize;
+                + mHandling + ", reloadTime " + mReloadTime + ", fireRate " + mFireRate + ", magazineSize" + mMagazineSize;
     }
 
     public Weapon(int damage, float accuracy, int handling, float reloadTime, float fireRate, int magazineSize) {
@@ -121,6 +127,32 @@ public float getDPSSustained() {
         return mDamage * mMagazineSize / (mMagazineSize / mFireRate + mReloadTime);
     }
 
+    private void writeToFile(String data,Context context) {
+        try {
+            OutputStreamWriter outputStreamWriter = new OutputStreamWriter(context.openFileOutput("weapons.txt", Context.MODE_PRIVATE));
+            outputStreamWriter.write(data);
+            outputStreamWriter.close();
+        }
+        catch (IOException e) {
+            Log.e("Exception", "File write failed: " + e.toString());
+        }
+    }
+    // code to handle saving the weapon stats to a file.
+    public void saveWeapon(Context context) {
+        File file = new File(context.getFilesDir(), "weapons.txt");
+        if(file.exists()){
+            Log.d("File Exists", "True");
+            if (!file.canRead())
+                Log.d("File Log:", "File is read-restricted");
+        }
+        else {
+            writeToFile("success", context);
+            Log.d("File Exists", "False");
+            Log.d("File Location", String.valueOf(file));
+        }
+
+    }
+
     private int mDamage;
     private float mAccuracy;
     private int mHandling;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 97a2991..0eb611b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -137,6 +137,14 @@
             android:layout_height="wrap_content"
             android:text="@string/auto_mode" />
 
+        <Button
+            android:id="@+id/saveWeapon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/save_weapon" />
+
+
+
     </LinearLayout>
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2d2d9ad..c5d39dd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -18,4 +18,5 @@
     <string name="auto_mode">Scan automatique</string>
     <string name="pick_weapon">Choisir cette arme</string>
     <string name="damage_per_second_sustained">Dégâts par seconde (rechargement inclus)</string>
+    <string name="save_weapon">Enregistrer l\'arme</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a04604d..9c40596 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,4 +17,5 @@
     <string name="auto_mode">Auto scan</string>
     <string name="pick_weapon">Pick this weapon</string>
     <string name="damage_per_second_sustained">Damage per second sustained</string>
+    <string name="save_weapon">Save weapon</string>
 </resources>

From 7009eb1a9240f5526aa1cf311bc6a8cee2251cd1 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Thu, 17 Jun 2021 09:26:25 -0400
Subject: [PATCH 02/10] Moved MainActivity functions to fragment "MainView" and
 created container to hold fragments in MainActivity.

---
 app/build.gradle                              |  17 +-
 .../activities/MainActivity.java              | 129 +-------
 .../activities/MainView.java                  | 186 +++++++++++
 .../activities/SaveWeapon.kt                  |  19 ++
 app/src/main/res/layout/activity_main.xml     | 301 +-----------------
 .../main/res/layout/activity_save_weapon.xml  | 301 ++++++++++++++++++
 app/src/main/res/layout/main_view.xml         | 301 ++++++++++++++++++
 build.gradle                                  |   4 +-
 8 files changed, 839 insertions(+), 419 deletions(-)
 create mode 100644 app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
 create mode 100644 app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
 create mode 100644 app/src/main/res/layout/activity_save_weapon.xml
 create mode 100644 app/src/main/res/layout/main_view.xml

diff --git a/app/build.gradle b/app/build.gradle
index eb9bb59..7c59909 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 29
@@ -21,14 +22,26 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.gms:play-services-vision:15.0.0'
-    implementation 'org.jetbrains:annotations-java5:15.0'
+    //implementation 'org.jetbrains:annotations-java5:15.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test:rules:1.1.0'
+    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    def fragment_version = "1.3.4"
 
+    // Kotlin
+    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+    // Java language implementation
+    implementation "androidx.fragment:fragment:$fragment_version"
+
+
+}
+repositories {
+    mavenCentral()
 }
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index fc05420..0c57662 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -18,130 +18,19 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    EditText mEditTextDamage;
-    EditText mEditTextReloadTime;
-    EditText mEditTextFireRate;
-    EditText mEditTextMagazineSize;
-
-    TextView mTextViewTimeToEmptyMagazine;
-    TextView mTextViewDamagePerSecond;
-    TextView mTextViewDamagePerMagazine;
-    TextView mTextViewTimeSpentShooting;
-    TextView mTextViewTimeSpentReloading;
-    TextView mTextViewDPSSustained;
-
-    Button mButton;
-    Button mButtonSaveWeapon;
-
-    private Weapon mWeapon = new Weapon();
+    public MainActivity() {
+        super(R.layout.activity_main);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        mEditTextDamage = findViewById(R.id.editTextDamage);
-        mEditTextReloadTime = findViewById(R.id.editTextReloadTime);
-        mEditTextFireRate = findViewById(R.id.editTextFireRate);
-        mEditTextMagazineSize = findViewById(R.id.editTextMagazineSize);
-
-        mTextViewDPSSustained = findViewById(R.id.textViewDamagePerSecondSustained);
-        mTextViewTimeToEmptyMagazine = findViewById(R.id.textViewEmptyMagazine);
-        mTextViewDamagePerSecond = findViewById(R.id.textViewDamagePerSecond);
-        mTextViewDamagePerMagazine = findViewById(R.id.textViewDamagePerMagazine);
-        mTextViewTimeSpentShooting = findViewById(R.id.textViewTimeSpentShooting);
-        mTextViewTimeSpentReloading = findViewById(R.id.textViewTimeSpentReloading);
-
-        mButton = findViewById(R.id.autoScanButton);
-        mButtonSaveWeapon = findViewById(R.id.saveWeapon);
-
-        initListeners();
-    }
-
-    protected void initListeners() {
-        TextWatcher textWatcher = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                updateWeapon();
-                updateTextViews();
-            }
-        };
-
-        mEditTextDamage.addTextChangedListener(textWatcher);
-        mEditTextReloadTime.addTextChangedListener(textWatcher);
-        mEditTextFireRate.addTextChangedListener(textWatcher);
-        mEditTextMagazineSize.addTextChangedListener(textWatcher);
-
-        mButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), CameraActivity.class);
-                startActivityForResult(intent, 1);
-            }
-        });
-
-        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                saveWeapon();
-            }
-        });
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        if (requestCode == 1) {
-            if(resultCode == Activity.RESULT_OK){
-                Weapon resultWeapon = (Weapon)data.getSerializableExtra("weapon");
-                if (resultWeapon != null) {
-                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
-                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
-                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
-                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
-                }
-            }
-        }
-    }
-
-    private void updateWeapon() {
-        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
-                && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
-            int damage = Integer.parseInt(mEditTextDamage.getText().toString());
-            float reloadTime = Float.parseFloat(mEditTextReloadTime.getText().toString());
-            float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
-            int magazineSize = Integer.parseInt(mEditTextMagazineSize.getText().toString());
-
-            // Get all values
-            mWeapon.setDamage(damage);
-            mWeapon.setReloadTime(reloadTime);
-            mWeapon.setFireRate(fireRate);
-            mWeapon.setMagazineSize(magazineSize);
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .setReorderingAllowed(true)
+                    .add(R.id.fragment_container_view, MainView.class, null)
+                    .commit();
         }
     }
-
-    protected void updateTextViews() {
-        double dpsSustained = Math.round(mWeapon.getDPSSustained() * 100.0) / 100.0;
-        double dps = Math.round(mWeapon.getDamagePerSecond() * 100.0) / 100.0;
-        mTextViewDPSSustained.setText(String.valueOf(dpsSustained));
-        mTextViewDamagePerSecond.setText(String.valueOf(dps));
-        mTextViewTimeToEmptyMagazine.setText(String.valueOf(mWeapon.getTimeToEmptyMagazine()));
-        mTextViewDamagePerMagazine.setText(String.valueOf(mWeapon.getDamagePerMagazine()));
-        mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
-        mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
-    }
-
-    private void saveWeapon(){
-        mWeapon.saveWeapon(getApplicationContext());
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
new file mode 100644
index 0000000..dbddf8c
--- /dev/null
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
@@ -0,0 +1,186 @@
+package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
+
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
+import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon;
+
+public class MainView extends Fragment {
+    private Weapon mWeapon = new Weapon();
+    EditText mEditTextDamage;
+    EditText mEditTextReloadTime;
+    EditText mEditTextFireRate;
+    EditText mEditTextMagazineSize;
+
+    TextView mTextViewTimeToEmptyMagazine;
+    TextView mTextViewDamagePerSecond;
+    TextView mTextViewDamagePerMagazine;
+    TextView mTextViewTimeSpentShooting;
+    TextView mTextViewTimeSpentReloading;
+    TextView mTextViewDPSSustained;
+
+    Button mButton;
+    Button mButtonSaveWeapon;
+
+
+    public MainView() {
+        super(R.layout.main_view);
+    }
+
+    ActivityResultLauncher<Intent> cameraActivityResultLauncher = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+                @Override
+                public void onActivityResult(ActivityResult result) {
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        // There are no request codes
+                        Intent data = result.getData();
+                        if (data != null) {
+                            buildWeapon(data);
+                        }
+
+                    }
+                }
+            });
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        mEditTextDamage = getView().findViewById(R.id.editTextDamage);
+        mEditTextReloadTime = getView().findViewById(R.id.editTextReloadTime);
+        mEditTextFireRate = getView().findViewById(R.id.editTextFireRate);
+        mEditTextMagazineSize = getView().findViewById(R.id.editTextMagazineSize);
+
+        mTextViewDPSSustained = getView().findViewById(R.id.textViewDamagePerSecondSustained);
+        mTextViewTimeToEmptyMagazine = getView().findViewById(R.id.textViewEmptyMagazine);
+        mTextViewDamagePerSecond = getView().findViewById(R.id.textViewDamagePerSecond);
+        mTextViewDamagePerMagazine = getView().findViewById(R.id.textViewDamagePerMagazine);
+        mTextViewTimeSpentShooting = getView().findViewById(R.id.textViewTimeSpentShooting);
+        mTextViewTimeSpentReloading = getView().findViewById(R.id.textViewTimeSpentReloading);
+
+        mButton = getView().findViewById(R.id.autoScanButton);
+        mButtonSaveWeapon = getView().findViewById(R.id.saveWeapon);
+
+        initListeners();
+    }
+
+
+    protected void initListeners() {
+        TextWatcher textWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                updateWeapon();
+                updateTextViews();
+            }
+        };
+
+        mEditTextDamage.addTextChangedListener(textWatcher);
+        mEditTextReloadTime.addTextChangedListener(textWatcher);
+        mEditTextFireRate.addTextChangedListener(textWatcher);
+        mEditTextMagazineSize.addTextChangedListener(textWatcher);
+
+        mButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
+                cameraActivityResultLauncher.launch(intent);
+            }
+        });
+
+//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
+//                startActivityForResult(intent, 1);
+//            }
+//        });
+    }
+
+//    @Override
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//
+//        super.onActivityResult(requestCode, resultCode, data);
+//        if (requestCode == 1) {
+//            if (resultCode == Activity.RESULT_OK) {
+//                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
+//                if (resultWeapon != null) {
+//                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
+//                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
+//                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
+//                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
+//                }
+//            }
+//        }
+//    }
+
+
+    private void buildWeapon(Intent data) {
+        Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
+        if (resultWeapon != null) {
+            mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
+            mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
+            mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
+            mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
+        }
+    }
+
+    private void updateWeapon() {
+        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
+                && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
+            int damage = Integer.parseInt(mEditTextDamage.getText().toString());
+            float reloadTime = Float.parseFloat(mEditTextReloadTime.getText().toString());
+            float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
+            int magazineSize = Integer.parseInt(mEditTextMagazineSize.getText().toString());
+
+            // Get all values
+            mWeapon.setDamage(damage);
+            mWeapon.setReloadTime(reloadTime);
+            mWeapon.setFireRate(fireRate);
+            mWeapon.setMagazineSize(magazineSize);
+        }
+    }
+
+    protected void updateTextViews() {
+        double dpsSustained = Math.round(mWeapon.getDPSSustained() * 100.0) / 100.0;
+        double dps = Math.round(mWeapon.getDamagePerSecond() * 100.0) / 100.0;
+        mTextViewDPSSustained.setText(String.valueOf(dpsSustained));
+        mTextViewDamagePerSecond.setText(String.valueOf(dps));
+        mTextViewTimeToEmptyMagazine.setText(String.valueOf(mWeapon.getTimeToEmptyMagazine()));
+        mTextViewDamagePerMagazine.setText(String.valueOf(mWeapon.getDamagePerMagazine()));
+        mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
+        mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
+    }
+
+    private void saveWeapon(){
+        mWeapon.saveWeapon(getActivity().getApplicationContext());
+    }
+}
+
+
+
+
+
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
new file mode 100644
index 0000000..7443a87
--- /dev/null
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -0,0 +1,19 @@
+package com.borderlandsdpscalculator.borderlands3dpscalculator.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import com.borderlandsdpscalculator.borderlands3dpscalculator.R
+
+class SaveWeapon: AppCompatActivity(R.layout.activity_save_weapon) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                //add<SaveWeapon>(R.id.fragment_container_view)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0eb611b..1dcab53 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,300 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- res/layout/activity_main.xml -->
+<androidx.fragment.app.FragmentContainerView
+    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/fragment_container_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/guideline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/textView5"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/weapon_stats_title" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/damage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:labelFor="@id/editTextDamage"
-                android:text="@string/damage" />
-
-            <EditText
-                android:id="@+id/editTextDamage"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:importantForAutofill="no"
-                android:inputType="number"
-                android:nextFocusRight="@id/editTextReloadTime"
-                android:nextFocusDown="@id/editTextReloadTime"
-                android:nextFocusForward="@id/editTextReloadTime"
-                android:selectAllOnFocus="true" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/Reload"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:labelFor="@id/editTextReloadTime"
-                android:text="@string/reload_time" />
-
-            <EditText
-                android:id="@+id/editTextReloadTime"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:importantForAutofill="no"
-                android:inputType="numberDecimal"
-                android:nextFocusRight="@id/editTextFireRate"
-                android:nextFocusDown="@id/editTextFireRate"
-                android:selectAllOnFocus="true" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/fireRate"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:labelFor="@id/editTextFireRate"
-                android:text="@string/fire_rate" />
-
-            <EditText
-                android:id="@+id/editTextFireRate"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:importantForAutofill="no"
-                android:inputType="numberDecimal"
-                android:nextFocusLeft="@id/editTextFireRate"
-                android:nextFocusRight="@id/editTextMagazineSize"
-                android:nextFocusUp="@id/editTextFireRate"
-                android:nextFocusDown="@id/editTextMagazineSize"
-                android:nextFocusForward="@id/editTextMagazineSize"
-                android:selectAllOnFocus="true" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/magazineSize"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:labelFor="@id/editTextMagazineSize"
-                android:text="@string/magazine_size" />
-
-            <EditText
-                android:id="@+id/editTextMagazineSize"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:importantForAutofill="no"
-                android:inputType="number"
-                android:nextFocusLeft="@id/editTextMagazineSize"
-                android:nextFocusUp="@id/editTextMagazineSize"
-                android:selectAllOnFocus="true" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/autoScanButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/auto_mode" />
-
-        <Button
-            android:id="@+id/saveWeapon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/save_weapon" />
-
-
-
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginBottom="365dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_begin="366dp" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_end="205dp" />
-
-    <TableLayout
-        android:layout_width="409dp"
-        android:layout_height="363dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline">
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/textViewDPSSLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:labelFor="@id/textViewDamagePerSecondSustained"
-                android:text="@string/damage_per_second_sustained" />
-
-            <TextView
-                android:id="@+id/textViewDamagePerSecondSustained"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:labelFor="@id/textViewDamagePerSecond"
-                android:text="@string/damage_per_second" />
-
-            <TextView
-                android:id="@+id/textViewDamagePerSecond"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:labelFor="@id/textViewEmptyMagazine"
-                android:text="@string/time_to_empty_magazine" />
-
-            <TextView
-                android:id="@+id/textViewEmptyMagazine"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/textView6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:labelFor="@id/textViewDamagePerMagazine"
-                android:text="@string/damage_per_magazine" />
-
-            <TextView
-                android:id="@+id/textViewDamagePerMagazine"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <TextView
-                android:id="@+id/textView8"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:text="@string/time_spent_shooting" />
-
-            <TextView
-                android:id="@+id/textViewTimeSpentShooting"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <TextView
-                android:id="@+id/textView9"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="3"
-                android:text="@string/time_spent_reloading" />
-
-            <TextView
-                android:id="@+id/textViewTimeSpentReloading"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textSize="18sp"
-                app:autoSizeTextType="uniform" />
-        </TableRow>
-
-    </TableLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    />
diff --git a/app/src/main/res/layout/activity_save_weapon.xml b/app/src/main/res/layout/activity_save_weapon.xml
new file mode 100644
index 0000000..97d6d8a
--- /dev/null
+++ b/app/src/main/res/layout/activity_save_weapon.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.MainActivity">
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/guideline"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/weapon_stats_title" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/damage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextDamage"
+                android:text="@string/damage" />
+
+            <EditText
+                android:id="@+id/editTextDamage"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:nextFocusRight="@id/editTextReloadTime"
+                android:nextFocusDown="@id/editTextReloadTime"
+                android:nextFocusForward="@id/editTextReloadTime"
+                android:selectAllOnFocus="true" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/Reload"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextReloadTime"
+                android:text="@string/reload_time" />
+
+            <EditText
+                android:id="@+id/editTextReloadTime"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="numberDecimal"
+                android:nextFocusRight="@id/editTextFireRate"
+                android:nextFocusDown="@id/editTextFireRate"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/fireRate"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextFireRate"
+                android:text="@string/fire_rate" />
+
+            <EditText
+                android:id="@+id/editTextFireRate"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="numberDecimal"
+                android:nextFocusLeft="@id/editTextFireRate"
+                android:nextFocusRight="@id/editTextMagazineSize"
+                android:nextFocusUp="@id/editTextFireRate"
+                android:nextFocusDown="@id/editTextMagazineSize"
+                android:nextFocusForward="@id/editTextMagazineSize"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/magazineSize"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextMagazineSize"
+                android:text="@string/magazine_size" />
+
+            <EditText
+                android:id="@+id/editTextMagazineSize"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:nextFocusLeft="@id/editTextMagazineSize"
+                android:nextFocusUp="@id/editTextMagazineSize"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/autoScanButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/auto_mode" />
+
+        <Button
+            android:id="@+id/saveWeapon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/save_weapon" />
+
+
+
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginBottom="365dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_begin="366dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="205dp" />
+
+    <TableLayout
+        android:layout_width="409dp"
+        android:layout_height="363dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline">
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textViewDPSSLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerSecondSustained"
+                android:text="@string/damage_per_second_sustained" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerSecondSustained"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerSecond"
+                android:text="@string/damage_per_second" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerSecond"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewEmptyMagazine"
+                android:text="@string/time_to_empty_magazine" />
+
+            <TextView
+                android:id="@+id/textViewEmptyMagazine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerMagazine"
+                android:text="@string/damage_per_magazine" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerMagazine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView8"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:text="@string/time_spent_shooting" />
+
+            <TextView
+                android:id="@+id/textViewTimeSpentShooting"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:text="@string/time_spent_reloading" />
+
+            <TextView
+                android:id="@+id/textViewTimeSpentReloading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+    </TableLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_view.xml b/app/src/main/res/layout/main_view.xml
new file mode 100644
index 0000000..97d6d8a
--- /dev/null
+++ b/app/src/main/res/layout/main_view.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.MainActivity">
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/guideline"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/weapon_stats_title" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/damage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextDamage"
+                android:text="@string/damage" />
+
+            <EditText
+                android:id="@+id/editTextDamage"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:nextFocusRight="@id/editTextReloadTime"
+                android:nextFocusDown="@id/editTextReloadTime"
+                android:nextFocusForward="@id/editTextReloadTime"
+                android:selectAllOnFocus="true" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/Reload"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextReloadTime"
+                android:text="@string/reload_time" />
+
+            <EditText
+                android:id="@+id/editTextReloadTime"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="numberDecimal"
+                android:nextFocusRight="@id/editTextFireRate"
+                android:nextFocusDown="@id/editTextFireRate"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/fireRate"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextFireRate"
+                android:text="@string/fire_rate" />
+
+            <EditText
+                android:id="@+id/editTextFireRate"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="numberDecimal"
+                android:nextFocusLeft="@id/editTextFireRate"
+                android:nextFocusRight="@id/editTextMagazineSize"
+                android:nextFocusUp="@id/editTextFireRate"
+                android:nextFocusDown="@id/editTextMagazineSize"
+                android:nextFocusForward="@id/editTextMagazineSize"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/magazineSize"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:labelFor="@id/editTextMagazineSize"
+                android:text="@string/magazine_size" />
+
+            <EditText
+                android:id="@+id/editTextMagazineSize"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:nextFocusLeft="@id/editTextMagazineSize"
+                android:nextFocusUp="@id/editTextMagazineSize"
+                android:selectAllOnFocus="true" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/autoScanButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/auto_mode" />
+
+        <Button
+            android:id="@+id/saveWeapon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/save_weapon" />
+
+
+
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginBottom="365dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_begin="366dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="205dp" />
+
+    <TableLayout
+        android:layout_width="409dp"
+        android:layout_height="363dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline">
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textViewDPSSLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerSecondSustained"
+                android:text="@string/damage_per_second_sustained" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerSecondSustained"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerSecond"
+                android:text="@string/damage_per_second" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerSecond"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewEmptyMagazine"
+                android:text="@string/time_to_empty_magazine" />
+
+            <TextView
+                android:id="@+id/textViewEmptyMagazine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/textView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:labelFor="@id/textViewDamagePerMagazine"
+                android:text="@string/damage_per_magazine" />
+
+            <TextView
+                android:id="@+id/textViewDamagePerMagazine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView8"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:text="@string/time_spent_shooting" />
+
+            <TextView
+                android:id="@+id/textViewTimeSpentShooting"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:id="@+id/textView9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:text="@string/time_spent_reloading" />
+
+            <TextView
+                android:id="@+id/textViewTimeSpentReloading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:textSize="18sp"
+                app:autoSizeTextType="uniform" />
+        </TableRow>
+
+    </TableLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 95a3996..d68786a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.5.10'
     repositories {
         google()
         jcenter()
@@ -8,7 +9,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
-        
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

From 13a868ba75797e0782b8d8ce5bbe1ed65defb7b0 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Thu, 17 Jun 2021 10:03:30 -0400
Subject: [PATCH 03/10] Updated Gradle.  This also updated Java from 7 to 8 and
 buildtools version to automatically use the newest version.

---
 app/build.gradle                         | 3 +--
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7c59909..29a0098 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,10 +3,9 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId 'com.romaindeschenes.borderlands3dpscalculator'
-        minSdkVersion 19
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         versionName '0.1.0'
diff --git a/build.gradle b/build.gradle
index d68786a..e1179e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1ea2d9c..4cc162e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

From 99779735f1e8462906ba7924a9b99d9b0aafe0b1 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Tue, 22 Jun 2021 13:11:27 -0400
Subject: [PATCH 04/10] Adds logic to handle fragment displays and functions.

---
 app/build.gradle                              |   1 +
 .../activities/MainActivity.java              |  18 ++-
 .../activities/MainView.java                  |  67 ++++++++-
 .../activities/SaveWeapon.kt                  | 141 +++++++++++++++++-
 .../main/res/layout/activity_save_weapon.xml  |   2 +-
 5 files changed, 217 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 29a0098..54318a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test:rules:1.1.0'
+    implementation "org.greenrobot:eventbus:3.2.0"
     implementation "androidx.core:core-ktx:1.5.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     def fragment_version = "1.3.4"
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 0c57662..9ce3bbc 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -1,6 +1,9 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,6 +11,7 @@
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -16,6 +20,9 @@
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
 import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 public class MainActivity extends AppCompatActivity {
 
     public MainActivity() {
@@ -29,8 +36,17 @@ protected void onCreate(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction()
                     .setReorderingAllowed(true)
-                    .add(R.id.fragment_container_view, MainView.class, null)
+                    .add(R.id.fragment_container_view, MainView.class, null, "main_view")
                     .commit();
         }
     }
+
+    public static class MessageEvent {
+        public final Class fragmentClass;
+
+        public MessageEvent(Class fragmentClass) {
+            this.fragmentClass = fragmentClass;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
index dbddf8c..dc32014 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
@@ -6,12 +6,14 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -19,6 +21,10 @@
 
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
 import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon;
+import com.borderlandsdpscalculator.borderlands3dpscalculator.activities.SaveWeapon;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
 public class MainView extends Fragment {
     private Weapon mWeapon = new Weapon();
@@ -111,6 +117,15 @@ public void onClick(View v) {
             }
         });
 
+        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
+                EventBus.getDefault().post(new MainActivity.MessageEvent(SaveWeapon.class));
+            }
+        });
+
+
 //        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
 //            @Override
 //            public void onClick(View v) {
@@ -120,6 +135,52 @@ public void onClick(View v) {
 //        });
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void replaceFragments(MainActivity.MessageEvent event) {
+        Class fragmentClass = event.fragmentClass;
+        Log.d("MessageEvent", "success!");
+        Fragment fragment = null;
+        try {
+            fragment = (Fragment) fragmentClass.newInstance();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // Insert the fragment by replacing any existing fragment
+        Bundle bundle = new Bundle();
+        bundle.putString("weapon", mWeapon.toString());
+        bundle.putInt("damage", mWeapon.getDamage());
+        bundle.putFloat("reload_time", mWeapon.getReloadTime());
+        bundle.putFloat("fire_rate", mWeapon.getFireRate());
+        bundle.putInt("magazine_size", mWeapon.getMagazineSize());
+
+
+        //bundle.putString("current_weapon", (getSupportFragmentManager().findFragmentByTag("main_view")).getCurrentWeapon);
+        FragmentManager fragmentManager = ((MainActivity) getActivity()).getSupportFragmentManager();
+        if (fragmentManager.findFragmentByTag("main_view") == fragmentManager.findFragmentById(R.id.fragment_container_view)) {
+            fragmentManager.beginTransaction().add(R.id.fragment_container_view, fragment)
+                    .hide(fragmentManager.findFragmentByTag("main_view"))
+                    .addToBackStack("view1")
+                    .commit();
+        } else {
+            fragmentManager.beginTransaction().add(R.id.fragment_container_view, fragment)
+                    .replace(R.id.fragment_container_view, fragmentManager.findFragmentById(R.id.fragment_container_view))
+                    .addToBackStack(null)
+                    .commit();
+        }
+    }
+
 //    @Override
 //    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 //
@@ -175,9 +236,9 @@ protected void updateTextViews() {
         mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
     }
 
-    private void saveWeapon(){
-        mWeapon.saveWeapon(getActivity().getApplicationContext());
-    }
+//    private void saveWeapon(){
+//        mWeapon.saveWeapon(getActivity().getApplicationContext());
+//    }
 }
 
 
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
index 7443a87..d01fd17 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -2,18 +2,145 @@ package com.borderlandsdpscalculator.borderlands3dpscalculator.activities
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R
+import android.app.Activity
+import android.content.Intent
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainActivity.MessageEvent
+import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon
+import org.greenrobot.eventbus.EventBus
 
-class SaveWeapon: AppCompatActivity(R.layout.activity_save_weapon) {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (savedInstanceState == null) {
-            supportFragmentManager.commit {
-                setReorderingAllowed(true)
-                //add<SaveWeapon>(R.id.fragment_container_view)
+class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
+    private val mWeapon = Weapon()
+    var mEditTextDamage: EditText? = null
+    var mEditTextReloadTime: EditText? = null
+    var mEditTextFireRate: EditText? = null
+    var mEditTextMagazineSize: EditText? = null
+    var mTextViewTimeToEmptyMagazine: TextView? = null
+    var mTextViewDamagePerSecond: TextView? = null
+    var mTextViewDamagePerMagazine: TextView? = null
+    var mTextViewTimeSpentShooting: TextView? = null
+    var mTextViewTimeSpentReloading: TextView? = null
+    var mTextViewDPSSustained: TextView? = null
+    var mButton: Button? = null
+    var mButtonSaveWeapon: Button? = null
+    var cameraActivityResultLauncher = registerForActivityResult(
+        StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            // There are no request codes
+            val data = result.data
+            data?.let { buildWeapon(it) }
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        mEditTextDamage = requireView().findViewById(R.id.editTextDamage)
+        mEditTextReloadTime = requireView().findViewById(R.id.editTextReloadTime)
+        mEditTextFireRate = requireView().findViewById(R.id.editTextFireRate)
+        mEditTextMagazineSize = requireView().findViewById(R.id.editTextMagazineSize)
+        mTextViewDPSSustained = requireView().findViewById(R.id.textViewDamagePerSecondSustained)
+        mTextViewTimeToEmptyMagazine = requireView().findViewById(R.id.textViewEmptyMagazine)
+        mTextViewDamagePerSecond = requireView().findViewById(R.id.textViewDamagePerSecond)
+        mTextViewDamagePerMagazine = requireView().findViewById(R.id.textViewDamagePerMagazine)
+        mTextViewTimeSpentShooting = requireView().findViewById(R.id.textViewTimeSpentShooting)
+        mTextViewTimeSpentReloading = requireView().findViewById(R.id.textViewTimeSpentReloading)
+        mButton = requireView().findViewById(R.id.autoScanButton)
+        mButtonSaveWeapon = requireView().findViewById(R.id.saveWeapon)
+        initListeners()
+    }
+
+    protected fun initListeners() {
+        val textWatcher: TextWatcher = object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable) {
+                updateWeapon()
+                updateTextViews()
             }
         }
+        mEditTextDamage!!.addTextChangedListener(textWatcher)
+        mEditTextReloadTime!!.addTextChangedListener(textWatcher)
+        mEditTextFireRate!!.addTextChangedListener(textWatcher)
+        mEditTextMagazineSize!!.addTextChangedListener(textWatcher)
+        mButton!!.setOnClickListener {
+            val intent = Intent(requireActivity().applicationContext, CameraActivity::class.java)
+            cameraActivityResultLauncher.launch(intent)
+        }
+        mButtonSaveWeapon!!.setOnClickListener { //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
+            EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
+        }
+
+//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
+//                startActivityForResult(intent, 1);
+//            }
+//        });
+    }
+
+    //    @Override
+    //    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    //
+    //        super.onActivityResult(requestCode, resultCode, data);
+    //        if (requestCode == 1) {
+    //            if (resultCode == Activity.RESULT_OK) {
+    //                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
+    //                if (resultWeapon != null) {
+    //                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
+    //                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
+    //                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
+    //                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
+    //                }
+    //            }
+    //        }
+    //    }
+    private fun buildWeapon(data: Intent) {
+        val resultWeapon = data.getSerializableExtra("weapon") as Weapon
+        if (resultWeapon != null) {
+            mEditTextDamage!!.setText(resultWeapon.damage.toString())
+            mEditTextReloadTime!!.setText(resultWeapon.reloadTime.toString())
+            mEditTextFireRate!!.setText(resultWeapon.fireRate.toString())
+            mEditTextMagazineSize!!.setText(resultWeapon.magazineSize.toString())
+        }
+    }
+
+    private fun updateWeapon() {
+        if (mEditTextDamage!!.text.toString() != "" && mEditTextReloadTime!!.text.toString() != ""
+            && mEditTextFireRate!!.text.toString() != "" && mEditTextMagazineSize!!.text.toString() != ""
+        ) {
+            val damage = mEditTextDamage!!.text.toString().toInt()
+            val reloadTime = mEditTextReloadTime!!.text.toString().toFloat()
+            val fireRate = mEditTextFireRate!!.text.toString().toFloat()
+            val magazineSize = mEditTextMagazineSize!!.text.toString().toInt()
+
+            // Get all values
+            mWeapon.damage = damage
+            mWeapon.reloadTime = reloadTime
+            mWeapon.fireRate = fireRate
+            mWeapon.magazineSize = magazineSize
+        }
     }
 
+    protected fun updateTextViews() {
+        val dpsSustained = Math.round(mWeapon.dpsSustained * 100.0) / 100.0
+        val dps = Math.round(mWeapon.damagePerSecond * 100.0) / 100.0
+        mTextViewDPSSustained!!.text = dpsSustained.toString()
+        mTextViewDamagePerSecond!!.text = dps.toString()
+        mTextViewTimeToEmptyMagazine!!.text = mWeapon.timeToEmptyMagazine.toString()
+        mTextViewDamagePerMagazine!!.text = mWeapon.damagePerMagazine.toString()
+        mTextViewTimeSpentReloading!!.text = mWeapon.timeSpentReloading.toString()
+        mTextViewTimeSpentShooting!!.text = mWeapon.timeSpentShooting.toString()
+    } //    private void saveWeapon(){
+    //        mWeapon.saveWeapon(getActivity().getApplicationContext());
+    //    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_save_weapon.xml b/app/src/main/res/layout/activity_save_weapon.xml
index 97d6d8a..e804fce 100644
--- a/app/src/main/res/layout/activity_save_weapon.xml
+++ b/app/src/main/res/layout/activity_save_weapon.xml
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:labelFor="@id/editTextDamage"
-                android:text="@string/damage" />
+                android:text="Gedanken sind Frei!" />
 
             <EditText
                 android:id="@+id/editTextDamage"

From 4bea110bd41ab83006a27b3b82cf3aabc29ccd74 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Thu, 24 Jun 2021 11:54:22 -0400
Subject: [PATCH 05/10] Switched from fragment navigation using FragmentManager
 to navigation using NavController.

---
 app/build.gradle                              |  2 ++
 .../activities/MainActivity.java              | 31 ++++++++--------
 .../activities/MainView.java                  | 36 ++++++-------------
 .../activities/SaveWeapon.kt                  |  2 +-
 app/src/main/res/layout/activity_main.xml     |  3 ++
 app/src/main/res/navigation/nav_graph.xml     | 28 +++++++++++++++
 6 files changed, 62 insertions(+), 40 deletions(-)
 create mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/app/build.gradle b/app/build.gradle
index 54318a9..9ed72a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.gms:play-services-vision:15.0.0'
+    implementation 'androidx.navigation:navigation-fragment:2.3.5'
+    implementation 'androidx.navigation:navigation-ui:2.3.5'
     //implementation 'org.jetbrains:annotations-java5:15.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 9ce3bbc..88cd570 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -1,5 +1,6 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
 
+import androidx.annotation.IdRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -29,23 +30,25 @@ public MainActivity() {
         super(R.layout.activity_main);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .setReorderingAllowed(true)
-                    .add(R.id.fragment_container_view, MainView.class, null, "main_view")
-                    .commit();
-        }
-    }
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_main);
+//        if (savedInstanceState == null) {
+//            getSupportFragmentManager().beginTransaction()
+//                    .setReorderingAllowed(true)
+//                    .add(R.id.fragment_container_view, MainView.class, null, "main_view")
+//                    .commit();
+//        }
+//    }
 
     public static class MessageEvent {
-        public final Class fragmentClass;
+        public final int resId;
+        public final View view;
 
-        public MessageEvent(Class fragmentClass) {
-            this.fragmentClass = fragmentClass;
+        public MessageEvent(@IdRes int resId, View view) {
+            this.resId = resId;
+            this.view = view;
         }
     }
 
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
index dc32014..16414f4 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
@@ -7,12 +7,14 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.navigation.Navigation;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.EventLog;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -117,12 +119,12 @@ public void onClick(View v) {
             }
         });
 
-        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
-                EventBus.getDefault().post(new MainActivity.MessageEvent(SaveWeapon.class));
-            }
+        mButtonSaveWeapon.setOnClickListener(view -> {
+            //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
+            //EventBus.getDefault().post(new MainActivity.MessageEvent(SaveWeapon.class));
+            //Navigation.findNavController(view).navigate(R.id.action_mainView_to_saveWeapon2);
+            EventBus.getDefault().post(new MainActivity.MessageEvent(R.id.action_mainView_to_saveWeapon2, view));
+
         });
 
 
@@ -149,14 +151,9 @@ public void onStop() {
 
     @Subscribe
     public void replaceFragments(MainActivity.MessageEvent event) {
-        Class fragmentClass = event.fragmentClass;
+        int resId = event.resId;
+        View view = event.view;
         Log.d("MessageEvent", "success!");
-        Fragment fragment = null;
-        try {
-            fragment = (Fragment) fragmentClass.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         // Insert the fragment by replacing any existing fragment
         Bundle bundle = new Bundle();
         bundle.putString("weapon", mWeapon.toString());
@@ -167,18 +164,7 @@ public void replaceFragments(MainActivity.MessageEvent event) {
 
 
         //bundle.putString("current_weapon", (getSupportFragmentManager().findFragmentByTag("main_view")).getCurrentWeapon);
-        FragmentManager fragmentManager = ((MainActivity) getActivity()).getSupportFragmentManager();
-        if (fragmentManager.findFragmentByTag("main_view") == fragmentManager.findFragmentById(R.id.fragment_container_view)) {
-            fragmentManager.beginTransaction().add(R.id.fragment_container_view, fragment)
-                    .hide(fragmentManager.findFragmentByTag("main_view"))
-                    .addToBackStack("view1")
-                    .commit();
-        } else {
-            fragmentManager.beginTransaction().add(R.id.fragment_container_view, fragment)
-                    .replace(R.id.fragment_container_view, fragmentManager.findFragmentById(R.id.fragment_container_view))
-                    .addToBackStack(null)
-                    .commit();
-        }
+        Navigation.findNavController(view).navigate(resId);
     }
 
 //    @Override
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
index d01fd17..966d20a 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -76,7 +76,7 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
             cameraActivityResultLauncher.launch(intent)
         }
         mButtonSaveWeapon!!.setOnClickListener { //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
-            EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
+            //EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
         }
 
 //        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1dcab53..fc076b9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/fragment_container_view"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
     />
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..84074ca
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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/nav_graph"
+    app:startDestination="@id/mainView">
+
+    <fragment
+        android:id="@+id/mainView"
+        android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainView"
+        android:label="MainView" >
+        <action
+            android:id="@+id/action_mainView_to_cameraActivity"
+            app:destination="@id/cameraActivity" />
+        <action
+            android:id="@+id/action_mainView_to_saveWeapon2"
+            app:destination="@id/saveWeapon2" />
+    </fragment>
+    <activity
+        android:id="@+id/cameraActivity"
+        android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.CameraActivity"
+        android:label="activity_camera"
+        tools:layout="@layout/activity_camera" />
+    <fragment
+        android:id="@+id/saveWeapon2"
+        android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.SaveWeapon"
+        android:label="SaveWeapon" />
+</navigation>
\ No newline at end of file

From 36cd327b659322150450308de7d0dabf761ee718 Mon Sep 17 00:00:00 2001
From: Jacob Wood <50378486+jacusaurus@users.noreply.github.com>
Date: Fri, 25 Jun 2021 13:26:21 -0400
Subject: [PATCH 06/10] Renamed files and classes to more concisely reflect
 purposes.

---
 ...vityTest.java => NavHostActivityTest.java} |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../activities/MainActivity.java              | 219 ++++++++++++++--
 .../activities/MainView.java                  | 233 ------------------
 .../activities/NavHostActivity.java           |  38 +++
 .../activities/SaveWeapon.kt                  |   8 +-
 .../main/res/layout/activity_save_weapon.xml  |   4 +-
 .../{main_view.xml => main_activity.xml}      |   4 +-
 ...tivity_main.xml => nav_host_container.xml} |   2 +-
 app/src/main/res/navigation/nav_graph.xml     |   8 +-
 10 files changed, 249 insertions(+), 273 deletions(-)
 rename app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/{MainActivityTest.java => NavHostActivityTest.java} (75%)
 delete mode 100644 app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
 create mode 100644 app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
 rename app/src/main/res/layout/{main_view.xml => main_activity.xml} (99%)
 rename app/src/main/res/layout/{activity_main.xml => nav_host_container.xml} (91%)

diff --git a/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivityTest.java
similarity index 75%
rename from app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java
rename to app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivityTest.java
index af92638..ca725f1 100644
--- a/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java
+++ b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivityTest.java
@@ -10,10 +10,10 @@
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
-public class MainActivityTest {
+public class NavHostActivityTest {
 
     @Rule
-    public ActivityTestRule<MainActivity> activityRule = new ActivityTestRule<>(MainActivity.class);
+    public ActivityTestRule<NavHostActivity> activityRule = new ActivityTestRule<>(NavHostActivity.class);
 
     @Test
     public void DPSIsDisplayedWhenWeaponIsEntered() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9cc9a0e..3c43486 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.CameraActivity" />
-        <activity android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainActivity">
+        <activity android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.NavHostActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 88cd570..800e010 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -1,13 +1,14 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
 
-import androidx.annotation.IdRes;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.Navigation;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
@@ -24,32 +25,206 @@
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Fragment {
+    private Weapon mWeapon = new Weapon();
+    EditText mEditTextDamage;
+    EditText mEditTextReloadTime;
+    EditText mEditTextFireRate;
+    EditText mEditTextMagazineSize;
+
+    TextView mTextViewTimeToEmptyMagazine;
+    TextView mTextViewDamagePerSecond;
+    TextView mTextViewDamagePerMagazine;
+    TextView mTextViewTimeSpentShooting;
+    TextView mTextViewTimeSpentReloading;
+    TextView mTextViewDPSSustained;
+
+    Button mButton;
+    Button mButtonSaveWeapon;
+
 
     public MainActivity() {
-        super(R.layout.activity_main);
+        super(R.layout.main_activity);
+    }
+
+    ActivityResultLauncher<Intent> cameraActivityResultLauncher = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+                @Override
+                public void onActivityResult(ActivityResult result) {
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        // There are no request codes
+                        Intent data = result.getData();
+                        if (data != null) {
+                            buildWeapon(data);
+                        }
+
+                    }
+                }
+            });
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        mEditTextDamage = getView().findViewById(R.id.editTextDamage);
+        mEditTextReloadTime = getView().findViewById(R.id.editTextReloadTime);
+        mEditTextFireRate = getView().findViewById(R.id.editTextFireRate);
+        mEditTextMagazineSize = getView().findViewById(R.id.editTextMagazineSize);
+
+        mTextViewDPSSustained = getView().findViewById(R.id.textViewDamagePerSecondSustained);
+        mTextViewTimeToEmptyMagazine = getView().findViewById(R.id.textViewEmptyMagazine);
+        mTextViewDamagePerSecond = getView().findViewById(R.id.textViewDamagePerSecond);
+        mTextViewDamagePerMagazine = getView().findViewById(R.id.textViewDamagePerMagazine);
+        mTextViewTimeSpentShooting = getView().findViewById(R.id.textViewTimeSpentShooting);
+        mTextViewTimeSpentReloading = getView().findViewById(R.id.textViewTimeSpentReloading);
+
+        mButton = getView().findViewById(R.id.autoScanButton);
+        mButtonSaveWeapon = getView().findViewById(R.id.saveWeaponButton);
+
+        initListeners();
+    }
+
+
+    protected void initListeners() {
+        TextWatcher textWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                updateWeapon();
+                updateTextViews();
+            }
+        };
+
+        mEditTextDamage.addTextChangedListener(textWatcher);
+        mEditTextReloadTime.addTextChangedListener(textWatcher);
+        mEditTextFireRate.addTextChangedListener(textWatcher);
+        mEditTextMagazineSize.addTextChangedListener(textWatcher);
+
+        mButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
+                cameraActivityResultLauncher.launch(intent);
+            }
+        });
+
+        mButtonSaveWeapon.setOnClickListener(view -> {
+            //((NavHostActivity) getActivity()).replaceFragments(SaveWeapon.class);
+            //EventBus.getDefault().post(new NavHostActivity.MessageEvent(SaveWeapon.class));
+            //Navigation.findNavController(view).navigate(R.id.action_mainView_to_saveWeapon);
+            EventBus.getDefault().post(new NavHostActivity.MessageEvent(R.id.action_mainView_to_saveWeapon, view));
+
+        });
+
+
+//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
+//                startActivityForResult(intent, 1);
+//            }
+//        });
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void replaceFragments(NavHostActivity.MessageEvent event) {
+        int resId = event.resId;
+        View view = event.view;
+        Log.d("MessageEvent", "success!");
+        // Insert the fragment by replacing any existing fragment
+        Bundle bundle = new Bundle();
+        bundle.putString("weapon", mWeapon.toString());
+        bundle.putInt("damage", mWeapon.getDamage());
+        bundle.putFloat("reload_time", mWeapon.getReloadTime());
+        bundle.putFloat("fire_rate", mWeapon.getFireRate());
+        bundle.putInt("magazine_size", mWeapon.getMagazineSize());
+
+
+        //bundle.putString("current_weapon", (getSupportFragmentManager().findFragmentByTag("main_activity")).getCurrentWeapon);
+        Navigation.findNavController(view).navigate(resId);
     }
 
 //    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        setContentView(R.layout.activity_main);
-//        if (savedInstanceState == null) {
-//            getSupportFragmentManager().beginTransaction()
-//                    .setReorderingAllowed(true)
-//                    .add(R.id.fragment_container_view, MainView.class, null, "main_view")
-//                    .commit();
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//
+//        super.onActivityResult(requestCode, resultCode, data);
+//        if (requestCode == 1) {
+//            if (resultCode == Activity.RESULT_OK) {
+//                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
+//                if (resultWeapon != null) {
+//                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
+//                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
+//                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
+//                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
+//                }
+//            }
 //        }
 //    }
 
-    public static class MessageEvent {
-        public final int resId;
-        public final View view;
 
-        public MessageEvent(@IdRes int resId, View view) {
-            this.resId = resId;
-            this.view = view;
+    private void buildWeapon(Intent data) {
+        Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
+        if (resultWeapon != null) {
+            mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
+            mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
+            mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
+            mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
         }
     }
 
-}
\ No newline at end of file
+    private void updateWeapon() {
+        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
+                && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
+            int damage = Integer.parseInt(mEditTextDamage.getText().toString());
+            float reloadTime = Float.parseFloat(mEditTextReloadTime.getText().toString());
+            float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
+            int magazineSize = Integer.parseInt(mEditTextMagazineSize.getText().toString());
+
+            // Get all values
+            mWeapon.setDamage(damage);
+            mWeapon.setReloadTime(reloadTime);
+            mWeapon.setFireRate(fireRate);
+            mWeapon.setMagazineSize(magazineSize);
+        }
+    }
+
+    protected void updateTextViews() {
+        double dpsSustained = Math.round(mWeapon.getDPSSustained() * 100.0) / 100.0;
+        double dps = Math.round(mWeapon.getDamagePerSecond() * 100.0) / 100.0;
+        mTextViewDPSSustained.setText(String.valueOf(dpsSustained));
+        mTextViewDamagePerSecond.setText(String.valueOf(dps));
+        mTextViewTimeToEmptyMagazine.setText(String.valueOf(mWeapon.getTimeToEmptyMagazine()));
+        mTextViewDamagePerMagazine.setText(String.valueOf(mWeapon.getDamagePerMagazine()));
+        mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
+        mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
+    }
+
+//    private void saveWeapon(){
+//        mWeapon.saveWeapon(getActivity().getApplicationContext());
+//    }
+}
+
+
+
+
+
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
deleted file mode 100644
index 16414f4..0000000
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainView.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
-
-import androidx.activity.result.ActivityResult;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.navigation.Navigation;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.EventLog;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
-import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon;
-import com.borderlandsdpscalculator.borderlands3dpscalculator.activities.SaveWeapon;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-public class MainView extends Fragment {
-    private Weapon mWeapon = new Weapon();
-    EditText mEditTextDamage;
-    EditText mEditTextReloadTime;
-    EditText mEditTextFireRate;
-    EditText mEditTextMagazineSize;
-
-    TextView mTextViewTimeToEmptyMagazine;
-    TextView mTextViewDamagePerSecond;
-    TextView mTextViewDamagePerMagazine;
-    TextView mTextViewTimeSpentShooting;
-    TextView mTextViewTimeSpentReloading;
-    TextView mTextViewDPSSustained;
-
-    Button mButton;
-    Button mButtonSaveWeapon;
-
-
-    public MainView() {
-        super(R.layout.main_view);
-    }
-
-    ActivityResultLauncher<Intent> cameraActivityResultLauncher = registerForActivityResult(
-            new ActivityResultContracts.StartActivityForResult(),
-            new ActivityResultCallback<ActivityResult>() {
-                @Override
-                public void onActivityResult(ActivityResult result) {
-                    if (result.getResultCode() == Activity.RESULT_OK) {
-                        // There are no request codes
-                        Intent data = result.getData();
-                        if (data != null) {
-                            buildWeapon(data);
-                        }
-
-                    }
-                }
-            });
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        mEditTextDamage = getView().findViewById(R.id.editTextDamage);
-        mEditTextReloadTime = getView().findViewById(R.id.editTextReloadTime);
-        mEditTextFireRate = getView().findViewById(R.id.editTextFireRate);
-        mEditTextMagazineSize = getView().findViewById(R.id.editTextMagazineSize);
-
-        mTextViewDPSSustained = getView().findViewById(R.id.textViewDamagePerSecondSustained);
-        mTextViewTimeToEmptyMagazine = getView().findViewById(R.id.textViewEmptyMagazine);
-        mTextViewDamagePerSecond = getView().findViewById(R.id.textViewDamagePerSecond);
-        mTextViewDamagePerMagazine = getView().findViewById(R.id.textViewDamagePerMagazine);
-        mTextViewTimeSpentShooting = getView().findViewById(R.id.textViewTimeSpentShooting);
-        mTextViewTimeSpentReloading = getView().findViewById(R.id.textViewTimeSpentReloading);
-
-        mButton = getView().findViewById(R.id.autoScanButton);
-        mButtonSaveWeapon = getView().findViewById(R.id.saveWeapon);
-
-        initListeners();
-    }
-
-
-    protected void initListeners() {
-        TextWatcher textWatcher = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                updateWeapon();
-                updateTextViews();
-            }
-        };
-
-        mEditTextDamage.addTextChangedListener(textWatcher);
-        mEditTextReloadTime.addTextChangedListener(textWatcher);
-        mEditTextFireRate.addTextChangedListener(textWatcher);
-        mEditTextMagazineSize.addTextChangedListener(textWatcher);
-
-        mButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
-                cameraActivityResultLauncher.launch(intent);
-            }
-        });
-
-        mButtonSaveWeapon.setOnClickListener(view -> {
-            //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
-            //EventBus.getDefault().post(new MainActivity.MessageEvent(SaveWeapon.class));
-            //Navigation.findNavController(view).navigate(R.id.action_mainView_to_saveWeapon2);
-            EventBus.getDefault().post(new MainActivity.MessageEvent(R.id.action_mainView_to_saveWeapon2, view));
-
-        });
-
-
-//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
-//                startActivityForResult(intent, 1);
-//            }
-//        });
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Subscribe
-    public void replaceFragments(MainActivity.MessageEvent event) {
-        int resId = event.resId;
-        View view = event.view;
-        Log.d("MessageEvent", "success!");
-        // Insert the fragment by replacing any existing fragment
-        Bundle bundle = new Bundle();
-        bundle.putString("weapon", mWeapon.toString());
-        bundle.putInt("damage", mWeapon.getDamage());
-        bundle.putFloat("reload_time", mWeapon.getReloadTime());
-        bundle.putFloat("fire_rate", mWeapon.getFireRate());
-        bundle.putInt("magazine_size", mWeapon.getMagazineSize());
-
-
-        //bundle.putString("current_weapon", (getSupportFragmentManager().findFragmentByTag("main_view")).getCurrentWeapon);
-        Navigation.findNavController(view).navigate(resId);
-    }
-
-//    @Override
-//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-//
-//        super.onActivityResult(requestCode, resultCode, data);
-//        if (requestCode == 1) {
-//            if (resultCode == Activity.RESULT_OK) {
-//                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
-//                if (resultWeapon != null) {
-//                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
-//                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
-//                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
-//                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
-//                }
-//            }
-//        }
-//    }
-
-
-    private void buildWeapon(Intent data) {
-        Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
-        if (resultWeapon != null) {
-            mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
-            mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
-            mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
-            mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
-        }
-    }
-
-    private void updateWeapon() {
-        if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
-                && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
-            int damage = Integer.parseInt(mEditTextDamage.getText().toString());
-            float reloadTime = Float.parseFloat(mEditTextReloadTime.getText().toString());
-            float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
-            int magazineSize = Integer.parseInt(mEditTextMagazineSize.getText().toString());
-
-            // Get all values
-            mWeapon.setDamage(damage);
-            mWeapon.setReloadTime(reloadTime);
-            mWeapon.setFireRate(fireRate);
-            mWeapon.setMagazineSize(magazineSize);
-        }
-    }
-
-    protected void updateTextViews() {
-        double dpsSustained = Math.round(mWeapon.getDPSSustained() * 100.0) / 100.0;
-        double dps = Math.round(mWeapon.getDamagePerSecond() * 100.0) / 100.0;
-        mTextViewDPSSustained.setText(String.valueOf(dpsSustained));
-        mTextViewDamagePerSecond.setText(String.valueOf(dps));
-        mTextViewTimeToEmptyMagazine.setText(String.valueOf(mWeapon.getTimeToEmptyMagazine()));
-        mTextViewDamagePerMagazine.setText(String.valueOf(mWeapon.getDamagePerMagazine()));
-        mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
-        mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
-    }
-
-//    private void saveWeapon(){
-//        mWeapon.saveWeapon(getActivity().getApplicationContext());
-//    }
-}
-
-
-
-
-
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
new file mode 100644
index 0000000..5fe0a5e
--- /dev/null
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
@@ -0,0 +1,38 @@
+package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
+
+import androidx.annotation.IdRes;
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.view.View;
+
+import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
+
+public class NavHostActivity extends AppCompatActivity {
+
+    public NavHostActivity() {
+        super(R.layout.nav_host_container);
+    }
+
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.nav_host_container);
+//        if (savedInstanceState == null) {
+//            getSupportFragmentManager().beginTransaction()
+//                    .setReorderingAllowed(true)
+//                    .add(R.id.fragment_container_view, MainActivity.class, null, "main_activity")
+//                    .commit();
+//        }
+//    }
+
+    public static class MessageEvent {
+        public final int resId;
+        public final View view;
+
+        public MessageEvent(@IdRes int resId, View view) {
+            this.resId = resId;
+            this.view = view;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
index 966d20a..d6443ef 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -1,9 +1,7 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.commit
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R
 import android.app.Activity
 import android.content.Intent
@@ -14,9 +12,7 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainActivity.MessageEvent
 import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon
-import org.greenrobot.eventbus.EventBus
 
 class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
     private val mWeapon = Weapon()
@@ -54,7 +50,7 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
         mTextViewTimeSpentShooting = requireView().findViewById(R.id.textViewTimeSpentShooting)
         mTextViewTimeSpentReloading = requireView().findViewById(R.id.textViewTimeSpentReloading)
         mButton = requireView().findViewById(R.id.autoScanButton)
-        mButtonSaveWeapon = requireView().findViewById(R.id.saveWeapon)
+        mButtonSaveWeapon = requireView().findViewById(R.id.saveWeaponButton)
         initListeners()
     }
 
@@ -75,7 +71,7 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
             val intent = Intent(requireActivity().applicationContext, CameraActivity::class.java)
             cameraActivityResultLauncher.launch(intent)
         }
-        mButtonSaveWeapon!!.setOnClickListener { //((MainActivity) getActivity()).replaceFragments(SaveWeapon.class);
+        mButtonSaveWeapon!!.setOnClickListener { //((NavHostActivity) getActivity()).replaceFragments(SaveWeapon.class);
             //EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
         }
 
diff --git a/app/src/main/res/layout/activity_save_weapon.xml b/app/src/main/res/layout/activity_save_weapon.xml
index e804fce..49a49b4 100644
--- a/app/src/main/res/layout/activity_save_weapon.xml
+++ b/app/src/main/res/layout/activity_save_weapon.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
+    tools:context=".activities.NavHostActivity">
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -139,7 +139,7 @@
             android:text="@string/auto_mode" />
 
         <Button
-            android:id="@+id/saveWeapon"
+            android:id="@+id/saveWeaponButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/save_weapon" />
diff --git a/app/src/main/res/layout/main_view.xml b/app/src/main/res/layout/main_activity.xml
similarity index 99%
rename from app/src/main/res/layout/main_view.xml
rename to app/src/main/res/layout/main_activity.xml
index 97d6d8a..22088c3 100644
--- a/app/src/main/res/layout/main_view.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
+    tools:context=".activities.NavHostActivity">
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -139,7 +139,7 @@
             android:text="@string/auto_mode" />
 
         <Button
-            android:id="@+id/saveWeapon"
+            android:id="@+id/saveWeaponButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/save_weapon" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/nav_host_container.xml
similarity index 91%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/nav_host_container.xml
index fc076b9..b90e114 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/nav_host_container.xml
@@ -1,4 +1,4 @@
-<!-- res/layout/activity_main.xml -->
+<!-- res/layout/nav_host_container.xml -->
 <androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 84074ca..efc28bb 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,14 +7,14 @@
 
     <fragment
         android:id="@+id/mainView"
-        android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainView"
+        android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainActivity"
         android:label="MainView" >
         <action
             android:id="@+id/action_mainView_to_cameraActivity"
             app:destination="@id/cameraActivity" />
         <action
-            android:id="@+id/action_mainView_to_saveWeapon2"
-            app:destination="@id/saveWeapon2" />
+            android:id="@+id/action_mainView_to_saveWeapon"
+            app:destination="@id/saveWeapon" />
     </fragment>
     <activity
         android:id="@+id/cameraActivity"
@@ -22,7 +22,7 @@
         android:label="activity_camera"
         tools:layout="@layout/activity_camera" />
     <fragment
-        android:id="@+id/saveWeapon2"
+        android:id="@+id/saveWeapon"
         android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.SaveWeapon"
         android:label="SaveWeapon" />
 </navigation>
\ No newline at end of file

From e308ecccaf8b5e9adb3dc17424e3150a2e294da9 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Fri, 25 Jun 2021 13:36:38 -0400
Subject: [PATCH 07/10] Removed most commented out code.

---
 .../activities/MainActivity.java              | 29 ------------------
 .../activities/NavHostActivity.java           | 12 --------
 .../activities/SaveWeapon.kt                  | 30 ++-----------------
 3 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 800e010..3810b4a 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -123,15 +123,6 @@ public void onClick(View v) {
             EventBus.getDefault().post(new NavHostActivity.MessageEvent(R.id.action_mainView_to_saveWeapon, view));
 
         });
-
-
-//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
-//                startActivityForResult(intent, 1);
-//            }
-//        });
     }
 
     @Override
@@ -164,23 +155,6 @@ public void replaceFragments(NavHostActivity.MessageEvent event) {
         Navigation.findNavController(view).navigate(resId);
     }
 
-//    @Override
-//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-//
-//        super.onActivityResult(requestCode, resultCode, data);
-//        if (requestCode == 1) {
-//            if (resultCode == Activity.RESULT_OK) {
-//                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
-//                if (resultWeapon != null) {
-//                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
-//                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
-//                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
-//                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
-//                }
-//            }
-//        }
-//    }
-
 
     private void buildWeapon(Intent data) {
         Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
@@ -219,9 +193,6 @@ protected void updateTextViews() {
         mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
     }
 
-//    private void saveWeapon(){
-//        mWeapon.saveWeapon(getActivity().getApplicationContext());
-//    }
 }
 
 
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
index 5fe0a5e..3297557 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
@@ -13,18 +13,6 @@ public NavHostActivity() {
         super(R.layout.nav_host_container);
     }
 
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        setContentView(R.layout.nav_host_container);
-//        if (savedInstanceState == null) {
-//            getSupportFragmentManager().beginTransaction()
-//                    .setReorderingAllowed(true)
-//                    .add(R.id.fragment_container_view, MainActivity.class, null, "main_activity")
-//                    .commit();
-//        }
-//    }
-
     public static class MessageEvent {
         public final int resId;
         public final View view;
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
index d6443ef..566dbff 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -71,35 +71,11 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
             val intent = Intent(requireActivity().applicationContext, CameraActivity::class.java)
             cameraActivityResultLauncher.launch(intent)
         }
-        mButtonSaveWeapon!!.setOnClickListener { //((NavHostActivity) getActivity()).replaceFragments(SaveWeapon.class);
+        mButtonSaveWeapon!!.setOnClickListener {
             //EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
         }
-
-//        mButtonSaveWeapon.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                Intent intent = new Intent(getActivity().getApplicationContext(), SaveWeapon.class);
-//                startActivityForResult(intent, 1);
-//            }
-//        });
     }
 
-    //    @Override
-    //    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    //
-    //        super.onActivityResult(requestCode, resultCode, data);
-    //        if (requestCode == 1) {
-    //            if (resultCode == Activity.RESULT_OK) {
-    //                Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
-    //                if (resultWeapon != null) {
-    //                    mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
-    //                    mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
-    //                    mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
-    //                    mEditTextMagazineSize.setText(String.valueOf(resultWeapon.getMagazineSize()));
-    //                }
-    //            }
-    //        }
-    //    }
     private fun buildWeapon(data: Intent) {
         val resultWeapon = data.getSerializableExtra("weapon") as Weapon
         if (resultWeapon != null) {
@@ -136,7 +112,5 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
         mTextViewDamagePerMagazine!!.text = mWeapon.damagePerMagazine.toString()
         mTextViewTimeSpentReloading!!.text = mWeapon.timeSpentReloading.toString()
         mTextViewTimeSpentShooting!!.text = mWeapon.timeSpentShooting.toString()
-    } //    private void saveWeapon(){
-    //        mWeapon.saveWeapon(getActivity().getApplicationContext());
-    //    }
+    }
 }
\ No newline at end of file

From 27c842b19fe73556deaf2dee405491213882b64b Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Fri, 25 Jun 2021 14:08:16 -0400
Subject: [PATCH 08/10] Renamed mButton for autoscanning, MessageEvent, and
 navigation graph elements and actions.

---
 .../activities/MainActivity.java              | 35 +++++++++----------
 .../activities/NavHostActivity.java           |  8 ++---
 .../activities/SaveWeapon.kt                  |  8 ++---
 app/src/main/res/navigation/nav_graph.xml     | 12 +++----
 4 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index 3810b4a..db82dce 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -1,13 +1,5 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
 
-import androidx.activity.result.ActivityResult;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.navigation.Navigation;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -19,6 +11,14 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
+
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
 import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon;
 
@@ -39,7 +39,7 @@ public class MainActivity extends Fragment {
     TextView mTextViewTimeSpentReloading;
     TextView mTextViewDPSSustained;
 
-    Button mButton;
+    Button mAutoScanButton;
     Button mButtonSaveWeapon;
 
 
@@ -77,7 +77,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         mTextViewTimeSpentShooting = getView().findViewById(R.id.textViewTimeSpentShooting);
         mTextViewTimeSpentReloading = getView().findViewById(R.id.textViewTimeSpentReloading);
 
-        mButton = getView().findViewById(R.id.autoScanButton);
+        mAutoScanButton = getView().findViewById(R.id.autoScanButton);
         mButtonSaveWeapon = getView().findViewById(R.id.saveWeaponButton);
 
         initListeners();
@@ -108,7 +108,7 @@ public void afterTextChanged(Editable s) {
         mEditTextFireRate.addTextChangedListener(textWatcher);
         mEditTextMagazineSize.addTextChangedListener(textWatcher);
 
-        mButton.setOnClickListener(new View.OnClickListener() {
+        mAutoScanButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
@@ -117,10 +117,10 @@ public void onClick(View v) {
         });
 
         mButtonSaveWeapon.setOnClickListener(view -> {
-            //((NavHostActivity) getActivity()).replaceFragments(SaveWeapon.class);
-            //EventBus.getDefault().post(new NavHostActivity.MessageEvent(SaveWeapon.class));
-            //Navigation.findNavController(view).navigate(R.id.action_mainView_to_saveWeapon);
-            EventBus.getDefault().post(new NavHostActivity.MessageEvent(R.id.action_mainView_to_saveWeapon, view));
+            //((NavHostActivity) getActivity()).switchFragment(SaveWeapon.class);
+            //EventBus.getDefault().post(new NavHostActivity.SwitchFragEvent(SaveWeapon.class));
+            //Navigation.findNavController(view).navigate(R.id.action_mainActivityFrag_to_saveWeaponFrag);
+            EventBus.getDefault().post(new NavHostActivity.SwitchFragEvent(R.id.action_mainActivityFrag_to_saveWeaponFrag, view));
 
         });
     }
@@ -138,11 +138,10 @@ public void onStop() {
     }
 
     @Subscribe
-    public void replaceFragments(NavHostActivity.MessageEvent event) {
+    public void switchFragment(NavHostActivity.SwitchFragEvent event) {
         int resId = event.resId;
         View view = event.view;
-        Log.d("MessageEvent", "success!");
-        // Insert the fragment by replacing any existing fragment
+        Log.d("SwitchFragEvent", "success!");
         Bundle bundle = new Bundle();
         bundle.putString("weapon", mWeapon.toString());
         bundle.putInt("damage", mWeapon.getDamage());
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
index 3297557..b7dbbee 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
@@ -1,10 +1,10 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities;
 
+import android.view.View;
+
 import androidx.annotation.IdRes;
 import androidx.appcompat.app.AppCompatActivity;
 
-import android.view.View;
-
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
 
 public class NavHostActivity extends AppCompatActivity {
@@ -13,11 +13,11 @@ public NavHostActivity() {
         super(R.layout.nav_host_container);
     }
 
-    public static class MessageEvent {
+    public static class SwitchFragEvent {
         public final int resId;
         public final View view;
 
-        public MessageEvent(@IdRes int resId, View view) {
+        public SwitchFragEvent(@IdRes int resId, View view) {
             this.resId = resId;
             this.view = view;
         }
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
index 566dbff..38c64ac 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/SaveWeapon.kt
@@ -1,10 +1,8 @@
 package com.borderlandsdpscalculator.borderlands3dpscalculator.activities
 
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import com.borderlandsdpscalculator.borderlands3dpscalculator.R
 import android.app.Activity
 import android.content.Intent
+import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
@@ -12,6 +10,8 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.fragment.app.Fragment
+import com.borderlandsdpscalculator.borderlands3dpscalculator.R
 import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon
 
 class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
@@ -72,7 +72,7 @@ class SaveWeapon : Fragment(R.layout.activity_save_weapon) {
             cameraActivityResultLauncher.launch(intent)
         }
         mButtonSaveWeapon!!.setOnClickListener {
-            //EventBus.getDefault().post(MessageEvent(SaveWeapon::class.java))
+            //EventBus.getDefault().post(SwitchFragEvent(SaveWeapon::class.java))
         }
     }
 
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index efc28bb..9d16715 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -3,18 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/mainView">
+    app:startDestination="@id/mainActivityFrag">
 
     <fragment
-        android:id="@+id/mainView"
+        android:id="@+id/mainActivityFrag"
         android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.MainActivity"
         android:label="MainView" >
         <action
-            android:id="@+id/action_mainView_to_cameraActivity"
+            android:id="@+id/action_mainActivityFrag_to_cameraActivity"
             app:destination="@id/cameraActivity" />
         <action
-            android:id="@+id/action_mainView_to_saveWeapon"
-            app:destination="@id/saveWeapon" />
+            android:id="@+id/action_mainActivityFrag_to_saveWeaponFrag"
+            app:destination="@id/saveWeaponFrag" />
     </fragment>
     <activity
         android:id="@+id/cameraActivity"
@@ -22,7 +22,7 @@
         android:label="activity_camera"
         tools:layout="@layout/activity_camera" />
     <fragment
-        android:id="@+id/saveWeapon"
+        android:id="@+id/saveWeaponFrag"
         android:name="com.borderlandsdpscalculator.borderlands3dpscalculator.activities.SaveWeapon"
         android:label="SaveWeapon" />
 </navigation>
\ No newline at end of file

From 892622758413c1fd029baf81a9400583c4f58794 Mon Sep 17 00:00:00 2001
From: "Wood, Jacob G" <jacob.wood@jhuapl.edu>
Date: Thu, 1 Jul 2021 11:56:09 -0400
Subject: [PATCH 09/10] Added comments to code.

---
 app/build.gradle                              |  2 +-
 .../activities/MainActivity.java              | 74 +++++++++++++------
 .../activities/NavHostActivity.java           |  8 +-
 .../main/res/layout/activity_save_weapon.xml  |  1 -
 app/src/main/res/layout/main_activity.xml     |  4 +-
 .../main/res/layout/nav_host_container.xml    |  8 +-
 app/src/main/res/navigation/nav_graph.xml     |  2 +
 7 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9ed72a3..337232f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation "org.greenrobot:eventbus:3.2.0"
     implementation "androidx.core:core-ktx:1.5.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    def fragment_version = "1.3.4"
+    def fragment_version = "1.3.5"
 
     // Kotlin
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
index db82dce..d3de438 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java
@@ -26,12 +26,17 @@
 import org.greenrobot.eventbus.Subscribe;
 
 public class MainActivity extends Fragment {
-    private Weapon mWeapon = new Weapon();
+/* MainActivity extends Fragment, allowing it to be used more in a more modular way.  MainActivity is not actually the default
+ * starting activity, but is the first activity/fragment that the user sees as it is the default view as defined in the navigation
+   graph "nav_graph.xml". */
+    private Weapon mWeapon = new Weapon(); // declares a Weapon model object whose variables will be passed to most other processes
+    // declares several text fields that will be bound to their corresponding views
     EditText mEditTextDamage;
     EditText mEditTextReloadTime;
     EditText mEditTextFireRate;
     EditText mEditTextMagazineSize;
 
+    // declares several text blocks that will be bound to their corresponding views
     TextView mTextViewTimeToEmptyMagazine;
     TextView mTextViewDamagePerSecond;
     TextView mTextViewDamagePerMagazine;
@@ -39,32 +44,43 @@ public class MainActivity extends Fragment {
     TextView mTextViewTimeSpentReloading;
     TextView mTextViewDPSSustained;
 
+    // declares several buttons that will be bound to their corresponding views
     Button mAutoScanButton;
     Button mButtonSaveWeapon;
 
 
+    // constructor that calls "MainActivity" constructor and gives main_activity.xml as a layout.  Layout is subsequently inflated.
     public MainActivity() {
         super(R.layout.main_activity);
     }
 
+
+    // https://stackoverflow.com/questions/62671106/onactivityresult-method-is-deprecated-what-is-the-alternative
+    // defines actions to be executed upon completion of an activity (cameraActivity)
     ActivityResultLauncher<Intent> cameraActivityResultLauncher = registerForActivityResult(
             new ActivityResultContracts.StartActivityForResult(),
             new ActivityResultCallback<ActivityResult>() {
                 @Override
-                public void onActivityResult(ActivityResult result) {
+                public void onActivityResult(ActivityResult result) { // code that executes when Activity completes
                     if (result.getResultCode() == Activity.RESULT_OK) {
                         // There are no request codes
-                        Intent data = result.getData();
+                        Intent data = result.getData(); //gets data from result and saves it as an Intent
                         if (data != null) {
-                            buildWeapon(data);
+                            buildWeapon(data);  //build weapon if data was returned from activity
                         }
 
                     }
                 }
             });
 
+    // overrides onViewCreated().  Executes after view is created, and therefore, after onCreate() and onCreateView().
+    // getView() only works after onCreateView(), which is why the overridden method is onViewCreated()
+    // see https://stackoverflow.com/a/6496000/7136798 for more details
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        // method accepts a View, which is the View created by onCreateView(), and a Bundle, which is the bundle
+        // passed into onCreateView().
+        // the following statements bind View elements (from layout file) to their corresponding class variables
         mEditTextDamage = getView().findViewById(R.id.editTextDamage);
         mEditTextReloadTime = getView().findViewById(R.id.editTextReloadTime);
         mEditTextFireRate = getView().findViewById(R.id.editTextFireRate);
@@ -80,12 +96,13 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         mAutoScanButton = getView().findViewById(R.id.autoScanButton);
         mButtonSaveWeapon = getView().findViewById(R.id.saveWeaponButton);
 
-        initListeners();
+        initListeners();    //calls method to initialize listeners for bound objects
     }
 
 
+    // function to initialize listeners
     protected void initListeners() {
-        TextWatcher textWatcher = new TextWatcher() {
+        TextWatcher textWatcher = new TextWatcher() { // TextWatcher objects are called when an "Editable" object (that it's attached to) is changed
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -97,51 +114,62 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
             }
 
             @Override
-            public void afterTextChanged(Editable s) {
+            public void afterTextChanged(Editable s) {  // I'm only concerned with the behavior that occurs *after* text is changed
                 updateWeapon();
                 updateTextViews();
             }
         };
-
+        // the following statements attach the previously instantiated textWatcher to several "Editable" objects through the use of a text-change listener
         mEditTextDamage.addTextChangedListener(textWatcher);
         mEditTextReloadTime.addTextChangedListener(textWatcher);
         mEditTextFireRate.addTextChangedListener(textWatcher);
         mEditTextMagazineSize.addTextChangedListener(textWatcher);
 
+        // when clicked, the autoscan will launch a CameraActivity
         mAutoScanButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                // creates intent to launch CameraActivity.  getActivity() returns the FragmentActivity (or AppCompatActivity) that the current fragment is associated with (NavHostActivity in this case)
+                // getApplicationContext() returns the context of the global Application object of the current process (in this case returns context of NavHostActivity)
                 Intent intent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
-                cameraActivityResultLauncher.launch(intent);
+                cameraActivityResultLauncher.launch(intent);    //activity is launched and program flow control is passed to cameraActivityResultLauncher, which handles post-activity logic
             }
         });
 
+        // when clicked, the button to save your weapon launches an event that switches the active fragment
         mButtonSaveWeapon.setOnClickListener(view -> {
             //((NavHostActivity) getActivity()).switchFragment(SaveWeapon.class);
             //EventBus.getDefault().post(new NavHostActivity.SwitchFragEvent(SaveWeapon.class));
             //Navigation.findNavController(view).navigate(R.id.action_mainActivityFrag_to_saveWeaponFrag);
+            //launches activity by posting an event using EventBus and passing control to the subscribing method
             EventBus.getDefault().post(new NavHostActivity.SwitchFragEvent(R.id.action_mainActivityFrag_to_saveWeaponFrag, view));
-
+            /* EventBus is used because it contains a simple framework that can be used to pass data from the calling activity (or fragment) to the child fragment.
+             * It's also super re-usable and allows me to write a few less lines of code (theoretically) per fragment switch.
+               See https://stackoverflow.com/questions/13216916/how-to-replace-the-activitys-fragment-from-the-fragment-itself#comment56148125_13221546 for another reason why you should use EventBus. */
         });
     }
 
+    //onStart() registers the EventBus listener so that it picks up any posts that occur.  This subscription is valid for the duration of the lifecycle of the calling class (MainActivity).
     @Override
     public void onStart() {
         super.onStart();
         EventBus.getDefault().register(this);
     }
 
+    //onsStop() unregisters the EventBus listener when the class'/activity's lifecycle ends.  Because MainActivity is the "start destination" (defined in nav_graph.xml), the lifecycle should extend to the lifetime of the application.
     @Override
     public void onStop() {
         super.onStop();
         EventBus.getDefault().unregister(this);
     }
 
+    //a "subscriber" method that handles behavior when a SwitchFragEvent is posted.  Reads as unused because it is executed asynchronously, once an event is posted.
     @Subscribe
     public void switchFragment(NavHostActivity.SwitchFragEvent event) {
-        int resId = event.resId;
-        View view = event.view;
+        int resId = event.resId;    //sets resID according to the event object's resId value
+        View view = event.view; // sets view object according to the event object's View
         Log.d("SwitchFragEvent", "success!");
+        //creates bundle containing weapon info to pass to the newly displayed fragment
         Bundle bundle = new Bundle();
         bundle.putString("weapon", mWeapon.toString());
         bundle.putInt("damage", mWeapon.getDamage());
@@ -149,15 +177,17 @@ public void switchFragment(NavHostActivity.SwitchFragEvent event) {
         bundle.putFloat("fire_rate", mWeapon.getFireRate());
         bundle.putInt("magazine_size", mWeapon.getMagazineSize());
 
-
         //bundle.putString("current_weapon", (getSupportFragmentManager().findFragmentByTag("main_activity")).getCurrentWeapon);
+        //navigates to the given resId (or with the action defined by resId).  findNavController returns the NavController given by the view of the onClick listener (or other caller that posts a compatible event).
         Navigation.findNavController(view).navigate(resId);
     }
 
 
+    //sets displayed text according to data returned to it by an external activity/fragment
     private void buildWeapon(Intent data) {
-        Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon");
-        if (resultWeapon != null) {
+        Weapon resultWeapon = (Weapon) data.getSerializableExtra("weapon"); //gets data from Intent and creates a Weapon object with it
+        //sets displayed values (in the editable text fields) according to the values of resultWeapon
+        if (resultWeapon != null) { //check to ensure that there was sufficient data passed to construct a Weapon (otherwise resultWeapon is null)
             mEditTextDamage.setText(String.valueOf(resultWeapon.getDamage()));
             mEditTextReloadTime.setText(String.valueOf(resultWeapon.getReloadTime()));
             mEditTextFireRate.setText(String.valueOf(resultWeapon.getFireRate()));
@@ -165,7 +195,9 @@ private void buildWeapon(Intent data) {
         }
     }
 
+    //updates mWeapon values according to user input in text fields
     private void updateWeapon() {
+        //checks to ensure that none of the text fields were changed to be blank (e.g. user hits backspace) and assigns these values to mWeapon accordingly
         if (!mEditTextDamage.getText().toString().equals("") && !mEditTextReloadTime.getText().toString().equals("")
                 && !mEditTextFireRate.getText().toString().equals("") && !mEditTextMagazineSize.getText().toString().equals("")) {
             int damage = Integer.parseInt(mEditTextDamage.getText().toString());
@@ -173,7 +205,7 @@ private void updateWeapon() {
             float fireRate = Float.parseFloat(mEditTextFireRate.getText().toString());
             int magazineSize = Integer.parseInt(mEditTextMagazineSize.getText().toString());
 
-            // Get all values
+            //sets mWeapon variable values according to local variables, which are defined above
             mWeapon.setDamage(damage);
             mWeapon.setReloadTime(reloadTime);
             mWeapon.setFireRate(fireRate);
@@ -181,9 +213,13 @@ private void updateWeapon() {
         }
     }
 
+    //updates text blocks according to the values of mWeapon
     protected void updateTextViews() {
+        //I think I calculated the following two instead of getting them from the Weapon class because it didn't print them nice when I tried it the other way, but I can't be sure ¯\_(ツ)_/¯
         double dpsSustained = Math.round(mWeapon.getDPSSustained() * 100.0) / 100.0;
         double dps = Math.round(mWeapon.getDamagePerSecond() * 100.0) / 100.0;
+
+        //updates values of text blocks
         mTextViewDPSSustained.setText(String.valueOf(dpsSustained));
         mTextViewDamagePerSecond.setText(String.valueOf(dps));
         mTextViewTimeToEmptyMagazine.setText(String.valueOf(mWeapon.getTimeToEmptyMagazine()));
@@ -191,10 +227,4 @@ protected void updateTextViews() {
         mTextViewTimeSpentReloading.setText(String.valueOf(mWeapon.getTimeSpentReloading()));
         mTextViewTimeSpentShooting.setText(String.valueOf(mWeapon.getTimeSpentShooting()));
     }
-
 }
-
-
-
-
-
diff --git a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
index b7dbbee..3dd133f 100644
--- a/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
+++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/NavHostActivity.java
@@ -7,17 +7,19 @@
 
 import com.borderlandsdpscalculator.borderlands3dpscalculator.R;
 
+//FragmentActivity is the base class for AppCompatActivity, so we can use AppCompatActivity to contain and display a fragment
 public class NavHostActivity extends AppCompatActivity {
 
-    public NavHostActivity() {
+    public NavHostActivity() {  //constructor instantiates and inflates layout with a Fragment Container View, which is used to hold and display different Fragments
         super(R.layout.nav_host_container);
     }
 
-    public static class SwitchFragEvent {
+    public static class SwitchFragEvent {   //acts as an event that is accessible from anywhere (provided a NavHostActivity object has already been instantiated)
+        //following variables are final, as they are not changed after being set during instantiation, and public, because the subscriber needs to be able to retrieve their values to perform its function
         public final int resId;
         public final View view;
 
-        public SwitchFragEvent(@IdRes int resId, View view) {
+        public SwitchFragEvent(@IdRes int resId, View view) {   //constructor that takes two parameters and sets instance variables with them.  Necessary to pass data from caller to subscriber outside of caller scope.
             this.resId = resId;
             this.view = view;
         }
diff --git a/app/src/main/res/layout/activity_save_weapon.xml b/app/src/main/res/layout/activity_save_weapon.xml
index 49a49b4..69b5a9a 100644
--- a/app/src/main/res/layout/activity_save_weapon.xml
+++ b/app/src/main/res/layout/activity_save_weapon.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <androidx.constraintlayout.widget.ConstraintLayout 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"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 22088c3..4d380aa 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<!-- Main activity layout, which is the default landing that users see -->
 <androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -144,8 +144,6 @@
             android:layout_height="wrap_content"
             android:text="@string/save_weapon" />
 
-
-
     </LinearLayout>
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/layout/nav_host_container.xml b/app/src/main/res/layout/nav_host_container.xml
index b90e114..6ef78ec 100644
--- a/app/src/main/res/layout/nav_host_container.xml
+++ b/app/src/main/res/layout/nav_host_container.xml
@@ -1,12 +1,10 @@
 <!-- res/layout/nav_host_container.xml -->
-<androidx.fragment.app.FragmentContainerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- creates a Fragment Container View to hold fragments and specifies a navGraph that defines how most navigation among activities and fragments will be controlled -->
+<androidx.fragment.app.FragmentContainerView 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/fragment_container_view"
     android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:defaultNavHost="true"
-    app:navGraph="@navigation/nav_graph"
-    />
+    app:navGraph="@navigation/nav_graph" />
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 9d16715..cf36b46 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- I used https://blog.usejournal.com/the-navigation-component-not-that-hard-ca705cf4326 as a guide to get me started with Navigation -->
+<!-- Navigation graph that defines how navigation among fragments and activities operates.  Starting view is MainView -->
 <navigation 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"

From eae6164ea712455360385eb0b8651fd4c413d181 Mon Sep 17 00:00:00 2001
From: Jacob Wood <50378486+Jacusaurus@users.noreply.github.com>
Date: Wed, 7 Jul 2021 09:59:34 -0400
Subject: [PATCH 10/10] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cac3287..162b5e2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Borderlands3WeaponDpsCalculator
-An Android App for Borderlands 3 weapons DPS calculation
+An Android App to calculate DPS and DPS sustained of Borderlands 2, 3, and Pre-Sequel weapons
 
 A Weapon DPS Calculator I forked from https://github.com/RomainDeschenes/Borderlands3DpsCalculator