Merge pull request '微修正' (#37) from hotfix-Fine-adjustment into main

Reviewed-on: #37

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.childguard",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/main/AndroidManifest.xml

@@ -35,7 +35,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service android:name=".TestService" />
+        <service android:name=".SurveillanceService" />
     </application>
 
 </manifest>

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

@@ -1,22 +0,0 @@
-package com.example.childguard;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class Bluetooth_device_save {
-    SharedPreferences pref;
-
-//    public void device_save(String deviceAddress){
-//        pref = PreferenceManager.getDefaultSharedPreferencesName()
-//        SharedPreferences.Editor e=pref.edit();
-//        e.putString("bluetooth_device1",deviceAddress);
-//        e.apply();
-//    }
-    public String device_info(){
-        return pref.getString("bluetooth_device1","not_device");
-    }
-}

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

@@ -1,14 +1,18 @@
 package com.example.childguard;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 public class First_Start extends AppCompatActivity {
+
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.first_start);
 
+
     }
 
 }

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

@@ -23,6 +23,7 @@ public class GenerateQrFragment extends Fragment {
     public GenerateQrFragment() {
         // Required empty public constructor
     }
+
     public static GenerateQrFragment newInstance(String key) {
         GenerateQrFragment fragment = new GenerateQrFragment();
         Bundle args = new Bundle();

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

@@ -1,11 +1,13 @@
 package com.example.childguard;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.core.content.res.ResourcesCompat;
@@ -18,7 +20,7 @@ import androidx.fragment.app.FragmentTransaction;
  * Use the {@link HomeFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class HomeFragment extends Fragment implements OnEventListener{
+public class HomeFragment extends Fragment  {
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -29,6 +31,9 @@ public class HomeFragment extends Fragment implements OnEventListener{
     private String str_key;
     private String mParam2;
 
+    final String GET_ON = "\n乗車状態";
+    final String GET_OFF = "\n降車状態";
+
 
     public HomeFragment() {
         // Required empty public constructor
@@ -61,6 +66,7 @@ public class HomeFragment extends Fragment implements OnEventListener{
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
 
+
     }
 
     @Override
@@ -76,30 +82,35 @@ public class HomeFragment extends Fragment implements OnEventListener{
     public void onResume() {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
+        Log.d("isIncar", "onResume: " + getIsInCarLocal());
+        this.updateUiState(getIsInCarLocal());
+        this.updateBluetoothSituation(isBluetoothConnected());
     }
 
-    //画面遷移メソッド
+    private boolean isBluetoothConnected() {
-    private void replaceFragment(Fragment fragment) {
+        SharedPreferences pref = requireActivity().getSharedPreferences("Bluetooth_situation", requireActivity().MODE_PRIVATE);
-        // フラグメントマネージャーの取得
+        return pref.getBoolean("status", false);
-        FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
-        // フラグメントトランザクションの開始
-        FragmentTransaction transaction = manager.beginTransaction();
-        // レイアウトをfragmentに置き換え（追加）
-        transaction.replace(R.id.fragmentContainerView, fragment);
-        // 置き換えのトランザクションをバックスタックに保存する
-        transaction.addToBackStack(null);
-        // フラグメントトランザクションをコミット
-        transaction.commit();
     }
 
+    private boolean getIsInCarLocal() {
+        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
+        Boolean isInCar = pref.getBoolean("isInCarPref", false);
+        Log.d("isInCarPref","isInCar"+ isInCar);
+        return isInCar;
+    }
+
+    /**
+     * 乗車状態の画面を切り替える
+     */
     private boolean updateUiState(boolean isInCar) {
         Log.d("HomeFragment", "updateUiState: called");
+        Log.d("HomeFragment", "updateUiState:"+isInCar);
         // Init
         TextView tv;
         FrameLayout fl;
         try {
-            tv = requireView().findViewById(R.id.situation);
+            tv = requireView().findViewById(R.id.car_situation);
-            fl = requireView().findViewById(R.id.situation_bg);
+            fl = requireView().findViewById(R.id.car_situation_bg);
         } catch (NullPointerException e) {
             Log.d("HomeFragment", "updateUiState: view is null");
             return false;
@@ -109,26 +120,56 @@ public class HomeFragment extends Fragment implements OnEventListener{
             updateUiState(isInCar);
             return false;
         }
-        String get_on = "\n乗車状態";
+
-        String get_off = "\n降車状態";
+        if (isInCar) {
-        if (!isInCar) {
             //乗車状態にする
             fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
-            tv.setText(get_on);
+            tv.setText(GET_ON);
         } else {
             //降車状態にする
             fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
-            tv.setText(get_off);
+            tv.setText(GET_OFF);
         }
 
         return true;
     }
 
-    @Override
+    /**
-    public boolean onEvent(boolean isInCar) {
+     * Bluetoothの接続状態の画面を切り替える
-        Log.d("HomeFragment", "onEvent: called");
+     */
-
+    boolean updateBluetoothSituation(Boolean BluetoothConnect) {
-        return updateUiState(isInCar);
+        FrameLayout frameLayout;
+        TextView textView;
+        ImageView imageView;
+        try {
+            frameLayout = requireView().findViewById(R.id.situation_bg_bluetooth);
+            textView = requireView().findViewById(R.id.BluetoothSituation);
+            imageView = requireView().findViewById(R.id.BluetoothSituationImage);
+        } catch (NullPointerException e) {
+            Log.d("HomeFragment", "updateUiState: view is null");
+            return false;
+        } catch (IllegalStateException e) {
+            Log.d("HomeFragment", "updateUiState: view is not attached");
+            getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, HomeFragment.newInstance("test", "test")).commit();
+            updateBluetoothSituation(BluetoothConnect);
+            return false;
         }
+        final String CONNECT = "接続中";
+        final String DISCONNECT = "切断中";
+        if (BluetoothConnect) {
+            //接続状態にする
+            frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
+            textView.setText(CONNECT);
+            imageView.setVisibility(View.GONE);
+        } else {
+            //切断状態にする
+            frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
+            textView.setText(DISCONNECT);
+            imageView.setVisibility(View.VISIBLE);
+        }
+
+        return true;
+    }
+
 }
 

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

@@ -4,9 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -14,7 +12,6 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -24,11 +21,10 @@ import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
-import androidx.fragment.app.Fragment;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.firebase.firestore.DocumentReference;
@@ -36,18 +32,20 @@ import com.google.firebase.firestore.FirebaseFirestore;
 import com.journeyapps.barcodescanner.ScanContract;
 import com.journeyapps.barcodescanner.ScanOptions;
 
+// Manifest
+import android.Manifest;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class MainActivity extends AppCompatActivity {
 
     FirebaseFirestore db;
-    BluetoothManager bluetoothManager;
+
-    BluetoothAdapter bluetoothAdapter;
 
     DocumentReference mDocRef;
 
-    private HomeFragment homeFragment;
+    private HomeFragment homeFragment = HomeFragment.newInstance("test", "test");;
 
     public static final String TAG = "InspirationQuote";
 
@@ -60,53 +58,61 @@ public class MainActivity extends AppCompatActivity {
                     Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
                 } else {
                     if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
-                        Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
+                        Toast.makeText(this, "Child Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
                     } else {
-                        //URLの表示
+                        changeIsInCar();
-                        Toast.makeText(this, contents, Toast.LENGTH_SHORT).show();
-                        //ブラウザを起動し、URL先のサイトを開く
-                        CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
-                        CustomTabsIntent customTabsIntent = builder.build();
-                        customTabsIntent.launchUrl(this, Uri.parse(contents));
                     }
                 }
             }
     );
 
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+        Log.d(TAG, "onCreate: called");
+        //Bluetooth接続判定用
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor e = pref.edit();
+        e.putBoolean("connection_status", false);
+
+
+        if (!hasPermissions()) {
+            requestPermissions();
+        }
 
         BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
 
-        this.homeFragment = HomeFragment.newInstance("test", "tset");
+        this.homeFragment = HomeFragment.newInstance("test", "test");
+        if(savedInstanceState == null){
+            getSupportFragmentManager().beginTransaction()
+                    .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
+                    .addToBackStack(null)
+                    .commit();
+        }
 
         bottomNavigationView.setOnNavigationItemSelectedListener(v ->
-
         {
             if (v.getItemId() == findViewById(R.id.navigation_home).getId()) {
+                Log.d("MainActivity", "navigation_home: called");
                 findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
                 getSupportFragmentManager().beginTransaction()
                         .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
                         .addToBackStack(null)
                         .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()) {
+                Log.d("MainActivity", "navigation_settings: called");
                 findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
                 getSupportFragmentManager().beginTransaction()
                         .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
                         .addToBackStack(null)
                         .commit();
             }
+            firebaseLink();
+            Bluetooth_status();
             return true;
         });
 
@@ -116,7 +122,6 @@ public class MainActivity extends AppCompatActivity {
             ScanOptions options = new ScanOptions();
             options.setPrompt("QRコードを読み取ってください");
             QrLauncher.launch(options);
-
         });
 
         //Bluetooth検知機能
@@ -124,6 +129,123 @@ public class MainActivity extends AppCompatActivity {
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
 
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            Log.d("BT", "No permission to connect bluetooth devices");
+            return;
+        } else {
+            Log.d("BT", "Permission to connect bluetooth devices granted");
+        }
+        registerReceiver(receiver, intentFilter);
+
+        //startForegroundService(new Intent(this, SurveillanceService.class));
+
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.d("MainActivity onResume", "called");
+//        Log.d("MainActivity onResume", "mDocRef is null");
+        firebaseLink();
+    }
+    /**
+     * 乗車状態の変更
+     */
+    public void changeIsInCar() {
+        //共有プリファレンス全体の準備
+        SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
+        //共有プリファレンス 書き込みの準備
+        SharedPreferences.Editor E = sharedPreferences.edit();
+        SharedPreferences.Editor E2 = sharedPreferences.edit();
+        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
+        Log.d("MainActivity", "changeIsInCar: ID= " + IdPref);
+        boolean change = sharedPreferences.getBoolean("change", false);
+        Log.d("MainActivity", "changeIsInCar: " + change);
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+        DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
+        Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
+        if (!change) {
+            //isInCarをtrueに更新
+            Log.d("MainActivity", "change:"+change);
+            E.putBoolean("change", true);
+            E.apply();
+            Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
+        } else {
+            Log.d("MainActivity", "change:"+change);
+            E.putBoolean("change", false);
+            E.apply();
+            Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
+        }
+        Log.d("MainActivity", "changeIsInCar: "+sharedPreferences.getBoolean("change",false));
+        isReported.update("isInCar", sharedPreferences.getBoolean("change",false)).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
+        E2.putBoolean("isInCarPref", sharedPreferences.getBoolean("change",false));
+        E2.apply();
+    }
+
+
+
+    private boolean hasPermissions() {
+        return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermissions() {
+        ActivityCompat.requestPermissions(this,
+                new String[]{
+                        Manifest.permission.BLUETOOTH,
+                        Manifest.permission.BLUETOOTH_ADMIN,
+                        Manifest.permission.BLUETOOTH_SCAN,
+                        Manifest.permission.BLUETOOTH_CONNECT,
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,
+                        Manifest.permission.POST_NOTIFICATIONS,
+                        Manifest.permission.VIBRATE,
+                        Manifest.permission.FOREGROUND_SERVICE
+                },
+                2);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 2) {
+            if (!hasPermissions()) {
+                Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+
+    /**
+     * FireBaseのIDの取得
+     */
+    public void firebaseLink() {//Firebaseのドキュメントの取得
+        Log.d("MainActivity", "firebaseLink: called");
+        //共有プリファレンス全体の準備
+        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
+        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
+        if (IdPref == null) {
+            Log.d("onResume", "ID not initialized.");
+        } else {
+            mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
+            //updateIsInCarPref(mDocRef);//現在の位置を引数に initNotification()を処理
+        }
+    }
+
+    public void Bluetooth_status() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+
         if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
             Log.d("BT", "No permission to connect bluetooth devices");
             return;
@@ -131,194 +253,61 @@ public class MainActivity extends AppCompatActivity {
             Log.d("BT", "Permission to connect bluetooth devices granted");
         }
         registerReceiver(receiver, intentFilter);
-        changessituation();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        changessituation();
-        Log.d("onResume", "called");
-        Log.d("onResume", "mDocRef is null");
-        firebaselink();
-    }
-
-    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
-        // 共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-        mDocRef.addSnapshotListener(this, (documentSnapshot, e) -> {
-
-            Log.d("nt", "イベント開始");
-            //共有プリファレンス 書き込みの準備
-            SharedPreferences.Editor E = sharedPreferences.edit();
-            //車の乗り降りを管理するtrue=乗車、false=降車
-            if (documentSnapshot.exists()) {//exists()でdocumentSnapshotの中のファイルの存在の確認
-                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
-                Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
-                E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
-                E.apply();//確定処理
-                Log.d("nt", "レスポンスを検知しました1");
-                //FireBaseで更新された情報の判定
-                if (documentSnapshot.getBoolean("isReported") == false) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
-                    if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定
-                        changessituation();//  changessituation()メソッドを処理→アプリ側の乗降状態を変化
-                    }
-                } else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき＝乗車状態のとき→いたずら防止
-                    int importance = NotificationManager.IMPORTANCE_DEFAULT;
-                    NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
-                    channel.setDescription("第3者からの通報を検知しました");
-                    NotificationManager notificationManager = getSystemService(NotificationManager.class);
-                    notificationManager.createNotificationChannel(channel);
-                    Log.d("nt", "レスポンスを検知しました2");
-                    NotificationSetting();//通知に関する設定のメソッド
-                    Notification(getApplicationContext());//通知を行うメソッド
-                    ResetReported();// ResetReported();メソッドを処理→FireBaseのisReportedをfalseにする
-                } else {//第三者ボタンが押されたときにisInCarがfalseのとき=降車状態のとき
-                    ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする
-                    Log.d("nt", "何もなし");
-                }
-            }
-        });
-
     }
 
 
-    //Bluetoothの検知機能
     private final BroadcastReceiver receiver = new BroadcastReceiver() {
-
         @Override
         public void onReceive(Context context, Intent intent) {
+            SharedPreferences pref = getSharedPreferences("Bluetooth_situation", MODE_PRIVATE);
+            SharedPreferences.Editor e = pref.edit();
             String action = intent.getAction(); // may need to chain this to a recognizing function
             BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-//            HomeFragment homeFragment=new HomeFragment();
+            Boolean isInCar = pref.getBoolean("isInCarPref", false);
-
             if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
                 Log.d("BT", "No permission to connect bluetooth devices");
                 return;
             }
             String deviceHardwareAddress = device.getAddress(); // MAC address
 
-            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
-                Log.d("BT", "Device connected");
-
             String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
 
+            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+                //Bluetoothデバイスが接続されたときの処理
+                Log.d("BT", "Device connected");
+
                 Log.d("BT_Judge", "Registered: " + registeredId);
 
                 if (deviceHardwareAddress.equals(registeredId)) {
+                    //登録済みのデバイスだったときの処理
                     Log.d("BT_Judge", "登録済み");
-                } else Log.d("BT_Judge", "未登録");
+                    changeBluetooth(true);
+                    e.putBoolean("connection_status", true);
+                    if(homeFragment != null && homeFragment.isVisible()){
+                        homeFragment.updateBluetoothSituation(true);
+                    }
+                } else {
+                    //登録していないデバイスだったときの処理
+                    Log.d("BT_Judge", "未登録");
+                    e.putBoolean("connection_status", false);
+                }
+                e.apply();
 
             }else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                //Do something if disconnected
+                //bluetoothデバイスが切断されたときの処理
-                Log.d("BT", "Device disconnected");
+                changeBluetooth(false);
-
+                if(homeFragment != null && homeFragment.isVisible()){
+                    homeFragment.updateBluetoothSituation(false);
+                }
             }
         }
     };
 
