Merge pull request #15 from child-guardian/rca/fix_ui

Rca/fix UI

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

@@ -0,0 +1,69 @@
+package com.example.childguard;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.print.PrintHelper;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link GenerateQrFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+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();
+        args.putString("key", key);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_generate_qr, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+
+        QrUtils qrUtils = new QrUtils();
+
+        assert getArguments() != null;
+        Bitmap result = qrUtils.setContext(getContext()).getBitmap(getArguments().getString("key"));
+
+        ImageView imageView = view.findViewById(R.id.result_bitmap_image_view);
+        imageView.setImageBitmap(result);
+
+        view.findViewById(R.id.button_print).setOnClickListener( v -> {
+            PrintHelper photoPrinter = new PrintHelper(requireContext());
+            photoPrinter.setScaleMode(PrintHelper.SCALE_MODE_FIT);
+            photoPrinter.printBitmap("placeholder", result, () -> {
+                Toast.makeText(getContext(), "印刷完了", Toast.LENGTH_SHORT).show();
+            });
+        });
+
+        view.findViewById(R.id.button_cancel).setOnClickListener( v -> {
+            getParentFragmentManager().popBackStack();
+        });
+    }
+}

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

@@ -39,7 +39,6 @@ import java.util.Objects;
  * create an instance of this fragment.
  */
 public class HomeFragment extends Fragment implements OnEventListener{
-    FirebaseFirestore db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -85,95 +84,7 @@ public class HomeFragment extends Fragment implements OnEventListener{
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        //    Log.d("HomeFlagment_cnt", "aaaaa");
-        // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_home, container, false);
-        MainActivity activity = (MainActivity) getActivity();
-        //共有プリファレンス全体の準備
-        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("app_situation", MODE_PRIVATE);
-        //QRコード印刷の処理
-        Button bt1 = view.findViewById(R.id.QRprinting);
-        bt1.setOnClickListener(v -> {
-            //初回起動かを保存する変数
-            boolean alreadySaved = sharedPreferences.getBoolean("alreadySaved", false);
-            //ボタン変数の宣言
-            Button parent = view.findViewById(R.id.QRprinting);
-            Button born = view.findViewById(R.id.QRprinting);
-            //falseのときにFirebaseへの登録
-            if (alreadySaved) {
-                Log.d("HomeFragment", "already printed");
-                //画面遷移＆ID受け渡し
-                Toast.makeText(getActivity(), "再印刷", Toast.LENGTH_SHORT).show();
-                QrUtils qrUtils = new QrUtils();
-                PrintHelper printHelper = new PrintHelper(requireContext());
-                printHelper.setScaleMode(PrintHelper.SCALE_MODE_FIT);
-                printHelper.printBitmap("QRコード", qrUtils.setContext(getContext()).getBitmap(sharedPreferences.getString("ID", "placeholder")), new PrintHelper.OnPrintFinishCallback() {
-                    @Override
-                    public void onFinish() {
-                        Toast.makeText(getContext(), "印刷完了", Toast.LENGTH_SHORT).show();
-                    }
-                });
-                return;
-            } else {
-                String valueParent = parent.getText().toString();//変数に文字列を代入
-                String valueBorn = born.getText().toString();//変数に文字列を代入
-                Map<String, String> user = new HashMap<>();//mapの宣言
-
-                Log.d("HomeFragment", "onClick is called");
-
-                //mapに入れる
-                user.put("parent", valueParent);
-                user.put("born", valueBorn);
-                //新しいドキュメントにIDを作って追加
-                db.collection("users")
-                        .add(user)
-                        .addOnSuccessListener(new OnSuccessListener<DocumentReference>() {
-                            @Override
-                            public void onSuccess(DocumentReference documentReference) {
-                                //成功したら
-                                //documentReference.getId()でID取得
-                                Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.getId());
-                                SharedPreferences.Editor e = sharedPreferences.edit();
-                                // キー"alreadySaved"の値をtrueにする
-                                e.putBoolean("alreadySaved", true);
-                                //確定処理
-                                e.apply();
-                                //画面遷移＆ID受け渡し
-                                str_key = "" + documentReference.getId();
-                                Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show();
-                                QrUtils qrUtils = new QrUtils();
-                                PrintHelper printHelper = new PrintHelper(requireContext());
-                                printHelper.setScaleMode(PrintHelper.SCALE_MODE_FIT);
-                                printHelper.printBitmap("QRコード", qrUtils.setContext(getContext()).getBitmap(documentReference.getId()), new PrintHelper.OnPrintFinishCallback() {
-                                    @Override
-                                    public void onFinish() {
-                                        Toast.makeText(getContext(), "印刷完了", Toast.LENGTH_SHORT).show();
-                                    }
-                                });
-                            }
-                        })
-                        .addOnFailureListener(new OnFailureListener() {
-                            @Override
-                            public void onFailure(@NonNull Exception e) {
-                                //失敗したら
-                                Log.w(TAG, "Error adding document", e);
-                            }
-                        });
-                }
-        });
-        //bluetooth設定ボタンの処理
-        Button bt2 = view.findViewById(R.id.Bluetooth_setup);
-        bt2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                replaceFragment(new bluetooth_setupFragment());
-            }
-        });
-
-        //デバック用ボタン
-        view.findViewById(R.id.bt_debug).setOnClickListener( v -> {
-            Toast.makeText(getContext(), PreferenceManager.getDefaultSharedPreferences(getContext().getApplicationContext()).getString("bluetooth_device_id", "none"), Toast.LENGTH_SHORT).show();
-        });
 
         return view;
     }
@@ -183,7 +94,6 @@ public class HomeFragment extends Fragment implements OnEventListener{
     public void onResume() {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
-        updateUiState(getActivity().getSharedPreferences("app_situation", MODE_PRIVATE).getBoolean("car", false));
     }
 
     //画面遷移メソッド
@@ -200,17 +110,22 @@ public class HomeFragment extends Fragment implements OnEventListener{
         transaction.commit();
     }
 
-    private void updateUiState(boolean state) {
+    private boolean updateUiState(boolean state) {
         Log.d("HomeFragment", "updateUiState: called");
         // Init
         TextView tv;
         FrameLayout fl;
         try {
             tv = requireView().findViewById(R.id.situation);
-            fl = getView().findViewById(R.id.situation_bg);
+            fl = requireView().findViewById(R.id.situation_bg);
         } catch (NullPointerException e) {
             Log.d("HomeFragment", "updateUiState: view is null");
-            return;
+            return false;
+        } catch (IllegalStateException e) {
+            Log.d("HomeFragment", "updateUiState: view is not attached");
+//            getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, HomeFragment.newInstance("test", "test")).commit();
+//            updateUiState(state);
+            return false;
         }
         String get_on = "\n乗車状態";
         String get_off = "\n降車状態";
@@ -223,12 +138,14 @@ public class HomeFragment extends Fragment implements OnEventListener{
             fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
             tv.setText(get_off);
         }
+
+        return true;
     }
 
     @Override
-    public void onEvent(boolean state) {
+    public boolean onEvent(boolean state) {
         Log.d("HomeFragment", "onEvent: called");
-        updateUiState(state);
+        return updateUiState(state);
     }
 }
 

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

@@ -1,7 +1,11 @@
 package com.example.childguard;
 
+import static java.security.AccessController.getContext;
+
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
@@ -19,6 +23,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Vibrator;
 
@@ -49,12 +54,18 @@ import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.EventListener;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.FirebaseFirestoreException;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+import com.journeyapps.barcodescanner.ScanContract;
+import com.journeyapps.barcodescanner.ScanOptions;
 
 public class MainActivity extends AppCompatActivity {
 
     BluetoothManager bluetoothManager;
     BluetoothAdapter bluetoothAdapter;
 
+    DocumentReference mDocRef;
+
     private HomeFragment homeFragment;
 
     public static final String TAG = "InspirationQuote";
@@ -68,6 +79,25 @@ public class MainActivity extends AppCompatActivity {
         return df.format(date);
     }
 
+    private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
+            new ScanContract(),
+            result -> {
+                String contents = result.getContents();
+                if (contents == null) {
+                    Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
+                } else if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
+                    Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
+                } else {
+                    //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));
+                }
+            }
+    );
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,22 +112,35 @@ public class MainActivity extends AppCompatActivity {
 
         {
             if (v.getItemId() == findViewById(R.id.navigation_home).getId()) {
+                findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
                 getSupportFragmentManager().beginTransaction()
                         .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
                         .addToBackStack(null)
                         .commit();
-            } else if (v.getItemId() == findViewById(R.id.navigation_QR).getId()) {
-                getSupportFragmentManager().beginTransaction()
-                        .replace(findViewById(R.id.fragmentContainerView).getId(), QRFragment.newInstance("test", "tset"))
-                        .commit();
             } 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()
+                        .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
+                        .addToBackStack(null)
                         .commit();
             }
             return true;
         });
 
