Merge branch 'main' into itazuraboushi

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

@@ -6,21 +6,53 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     tools:context=".bluetooth_setupFragment">
 
 
     <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="デバイス"
+        android:textSize="35dp"
+        android:textColor="@color/black"
+        android:layout_marginTop="20dp"
+        />
+    <View
+        android:id="@+id/divider1"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/black" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:scrollbars="vertical"/>
 
     <TextView
-        android:id="@+id/click_device"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
+        android:text="登録デバイス"
+        android:textSize="35dp"
+        android:textColor="@color/black"
+        android:layout_marginTop="20dp"
+        />
+    <View
+        android:id="@+id/divider2"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/black"
+        />
+    <TextView
+        android:id="@+id/registered_device"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:textSize="30sp"
+        android:textColor="@color/black"
         />
 
+
+
 </LinearLayout>

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

@@ -107,6 +107,16 @@
                 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"

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

@@ -6,6 +6,7 @@
         android:id="@+id/textView1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="30sp"/>
+        android:textSize="30sp"
+        android:textColor="@color/black"/>
 
 </LinearLayout>