UI Reskin and Added Features#46
Open
TheNathanGift wants to merge 96 commits intomichaelcarrano:masterfrom
Open
UI Reskin and Added Features#46TheNathanGift wants to merge 96 commits intomichaelcarrano:masterfrom
TheNathanGift wants to merge 96 commits intomichaelcarrano:masterfrom
Conversation
audio cue for end of rest, end of exercise, and end of workout
… the animation smoother.
…used from a rest countdown because the circle changes to the ticks of a exercise timer.
…t raises the bar and displays text underneath. Currently uses placeholder text.
…workout_android # Conflicts: # app/src/main/java/com/michaelcarrano/seven_min_workout/WorkoutCountdownFragment.java
…workout_android # Conflicts: # app/src/main/java/com/michaelcarrano/seven_min_workout/WorkoutCountdownFragment.java
…workout_android # Conflicts: # app/src/main/java/com/michaelcarrano/seven_min_workout/WorkoutCountdownFragment.java
…ly on pause in pauseAndPlayButtonSetUp because I am very kind.
…tes when opened and has no styling.
…wnTimer method for all three instances of the timer being used.
…me bug fixes needed with the animation. Timer and play button are now side by side. stats visuals still need updating on that page as well.
…ositioning, and bug with white background all fixed.
…e touches in the backing code and a few color changes.
…the user to view. Minor issue with layout not wrapping to content.
…he onCreate method.
…e files for backgrounds and modified the layouts to better suit the design.
…untdownfragment, fields given max value, sizing fixes, and orientation locked to portrait mode.
… resumeFab in case we decide to use it.
…nd "Rest" phases. When entering a "Rest" phase the bar now closes automatically. Fixed a bug where the "High knees running in place" exercise would cause the bottom bar animation to not display properly. Cleaned up and documented some code.
…workout_android # Conflicts: # app/src/main/java/com/michaelcarrano/seven_min_workout/WorkoutCountdownActivity.java
…ng to WorkoutCountdownFragment.java and CircularProgressBar.java.
Owner
|
@Giftasaurus thanks for the contributions. I will try to find some time this weekend to review. It has been a while since I worked on this code base so it will take some time to get through everything. Just looking at the description of the PR, there's a lot of really great features added. |
Owner
michaelcarrano
left a comment
michaelcarrano
left a comment
There was a problem hiding this comment.
Made some minor comments, need to find time to dive into the larger set of changes.
Few questions:
- Why did remove Youtube video?
- Is there a way to view the stats of previous workouts?
| 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' |
Owner
There was a problem hiding this comment.
Support libraries should be the same version and these are not the latest stable version.
| <activity android:name="com.michaelcarrano.seven_min_workout.WorkoutListActivity"> | ||
| <activity | ||
| android:name=".WorkoutListActivity" | ||
| android:screenOrientation="portrait"> |
Owner
There was a problem hiding this comment.
Any reason you are restricting the activity to only be portrait?
|
|
||
| <activity | ||
| android:name=".WorkoutCompleteActivity" | ||
| android:screenOrientation="portrait"></activity> |
Owner
There was a problem hiding this comment.
Can be be changed to self-closing /> instead of </activity>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New Features Added: