Skip to content

feature-map-icon-fragment #24

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.

Sign up for GitHub

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

Open
UnderratedDev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feature-map-icon-fragment #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Preventanyl/app/src/main/java/noverdose/preventanyl/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,16 +396,18 @@ public boolean onNavigationItemSelected(MenuItem item) {
// Handle navigation view item clicks here.
int id = item.getItemId();

if (id == R.id.nav_login) {
if (id == R.id.nav_map) {
preventanylMapFragment = new PreventanylMapFragment();
getSupportFragmentManager ().beginTransaction ().replace (R.id.content_frame, preventanylMapFragment).commitNow ();
} else if (id == R.id.nav_login) {
loginFragment = new LoginFragment();
getSupportFragmentManager ().beginTransaction ().replace (R.id.content_frame, loginFragment).commitNow ();
} else if (id == R.id.nav_register) {

/*} else if (id == R.id.nav_instructions) {
} else if (id == R.id.nav_instructions) {

Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://towardtheheart.com/naloxone-course"));
startActivity(browserIntent);
*/

} else if (id == R.id.nav_shop) {

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
## 97bc4346faf5cfe7c3e87cdba0a31da248221d2d - 2017-11-29 - Yudhvir
### Added
- Map icon opens map fragment

## 97bc4346faf5cfe7c3e87cdba0a31da248221d2d - 2017-11-29 - Yudhvir
### Added
- Push notifications work and display on ui thread
Expand Down