Added option to delay handling onclick events in activities (see #106)

CMU-CREATE-Lab · Jan 21, 2020 · 0879983 · 0879983
1 parent 10bfa06
commit 0879983
Show file tree

Hide file tree

Showing 18 changed files with 193 additions and 0 deletions.
diff --git a/...d/app/src/main/java/org/cmucreatelab/android/flutterprek/activities/AbstractActivity.java b/...d/app/src/main/java/org/cmucreatelab/android/flutterprek/activities/AbstractActivity.java
@@ -15,6 +15,31 @@
  */
 public abstract class AbstractActivity extends AppCompatActivity {
 
+    private final DelayedOnClickHandler delayedOnClickHandler = new DelayedOnClickHandler(this);
+
+
+    /**
+     * An activity by default will delay setting onclick listeners for its views.
+     *
+     * @return false if onclick listeners should be immediately set when the activity resumes.
+     */
+    public boolean activityUsesDelayedOnClickHandler() {
+        return true;
+    }
+
+
+    /**
+     * Determines if views in the activity should respond to onclick events. This depends on the state of the DelayedOnClickHandler.
+     *
+     * @return true if onclick events should be handled, false otherwise.
+     */
+    public final boolean activityShouldHandleOnClickEvents() {
+        if (activityUsesDelayedOnClickHandler()) {
+            return delayedOnClickHandler.delayIsFinished();
+        }
+        return true;
+    }
+
 
     /**
      * Hide navigation buttons to make the activity take up the entire screen.
@@ -28,6 +53,10 @@ protected void onResume() {
                 | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
 
         decorView.setSystemUiVisibility(uiOptions);
+
+        if (activityUsesDelayedOnClickHandler()) {
+            delayedOnClickHandler.onResumeActivity();
+        }
     }
 
 
@@ -42,7 +71,12 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onPause() {
         Log.i(Constants.LOG_TAG, "onPause");
+
         AudioPlayer.getInstance(getApplicationContext()).stop();
+        if (activityUsesDelayedOnClickHandler()) {
+            delayedOnClickHandler.onPauseActivity();
+        }
+
         super.onPause();
     }
 

diff --git a/.../src/main/java/org/cmucreatelab/android/flutterprek/activities/DelayedOnClickHandler.java b/.../src/main/java/org/cmucreatelab/android/flutterprek/activities/DelayedOnClickHandler.java
@@ -0,0 +1,45 @@
+package org.cmucreatelab.android.flutterprek.activities;
+
+import org.cmucreatelab.android.flutterprek.BackgroundTimer;
+
+/**
+ * Handles timer for setting the onclick listeners for an activity.
+ */
+public class DelayedOnClickHandler implements BackgroundTimer.TimeExpireListener {
+
+    private static final long SET_ONCLICK_LISTENER_DELAY_IN_MILLISECONDS = 1000;
+
+    private final BackgroundTimer backgroundTimer;
+    private final AbstractActivity activity;
+    private boolean delayIsFinished = false;
+
+
+    public DelayedOnClickHandler(AbstractActivity activity) {
+        this.activity = activity;
+        backgroundTimer = new BackgroundTimer(SET_ONCLICK_LISTENER_DELAY_IN_MILLISECONDS, this);
+    }
+
+
+    public void onResumeActivity() {
+        delayIsFinished = false;
+        backgroundTimer.startTimer();
+    }
+
+
+    public void onPauseActivity() {
+        backgroundTimer.stopTimer();
+        delayIsFinished = false;
+    }
+
+
+    public boolean delayIsFinished() {
+        return delayIsFinished;
+    }
+
+
+    @Override
+    public void timerExpired() {
+        delayIsFinished = true;
+    }
+
+}
diff --git a/.../cmucreatelab/android/flutterprek/activities/student_section/ChooseClassroomActivity.java b/.../cmucreatelab/android/flutterprek/activities/student_section/ChooseClassroomActivity.java
@@ -98,4 +98,10 @@ public boolean isInfoIconVisible() {
         return true;
     }
 
+
+    @Override
+    public boolean activityUsesDelayedOnClickHandler() {
+        return false;
+    }
+
 }
diff --git a/...mucreatelab/android/flutterprek/activities/student_section/ChooseCopingSkillActivity.java b/...mucreatelab/android/flutterprek/activities/student_section/ChooseCopingSkillActivity.java
@@ -38,6 +38,10 @@ public class ChooseCopingSkillActivity extends StudentSectionActivityWithTimeout
         @Override
         public void onClick(CopingSkill copingSkill, List<ItineraryItem> itineraryItems) {
             Log.d(Constants.LOG_TAG, "onClick coping skill = " + copingSkill.getName());
+            if (!activityShouldHandleOnClickEvents()) {
+                Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                return;
+            }
             GlobalHandler globalHandler = GlobalHandler.getInstance(getApplicationContext());
             globalHandler.getSessionTracker().onSelectedCopingSkill(ChooseCopingSkillActivity.this, copingSkill, itineraryItems);
 
@@ -126,6 +130,10 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.imagePlayAudioView).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 playAudioFile();
             }
         });

