small txt chg #2
Open
Conversation
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
…hich takes to a stub view
…hich takes to a stub view
Main Activity
Consistency fixes with action bar
Conflicts: .gitignore .idea/libraries/appcompat_v7_19_1_0.xml Recycle Austin/build.gradle Recycle Austin/src/main/AndroidManifest.xml Recycle Austin/src/main/res/values/strings.xml build.gradle
Conflicts: .gitignore .idea/libraries/appcompat_v7_19_1_0.xml Recycle Austin/build.gradle Recycle Austin/src/main/AndroidManifest.xml Recycle Austin/src/main/res/values/strings.xml build.gradle
Conflicts: .gitignore .idea/libraries/appcompat_v7_19_1_0.xml Recycle Austin/build.gradle Recycle Austin/src/main/AndroidManifest.xml Recycle Austin/src/main/res/values/strings.xml build.gradle
moved SodaActivity to activity package
Added support for unit and functional testing Added example Junit, Androidtestunit, and android functional tests
…name, city/state, schedule week, schedule day.
Schedule screen
SodaQuery now a service, Unit test written
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
No description provided.