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

Fix 1 #16

Merged
r-ca merged 4 commits from fix-1 into main 2024-01-17 11:07:45 +00:00
Conversation 0 Commits 4 Files Changed 1 +7 -12
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51fd91027d - Show all commits

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

@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Vibrator; import android.os.Vibrator;
@ -165,12 +166,11 @@ public class MainActivity extends AppCompatActivity {
String IdPref = sharedPreferences.getString("ID", null); String IdPref = sharedPreferences.getString("ID", null);
if (IdPref == null) { if (IdPref == null) {
Log.d("onResume", "ID not initialized."); Log.d("onResume", "ID not initialized.");
return; } else {
}
mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得 mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
this.flg = false; this.flg = false;
initNotification(mDocRef); initNotification(mDocRef);
}
super.onResume(); super.onResume();
} }
@ -203,13 +203,8 @@ public class MainActivity extends AppCompatActivity {
notifyMain(); notifyMain();
} }
} else { } else {
if (isInCar) { E.putBoolean("car", !isInCar);
E.putBoolean("car", false);
E.apply(); E.apply();
} else {
E.putBoolean("car", true);
E.apply();
}
// 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) {