-
+    /**
-    public void firebaselink() {//Firebaseのドキュメントの取得
+     * Bluetoothの接続状態を変更するメソッド
-        //共有プリファレンス全体の準備
+     */
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
+    public void changeBluetooth(boolean actual) {
-        String IdPref = sharedPreferences.getString("ID", null);////アプリに記録されているIDの取得
+        getSharedPreferences("Bluetooth_situation", MODE_PRIVATE).edit().putBoolean("status", actual).apply();
-        if (IdPref == null) {//FireBaseのIDがアプリに登録されているとき
-            Log.d("onResume", "ID not initialized.");
-        } else {
-            mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
-            initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
-
     }
 }
 
-    public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド
-        //共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
-        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
-        DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
-        Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
-        //isReportedをfalseに更新
-        isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
-    }
-
-    public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
-        int importance = NotificationManager.IMPORTANCE_DEFAULT;
-        //通知チャネルの実装
-        NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通知", importance);
-        channel.setDescription("第三者により置き去りの通報が行われたときに通知します。");
-
-        NotificationManager notificationManager = getSystemService(NotificationManager.class);
-        notificationManager.createNotificationChannel(channel);
-
-    }
-
-    public void Notification(Context context) {//実際に通知を行うメソッド
-        final String CHANNEL_ID = "my_channel_id";
-        // 通知がクリックされたときに送信されるIntent
-        Intent intent = new Intent(context, MainActivity.class);
-        intent.setAction("OPEN_ACTIVITY");
-        // PendingIntentの作成
-        int requestCode = 100;
-        int flags = 0;
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
-
-        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
-
-        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
-                .setSmallIcon(android.R.drawable.ic_menu_info_details)
-                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("第三者からの通報が行われました。")//通知の本文
-                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
-                .setAutoCancel(true)//通知をタップすると削除する
-                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
-
-        // NotificationChannelの作成（Android 8.0以降）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            if (notificationManager != null) {
-                NotificationChannel channel = new NotificationChannel(
-                        CHANNEL_ID,
-                        "Channel Name",
-                        NotificationManager.IMPORTANCE_HIGH
-                );
-
-                channel.setDescription("Channel Description");
-                channel.enableLights(true);
-                channel.setLightColor(Color.RED);
-                channel.enableVibration(true);
-                notificationManager.createNotificationChannel(channel);
-            }
-        }
-
-
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
-        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
-    }
-
-
-    public void changessituation() {//乗降状態の管理をするためにHomeFramgentを呼び出すメソッド
-
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-        //共有プリファレンス 書き込みの準備
-        SharedPreferences.Editor E = sharedPreferences.edit();
-        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
-        Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
-        ((HomeFragment) fragment).onEvent(!isInCar);
-    }
-
-    @Override
-    public void onStop() {//アプリをバックグラウンドにした時のメソッド
-        super.onStop();
-        Intent intent = new Intent(getApplication(), TestService.class);
-        startService(intent);//TestServiceを起動
-    }
-
-}
-

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

