Skip to content
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
merged 21 commits into from
Jul 26, 2016
Merged

Conversation

xyber3364
Copy link
Contributor

Ongoing Notification of Pokemon in the area.

Option in settings
Default is off and 60 second refresh period.

xyber3364 added 14 commits July 24, 2016 15:00
Currently buggy but seems to work somewhat
…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
@s7092910
Copy link
Contributor

Looks good, but can you use google's material design icon svgs instead of pngs

@xyber3364
Copy link
Contributor Author

updated to SVG, forgot I could use those with a slight conversion

@s7092910
Copy link
Contributor

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
@xyber3364
Copy link
Contributor Author

done :-)

@omkarmoghe
Copy link
Owner

lgtm, will merge after conflicts are resolved!

…ice_notification_merged

# Conflicts:
#	app/src/main/java/com/omkarmoghe/pokemap/views/MainActivity.java
@xyber3364
Copy link
Contributor Author

grumble grumble if CI builds please merge before more conflicts , conflicts make me sad.

@xyber3364
Copy link
Contributor Author

please merge, fixed conflict CI is building

@rohanjain1 rohanjain1 merged commit d4c146d into omkarmoghe:dev Jul 26, 2016
@xyber3364 xyber3364 deleted the service_notification_merged branch July 26, 2016 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants