権限の要求を追加

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <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" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" 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

@@ -1,20 +0,0 @@
-{
-  "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/java/com/example/childguard/Bluetooth_device_save.java

@@ -0,0 +1,22 @@
+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,18 +1,14 @@
 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,7 +23,6 @@ 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

@@ -7,7 +7,6 @@ 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;
@@ -15,6 +14,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FirebaseFirestore;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link HomeFragment#newInstance} factory method to
@@ -63,7 +65,6 @@ public class HomeFragment extends Fragment implements OnEventListener {
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
 
-
     }
 
     @Override
@@ -71,26 +72,52 @@ public class HomeFragment extends Fragment implements OnEventListener {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_home, container, false);
 
+        view.findViewById(R.id.situation_bg).setOnClickListener(v -> {
+            if (updateStateByServer()) {
+                Log.d("HomeFragment", "onCreateView: updateStateByServer() success");
+            } else {
+                Log.d("HomeFragment", "onCreateView: updateStateByServer() failed");
+            }
+        });
+
         return view;
     }
 
+    // TODO: updateUiState()を切り出す
+    private boolean updateStateByServer() {
+        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
+        String key = pref.getString("ID", null);
+        DocumentReference documentReference;
+        if (key == null) {
+            Log.d("HomeFragment", "updateStateCache: key is null");
+            return false;
+        } else {
+            Log.d("HomeFragment", "updateStateCache: key is " + key);
+            documentReference = FirebaseFirestore.getInstance().document("status/" + key);
+
+            documentReference.get().addOnCompleteListener(task -> {
+                if (task.isSuccessful()) {
+                    Log.d("HomeFragment", "updateStateCache: get document success");
+                    Log.d("HomeFragment", "updateStateCache: isInCar is " + task.getResult().getBoolean("isInCar"));
+                    if (pref.getBoolean("isInCar", false) != task.getResult().getBoolean("isInCar")) {
+                        SharedPreferences.Editor editor = pref.edit();
+                        editor.putBoolean("isInCar", task.getResult().getBoolean("isInCar"));
+                        editor.apply();
+                    }
+                    updateUiState(pref.getBoolean("isInCar", false)); // UpdateUI
+                } else {
+                    Log.d("HomeFragment", "updateStateCache: get document failed");
+                }
+            });
+        }
+        return true;
+    }
+
 
     @Override
     public void onResume() {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
-        this.updateUiState(getIsInCarLocal());
-        this.updateBluetoothSituation(isBluetoothConnected());
-    }
-
-    private boolean isBluetoothConnected() {
-        SharedPreferences pref = requireActivity().getSharedPreferences("Bluetooth_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("status", false);
-    }
-
-    private boolean getIsInCarLocal() {
-        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("isInCar", false);
     }
 
     //画面遷移メソッド
@@ -126,7 +153,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
         }
         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);
@@ -139,58 +166,11 @@ public class HomeFragment extends Fragment implements OnEventListener {
         return true;
     }
 
-    private boolean updateBluetoothSituation(Boolean BluetoothConnect) {
-        FrameLayout frameLayout;
-        TextView textView;
-        ImageView imageView;
-        try {
-            frameLayout = requireView().findViewById(R.id.situation_bg2);
-            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;
-        }
-        String connect = "接続中";
-        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;
-    }
-
-
     @Override
-    public boolean onEvent(boolean isInCar) {//乗車状態と降車状態の変更を受け取ってupdateUiState()に渡す
+    public boolean onEvent(boolean isInCar) {
         Log.d("HomeFragment", "onEvent: called");
 
         return updateUiState(isInCar);
     }
-
-    @Override
-    public void onEvent2(boolean BluetoothConnect) {
-        return;
-    }
-
-
-    @Override
-    public boolean onEvent2(Boolean BluetoothConnect) {//Bluetoothの接続切断を受け取ってupdateBluetoothSituation()に渡す
-        updateBluetoothSituation(BluetoothConnect);
-        return false;
-    }
 }
 

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