diff --git a/...rg/cmucreatelab/android/flutterprek/activities/student_section/ChooseStudentActivity.java b/...rg/cmucreatelab/android/flutterprek/activities/student_section/ChooseStudentActivity.java
@@ -80,6 +80,10 @@ public int getResourceIdForActivityLayout() {
 
     @Override
     public void onClickImageStudent() {
+        if (!activityShouldHandleOnClickEvents()) {
+            Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+            return;
+        }
         startActivity(new Intent(this, LoginActivity.class));
     }
 

diff --git a/...elab/android/flutterprek/activities/student_section/StudentSectionActivityWithHeader.java b/...elab/android/flutterprek/activities/student_section/StudentSectionActivityWithHeader.java
@@ -57,6 +57,10 @@ public void onClick(View v) {
 
 
     public void onClickImageStudent() {
+        if (!activityShouldHandleOnClickEvents()) {
+            Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+            return;
+        }
         // go back to students page
         GlobalHandler.getInstance(getApplicationContext()).endCurrentSession(this);
     }

diff --git a/.../flutterprek/activities/student_section/choose_emotion/ChooseEmotionAbstractActivity.java b/.../flutterprek/activities/student_section/choose_emotion/ChooseEmotionAbstractActivity.java
@@ -38,6 +38,10 @@ public abstract class ChooseEmotionAbstractActivity extends StudentSectionActivi
         @Override
         public void onClick(Emotion emotion, List<ItineraryItem> itineraryItems) {
             Log.d(Constants.LOG_TAG, "onClick emotion = " + emotion.getName());
+            if (!activityShouldHandleOnClickEvents()) {
+                Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                return;
+            }
             GlobalHandler globalHandler = GlobalHandler.getInstance(getApplicationContext());
 
             // track selection with GlobalHandler
@@ -136,6 +140,10 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.imagePlayAudioView).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 playAudioHowAreYouFeeling();
             }
         });

diff --git a/...oid/flutterprek/activities/student_section/coping_skills/AbstractCopingSkillActivity.java b/...oid/flutterprek/activities/student_section/coping_skills/AbstractCopingSkillActivity.java
@@ -47,4 +47,10 @@ public void finish() {
         startActivity(postCopingActivity);
     }
 
+
+    @Override
+    public boolean activityUsesDelayedOnClickHandler() {
+        return false;
+    }
+
 }
diff --git a/...ills/post_coping_skills/post_coping_skill_finished_exercise/FinishedExerciseActivity.java b/...ills/post_coping_skills/post_coping_skill_finished_exercise/FinishedExerciseActivity.java
@@ -79,20 +79,32 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.viewFeelingUnchanged).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().onSelectedFinishedExerciseEmotion("unchanged");
                 startActivity(GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().getNextIntent(FinishedExerciseActivity.this));
             }
         });
         findViewById(R.id.viewFeelingOk).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().onSelectedFinishedExerciseEmotion("ok");
                 goToNextPostCopingSkillActivity();
             }
         });
         findViewById(R.id.viewFeelingHappy).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().onSelectedFinishedExerciseEmotion("happy");
                 goToNextPostCopingSkillActivity();
             }

diff --git a/...oping_skills/post_coping_skills/post_coping_skill_heart_beating/HeartBeatingActivity.java b/...oping_skills/post_coping_skills/post_coping_skill_heart_beating/HeartBeatingActivity.java
@@ -56,13 +56,21 @@ protected void onCreate(Bundle savedInstanceState) {
         heartSlow.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().onSelectedHeartBeat("slow");
                 goToNextPostCopingSkillActivity();
             }
         });
         heartFast.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().onSelectedHeartBeat("fast");
                 goToNextPostCopingSkillActivity();
             }

diff --git a/...ing_skills/post_coping_skills/post_coping_skill_rejoin_friends/RejoinFriendsActivity.java b/...ing_skills/post_coping_skills/post_coping_skill_rejoin_friends/RejoinFriendsActivity.java
@@ -1,8 +1,10 @@
 package org.cmucreatelab.android.flutterprek.activities.student_section.coping_skills.post_coping_skills.post_coping_skill_rejoin_friends;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
