Merge pull request '修正中、バグあり' (#34) from hotfix-isInCar into main

Reviewed-on: #34

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/HomeFragment.java

@@ -31,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
@@ -80,6 +83,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
         this.updateUiState(getIsInCarLocal());
+        Log.d("isIncar", "onResume: " + getIsInCarLocal());
         this.updateBluetoothSituation(isBluetoothConnected());
     }
 
@@ -90,7 +94,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
 
     private boolean getIsInCarLocal() {
         SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("isInCar", false);
+        Boolean isInCar = pref.getBoolean("isInCarPref", false);
+        Log.d("isInCarPref","isInCar"+ isInCar);
+        return pref.getBoolean("isInCarPref", false);
     }
 
     //画面遷移メソッド
@@ -107,14 +113,17 @@ public class HomeFragment extends Fragment implements OnEventListener {
         transaction.commit();
     }
 
+    /**
+     * 乗車状態の画面を切り替える
+     */
     private boolean updateUiState(boolean isInCar) {
         Log.d("HomeFragment", "updateUiState: called");
         // 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;
@@ -124,29 +133,31 @@ public class HomeFragment extends Fragment implements OnEventListener {
             updateUiState(isInCar);
             return false;
         }
-        String get_on = "\n乗車状態";
+
-        String get_off = "\n降車状態";
         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;
     }
 
+    /**
+     * Bluetoothの接続状態の画面を切り替える
+     */
     private boolean updateBluetoothSituation(Boolean BluetoothConnect) {
         FrameLayout frameLayout;
         TextView textView;
         ImageView imageView;
         try {
-            frameLayout = requireView().findViewById(R.id.situation_bg2);
+            frameLayout = requireView().findViewById(R.id.situation_bg_bluetooth);
-            textView = requireView().findViewById(R.id.Bluetoothsituation);
+            textView = requireView().findViewById(R.id.BluetoothSituation);
-            imageView = requireView().findViewById(R.id.Bluetoothsituationimage);
+            imageView = requireView().findViewById(R.id.BluetoothSituationImage);
         } catch (NullPointerException e) {
             Log.d("HomeFragment", "updateUiState: view is null");
             return false;
@@ -156,17 +167,17 @@ public class HomeFragment extends Fragment implements OnEventListener {
             updateBluetoothSituation(BluetoothConnect);
             return false;
         }
-        String connect = "接続中";
+        final String CONNECT = "接続中";
-        String disconnect = "切断中";
+        final String DISCONNECT = "切断中";
         if (BluetoothConnect) {
             //接続状態にする
             frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
-            textView.setText(connect);
+            textView.setText(CONNECT);
             imageView.setVisibility(View.GONE);
         } else {
-            //降車状態にする
+            //切断状態にする
             frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
-            textView.setText(disconnect);
+            textView.setText(DISCONNECT);
             imageView.setVisibility(View.VISIBLE);
         }
 

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

@@ -14,7 +14,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -52,7 +51,6 @@ public class MainActivity extends AppCompatActivity {
     public static final String TAG = "InspirationQuote";
 
 
-
     private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
             new ScanContract(),
             result -> {
@@ -81,7 +79,6 @@ public class MainActivity extends AppCompatActivity {
         e.putBoolean("connection_status", false);
 
 
-
         if (!hasPermissions()) {
             requestPermissions();
         }
@@ -136,6 +133,8 @@ public class MainActivity extends AppCompatActivity {
         }
         registerReceiver(receiver, intentFilter);
 
+        startForegroundService(new Intent(this, SurveillanceService.class));
+
     }
 
 
@@ -185,7 +184,6 @@ public class MainActivity extends AppCompatActivity {
                 }
             }
         });
-
     }
 
     private boolean hasPermissions() {
@@ -227,22 +225,24 @@ public class MainActivity extends AppCompatActivity {
     }
 
 
-
+    /**
-
+     * FireBaseのIDの取得
+     */
     public void firebaseLink() {//Firebaseのドキュメントの取得
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-        String IdPref = sharedPreferences.getString("ID", null);////アプリに記録されているIDの取得
+        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()を処理
-
         }
     }
