Added Comments to Combat and Added InputFilters to All Title inputs

Author: FrozenDrew

app/src/main/java/com/example/bored_bard/Combat/CombatAdapter.java

@@ -22,16 +22,33 @@
 import java.util.ArrayList;
 import java.util.jar.Attributes;
 
-
+/**
+ * @author Andrew MacMurray - FrozenDrew
+ */
 public class CombatAdapter extends RecyclerView.Adapter<CombatAdapter.CombatHolder>{
     Context context;
    ArrayList<Player> playerlist;
 
+
+    /**
+     *
+      * @param context is context?
+     * @param playerlist is the ArrayList of Players that will be used to set the CombatCard View
+     *                   With the Data From the RealTime Database
+     */
     public CombatAdapter(Context context, ArrayList<Player> playerlist) {
         this.context = context;
         this.playerlist = playerlist;
     }
 
+    /**
+     *
+     * @param parent The ViewGroup into which the new View will be added after it is bound to
+     *               an adapter position.
+     * @param viewType The view type of the new View.
+     *
+     * @return view is the CombatCard View
+     */
     @NonNull
     @Override
     public CombatHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -40,27 +57,38 @@ public CombatHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
         return new CombatHolder(view);
     }
 
+    /**
+     *
+     * @param holder The ViewHolder which should be updated to represent the contents of the
+     *        item at the given position in the data set.
+     * @param position The position of the item within the adapter's data set.
+     */
     @Override
     public void onBindViewHolder(@NonNull CombatHolder holder, int position) {FirebaseUser user;
 
 
-                holder.Name.setText(playerlist.get(position).getName());
+            //Sets the CombatCard with Values from the ArrayList
+            holder.Name.setText(playerlist.get(position).getName());
             holder.HP.setText(playerlist.get(position).getHp());
             holder.AC.setText(playerlist.get(position).getAc());
 
 
 
     }
 
+    /**
+     *
+     * @return the size of the playerList
+     */
     @Override
     public int getItemCount() {
         return playerlist.size();
     }
 
-    public void onBindViewHolder(String s) {
-    }
-
 
+    /**
+     * Stores the Views that are needed for the CombatCard
+     */
     public static class CombatHolder extends RecyclerView.ViewHolder{
         TextView Name, AC;
         EditText HP, IntRoll;

app/src/main/java/com/example/bored_bard/Combat/combat_activity.java

@@ -32,7 +32,7 @@
 import java.util.ArrayList;
 
 /**
- * @author Caroline Barrineau
+ * @author Andrew MacMurray - FrozenDrew
  */
 public class combat_activity extends Activity {
     FirebaseAuth mAuth;
@@ -57,34 +57,42 @@ protected void onCreate(Bundle savedInstanceState) {
         database = FirebaseDatabase.getInstance();
 
 
-
-
-
-
+        /**
+         * Gets the Title pointer for the Database
+         */
         Bundle bundle = getIntent().getExtras();
         if(bundle != null){
         combatTitle.setText(bundle.getString("CombatTitle"));
-        //CombatPath = bundle.getString("CombatTitle");
+
         }
         String Title = String.valueOf(combatTitle.getText());
 
-        //Firebase calls
 
 
 
+        //Creates an ArrayList for the Adapter to pull information from
         playerlist = new ArrayList<>();
 
+        //Calls RecyclerView
         RecyclerView recyclerView = findViewById(R.id.combatRecycler);
 
         GridLayoutManager gridLayoutManager = new GridLayoutManager(combat_activity.this, 1);
         recyclerView.setLayoutManager(gridLayoutManager);
 
+        //Calls the CombatApdater
         CombatAdapter playerAdapter = new CombatAdapter(combat_activity.this, playerlist);
 
+        //Sets the RecyclerView to the CombatAdpater
         recyclerView.setAdapter(playerAdapter);
 
+        //FireBase DatabaseReference to find the Players
         databaseReference = database.getReference(username).child("Campaigns").child(Title).child("Players");
 
+        /**
+         * Adds players to the ArrayList playerList from the Firebase Realtime Database
+         * The CombatAdapter will set the CombatCard with the Values from the playerList
+         * Then the RecyclerView will Display the CombatCard
+         */
         eventListener = databaseReference.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot snapshot) {
@@ -104,15 +112,15 @@ public void onCancelled(@NonNull DatabaseError error) {
             }
         });
 
-        playerAdapter.onBindViewHolder(Title = String.valueOf(combatTitle));
+
 
 
 
         //button calls
         backBtn = findViewById(R.id.CombatbackBtn);
-
-
-
+        /**
+         * Will send the User back to the Campaign Menu with the Title pointer
+         */
         backBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/example/bored_bard/UI_files/Register.java

@@ -4,6 +4,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -82,6 +84,21 @@ public void onClick(View view) {
             }
         });
 