@@ -1,64 +0,0 @@
-package com.example.childguard;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link NotificationFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class NotificationFragment extends Fragment {
-
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    public NotificationFragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment NotificationFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static NotificationFragment newInstance(String param1, String param2) {
-        NotificationFragment fragment = new NotificationFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_notification, container, false);
-    }
-}

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 
 public class NotificationReceiver extends BroadcastReceiver {//通知をタップしたときにアプリを起動する処理
+
     @Override
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction() != null && intent.getAction().equals("OPEN_ACTIVITY")) {// 通知がタップされたときの処理

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

@@ -1,19 +1,14 @@
 package com.example.childguard;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.drawable.BitmapDrawable;
 import android.util.AndroidRuntimeException;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.WindowManager;
-import android.widget.ImageView;
-
-import androidx.print.PrintHelper;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
@@ -30,40 +25,41 @@ public class QrUtils {
 
     public Bitmap getBitmap(String key) {
         Log.d("getBitmap", "getBitmap: " + key);
-        String KoteiURL = "https://practicefirestore1-8808c.web.app/?id=";
+        String fixationURL = "https://practicefirestore1-8808c.web.app/?id=";
         //すべてのドメイン
         String AllURL;
         //IdPrefにの値が初期値の場合
-        AllURL=KoteiURL+key;
+        AllURL = fixationURL + key;
+
 
-        int size = 1500;
         int qrCodeSize = calculateQRCodeSize(); // 画面密度に応じてサイズを計算
-        Bitmap QRGazou;
+        Bitmap QRImage;
-        Bitmap bitmapqr;
+        Bitmap bitmapQR;
         try {
             //QRコード生成
             BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
-            bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, size, size);
+            bitmapQR = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize);
         } catch (WriterException e) {
             throw new AndroidRuntimeException("Barcode Error.", e);
         }
         // 画像合成の準備
-        Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos);
+        Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos_2);
         int width = bitmap.getWidth();
         int height = bitmap.getHeight();
