-
Notifications
You must be signed in to change notification settings - Fork 315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Service Notification #155
Merged
rohanjain1
merged 21 commits into
omkarmoghe:dev
from
xyber3364:service_notification_merged
Jul 26, 2016
Merged
Service Notification #155
rohanjain1
merged 21 commits into
omkarmoghe:dev
from
xyber3364:service_notification_merged
Jul 26, 2016
Conversation
This file contains 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
Currently buggy but seems to work somewhat
…ice_notification_merged
…ice_notification_merged # Conflicts: # app/src/main/java/com/omkarmoghe/pokemap/views/MainActivity.java
…ice_notification_merged # Conflicts: # app/src/main/java/com/omkarmoghe/pokemap/controllers/app_preferences/PokemapAppPreferences.java # app/src/main/java/com/omkarmoghe/pokemap/controllers/app_preferences/PokemapSharedPreferences.java # app/src/main/java/com/omkarmoghe/pokemap/views/MainActivity.java
Looks good, but can you use google's material design icon svgs instead of pngs |
updated to SVG, forgot I could use those with a slight conversion |
Fix the build error with travis-ci and then you have my approval |
…ice_notification_merged # Conflicts: # app/src/main/java/com/omkarmoghe/pokemap/controllers/app_preferences/PokemapSharedPreferences.java
done :-) |
lgtm, will merge after conflicts are resolved! |
…ice_notification_merged # Conflicts: # app/src/main/java/com/omkarmoghe/pokemap/views/MainActivity.java
grumble grumble if CI builds please merge before more conflicts , conflicts make me sad. |
please merge, fixed conflict CI is building |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ongoing Notification of Pokemon in the area.
Option in settings
Default is off and 60 second refresh period.