+        findViewById(R.id.fab_scan_qr_code).setOnClickListener(v -> {
+            Log.d("QRFragment", "onClick: called");
+            //QRリーダ起動
+            ScanOptions options = new ScanOptions();
+            options.setPrompt("QRコードを読み取ってください");
+            QrLauncher.launch(options);
+        });
+
         //Bluetooth検知機能
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
@@ -116,13 +159,16 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        Log.d("onResume", "called");
+        Log.d("onResume", "mDocRef is null");
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);
         if (IdPref == null) {
             Log.d("onResume", "ID not initialized.");
             return;
         }
-        DocumentReference mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
+        mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
+        this.flg = false;
         initNotification(mDocRef);
 
         super.onResume();
@@ -164,11 +210,13 @@ public class MainActivity extends AppCompatActivity {
                             E.putBoolean("car", true);
                             E.apply();
                         }
-
+                        // SupportFragmentManagerが現在表示しているFragmentを取得
-                        HomeFragment fragment = new HomeFragment();
+                        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
-                        getSupportFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, fragment).commit();
+                        if (fragment instanceof HomeFragment) {
-
+                            ((HomeFragment) fragment).onEvent(!isInCar);
-                        homeFragment.onEvent(!isInCar);
+                        } else {
+                            Log.d("nt", "HomeFragment is not visible");
+                        }
                     }
                 }
                 flg = true;

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

@@ -2,5 +2,5 @@ package com.example.childguard;
 
 public interface OnEventListener {
 
-    void onEvent(boolean state);
+    boolean onEvent(boolean state);
 }

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

@@ -0,0 +1,116 @@
+package com.example.childguard;
+
+import static android.content.ContentValues.TAG;
+import static android.content.Context.MODE_PRIVATE;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.print.PrintHelper;
+
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FirebaseFirestore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link SettingFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class SettingFragment extends Fragment {
+
+    FirebaseFirestore db;
+    public SettingFragment() {
+        // Required empty public constructor
+    }
+
+    public static SettingFragment newInstance() {
+        SettingFragment fragment = new SettingFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_setting, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+
+        view.findViewById(R.id.button_bluetooth_setting).setOnClickListener( v -> {
+            getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, bluetooth_setupFragment.newInstance("test", "test")).addToBackStack(null).commit();
+        });
+
+        view.findViewById(R.id.button_print_qr).setOnClickListener( v -> {
+            SharedPreferences sharedPreferences = getActivity().getSharedPreferences("app_situation", MODE_PRIVATE);
+            boolean alreadySaved = sharedPreferences.getBoolean("alreadySaved", false);
+            //falseのときにFirebaseへの登録
+            if (alreadySaved) {
+                Log.d("HomeFragment", "already printed");
+                //画面遷移＆ID受け渡し
+                Toast.makeText(getActivity(), "再印刷", Toast.LENGTH_SHORT).show();
+                getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(sharedPreferences.getString("ID", "none"))).commit();
+            } else {
+                String valueParent = "placeholder";
+                String valueBorn = "placeholder";
+                Map<String, String> user = new HashMap<>();//mapの宣言
+
+                Log.d("HomeFragment", "onClick is called");
+
+                //mapに入れる
+                user.put("parent", valueParent);
+                user.put("born", valueBorn);
+                //新しいドキュメントにIDを作って追加
+                db.collection("users")
+                        .add(user)
+                        .addOnSuccessListener(documentReference -> {
+                            //成功したら
+                            //documentReference.getId()でID取得
+                            Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.getId());
+                            SharedPreferences.Editor e = sharedPreferences.edit();
+                            // キー"alreadySaved"の値をtrueにする
+                            e.putBoolean("alreadySaved", true);
+                            //確定処理
+                            e.apply();
+                            //画面遷移＆ID受け渡し
+                            SharedPreferences sharedPreferences1 = getActivity().getSharedPreferences("app_situation", MODE_PRIVATE);
+                            SharedPreferences.Editor editor = sharedPreferences1.edit();
+                            editor.putString("ID", documentReference.getId());
+                            editor.apply();
+
+                            Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show();
+                            getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(documentReference.getId())).commit();
+                        })
+                        .addOnFailureListener(e -> {
+                            //失敗したら
+                            Log.w(TAG, "Error adding document", e);
+                        });
+            }
+        });
+    }
+}