-        QRGazou = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        QRImage = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
 
         // Canvasの準備
-        Canvas canvas = new Canvas(QRGazou);
+        Canvas canvas = new Canvas(QRImage);
 
         // 画像のサイズの調整
-        int disWidth = (width - bitmapqr.getWidth()) / 2;
+        int disWidth = (width - bitmapQR.getWidth()) / 2;
-        int disHeight = (int) ((height - bitmapqr.getHeight()) / 1.4);
+        int disHeight = (int) ((height - bitmapQR.getHeight()) / 1.5);
         canvas.drawBitmap(bitmap, 0, 0, (Paint) null);
-        canvas.drawBitmap(bitmapqr, disWidth, disHeight, (Paint) null); // 画像合成
+        canvas.drawBitmap(bitmapQR, disWidth, disHeight, (Paint) null); // 画像合成
         //Androidからプリンターへ印刷指示を出すサポートライブラリ
-        return QRGazou;
+        return QRImage;
     }
+
     private int calculateQRCodeSize() {
         // 画面解像度を取得
         DisplayMetrics metrics = new DisplayMetrics();
@@ -72,7 +68,7 @@ public class QrUtils {
 
         // 画面密度に基づいてQRコードのサイズを計算
         float density = context.getResources().getDisplayMetrics().density;
-        return (int) (1500 * density);
+        return (int) (700 * density);
     }
 
 }

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

@@ -23,6 +23,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
     Context applicationContext;
     View parentView;
 
+
     // Constructor
     public RecyclerAdapter(ArrayList<String[]> deviceList, Context applicationContext, View parentView) {
         // Init
@@ -30,6 +31,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
         this.deviceList = deviceList;
         this.applicationContext = applicationContext;
         this.parentView = parentView;
+
     }
 
     @NonNull
@@ -51,16 +53,15 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
                     .setMessage("このデバイスを登録しますか？")
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
                         // OK button pressed
-                        Toast.makeText(v.getContext(), "OK button clicked", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(v.getContext(), "OK button clicked", Toast.LENGTH_SHORT).show();
                         //共有プリファレンスに保存
                         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.applicationContext);
                         sharedPreferences.edit().putString("bluetooth_device_id", deviceList.get(position)[1]).apply();
                         sharedPreferences.edit().putString("bluetooth_device_name", deviceList.get(position)[0]).apply();
