Small changes to make the bottom sheet hide when the trials are done.

cmsc436 · May 2, 2017 · cccdc12 · cccdc12
1 parent 7d0846b
commit cccdc12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainActivity.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainActivity.java
@@ -40,6 +40,7 @@
 import java.util.Comparator;
 
 import edu.umd.cmsc436.mstestsuite.data.ActionsAdapter;
+import edu.umd.cmsc436.mstestsuite.ui.CoordinatorActivity;
 import edu.umd.cmsc436.sheets.Sheets;
 
 public class MainActivity extends AppCompatActivity implements MainContract.View, Sheets.Host {
@@ -308,6 +309,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         mPresenter.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_INSTALL) {
             mPresenter.onPackageInstalled();
+        } else if (requestCode == CoordinatorActivity.REQUEST_CODE) {
+            mPresenter.onCoordinatorDone();
         }
     }
 

diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainContract.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainContract.java
@@ -48,5 +48,6 @@ interface Presenter {
         void onActivityResult(int requestCode, int resultCode, Intent data);
         void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults);
         void onPackageInstalled ();
+        void onCoordinatorDone ();
     }
 }
diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainPresenter.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainPresenter.java
@@ -110,7 +110,7 @@ public void run() {
 
     @Override
     public void onDailyStart() {
-        CoordinatorActivity.start(mView.getContext(), mUserManager.getCurUserID(), mAllDifficulties, mNumTrials);
+        CoordinatorActivity.start(mView.getActivity(), mUserManager.getCurUserID(), mAllDifficulties, mNumTrials);
     }
 
     @Override
@@ -176,6 +176,12 @@ public void onPackageInstalled() {
         installFirst();
     }
 
+    @Override
+    public void onCoordinatorDone() {
+        mView.hideBottomSheet();
+        isBottomSheetExpanded = false;
+    }
+
     @Override
     public void onAppSelected(TestApp app) {
         try {

diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/ui/CoordinatorActivity.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/ui/CoordinatorActivity.java
@@ -1,7 +1,7 @@
 package edu.umd.cmsc436.mstestsuite.ui;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -24,13 +24,14 @@ public class CoordinatorActivity extends AppCompatActivity implements Sheets.Hos
     private static final String KEY_PID = "patient id";
     private static final String KEY_DIFFICULTIES = "difficulties";
     private static final String KEY_N_TRIALS = "number of trials";
+    public static final int REQUEST_CODE = 789;
 
-    public static void start(Context context, String patientId, int[] difficulties, int n_trials) {
-        Intent starter = new Intent(context, CoordinatorActivity.class);
+    public static void start(Activity activity, String patientId, int[] difficulties, int n_trials) {
+        Intent starter = new Intent(activity, CoordinatorActivity.class);
         starter.putExtra(KEY_PID, patientId);
         starter.putExtra(KEY_DIFFICULTIES, difficulties);
         starter.putExtra(KEY_N_TRIALS, n_trials);
-        context.startActivity(starter);
+        activity.startActivityForResult(starter, REQUEST_CODE);
     }
 
     private String mCurPatient;