UI Reskin and Added Features

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.michaelcarrano.seven_min_workout"
         minSdkVersion 16
@@ -23,18 +23,20 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.android.support:design:25.0.1'
-
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+    implementation 'com.android.support:appcompat-v7:25.0.1'
+    implementation 'com.android.support:design:25.3.1'
+    implementation 'com.github.ohoussein.playpauseview:playpauseview:1.0.2'
+    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
         transitive = true;
     }
 
     // Testing Dependencies
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    //implementation 'com.android.support:support-v4:25.4.0'
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }

app/src/main/AndroidManifest.xml

@@ -10,33 +10,38 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-        <activity android:name="com.michaelcarrano.seven_min_workout.WorkoutListActivity">
+        <activity
+            android:name=".WorkoutListActivity"
+            android:screenOrientation="portrait">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="com.michaelcarrano.seven_min_workout.WorkoutDetailActivity"
-            android:parentActivityName=".WorkoutListActivity">
+            android:name=".WorkoutDetailActivity"
+            android:parentActivityName=".WorkoutListActivity"
+            android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".WorkoutListActivity" />
         </activity>
         <activity
-            android:name="com.michaelcarrano.seven_min_workout.WorkoutCountdownActivity"
+
+            android:name=".WorkoutCountdownActivity"
             android:parentActivityName=".WorkoutListActivity"
             android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".WorkoutListActivity" />
         </activity>
-
         <activity
-            android:name="com.michaelcarrano.seven_min_workout.AboutActivity"
+            android:name=".AboutActivity"
             android:label="@string/menu_about_app"
-            android:parentActivityName=".WorkoutListActivity">
+            android:parentActivityName=".WorkoutListActivity"
+            android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".WorkoutListActivity" />
@@ -45,6 +50,10 @@
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="3fb5327e30111ad3ebb87c0769045f97c142cf2c" />
+
+        <activity
+            android:name=".WorkoutCompleteActivity"
+            android:screenOrientation="portrait"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/michaelcarrano/seven_min_workout/AllExerciseStatsFragment.java

@@ -0,0 +1,22 @@
+package com.michaelcarrano.seven_min_workout;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class AllExerciseStatsFragment extends Fragment {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_all_exercise_stats, container, false);
+        return rootView;
+    }
+}

app/src/main/java/com/michaelcarrano/seven_min_workout/App.java

@@ -26,7 +26,7 @@ public void onCreate() {
         final int[] darkColors = resources.getIntArray(R.array.darkColors);
         final int[] lightColors = resources.getIntArray(R.array.lightColors);
 
-        if (WorkoutContent.WORKOUTS.isEmpty()) {
+        if (WorkoutContent.MENU_ITEMS.isEmpty()) {
             for (int i = 0; i < workoutNames.length; i++) {
                 WorkoutContent.addWorkout(
                         new WorkoutContent.Workout(
@@ -39,7 +39,6 @@ public void onCreate() {
                         )
                 );
             }
-
         }
     }
 }

app/src/main/java/com/michaelcarrano/seven_min_workout/BaseActivity.java

@@ -10,6 +10,7 @@
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 
 /**
  * Created by michaelcarrano on 10/1/16.
@@ -94,4 +95,40 @@ public FloatingActionButton setShowFab(boolean show) {
         return fab;
     }
 
+    @NonNull
+    public Button addResumeFab() {
+        Button button = (Button) findViewById(R.id.fabResume);
+
+        if (button == null) {
+            getLayoutInflater().inflate(R.layout.fab_resume, getCoordinatorLayout());
+            button = (Button) findViewById(R.id.fabResume);
+        }
+
+        setShowResumeFab(true);
+
+        return button;
+    }
+
+    @Nullable
+    public Button setShowResumeFab(boolean show) {
+        Button fab = (Button) findViewById(R.id.fabResume);
+
+        if (fab == null || fab.getVisibility() == View.VISIBLE && show || fab.getVisibility() == View.GONE && !show) {
+            return fab;
+        }
+
+        fab.clearAnimation();
+
+        CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) fab.getLayoutParams();
+        if (show) {
+//            params.setBehavior(new FloatingActionButtonBehavior(this));
+            fab.setVisibility(View.VISIBLE);
+        } else {
+            params.setBehavior(null);
+            fab.setVisibility(View.GONE);
+        }
+
+        return fab;
+    }
+
 }