-
+    /**
-    public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド
+     * FireBaseのisReportedをfalseに初期化するメソッド
+     */
+    public void ResetReported() {
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@@ -253,6 +253,9 @@ public class MainActivity extends AppCompatActivity {
         isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
     }
 
+    /**
+     * 乗車状態の変更
+     */
     public void changeIsInCar() {
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
@@ -272,6 +275,10 @@ public class MainActivity extends AppCompatActivity {
         isReported.update("isInCar", change).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
         E.apply();
     }
+
+    /**
+     * 第三者通知に関する設定のメソッド
+     */
     public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
         int importance = NotificationManager.IMPORTANCE_DEFAULT;
         //通知チャネルの実装
@@ -280,9 +287,11 @@ public class MainActivity extends AppCompatActivity {
 
         NotificationManager notificationManager = getSystemService(NotificationManager.class);
         notificationManager.createNotificationChannel(channel);
-
     }
 
+    /**
+     * 第三者通知を行うメソッド
+     */
     public void Notification(Context context) {//実際に通知を行うメソッド
         final String CHANNEL_ID = "my_channel_id";
         // 通知がクリックされたときに送信されるIntent
@@ -330,63 +339,52 @@ public class MainActivity extends AppCompatActivity {
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
 
-
+//    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
-    @Override
+//        final String CHANNEL_ID = "my_channel_id";
-    public void onStop() {//アプリをバックグラウンドにした時のメソッド
+//        // 通知がクリックされたときに送信されるIntent
-        super.onStop();
+//        Intent intent = new Intent(context, MainActivity.class);
-        Intent intent = new Intent(getApplication(), TestService.class);
+//        intent.setAction("OPEN_ACTIVITY");
-        startService(intent);//TestServiceを起動
+//        // PendingIntentの作成
-    }
+//        int requestCode = 100;
-
+//        int flags = 0;
-    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
+//        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
-        final String CHANNEL_ID = "my_channel_id";
+//
-        // 通知がクリックされたときに送信されるIntent
+//        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
-        Intent intent = new Intent(context, MainActivity.class);
+//
-        intent.setAction("OPEN_ACTIVITY");
+//        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
-        // PendingIntentの作成
+//                .setSmallIcon(android.R.drawable.ic_menu_info_details)
-        int requestCode = 100;
+//                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-        int flags = 0;
+//                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
+//                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
-
+//                .setAutoCancel(true)//通知をタップすると削除する
-        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
+//                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
-
+//                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
-        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
+//
-                .setSmallIcon(android.R.drawable.ic_menu_info_details)
+//        // NotificationChannelの作成（Android 8.0以降）
-                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
+//            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
+//            if (notificationManager != null) {
-                .setAutoCancel(true)//通知をタップすると削除する
+//                NotificationChannel channel = new NotificationChannel(
-                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
+//                        CHANNEL_ID,
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
+//                        "Channel Name",
-
+//                        NotificationManager.IMPORTANCE_HIGH
-        // NotificationChannelの作成（Android 8.0以降）
+//                );
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+//                channel.setDescription("Channel Description");
-            if (notificationManager != null) {
+//                channel.enableLights(true);
-                NotificationChannel channel = new NotificationChannel(
+//                channel.setLightColor(Color.RED);
-                        CHANNEL_ID,
+//                channel.enableVibration(true);
-                        "Channel Name",
+//                notificationManager.createNotificationChannel(channel);
-                        NotificationManager.IMPORTANCE_HIGH
+//            }
-                );
+//        }
-
+//
-                channel.setDescription("Channel Description");
+//
-                channel.enableLights(true);
+//        NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
-                channel.setLightColor(Color.RED);
+//        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                channel.enableVibration(true);
+//            return;
-                notificationManager.createNotificationChannel(channel);
+//        }
-            }
+//        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
-        }
+//    }
-
-
-        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 Bluetooth_status() {
@@ -425,9 +423,7 @@ public class MainActivity extends AppCompatActivity {
             String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
 
             if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
                 //Bluetoothデバイスが接続されたときの処理
-                changeBluetooth(true);
                 Log.d("BT", "Device connected");
 
                 Log.d("BT_Judge", "Registered: " + registeredId);
@@ -435,6 +431,7 @@ public class MainActivity extends AppCompatActivity {
                 if (deviceHardwareAddress.equals(registeredId)) {
                     //登録済みのデバイスだったときの処理
                     Log.d("BT_Judge", "登録済み");
+                    changeBluetooth(true);
                     e.putBoolean("connection_status", true);
 
                 } else {
@@ -444,29 +441,16 @@ public class MainActivity extends AppCompatActivity {
                 }
                 e.apply();
 
-            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)&&!isInCar) {//bluetoothが切断されたときに乗車状態のとき
+            }else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-
+                //bluetoothデバイスが切断されたときの処理
-                //Do something if disconnected
-                //デバイスが切断されたときの処理
                 changeBluetooth(false);
-                if (deviceHardwareAddress.equals(registeredId)) {
-                    // 5分待機する
-                    Handler handler = new Handler();
-                    handler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)&&!isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない＝置き去りが発生した可能性大
-                                NotificationBluetooth(getApplicationContext());//通知を行うメソッド
-                            }}
-
-                    }, 5 *60*1000); // 5分をミリ秒に変換
-                }
-            }else {
-                Log.d("BT", "Device disconnected");
             }
         }
     };
 