@@ -4,7 +4,9 @@ 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;
@@ -12,9 +14,9 @@ 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.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -24,6 +26,7 @@ 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;
@@ -43,7 +46,8 @@ import java.util.Map;
 public class MainActivity extends AppCompatActivity {
 
     FirebaseFirestore db;
-
+    BluetoothManager bluetoothManager;
+    BluetoothAdapter bluetoothAdapter;
 
     DocumentReference mDocRef;
 
@@ -52,7 +56,6 @@ public class MainActivity extends AppCompatActivity {
     public static final String TAG = "InspirationQuote";
 
 
-
     private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
             new ScanContract(),
             result -> {
@@ -61,34 +64,33 @@ 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, "Child Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
+                        Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
                     } else {
-                        changeIsInCar();
+                        //URLの表示
+                        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);
-
-        //Bluetooth接続判定用
-        SharedPreferences pref=PreferenceManager.getDefaultSharedPreferences(this);
-        SharedPreferences.Editor e=pref.edit();
-        e.putBoolean("connection_status",false);
-
-
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
 
         if (!hasPermissions()) {
             requestPermissions();
         }
 
+
         BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
 
-        this.homeFragment = HomeFragment.newInstance("test", "test");
+        this.homeFragment = HomeFragment.newInstance("test", "tset");
 
         bottomNavigationView.setOnNavigationItemSelectedListener(v ->
 
@@ -99,8 +101,14 @@ public class MainActivity extends AppCompatActivity {
                         .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()) {
                 findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
                 getSupportFragmentManager().beginTransaction()
@@ -108,8 +116,6 @@ public class MainActivity extends AppCompatActivity {
                         .addToBackStack(null)
                         .commit();
             }
-            firebaseLink();
-            Bluetooth_status();
             return true;
         });
 
@@ -127,7 +133,6 @@ 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;
@@ -135,57 +140,13 @@ public class MainActivity extends AppCompatActivity {
             Log.d("BT", "Permission to connect bluetooth devices granted");
         }
         registerReceiver(receiver, intentFilter);
-
     }
 
-
     @Override
     protected void onResume() {
         super.onResume();
         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")) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
-                    if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
-//                        changes-situation();//  changes-situation()メソッドを処理→アプリ側の乗降状態を変化
-                        ((HomeFragment) fragment).onEvent(!isInCar);
-                    }
-                } 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", "何もなし");
-                }
-            }
-        });
-
+        firebaselink();
     }
 
     private boolean hasPermissions() {
@@ -223,13 +184,90 @@ public class MainActivity extends AppCompatActivity {
             if (!hasPermissions()) {
                 Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
             }
+            else {
+                Toast.makeText(this, "Permissions granted.", Toast.LENGTH_SHORT).show();
+            }
         }
     }
 
+    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のインスタンスかの判定
+//                        ((HomeFragment) fragment).onEvent(!isInCar);//onEvent()メソッドを処理→HomeFragmentのonEvent()メソッドを処理
+//                    }
+                } 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() {
 
-    public void firebaseLink() {//Firebaseのドキュメントの取得
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction(); // may need to chain this to a recognizing function
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+//            HomeFragment homeFragment=new HomeFragment();
+
+            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");
+
+                Log.d("BT_Judge", "Registered: " + registeredId);
+
+                if (deviceHardwareAddress.equals(registeredId)) {
+                    Log.d("BT_Judge", "登録済み");
+                } else Log.d("BT_Judge", "未登録");
+
+            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+                //Do something if disconnected
+                Log.d("BT", "Device disconnected");
+
+            }
+        }
+    };
+
+
+    public void firebaselink() {//Firebaseのドキュメントの取得
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);////アプリに記録されているIDの取得
@@ -253,25 +291,6 @@ 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);
-        //共有プリファレンス 書き込みの準備
-        SharedPreferences.Editor E = sharedPreferences.edit();
-        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-        Boolean change=sharedPreferences.getBoolean("change",false);
-        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
-        DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
-        Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
-        if (!change) {
-            //isInCarをtrueに更新
-            E.putBoolean("change",true);
-        }else{
-            E.putBoolean("change",false);
-        }
-        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;
         //通知チャネルの実装
@@ -331,144 +350,12 @@ public class MainActivity extends AppCompatActivity {
     }
 
 
-    @Override
-    public void onStop() {//アプリをバックグラウンドにした時のメソッド
-        super.onStop();
-        Intent intent = new Intent(getApplication(), TestService.class);
-        startService(intent);//TestServiceを起動
-    }
+//    @Override
+//    public void onStop() {//アプリをバックグラウンドにした時のメソッド
+//        super.onStop();
+//        Intent intent = new Intent(getApplication(), TestService.class);
+//        startService(intent);//TestServiceを起動
+//    }
 
-    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デバイスが接続されたときの処理
-                changeBluetooth(true);
-                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
-                //デバイスが切断されたときの処理
-                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");
-            }
-        }
-    };
-
-    public void changeBluetooth(boolean actual){
-        getSharedPreferences("Bluetooth_situation",MODE_PRIVATE).edit().putBoolean("status",actual).apply();
-    }
 }
 

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

@@ -5,7 +5,6 @@ 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/OnEventListener.java

@@ -3,8 +3,4 @@ package com.example.childguard;
 public interface OnEventListener {
 
     boolean onEvent(boolean state);
-
-    void onEvent2(boolean BluetoothConnect);
-
-    boolean onEvent2(Boolean BluetoothConnect);
 }

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

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

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

@@ -23,7 +23,6 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
     Context applicationContext;
     View parentView;
 
-
     // Constructor
     public RecyclerAdapter(ArrayList<String[]> deviceList, Context applicationContext, View parentView) {
         // Init
@@ -31,7 +30,6 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
         this.deviceList = deviceList;
         this.applicationContext = applicationContext;
         this.parentView = parentView;
-
     }
 
     @NonNull
@@ -64,6 +62,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
                         textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name","none"));
 
 
+
                     })
                     .setNegativeButton(android.R.string.cancel, null)
                     .show();

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

