Merge pull request #20 from child-guardian/last

各種バグの修正

app/src/main/java/com/example/childguard/HomeFragment.java

@@ -1,5 +1,6 @@
 package com.example.childguard;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -62,6 +63,7 @@ public class HomeFragment extends Fragment implements OnEventListener{
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
 
+
     }
 
     @Override

app/src/main/java/com/example/childguard/MainActivity.java

@@ -98,12 +98,7 @@ public class MainActivity extends AppCompatActivity {
                         .commit();
                 firebaselink();
 
-            } else if (v.getItemId() == findViewById(R.id.navigation_notification).getId()) {
-                findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
-                getSupportFragmentManager().beginTransaction()
-                        .replace(findViewById(R.id.fragmentContainerView).getId(), NotificationFragment.newInstance("test", "test"))
-                        .addToBackStack(null)
-                        .commit();
+
             } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
                 findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
                 getSupportFragmentManager().beginTransaction()
@@ -111,6 +106,7 @@ public class MainActivity extends AppCompatActivity {
                         .addToBackStack(null)
                         .commit();
             }
+            firebaselink();
             return true;
         });