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

Rca/fix UI #15

Merged
r-ca merged 30 commits from rca/fix_ui into main 2024-01-17 10:27:28 +00:00
Conversation 0 Commits 30 Files Changed 11 +12 -15
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1eea70f920 - Show all commits

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

@ -160,7 +160,6 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
Log.d("onResume", "called"); Log.d("onResume", "called");
if (mDocRef == null) {
Log.d("onResume", "mDocRef is null"); Log.d("onResume", "mDocRef is null");
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null); String IdPref = sharedPreferences.getString("ID", null);
@ -169,12 +168,8 @@ public class MainActivity extends AppCompatActivity {
return; return;
} }
mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得 mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
this.flg = false;
initNotification(mDocRef); initNotification(mDocRef);
}
if (mDocRef.getId().equals(null)) {
Log.d("onResume", "mDocRef.getId() is null");
}
super.onResume(); super.onResume();
} }
@ -218,7 +213,9 @@ public class MainActivity extends AppCompatActivity {
// SupportFragmentManagerが現在表示しているFragmentを取得 // SupportFragmentManagerが現在表示しているFragmentを取得
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView); Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
if (fragment instanceof HomeFragment) { if (fragment instanceof HomeFragment) {
((HomeFragment) fragment).updateUiState(!isInCar); ((HomeFragment) fragment).onEvent(!isInCar);
} else {
Log.d("nt", "HomeFragment is not visible");
} }
} }
} }