@@ -26,7 +26,6 @@ import java.util.Map;
 public class SettingFragment extends Fragment {
 
     FirebaseFirestore db;
-
     public SettingFragment() {
         // Required empty public constructor
     }

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

@@ -9,13 +9,14 @@ 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.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;
@@ -36,11 +37,11 @@ public class TestService extends Service {
 
     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の取得
@@ -50,16 +51,12 @@ public class TestService extends Service {
             mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
             initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
         }
-
-        Bluetooth_status();
         return flags;
-
-
     }
 
     private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
         // PeriodicTaskManagerのインスタンス化
-
+        periodicTaskManager = new PeriodicTaskManager();
         // 共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         //車の乗り降りを管理するtrue=乗車、false=降車
@@ -75,15 +72,22 @@ public class TestService extends Service {
                 E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
                 E.apply();//確定処理
                 Log.d("nt", "レスポンスを検知しました1");
-                if (isInCar) {//isReportedがtrue=サイト上で乗車状態のとき
-                    if (documentSnapshot.getBoolean("isReported")) {
-                        //ここスタート（リサイクル）
+                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 {//isReportedがfalse=サイト上で降車状態のとき
+                } else if(isInCar){//Bluetoothの切断後5分以上乗車状態のままのとき→QRコード読み取りを忘れているとき→置き去り発生
                     ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
+                    periodicTaskManager.startPeriodicTask();//通知のループをストップする
+                }else {
+                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
+                    periodicTaskManager.stopPeriodicTask();//5分毎に通知を行う
                 }
             }
 
@@ -159,8 +163,7 @@ public class TestService extends Service {
         }
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
-
-    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
+    public void NotificationBluetooth(Context context, int time) {//実際に通知を行うメソッド
         final String CHANNEL_ID = "my_channel_id";
         // 通知がクリックされたときに送信されるIntent
         Intent intent = new Intent(context, MainActivity.class);
@@ -175,7 +178,7 @@ public class TestService extends Service {
         @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
                 .setSmallIcon(android.R.drawable.ic_menu_info_details)
                 .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
+                .setContentText("Bluetootと車の切断から"+time+"分が経過しました")//通知の本文
                 .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
                 .setAutoCancel(true)//通知をタップすると削除する
                 .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
@@ -206,89 +209,52 @@ public class TestService extends Service {
         }
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
+    public class PeriodicTaskManager {//Bluetoothの切断後に乗車状態にならなかった場合に５分毎に通知を送るメソッド
 
+        private static final long INTERVAL = 5 *60* 1000; //300秒
+        private final Handler handler;
+        private final Runnable periodicTask;
 
-    public void Bluetooth_status() {
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
-        intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        public PeriodicTaskManager() {
 
-        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);
-    }
+            handler = new Handler(Looper.getMainLooper());
+            periodicTask = new Runnable() {
 
-
-    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());//通知を行うメソッド
-                            }
+
+                    //共有プリファレンス全体の準備
+                    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*2);
+                        E.apply();
                     }
 
-                    }, 5 * 60 * 1000); // 5分をミリ秒に変換
-                }
-            } else {
-                Log.d("BT", "Device disconnected");
-            }
+                    // 5分毎に実行される処理
+                    NotificationBluetooth(getApplicationContext(),time);
+                    Log.d("PeriodicTask", "５分後に処理を実行します");
+
+                    handler.postDelayed(this, INTERVAL);
                 }
             };
+        }
 
+        public void startPeriodicTask() {
+            // 最初の実行
+            handler.postDelayed(periodicTask,INTERVAL);//一回目は5分後に行う
+        }
 
+        public void stopPeriodicTask() {
+            // 定期的な処理の停止
+            handler.removeCallbacks(periodicTask);
+        }
+    }
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {

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

@@ -126,6 +126,7 @@ 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
@@ -146,6 +147,7 @@ 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

@@ -49,7 +49,6 @@
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/situation_bg2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -58,7 +57,6 @@
             android:background="@drawable/frame_style">
 
             <TextView
-                android:id="@+id/Bluetoothsituation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -75,7 +73,6 @@
                 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

@@ -6,19 +6,11 @@
     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">
+        android:layout_weight="9"
+        >
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView1"
@@ -28,8 +20,4 @@
 
     </LinearLayout>
 
-
-    </LinearLayout>
-
-
 </FrameLayout>

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

@@ -7,50 +7,18 @@
     tools:context=".SettingFragment"
     android:padding="16dp">
 
-
-    <ImageView
-        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"
+    <Button
+        android:id="@+id/button_print_qr"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black"
-        android:text="QRコード印刷とBluetooth設定"
-        android:layout_gravity="center_horizontal"
-        android:textStyle="bold"
-        android:textSize="18dp"
-        android:layout_marginTop="20dp"
-        />
+        android:text="QRコード印刷"
+        android:layout_marginVertical="8dp"/>
 
     <Button
         android:id="@+id/button_bluetooth_setting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Bluetooth設定"
-        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>
+        android:layout_marginVertical="8dp"/>
 
 </LinearLayout>

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

@@ -4,7 +4,10 @@
         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"