app/src/main/res/drawable/baseline_app_settings_alt_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21.81,12.74l-0.82,-0.63v-0.22l0.8,-0.63c0.16,-0.12 0.2,-0.34 0.1,-0.51l-0.85,-1.48c-0.07,-0.13 -0.21,-0.2 -0.35,-0.2 -0.05,0 -0.1,0.01 -0.15,0.03l-0.95,0.38c-0.08,-0.05 -0.11,-0.07 -0.19,-0.11l-0.15,-1.01c-0.03,-0.21 -0.2,-0.36 -0.4,-0.36h-1.71c-0.2,0 -0.37,0.15 -0.4,0.34l-0.14,1.01c-0.03,0.02 -0.07,0.03 -0.1,0.05l-0.09,0.06 -0.95,-0.38c-0.05,-0.02 -0.1,-0.03 -0.15,-0.03 -0.14,0 -0.27,0.07 -0.35,0.2l-0.85,1.48c-0.1,0.17 -0.06,0.39 0.1,0.51l0.8,0.63v0.23l-0.8,0.63c-0.16,0.12 -0.2,0.34 -0.1,0.51l0.85,1.48c0.07,0.13 0.21,0.2 0.35,0.2 0.05,0 0.1,-0.01 0.15,-0.03l0.95,-0.37c0.08,0.05 0.12,0.07 0.2,0.11l0.15,1.01c0.03,0.2 0.2,0.34 0.4,0.34h1.71c0.2,0 0.37,-0.15 0.4,-0.34l0.15,-1.01c0.03,-0.02 0.07,-0.03 0.1,-0.05l0.09,-0.06 0.95,0.38c0.05,0.02 0.1,0.03 0.15,0.03 0.14,0 0.27,-0.07 0.35,-0.2l0.85,-1.48c0.1,-0.17 0.06,-0.39 -0.1,-0.51zM18,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM17,17h2v4c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V3c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2v4h-2V6H7v12h10v-1z"/>
+    
+</vector>

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

@@ -36,5 +36,14 @@
         app:layout_constraintRight_toRightOf="parent"
         app:menu="@menu/bottom_menu" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_scan_qr_code"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        app:srcCompat="@drawable/qr_code_scanner_fill0_wght400_grad0_opsz24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/nav_view"
+        android:layout_margin="32dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:context=".GenerateQrFragment" >
+
+    <ImageView
+        android:id="@+id/result_bitmap_image_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@drawable/close_fill0_wght400_grad0_opsz24"
+        app:layout_constraintBottom_toTopOf="@id/qr_code_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/qr_code_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toBottomOf="@id/result_bitmap_image_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/button_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Cancel" />
+        <Button
+            android:id="@+id/button_print"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Print" />
+    </LinearLayout>
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -9,21 +9,14 @@
     tools:context=".HomeFragment"
    >
 
-
-    <ScrollView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
             android:id="@+id/situation_bg"
@@ -87,62 +80,6 @@
                 android:textAlignment="center" />
 
         </FrameLayout>
-
-            <Button
-                android:id="@+id/QRprinting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="70dp"
-                android:backgroundTint="#778899"
-                android:text="QRコード印刷"
-                android:textColor="@color/white"
-                android:textSize="40dp" />
-
-            <Button
-                android:id="@+id/Bluetooth_setup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:backgroundTint="#778899"
-                android:text="Bluetooth設定"
-                android:textColor="@color/white"
-                android:textSize="40dp" />
-
-            <Button
-                android:id="@+id/bt_debug"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:backgroundTint="#778899"
-                android:text="Bluetooth設定"
-                android:textColor="@color/white"
-                android:textSize="40dp" />
-
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/frame_style_button">
-
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/frame_style_button">
-
-
-                <!--<ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ss"/>-->
-                <!--android:layout_gravity="center"-->
-            </FrameLayout>
     </LinearLayout>
-    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical"
+    tools:context=".SettingFragment"
+    android:padding="16dp">
+
+    <Button
+        android:id="@+id/button_print_qr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        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_marginVertical="8dp"/>
+
+</LinearLayout>

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

@@ -3,16 +3,13 @@
     <item
         android:id="@+id/navigation_home"
         android:icon="@drawable/ic_home_black_24dp"
-        android:title="home"
+        android:title="home"/>
-
-        />
-    <item
-        android:id="@+id/navigation_QR"
-        android:icon="@drawable/qr_code_scanner_fill0_wght400_grad0_opsz24"
-        android:title="QR"
-        />
     <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"
+        android:title="settings"/>
 </menu>