-                        Toast.makeText(v.getContext(),PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_id","none"), Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(v.getContext(), PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_id", "none"), Toast.LENGTH_SHORT).show();
 
                         TextView textView = this.parentView.findViewById(R.id.registered_device);
-                        textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name","none"));
+                        textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "登録されていません"));
-
 
 
                     })

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

@@ -3,6 +3,8 @@ package com.example.childguard;
 import static android.content.ContentValues.TAG;
 import static android.content.Context.MODE_PRIVATE;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -26,6 +28,7 @@ import java.util.Map;
 public class SettingFragment extends Fragment {
 
     FirebaseFirestore db;
+
     public SettingFragment() {
         // Required empty public constructor
     }
@@ -94,6 +97,7 @@ public class SettingFragment extends Fragment {
                             SharedPreferences.Editor editor = sharedPreferences1.edit();
                             editor.putString("ID", documentReference.getId());
                             editor.apply();
+                            startTestService();
 
                             Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show();
                             getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(documentReference.getId())).commit();
@@ -105,4 +109,11 @@ public class SettingFragment extends Fragment {
             }
         });
     }
+    private void startTestService() {
+        Context context = getContext();
+        if (context != null) {
+            Intent serviceIntent = new Intent(context, SurveillanceService.class);
+            context.startForegroundService(serviceIntent);
+        }
+    }
 }

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