+    /**
+     * Bluetoothの接続状態を変更するメソッド
+     */
     public void changeBluetooth(boolean actual) {
         getSharedPreferences("Bluetooth_situation", MODE_PRIVATE).edit().putBoolean("status", actual).apply();
     }

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/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;
@@ -95,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();
@@ -106,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,355 @@
+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
+    // DEBUG
+    private static final int NOTIFICATION_DELAY = 5 * 1000; // 15 seconds
+    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");
+
+                if (isInCar) {
+                    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);
+
+            String action = intent.getAction(); // may need to chain this to a recognizing function
+            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+                // bluetoothが切断されたときに乗車状態のとき
+                notificationRunnable = () -> {
+                    // 5分経過した時点でも車に乗っていない場合
+                    sendNotification(context, BLUETOOTH_NOTIFICATION);
+                };
+                handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY);
+            } else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+                // 再接続された場合、通知をキャンセルする
+                if (notificationRunnable != null) {
+                    handler.removeCallbacks(notificationRunnable);
+                    notificationRunnable = null;
+                    Log.d("BT", "Notification canceled due to reconnection");
+                }
+            }
+        }
+    };
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}

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

@@ -1,297 +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.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Handler;
-import android.os.IBinder;
-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 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";
-
-
-    @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()を処理
-        }
-
-        Bluetooth_status();
-        return flags;
-
-
-    }
-
-    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
-        // 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 (isInCar) {//isReportedがtrue=サイト上で乗車状態のとき
-                    if (documentSnapshot.getBoolean("isReported")) {
-                        //ここスタート（リサイクル）
-                        ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする
-                        NotificationSetting();//通知に関する設定のメソッド
-                        Notification(getApplicationContext());//通知を行うメソッド
-                    }
-                } else {//isReportedがfalse=サイト上で降車状態のとき
-                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
-                }
-            }
-
-        });
-    }
-
-    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) {//実際に通知を行うメソッド
-        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("Bluetoothと車の切断から5分が経過しました")//通知の本文
-                .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 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;
-        } else {
-            Log.d("BT", "Permission to connect bluetooth devices granted");
-        }
-        registerReceiver(receiver, intentFilter);
-    }
-
-
-    private final BroadcastReceiver receiver = new BroadcastReceiver() {
-
-
-        //PreferenceManager.getDefaultSharedPreferences("myPreferences",Context.MODE_PRIVATE);
-
-        @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);
-            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
-
-            String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
-
-            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
-                //Bluetoothデバイスが接続されたときの処理
-                Log.d("BT", "Device connected");
-
-
-                Log.d("BT_Judge", "Registered: " + registeredId);
-
-                if (deviceHardwareAddress.equals(registeredId)) {
-                    //登録済みのデバイスだったときの処理
-                    Log.d("BT_Judge", "登録済み");
-                    e.putBoolean("connection_status", true);
-
-                } else {
-                    //登録していないデバイスだったときの処理
-                    Log.d("BT_Judge", "未登録");
-                    e.putBoolean("connection_status", false);
-                }
-                e.apply();
-
-            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
-
-                //Do something if disconnected
-                //デバイスが切断されたときの処理
-                if (deviceHardwareAddress.equals(registeredId)) {
-                    // 5分待機する
-                    Handler handler = new Handler();
-                    handler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない＝置き去りが発生した可能性大
-                                NotificationBluetooth(getApplicationContext());//通知を行うメソッド
-                            }
-                        }
-
-                    }, 5 * 60 * 1000); // 5分をミリ秒に変換
-                }
-            } else {
-                Log.d("BT", "Device disconnected");
-            }
-        }
-    };
-
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}

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,7 +49,7 @@
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/situation_bg2"
+            android:id="@+id/situation_bg_bluetooth"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -58,7 +58,7 @@
             android:background="@drawable/frame_style">
 
             <TextView
-                android:id="@+id/Bluetoothsituation"
+                android:id="@+id/BluetoothSituation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -75,7 +75,7 @@
                 android:textAlignment="center" />
 
             <ImageView
-                android:id="@+id/Bluetoothsituationimage"
+                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,35 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:weightSum="10"
-        android:orientation="vertical"
-        tools:context=".MainActivity">
-
-        <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>
-
-
-    </LinearLayout>
-
-
-</FrameLayout>