各種バグの修正
通知のリスト化昨日の断念
This commit is contained in:
parent
b3972ef0e0
commit
39e9336de0
|
@ -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
|
||||
|
|
|
@ -94,12 +94,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()
|
||||
|
@ -107,6 +102,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
.addToBackStack(null)
|
||||
.commit();
|
||||
}
|
||||
firebaselink();
|
||||
return true;
|
||||
});
|
||||
|
||||
|
|
|
@ -4,10 +4,7 @@
|
|||
android:id="@+id/navigation_home"
|
||||
android:icon="@drawable/ic_home_black_24dp"
|
||||
android:title="home"/>
|
||||
<item
|
||||
android:id="@+id/navigation_notification"
|
||||
android:icon="@drawable/notifications_fill0_wght400_grad0_opsz24"
|
||||
android:title="notification"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/navigation_settings"
|
||||
android:icon="@drawable/baseline_app_settings_alt_24"
|
||||
|
|
Loading…
Reference in New Issue
Block a user