Merge branch 'master' of https://github.com/CMPUT301W21T21-H03/Divine…

…Inspiration

.travis.yml

@@ -3,7 +3,7 @@ jdk: oraclejdk8
 
 env:
   global:
-    - ANDROID_TARGET=android-28
+    - ANDROID_TARGET=android-22
     - ANDROID_ABI=armeabi-v7a
 
 android:
@@ -17,7 +17,7 @@ android:
     - build-tools-30.0.3
 
     # The SDK version used to compile your project
-    - android-28
+    - android-23
 
     # Additional components
     - extra-google-google_play_services

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/Experiments/ExperimentFragment.java

@@ -45,7 +45,7 @@
 
 /**
  * This class deals with the UI for displaying the experiment details. (It also contains 4 tabs: Trials, Comments, Stats, Data)
- * @see R.layout#experiment_fragment
+ * @see com.DivineInspiration.experimenter.R.layout#experiment_fragment
  */
 public class ExperimentFragment extends Fragment implements Subject, TrialManager.OnTrialListReadyListener{
     List<Trial> currentTrials = new ArrayList<>();            // The trials performed for the experiment
@@ -82,7 +82,7 @@ public class ExperimentFragment extends Fragment implements Subject, TrialManage
      * @param inflater
      * @param container
      * @param  savedInstanceState
-     * @return: view created
+     * @return view created
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/Experiments/ExperimentListTabFragment.java

@@ -25,7 +25,7 @@
 /**
  * This class deals with the UI for displaying the experiments lists of experiments.
  * Used in the Experiments and Subscriptions tabs of Profile fragment.
- * @see R.layout#experiment_list - XML layout file for this fragment
+ * @see com.DivineInspiration.experimenter.R.layout#experiment_list - XML layout file for this fragment
  */
 public class ExperimentListTabFragment extends Fragment implements ExperimentDialogFragment.OnExperimentOperationDoneListener, Refreshable {
 

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/Profile/EditProfileDialogFragment.java

@@ -24,7 +24,7 @@
 
 /**
  * This class provides the UI for a user to create or edit his/her own profile
- * @see: edit_profile_dialog_fragment
+ * @see edit_profile_dialog_fragment
  * Runs when: 'EDIT' button is clicked on the home page
  */
 public class EditProfileDialogFragment extends DialogFragment {

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/Profile/ProfileFragment.java

@@ -34,7 +34,7 @@
 
 /**
  * This class deals with the UI for displaying the experiment details. (It also contains 4 tabs: Trials, Comments, Stats, Data)
- * @see: profile_fragment (Contains 3 tabs: Experiments, Subscriptions, Trials)
+ * @see com.DivineInspiration.experimenter.R.layout#profile_fragment (Contains 3 tabs: Experiments, Subscriptions, Trials)
  */
 public class ProfileFragment extends Fragment {
 

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/QRBarCode/BarCodeListFragment.java

@@ -22,7 +22,7 @@ public class BarCodeListFragment extends Fragment {
      * @param inflater
      * @param container
      * @param savedInstanceState
-     * @return
+     * @return view
      */
     @Nullable
     @Override

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/Stats/GraphMaker.java

@@ -522,7 +522,7 @@ public static List<List<Trial>> groupTrialByRange(List<Trial> trials, int number
      * Helper function to find the max value in a list of measurement trials
      * @param trials
      * list of trials
-     * @return
+     * @return The greatest measurement in the listed trials
      */
     public static double findMaxMeasurement(List<Trial> trials) {
         return ((MeasurementTrial) Collections.max(trials, (t1, t2) -> Double.compare(((MeasurementTrial) t1).getValue(), ((MeasurementTrial) t2).getValue()))).getValue();

app/app/src/main/java/com/DivineInspiration/experimenter/Activity/UI/TrialsUI/TrialsTabFragment.java

@@ -24,7 +24,7 @@
 
 /**
  * An Activity Fragment that displays an experiments trials. A tab in the Experiment fragment labelled "Trials."
- * Associated xml file - {@see trial_list}
+ * @see com.DivineInspiration.experimenter.R.layout#trial_list - Associated xml file
  */
 public class TrialsTabFragment extends Fragment implements Observer {
 
@@ -75,7 +75,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
      * Implementation of the observer interface. This method updates its data
      * when update method is called from ExperimentFragment (which is the observable).
      * @param data
-     * A {@see java.util.List} of trials to replace the old trialList
+     * A {@link java.util.List} of trials to replace the old trialList
      */
     @Override
     public void update(Object data) {

app/app/src/main/java/com/DivineInspiration/experimenter/Controller/CommentManager.java

@@ -72,7 +72,6 @@ private CommentManager(){
     /**
      * Delete all comments of a given experiment from the database
      * @param experimentId the experiment the comments belongs to
-     * @return: void
      */
     public void deleteAllCommentOfExperiment(String experimentId){
         db.collection("Comments").document(experimentId).collection("Comments").get().addOnCompleteListener(task -> {
@@ -96,7 +95,6 @@ public void deleteAllCommentOfExperiment(String experimentId){
      * Adds a new comment to the database
      * @param comment comment we want to add
      * @param experimentID the experiment the comment belongs to
-     * @return void
      */
     public void addComment(Comment comment, String experimentID) {
         // Construct the Map object
@@ -133,7 +131,6 @@ public void onComplete(@NonNull Task<Void> task) {
      * @param reply comment we want to add
      * @param commentID the comment the reply belongs to
      * @param experimentID the experiment the comment belongs to
-     * @return void
      */
     public void addReply (Comment reply, String commentID, String experimentID) {
         // Construct the Map object
@@ -189,7 +186,6 @@ public void onComplete(@NonNull Task<Void> task) {
      * Deletes an existing comment from the database.
      * @param commentID comment we want to delete
      * @param experimentID the experiment the comment belongs to
-     * @return void
      */
     public void removeComment (String commentID, String experimentID) {
         // TODO: Recursive delete
@@ -217,7 +213,6 @@ public void onComplete(@NonNull Task<Void> task) {
      * @param replyID reply we want to delete
      * @param commentID comment we want to add
      * @param experimentID The experiment the comment belongs to
-     * @return void
      */
     public void removeReply (String replyID, String commentID, String experimentID) {
         // TODO check is last reply removed
@@ -228,7 +223,6 @@ public void removeReply (String replyID, String commentID, String experimentID)
      * @param experimentID The experiment the comment belongs to
      * @param callback the class to call after the operation is done.
      *         The data is passed as a parameter of this method.
-     * @return void
      */
     public void getExperimentComments (String experimentID, OnCommentsReadyListener callback) {
 
@@ -261,7 +255,6 @@ public void onComplete(@NonNull Task<QuerySnapshot> task) {
      * @param experimentID  the experiment the comment belongs to
      * @param callback The class to call after the operation is done.
      *         The data is passed as a parameter of this method.
-     * @return void
      */
     public void getCommentReplies (String commentID, String experimentID, OnRepliesReadyListener callback) {
 

app/app/src/main/java/com/DivineInspiration/experimenter/Controller/ExperimentManager.java

@@ -274,7 +274,6 @@ public void onComplete(@NonNull Task<Void> task) {
      * Adds a new experiment to database.
      * @param experiment experiment we want to add
      * @param callback the class to call after the operation is done
-     * @return void
      */
     public void addExperiment(Experiment experiment, OnOperationDone callback) {
         initLocalUserId();

app/app/src/main/java/com/DivineInspiration/experimenter/Controller/UserManager.java

@@ -87,7 +87,7 @@ public interface OnUserReadyListener {
     /**
      * Gets the current local user of the device.
      * @return the current user
-     * @Warning getLocalUser might return null if used during init
+     * @warning getLocalUser might return null if used during init
      */
     public User getLocalUser(){
         return user;

app/app/src/main/java/com/DivineInspiration/experimenter/Model/Comment/Comment.java

@@ -108,7 +108,7 @@ public void setComment(String comment) {
 
     /**
      * State of whether this is a reply of a comment
-     * @return
+     * @return true if the comment is a reply. false otherwise
      */
     public boolean isReply() {
         return isReply;