@@ -0,0 +1,363 @@
+package com.example.childguard;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FirebaseFirestore;
+
+public class SurveillanceService extends Service {
+
+    private final Handler handler = new Handler();
+    private Runnable notificationRunnable;
+
+    public static class NotificationContent {
+        private final String title;
+        private final String description;
+        private final String channelId;
+        private final int notificationId;
+
+        public NotificationContent(String title, String description, String channelId, int notificationId) {
+            this.title = title;
+            this.description = description;
+            this.channelId = channelId;
+            this.notificationId = notificationId;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getChannelId() {
+            return channelId;
+        }
+
+        public int getNotificationId() {
+            return notificationId;
+        }
+    }
+
+    public static final String TAG = "InspirationQuote";
+    private static final String BT_ALERT_CHANNEL_ID = "child_guard_bt_alert";
+    private static final String REPORTED_CHANNEL_ID = "child_guard_reported";
+    private static final String BACKGROUND_CHANNEL_ID = "child_guard_background";
+    private static final int REQUEST_CODE = 100;
+    private static final int NOTIFICATION_DELAY = 5 * 60 * 1000; // 5 minutes
+
+
+    private static final NotificationContent REPORTED_NOTIFICATION =
+            new NotificationContent("子供の置き去りをしていませんか？", "第三者からの通報が行われました。", REPORTED_CHANNEL_ID, 2);
+    private static final NotificationContent BLUETOOTH_NOTIFICATION =
+            new NotificationContent("子供の置き去りをしていませんか？🐈", "Bluetoothと車の切断から5分が経過しました", BT_ALERT_CHANNEL_ID, 3);
+
+    private String userId = null;
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.d(TAG, "onStartCommand: ");
+        this.userId = getSharedPreferences("app_situation", MODE_PRIVATE).getString("ID", null);
+        if (this.userId == null) {
+            Log.d("onResume", "ID not initialized.");
+            return flags; // IDが初期化されていない場合は何もしない
+        }
+
+        if (isNotificationChannelCreated(BACKGROUND_CHANNEL_ID)) {
+            createRunningNotificationChannel();
+        }
+        Intent notificationIntent = new Intent(this, MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
+        Notification notification = new NotificationCompat.Builder(this, BACKGROUND_CHANNEL_ID)
+                .setContentTitle("ChildGuardバックグラウンドサービス")
+                .setContentText("接続/通報監視サービスがバックグラウンドで実行されています")
+                .setSmallIcon(android.R.drawable.ic_menu_info_details)
+                .setContentIntent(pendingIntent)
+                .build();
+        startForeground(1, notification);
+
+        setSnapshotListener(FirebaseFirestore.getInstance().document("status/" + this.userId));
+
+        if (isNotBluetoothGranted()) return flags;
+
+        registerReceiver(receiver);
+        return START_STICKY;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (isNotificationChannelCreated(BT_ALERT_CHANNEL_ID)) createAlertNotificationChannel(BT_ALERT_CHANNEL_ID);
+        if (isNotificationChannelCreated(REPORTED_CHANNEL_ID)) createAlertNotificationChannel(REPORTED_CHANNEL_ID);
+    }
+
+    /**
+     * 通知チャネルが作成されているか確認
+     * @return 通知チャンネルの有無 true: 作成済み false: 未作成
+     */
+    private boolean isNotificationChannelCreated(String channelId) {
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        return notificationManager.getNotificationChannel(channelId) == null;
+    }
+
+    /**
+     * 通知チャネルの作成
+     */
+    private void createAlertNotificationChannel(String channelId) {
+        int importance = NotificationManager.IMPORTANCE_DEFAULT;
+        NotificationChannel channel = new NotificationChannel(channelId, "通知", importance);
+        channel.setDescription("第三者により置き去りの通報が行われたときに通知します。");
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(channel);
+    }
+
+    /**
+     * バックグラウンドで実行中の通知チャネルを作成
+     */
+    private void createRunningNotificationChannel() {
+        NotificationChannel serviceChannel = new NotificationChannel(
+                BACKGROUND_CHANNEL_ID,
+                "Foreground Service Channel",
+                NotificationManager.IMPORTANCE_NONE
+        );
+        NotificationManager manager = getSystemService(NotificationManager.class);
+        if (manager != null) {
+            manager.createNotificationChannel(serviceChannel);
+        }
+    }
+
+    /**
+     * 通知が許可がされているかどうかを確認
+     * @return 通知の許可の有無 true: 許可されていない false: 許可されている
+     */
+    private boolean isNotNotificationEnabled() {
+        NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(this);
+        if (!notificationManagerCompat.areNotificationsEnabled()) {
+            Log.d(TAG, "通知が許可されていません");
+            return true;
+        } else {
+            Log.d(TAG, "通知が許可されています");
+            return false;
+        }
+    }
+
+    /**
+     * Bluetoothの権限が許可されているかどうかを確認
+     * @return Bluetoothの権限の有無 true: 許可されていない false: 許可されている
+     */
+    private boolean isNotBluetoothGranted() {
+        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Bluetoothの権限が許可されていません");
+            return true;
+        } else {
+            Log.d(TAG, "Bluetoothの権限が許可されています");
+            return false;
+        }
+    }
+
+    /**
+     * ブロードキャストレシーバーを登録
+     * @param receiver ブロードキャストレシーバー
+     */
+    private void registerReceiver(BroadcastReceiver receiver) {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+
+        registerReceiver(receiver, intentFilter);
+    }
+
+    /**
+     * Firestoreのスナップショットリスナーを設定
+     * @param mDocRef Firestoreのドキュメントリファレンス
+     */
+    private void setSnapshotListener(DocumentReference mDocRef) {
+        // Initialize the PeriodicTaskManager
+        // (Assuming it's done elsewhere as it's not shown in the original code)
+
+        // Prepare SharedPreferences
+        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
+
+        // Add a snapshot listener to the document reference
+        mDocRef.addSnapshotListener((documentSnapshot, e) -> {
+            if (e != null) {
+                Log.w("nt", "Listen failed.", e);
+                return;
+            }
+
+            if (documentSnapshot != null && documentSnapshot.exists()) {
+                Log.d("nt", "イベント開始");
+
+                // Handle document snapshot
+                SharedPreferences.Editor editor = sharedPreferences.edit();
+                boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);
+                boolean newIsInCarState = Boolean.TRUE.equals(documentSnapshot.getBoolean("isInCar"));
+
+                editor.putBoolean("isInCarPref", newIsInCarState);
+                editor.apply();
+
+                Log.d("nt", "レスポンスを検知しました1");
+                Log.d("SurveillanceService", "Bluetooth: "+sharedPreferences.getBoolean("BluetoothStatusLocal", false));
+
+                if (isInCar&&!sharedPreferences.getBoolean("BluetoothStatusLocal", false)) {
+                    if (Boolean.TRUE.equals(documentSnapshot.getBoolean("isReported"))) {
+                        resetReported();
+                        sendNotification(getApplicationContext(), REPORTED_NOTIFICATION);
+                    }
+                } else {
+                    resetReported();
+                }
+            } else {
+                Log.d("nt", "Current data: null");
+            }
+        });
+    }
+
+    /**
+     * 通報フラグをリセットする
+     */
+    private void resetReported() {
+        FirebaseFirestore db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+        DocumentReference isReported = db.collection("status").document(this.userId);
+        //isReportedをfalseに更新
+        isReported.update("isReported", false).addOnSuccessListener(unused ->
+                Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
+    }
+
+    /**
+     * 通知をタップしたときにアプリを起動するPendingIntentを取得
+     *
+     * @param context コンテキスト
+     * @return PendingIntent
+     */
+    private PendingIntent getPendingIntent(Context context) {
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.setAction("OPEN_ACTIVITY");
+        return PendingIntent.getActivity(context, SurveillanceService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE);
+    }
+
+    /**
+     * デバイスをバイブレーションさせる
+     */
+    private void vibrateDevice() {
+        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        if (vibrator.hasVibrator()) {
+            vibrator.vibrate(VibrationEffect.createOneShot(2000, VibrationEffect.DEFAULT_AMPLITUDE));
+        }
+    }
+
+    /**
+     * 通知を送信する
+     * @param context コンテキスト
+     * @param content NotificationContent 通知内容
+     */
+    private void sendNotification(Context context, NotificationContent content) {//通知を行うメソッド
+        // 権限の保有を確認
+        if (isNotNotificationEnabled()) return;
+
+        vibrateDevice();
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, content.getChannelId())
+                .setSmallIcon(android.R.drawable.ic_menu_info_details)
+                .setContentTitle(content.getTitle())//通知のタイトル
+                .setContentText(content.getDescription())//通知の内容
+                .setContentIntent(getPendingIntent(context))//通知をタップするとActivityへ移動する
+                .setAutoCancel(true)//通知をタップすると削除する
+                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
+
+        NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+
+        notificationManager.notify(content.getNotificationId(), builder.build());
+    }
+
+    private final BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // 処理対象か確認 ----------------------------------------
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            if (device == null) {
+                Log.d("BT", "No device found");
+                return;
+            }
+            String deviceHardwareAddress = device.getAddress(); // MAC address
+            if (deviceHardwareAddress == null) {
+                Log.d("BT", "No device address found");
+                return;
+            }
+            String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", null);
+            if (registeredId == null) {
+                Log.d("BT_Judge", "No registered device");
+                return;
+            }
+            if (!registeredId.equals(deviceHardwareAddress)) {
+                Log.d("BT_Judge", "Not registered device");
+                return;
+            }
+            boolean isInCar = getSharedPreferences("app_situation", MODE_PRIVATE).getBoolean("change", false);
+//            if (!isInCar) {
+//                Log.d("BT_Judge", "Not in car");
+//                return;
+//            }
+            // -----------------------------------------------------
+
+            // debug log
+            Log.d("BT", "Bluetooth device found: " + deviceHardwareAddress);
+            Log.d("BT", "Registered device: " + registeredId);
+            Log.d("BT", "Is in car: " + isInCar);
+            SharedPreferences sharedPreferences = SurveillanceService.this.getSharedPreferences("app_situation", MODE_PRIVATE);
+            SharedPreferences.Editor E = sharedPreferences.edit();
+            String action = intent.getAction(); // may need to chain this to a recognizing function
+            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+                E.putBoolean("BluetoothStatusLocal", false);
+                // bluetoothが切断されたときに乗車状態のとき
+                if (isInCar) {
+                    notificationRunnable = () -> {
+                        // 5分経過した時点でも車に乗っていない場合
+                        sendNotification(context, BLUETOOTH_NOTIFICATION);
+                    };
+                }
+                handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY);
+            } else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+                E.putBoolean("BluetoothStatusLocal", true);
+                // 再接続された場合、通知をキャンセルする
+                if (notificationRunnable != null) {
+                    handler.removeCallbacks(notificationRunnable);
+                    notificationRunnable = null;
+                    Log.d("BT", "Notification canceled due to reconnection");
+                }
+            }
+            E.apply();
+            Log.d("SurveillanceService:BT", "Bluetooth status: " + sharedPreferences.getBoolean("BluetoothStatusLocal", false));
+        }
+    };
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}

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