+import org.cmucreatelab.android.flutterprek.Constants;
 import org.cmucreatelab.android.flutterprek.GlobalHandler;
 import org.cmucreatelab.android.flutterprek.R;
 import org.cmucreatelab.android.flutterprek.activities.student_section.coping_skills.post_coping_skills.PostCopingSkillActivity;
@@ -29,12 +31,20 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.imageViewNo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 startActivity(GlobalHandler.getInstance(getApplicationContext()).getSessionTracker().getNextIntent(RejoinFriendsActivity.this));
             }
         });
         findViewById(R.id.imageViewYes).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 GlobalHandler.getInstance(getApplicationContext()).endCurrentSession(RejoinFriendsActivity.this);
             }
         });

diff --git a/...ection/coping_skills/post_coping_skills/post_coping_skill_use_words/UseWordsActivity.java b/...ection/coping_skills/post_coping_skills/post_coping_skill_use_words/UseWordsActivity.java
@@ -55,12 +55,20 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.imageViewNo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 goToNextPostCopingSkillActivity();
             }
         });
         findViewById(R.id.imageViewYes).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
                 goToUseWordsActivity();
             }
         });

diff --git a/...g/cmucreatelab/android/flutterprek/activities/teacher_section/ClassroomIndexActivity.java b/...g/cmucreatelab/android/flutterprek/activities/teacher_section/ClassroomIndexActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.GridView;
 
+import org.cmucreatelab.android.flutterprek.Constants;
 import org.cmucreatelab.android.flutterprek.R;
 import org.cmucreatelab.android.flutterprek.activities.adapters.ClassroomIndexAdapter;
 import org.cmucreatelab.android.flutterprek.activities.fragments.DrawerTeacherMainFragment;
@@ -36,6 +37,10 @@ public void onChanged(@Nullable List<Classroom> classrooms) {
             @Override
             public void onClick(View v) {
                 Log.i("activity", "fabNewClassroom.onClick");
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
             }
         });
     }

diff --git a/...cmucreatelab/android/flutterprek/activities/teacher_section/CopingSkillIndexActivity.java b/...cmucreatelab/android/flutterprek/activities/teacher_section/CopingSkillIndexActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.GridView;
 
+import org.cmucreatelab.android.flutterprek.Constants;
 import org.cmucreatelab.android.flutterprek.R;
 import org.cmucreatelab.android.flutterprek.activities.adapters.CopingSkillIndexAdapter;
 import org.cmucreatelab.android.flutterprek.activities.fragments.DrawerTeacherMainFragment;
@@ -36,6 +37,10 @@ public void onChanged(@Nullable List<CopingSkill> copingSkills) {
             @Override
             public void onClick(View v) {
                 Log.i("activity", "fabNewCopingSkill.onClick");
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
             }
         });
     }

diff --git a/...org/cmucreatelab/android/flutterprek/activities/teacher_section/EmotionIndexActivity.java b/...org/cmucreatelab/android/flutterprek/activities/teacher_section/EmotionIndexActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.GridView;
 
+import org.cmucreatelab.android.flutterprek.Constants;
 import org.cmucreatelab.android.flutterprek.R;
 import org.cmucreatelab.android.flutterprek.activities.adapters.EmotionIndexAdapter;
 import org.cmucreatelab.android.flutterprek.activities.fragments.DrawerTeacherMainFragment;
@@ -36,6 +37,10 @@ public void onChanged(@Nullable List<Emotion> emotions) {
             @Override
             public void onClick(View v) {
                 Log.i("activity", "fabNewEmotion.onClick");
+                if (!activityShouldHandleOnClickEvents()) {
+                    Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+                    return;
+                }
             }
         });
     }

diff --git a/...n/java/org/cmucreatelab/android/flutterprek/activities/teacher_section/LoginActivity.java b/...n/java/org/cmucreatelab/android/flutterprek/activities/teacher_section/LoginActivity.java
@@ -2,10 +2,12 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
 
+import org.cmucreatelab.android.flutterprek.Constants;
 import org.cmucreatelab.android.flutterprek.R;
 import org.cmucreatelab.android.flutterprek.activities.teacher_section.session_index.SessionIndexActivity;
 
@@ -51,11 +53,19 @@ public int getResourceIdForActivityLayout() {
 
     @Override
     public void onClickImageStudent() {
+        if (!activityShouldHandleOnClickEvents()) {
+            Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+            return;
+        }
         finish();
     }
 
 
     public void onClickButtonLogin() {
+        if (!activityShouldHandleOnClickEvents()) {
+            Log.w(Constants.LOG_TAG, "ignoring onclick event when activityShouldHandleOnClickEvents is false");
+            return;
+        }
         if (checkPassword()) {
             findViewById(R.id.textViewErrorPrompt).setVisibility(View.INVISIBLE);
             // clear the text field