+        InputFilter filter = new InputFilter() {
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    if (c == '.' || c == '#' || c == '$' || c == '[' || c == ']') {
+                        return ""; // return an empty string to prevent the character from being entered
+                    }
+                }
+                return null; // let the character be entered
+            }
+        };
+        editUsername.setFilters(new InputFilter[] {filter});
+
+
         /**
          * Will Register a User using Email, Password, and Username
          * If Email is blank will prompt the user to Enter an Email

app/src/main/java/com/example/bored_bard/UI_files/addCampaign_activity.java

@@ -23,6 +23,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.widget.Button;
 import android.view.View;
@@ -58,6 +60,22 @@ protected void onCreate(Bundle savedInstanceState) {
         user = mAuth.getCurrentUser();
         databaseReference = FirebaseDatabase.getInstance().getReference();
 
+
+        InputFilter filter = new InputFilter() {
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    if (c == '.' || c == '#' || c == '$' || c == '[' || c == ']') {
+                        return ""; // return an empty string to prevent the character from being entered
+                    }
+                }
+                return null; // let the character be entered
+            }
+        };
+
+        CampaignTitle.setFilters(new InputFilter[] {filter});
+
        String campaignTitle = CampaignTitle.getText().toString();
        String campaignDescription = CampaignInfo.getText().toString();
 
@@ -70,6 +88,8 @@ protected void onCreate(Bundle savedInstanceState) {
        createCampaign.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+
+
                 String username = user.getDisplayName(), Title;
 
                 Title = String.valueOf(CampaignTitle.getText());

app/src/main/java/com/example/bored_bard/notes/AddNotes.java

@@ -5,6 +5,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -60,6 +62,19 @@ protected void onCreate(Bundle savedInstanceState) {
             CNTitle.setText(bundle.getString("Title"));
 
         }
+        InputFilter filter = new InputFilter() {
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    if (c == '.' || c == '#' || c == '$' || c == '[' || c == ']') {
+                        return ""; // return an empty string to prevent the character from being entered
+                    }
+                }
+                return null; // let the character be entered
+            }
+        };
+        titleInput.setFilters(new InputFilter[] {filter});
 
 
         //Creates a New Note and returns the user to the NotesList page

app/src/main/java/com/example/bored_bard/notes/EditNote.java

@@ -14,6 +14,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -61,6 +63,21 @@ protected void onCreate(Bundle savedInstanceState) {
             id = bundle.getString("id");
         }
 
+        InputFilter filter = new InputFilter() {
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    if (c == '.' || c == '#' || c == '$' || c == '[' || c == ']') {
+                        return ""; // return an empty string to prevent the character from being entered
+                    }
+                }
+                return null; // let the character be entered
+            }
+        };
+
+        ETitle.setFilters(new InputFilter[] {filter});
+
         //Calls the Firebase References from the RealTime database
         firebaseDatabase = FirebaseDatabase.getInstance();
         reference = FirebaseDatabase.getInstance().getReference(username).child("Campaigns").child(CTitle.getText().toString()).child("Notes").child(id);

app/src/main/java/com/example/bored_bard/player/addPlayer.java

@@ -4,6 +4,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -60,6 +62,20 @@ protected void onCreate(Bundle savedInstanceState) {
             Title = bundle.getString("Title");
         }
 
+        InputFilter filter = new InputFilter() {
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    if (c == '.' || c == '#' || c == '$' || c == '[' || c == ']') {
+                        return ""; // return an empty string to prevent the character from being entered
+                    }
+                }
+                return null; // let the character be entered
+            }
+        };
+        Name.setFilters(new InputFilter[] {filter});
+
 
         reference = FirebaseDatabase.getInstance().getReference();
 

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

@@ -101,17 +101,6 @@
         />
 
     <!-- Back Button -->
-    <TextView
-        android:id="@+id/backBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:text="@string/back"
-        android:textSize="17sp"
-        android:textAlignment="center"
-        android:layout_margin="10dp"
-        app:layout_constraintStart_toStartOf="@+id/guideline_left"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -155,6 +144,7 @@
         android:layout_marginTop="36dp"
         android:text="@string/create_note"
         android:textColor="@color/white"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
         app:layout_constraintEnd_toStartOf="@+id/guideline_right"
         app:layout_constraintStart_toEndOf="@+id/exitButton"
         app:layout_constraintTop_toBottomOf="@id/linearLayout" />
@@ -167,8 +157,9 @@
         android:layout_marginTop="36dp"
         android:text="@string/cancel"
         android:textColor="@color/white"
-        app:layout_constraintStart_toStartOf="@+id/guideline_left"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
         app:layout_constraintEnd_toStartOf="@+id/savebutton"
+        app:layout_constraintStart_toStartOf="@+id/guideline_left"
         app:layout_constraintTop_toBottomOf="@id/linearLayout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>