From b995c96849a02f15804eb16479e9f544504ce24c Mon Sep 17 00:00:00 2001 From: Yudhvir Raj Date: Wed, 29 Nov 2017 14:16:23 -0800 Subject: [PATCH] feature-map-icon-fragment --- .../src/main/java/noverdose/preventanyl/MainActivity.java | 8 +++++--- changelog.md | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Preventanyl/app/src/main/java/noverdose/preventanyl/MainActivity.java b/Preventanyl/app/src/main/java/noverdose/preventanyl/MainActivity.java index e054eda..c62aefe 100755 --- a/Preventanyl/app/src/main/java/noverdose/preventanyl/MainActivity.java +++ b/Preventanyl/app/src/main/java/noverdose/preventanyl/MainActivity.java @@ -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) { diff --git a/changelog.md b/changelog.md index 516b897..255c66d 100755 --- a/changelog.md +++ b/changelog.md @@ -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