ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from child-guardian/last

Browse Source 
各種バグの修正
This commit is contained in:
N-YOKU-jp 2024-01-22 22:07:38 +09:00 committed by GitHub
commit f396950009
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/childguard/HomeFragment.java
View File

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

8
app/src/main/java/com/example/childguard/MainActivity.java
View File

@ -98,12 +98,7 @@ public class MainActivity extends AppCompatActivity {
.commit(); .commit();
firebaselink(); 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()) { } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE); findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
@ -111,6 +106,7 @@ public class MainActivity extends AppCompatActivity {
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
} }
firebaselink();
return true; return true;
}); });

5
app/src/main/res/menu/bottom_menu.xml
View File

@ -4,10 +4,7 @@
android:id="@+id/navigation_home" android:id="@+id/navigation_home"
android:icon="@drawable/ic_home_black_24dp" android:icon="@drawable/ic_home_black_24dp"
android:title="home"/> android:title="home"/>
<item
android:id="@+id/navigation_notification"
android:icon="@drawable/notifications_fill0_wght400_grad0_opsz24"
android:title="notification"/>
<item <item
android:id="@+id/navigation_settings" android:id="@+id/navigation_settings"
android:icon="@drawable/baseline_app_settings_alt_24" android:icon="@drawable/baseline_app_settings_alt_24"