From 9dda0adbedbf0edfef5d205d80c42c83e6c21ff1 Mon Sep 17 00:00:00 2001
From: Asura146 <kyo008g@gmail.com>
Date: Thu, 11 Jan 2024 16:17:23 +0900
Subject: [PATCH] WIP

---
 .../com/example/childguard/MainActivity.java  |   4 +
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/fragment_home.xml     | 195 ++++++++++--------
 3 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/com/example/childguard/MainActivity.java b/app/src/main/java/com/example/childguard/MainActivity.java
index 9c79486..4cd26ee 100644
--- a/app/src/main/java/com/example/childguard/MainActivity.java
+++ b/app/src/main/java/com/example/childguard/MainActivity.java
@@ -17,6 +17,9 @@ import android.os.Vibrator;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
+import java.util.Random;
+import java.util.UUID;
+
 public class MainActivity extends AppCompatActivity {
 
     BluetoothManager bluetoothManager;
@@ -27,6 +30,7 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+
         //通知のやつ↓
         int importance = NotificationManager.IMPORTANCE_DEFAULT;
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f7e6c7d..5377215 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
         android:name="com.example.childguard.HomeFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/nav_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 338a0d3..504ddf1 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/frameLayout"
@@ -8,112 +8,127 @@
     android:orientation="vertical"
     tools:context=".HomeFragment">
 
-    <FrameLayout
-        android:id="@+id/situation_bg"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/frame_style">
 
-        <TextView
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="現在の状態"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="25dp" />
+            android:orientation="vertical" >
+            <FrameLayout
+                android:id="@+id/situation_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="20dp"
+                android:background="@drawable/frame_style">
 
-        <TextView
-            android:id="@+id/situation"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:layout_marginTop="10dp"
-            android:text="\n降車状態"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="55dp" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:text="現在の状態"
+                    android:textAlignment="center"
+                    android:textColor="@color/black"
+                    android:textSize="25dp" />
 
-    </FrameLayout>
+                <TextView
+                    android:id="@+id/situation"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    android:layout_marginTop="10dp"
+                    android:text="\n降車状態"
+                    android:textAlignment="center"
+                    android:textColor="@color/black"
+                    android:textSize="55dp" />
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/frame_style">
+            </FrameLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:text="切断中"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="30dp" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="20dp"
+                android:background="@drawable/frame_style">
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginTop="50dp"
-            android:src="@drawable/bluetooth_drive_fill0_wght400_grad0_opsz24"
-            android:textAlignment="center" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="切断中"
+                    android:textAlignment="center"
+                    android:textColor="@color/black"
+                    android:textSize="30dp" />
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginTop="50dp"
-            android:src="@drawable/close_fill0_wght400_grad0_opsz24"
-            android:textAlignment="center" />
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="50dp"
+                    android:src="@drawable/bluetooth_drive_fill0_wght400_grad0_opsz24"
+                    android:textAlignment="center" />
 
-    </FrameLayout>
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="50dp"
+                    android:src="@drawable/close_fill0_wght400_grad0_opsz24"
+                    android:textAlignment="center" />
 
-    <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" />
+            </FrameLayout>
 
-    <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/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" />
 
-    <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">
+            <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" />
+
+            <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>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+            <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">
+                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>
+                <!--<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>