Merge pull request #15 from cmsc436/coordinator

Coordinator
cmsc436 · May 2, 2017 · fcc1894 · fcc1894
2 parents 23ed951 + 87baebd
commit fcc1894
Show file tree

Hide file tree

Showing 12 changed files with 377 additions and 38 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,9 +24,9 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    compile project(':frontendhelper')
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:design:25.3.1'
-    compile project(':frontendhelper')
+    testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,10 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.CoordinatorActivity"
+            android:theme="@style/AppTheme.Fullscreen">
+        </activity>
 
         <activity android:name=".MainActivity"/>
     </application>

diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainActivity.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainActivity.java
@@ -50,6 +50,7 @@ public class MainActivity extends AppCompatActivity implements MainContract.View
     private Button mPeekButton;
     private BottomSheetBehavior mBottomSheet;
     private ImageView mCloseButton;
+    private View mSpacer;
 
     private MainContract.Presenter mPresenter;
 
@@ -66,6 +67,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
 
+        mSpacer = findViewById(R.id.spacer);
+        findViewById(R.id.bottom_sheet).setNestedScrollingEnabled(false);
+
         mInstallCache = null;
 
         mPeekButton = (Button) findViewById(R.id.peeked_begin_button);
@@ -95,6 +99,13 @@ public void onClick(View v) {
             }
         });
 
+        findViewById(R.id.expanded_daily_button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mPresenter.onDailyStart();
+            }
+        });
+
         mBottomSheet = BottomSheetBehavior.from(findViewById(R.id.bottom_sheet));
         mBottomSheet.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
             @Override
@@ -151,7 +162,6 @@ public void expandBottomSheet() {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mBottomSheet.setHideable(false);
                 mBottomSheet.setState(BottomSheetBehavior.STATE_EXPANDED);
             }
         });
@@ -162,8 +172,8 @@ public void collapseBottomSheet() {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mBottomSheet.setHideable(false);
                 mBottomSheet.setState(BottomSheetBehavior.STATE_COLLAPSED);
+                mSpacer.setVisibility(View.VISIBLE);
             }
         });
     }
@@ -173,8 +183,8 @@ public void hideBottomSheet() {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mBottomSheet.setHideable(true);
                 mBottomSheet.setState(BottomSheetBehavior.STATE_HIDDEN);
+                mSpacer.setVisibility(View.GONE);
             }
         });
     }

diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainPresenter.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/MainPresenter.java
@@ -2,8 +2,6 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -19,6 +17,7 @@
 import edu.umd.cmsc436.mstestsuite.data.ActionsAdapter;
 import edu.umd.cmsc436.mstestsuite.data.TestApp;
 import edu.umd.cmsc436.mstestsuite.model.UserManager;
+import edu.umd.cmsc436.mstestsuite.ui.CoordinatorActivity;
 import edu.umd.cmsc436.mstestsuite.util.PackageChecker;
 import edu.umd.cmsc436.mstestsuite.util.PackageUtil;
 import edu.umd.cmsc436.sheets.DriveApkTask;
@@ -65,6 +64,8 @@ public void run() {
     private ActionsAdapter mPracticeModeAdapter;
     private Sheets mSheet;
     private TestApp[] mAllApps;
+    private int[] mAllDifficulties;
+    private int mNumTrials;
     private ArrayList<TestApp> mDesiredApps;
 
     MainPresenter(MainContract.View v) {
@@ -79,7 +80,7 @@ public void run() {
             mUserManager = new UserManager(mView.getContext());
         }
 
-        mAllApps = loadAppInfo();
+        mAllApps = PackageUtil.loadAppInfo(mView.getContext(), this);
         mToInstall = new HashMap<>();
 
         mMainAdapter = new ActionsAdapter(actions, mView.getContext().getString(R.string.main_actions_header, mUserManager.getCurUserID()));
@@ -97,32 +98,9 @@ public void run() {
         mSheet.fetchPrescription(mUserManager.getCurUserID(), this);
     }
 
-    private TestApp[] loadAppInfo() {
-        Resources res = mView.getContext().getResources();
-        TypedArray package_names = res.obtainTypedArray(R.array.test_prefixes);
-        TypedArray display_names = res.obtainTypedArray(R.array.display_names);
-        TypedArray icons = res.obtainTypedArray(R.array.icons);
-
-        TestApp[] apps = new TestApp[package_names.length()];
-        if (package_names.length() == display_names.length() && display_names.length() == icons.length()) {
-            for (int i = 0; i < package_names.length(); i++) {
-                apps[i] = new TestApp(package_names.getString(i), display_names.getString(i), icons.getResourceId(i, R.mipmap.ic_launcher), this);
-            }
-        } else {
-            Log.e(getClass().getCanonicalName(), "XML resource arrays not same length");
-            apps = new TestApp[0];
-        }
-
-        package_names.recycle();
-        display_names.recycle();
-        icons.recycle();
-
-        return apps;
-    }
-
     @Override
     public void onDailyStart() {
-        // TODO
+        CoordinatorActivity.start(mView.getContext(), mUserManager.getCurUserID(), mAllDifficulties, mNumTrials);
     }
 
     @Override
@@ -205,10 +183,18 @@ public void onPrescriptionFetched(@Nullable List<String> list) {
             return;
         }
 
+        try {
+            mNumTrials = Integer.parseInt(list.get(2));
+        } catch (NumberFormatException nfe) {
+            mNumTrials = 1;
+        }
+
         mDesiredApps = new ArrayList<>();
+        mAllDifficulties = new int[mAllApps.length];
         for (int i = 0; i < mAllApps.length; i++) {
             try {
                 int difficulty = Integer.parseInt(list.get(i + 4));
+                mAllDifficulties[i] = difficulty;
                 if (difficulty > 0) {
                     mDesiredApps.add(mAllApps[i]);
                 }
@@ -284,6 +270,7 @@ public void onCheckFinished(Map<String, Float> versionMap) {
                     @Override
                     public void run() {
                         mMainAdapter.setEnabled(0, true);
+                        mView.expandBottomSheet();
                     }
                 });
             }

diff --git a/app/src/main/java/edu/umd/cmsc436/mstestsuite/data/TestApp.java b/app/src/main/java/edu/umd/cmsc436/mstestsuite/data/TestApp.java
@@ -1,13 +1,16 @@
 package edu.umd.cmsc436.mstestsuite.data;
 
+import edu.umd.cmsc436.sheets.Sheets;
+
 /**
  * Hold app information, not prescription info
  */
 
 public class TestApp extends Action {
     private String packageName;
+    private Sheets.TestType[] supportedAppendages;
 
-    public TestApp(final String packageName, String displayName, int iconResource, final Events callback) {
+    public TestApp(final String packageName, String displayName, int iconResource, CharSequence[] textArray, final Events callback) {
         super(displayName, iconResource, null);
         setAction(new Runnable() {
             @Override
@@ -17,12 +20,20 @@ public void run() {
         });
         this.packageName = packageName;
 
+        supportedAppendages = new Sheets.TestType[textArray.length];
+        for (int i = 0; i < textArray.length; i++) {
+            supportedAppendages[i] = Sheets.TestType.valueOf(textArray[i].toString());
+        }
     }
 
     public String getPackageName() {
         return packageName;
     }
 
+    public Sheets.TestType[] getSupportedAppendages() {
+        return supportedAppendages;
+    }
+
     public interface Events {
         void onAppSelected (TestApp app);
     }