@@ -1,276 +0,0 @@
-package com.example.childguard;
-
-import android.annotation.SuppressLint;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Vibrator;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
-
-import com.google.firebase.firestore.DocumentReference;
-import com.google.firebase.firestore.FirebaseFirestore;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TestService extends Service {
-    FirebaseFirestore db;
-    DocumentReference mDocRef;
-
-    public static final String TAG = "InspirationQuote";
-
-    public PeriodicTaskManager periodicTaskManager;
-
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        //共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-        if (IdPref == null) {//FireBaseのIDがアプリに登録されているとき
-            Log.d("onResume", "ID not initialized.");
-        } else {
-            mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
-            initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
-        }
-        return flags;
-    }
-
-    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
-        // PeriodicTaskManagerのインスタンス化
-        periodicTaskManager = new PeriodicTaskManager();
-        // 共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-        //車の乗り降りを管理するtrue=乗車、false=降車
-        //exists()でdocumentSnapshotの中のファイルの存在の確認
-        mDocRef.addSnapshotListener((documentSnapshot, e) -> {
-
-            Log.d("nt", "イベント開始");
-            //共有プリファレンス 書き込みの準備
-            SharedPreferences.Editor E = sharedPreferences.edit();
-            //車の乗り降りを管理するtrue=乗車、false=降車
-            if (documentSnapshot.exists()) {//exists()でdocumentSnapshotの中のファイルの存在の確認
-                Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
-                E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
-                E.apply();//確定処理
-                Log.d("nt", "レスポンスを検知しました1");
-                if (documentSnapshot.getBoolean("isReported") == true && isInCar) {//isReportedがtrueかつisInCarがtrueのとき=サイト上で第三者ボタンが押されたときに乗車状態のとき
-                    ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする
-                    int importance = NotificationManager.IMPORTANCE_DEFAULT;
-                    NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
-                    channel.setDescription("第3者からの通報を検知しました");
-                    NotificationManager notificationManager = getSystemService(NotificationManager.class);
-                    notificationManager.createNotificationChannel(channel);
-                    Log.d("nt", "レスポンスを検知しました2");
-                    NotificationSetting();//通知に関する設定のメソッド
-                    Notification(getApplicationContext());//通知を行うメソッド
-                } else if(isInCar){//Bluetoothの切断後5分以上乗車状態のままのとき→QRコード読み取りを忘れているとき→置き去り発生
-                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
-                    periodicTaskManager.startPeriodicTask();//通知のループをストップする
-                    E.putBoolean("isInCarPref", !documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
-                    E.apply();//確定処理
-                }else {
-                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
-                    periodicTaskManager.stopPeriodicTask();//5分毎に通知を行う
-                    E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
-                    E.apply();//確定処理
-                }
-            }
-
-        });
-    }
-
-    public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド
-        //共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
-        DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
-        Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
-        DEFAULT_ITEM.put("isReported", false);
-        //isReportedをfalseに更新
-        isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
-    }
-
-    public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
-            int importance = NotificationManager.IMPORTANCE_DEFAULT;
-            //通知チャネルの実装
-            NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通知", importance);
-            channel.setDescription("第三者により置き去りの通報が行われたときに通知します。");
-
-            NotificationManager notificationManager = getSystemService(NotificationManager.class);
-            notificationManager.createNotificationChannel(channel);
-
-    }
-
-    public void Notification(Context context) {//実際に通知を行うメソッド
-         final String CHANNEL_ID = "my_channel_id";
-        // 通知がクリックされたときに送信されるIntent
-        Intent intent = new Intent(context, MainActivity.class);
-        intent.setAction("OPEN_ACTIVITY");
-        // PendingIntentの作成
-        int requestCode = 100;
-        int flags = 0;
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
-
-        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
-
-        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
-                .setSmallIcon(android.R.drawable.ic_menu_info_details)
-                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("第三者からの通報が行われました。")//通知の本文
-                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
-                .setAutoCancel(true)//通知をタップすると削除する
-                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
-
-        // NotificationChannelの作成（Android 8.0以降）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            if (notificationManager != null) {
-                NotificationChannel channel = new NotificationChannel(
-                        CHANNEL_ID,
-                        "Channel Name",
-                        NotificationManager.IMPORTANCE_HIGH
-                );
-
-                channel.setDescription("Channel Description");
-                channel.enableLights(true);
-                channel.setLightColor(Color.RED);
-                channel.enableVibration(true);
-                notificationManager.createNotificationChannel(channel);
-            }
-        }
-
-
-        NotificationManager notificationManager = (NotificationManager)context.getSystemService(context.NOTIFICATION_SERVICE);
-        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
-    }
-    public void NotificationBluetooth(Context context, int time) {//実際に通知を行うメソッド
-        final String CHANNEL_ID = "my_channel_id";
-        // 通知がクリックされたときに送信されるIntent
-        Intent intent = new Intent(context, MainActivity.class);
-        intent.setAction("OPEN_ACTIVITY");
-        // PendingIntentの作成
-        int requestCode = 100;
-        int flags = 0;
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
-
-        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
-
-        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
-                .setSmallIcon(android.R.drawable.ic_menu_info_details)
-                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("Bluetootと車の切断から"+time+"分が経過しました")//通知の本文
-                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
-                .setAutoCancel(true)//通知をタップすると削除する
-                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
-
-        // NotificationChannelの作成（Android 8.0以降）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            if (notificationManager != null) {
-                NotificationChannel channel = new NotificationChannel(
-                        CHANNEL_ID,
-                        "Channel Name",
-                        NotificationManager.IMPORTANCE_HIGH
-                );
-
-                channel.setDescription("Channel Description");
-                channel.enableLights(true);
-                channel.setLightColor(Color.RED);
-                channel.enableVibration(true);
-                notificationManager.createNotificationChannel(channel);
-            }
-        }
-
-
-        NotificationManager notificationManager = (NotificationManager)context.getSystemService(context.NOTIFICATION_SERVICE);
-        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
-    }
-    public class PeriodicTaskManager {//Bluetoothの切断後に乗車状態にならなかった場合に５分毎に通知を送るメソッド
-
-        private static final long INTERVAL = 5 * 1000; //300秒
-        private final Handler handler;
-        private final Runnable periodicTask;
-
-        public PeriodicTaskManager() {
-
-            handler = new Handler(Looper.getMainLooper());
-            periodicTask = new Runnable() {
-
-                public void run() {
-
-                    //共有プリファレンス全体の準備
-                    SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-                    int time=sharedPreferences.getInt("time",0);
-                    //共有プリファレンス 書き込みの準備
-                    SharedPreferences.Editor E = sharedPreferences.edit();
-                    if(time==0) {//Bluetoot切断からの時間経過(5分刻み)
-                        E.putInt("time",5);
-                        E.apply();;
-                    }else {
-                        E.putInt("time",time+5);
-                        E.apply();
-                    }
-
-                    // 5分毎に実行される処理
-                    NotificationBluetooth(getApplicationContext(),time);
-                    Log.d("PeriodicTask", "５分後に処理を実行します");
-
-                    handler.postDelayed(this, INTERVAL);
-                }
-            };
-        }
-
-        public void startPeriodicTask() {
-            // 最初の実行
-            handler.postDelayed(periodicTask,INTERVAL);//一回目は5分後に行う
-        }
-
-        public void stopPeriodicTask() {
-            //共有プリファレンス全体の準備
-            SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-            int time=sharedPreferences.getInt("time",0);
-            //共有プリファレンス 書き込みの準備
-            SharedPreferences.Editor E = sharedPreferences.edit();
-            E.putInt("time",0);
-            E.apply();
-            // 定期的な処理の停止
-            handler.removeCallbacks(periodicTask);
-        }
-    }
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}

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

@@ -126,7 +126,6 @@ public class bluetooth_setupFragment extends Fragment {
             for (BluetoothDevice device : pairedDevices) {
 
 
-
                 String[] deviceInfo = new String[2];
                 deviceInfo[0] = device.getName();
                 deviceInfo[1] = device.getAddress(); // MAC address
@@ -147,7 +146,6 @@ public class bluetooth_setupFragment extends Fragment {
             textView.setText(PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext()).getString("bluetooth_device_name", "none"));
 
 
-
         }
 
         return view;

app/src/main/res/layout/fragment_home.xml

@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
-            android:id="@+id/situation_bg"
+            android:id="@+id/car_situation_bg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -37,7 +37,7 @@
                 android:textSize="25dp" />
 
             <TextView
-                android:id="@+id/situation"
+                android:id="@+id/car_situation"
                 android:layout_width="match_parent"
                 android:layout_height="200dp"
                 android:layout_marginTop="10dp"
@@ -49,6 +49,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:id="@+id/situation_bg_bluetooth"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -57,6 +58,7 @@
             android:background="@drawable/frame_style">
 
             <TextView
+                android:id="@+id/BluetoothSituation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -73,6 +75,7 @@
                 android:textAlignment="center" />
 
             <ImageView
+                android:id="@+id/BluetoothSituationImage"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_marginTop="50dp"

app/src/main/res/layout/fragment_notification.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".NotificationFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="9"
-        >
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"/>
-
-    </LinearLayout>
-
-</FrameLayout>

app/src/main/res/layout/fragment_setting.xml

@@ -7,18 +7,50 @@
     tools:context=".SettingFragment"
     android:padding="16dp">
 
-    <Button
+
-        android:id="@+id/button_print_qr"
+    <ImageView
-        android:layout_width="match_parent"
+        android:src="@drawable/bluetooth_and_qr2"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:layout_marginTop="150dp"
+        />
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="QRコード印刷"
+        android:textColor="@color/black"
-        android:layout_marginVertical="8dp"/>
+        android:text="QRコード印刷とBluetooth設定"
+        android:layout_gravity="center_horizontal"
+        android:textStyle="bold"
+        android:textSize="18dp"
+        android:layout_marginTop="20dp"
+        />
 
     <Button
         android:id="@+id/button_bluetooth_setting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Bluetooth設定"
-        android:layout_marginVertical="8dp"/>
+        android:layout_marginTop="120dp"
+        android:layout_marginBottom="20dp"/>
+
+    <Button
+        android:id="@+id/button_print_qr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="QRコード印刷"/>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="bottom">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="QRコードは株式会社デンソーウェーブの登録商標です"
+            android:textColor="@color/black" />
+    </LinearLayout>
 
 </LinearLayout>

app/src/main/res/menu/bottom_menu.xml

@@ -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"