ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rca/fix UI #15

Merged
r-ca merged 30 commits from rca/fix_ui into main 2024-01-17 10:27:28 +00:00
Conversation 0 Commits 30 Files Changed 11 +52 -115
1 changed files with 52 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a9485d04ce - Show all commits

167
app/src/main/res/layout/fragment_home.xml
View File

@ -9,140 +9,77 @@
tools:context=".HomeFragment" tools:context=".HomeFragment"
> >
<LinearLayout
<ScrollView android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="0dp" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
app:layout_constraintVertical_bias="0.0">
<LinearLayout <FrameLayout
android:id="@+id/situation_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginLeft="20dp"
android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:background="@drawable/frame_style">
<FrameLayout <TextView
android:id="@+id/situation_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginTop="20dp"
android:layout_marginTop="30dp" android:text="現在の状態"
android:layout_marginRight="20dp" android:textAlignment="center"
android:background="@drawable/frame_style"> android:textColor="@color/black"
android:textSize="25dp" />
<TextView <TextView
android:layout_width="match_parent" android:id="@+id/situation"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="20dp" android:layout_height="200dp"
android:text="現在の状態" android:layout_marginTop="10dp"
android:textAlignment="center" android:text="\n降車状態"
android:textColor="@color/black" android:textAlignment="center"
android:textSize="25dp" /> android:textColor="@color/black"
android:textSize="55dp" />
<TextView </FrameLayout>
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> <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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginTop="5dp"
android:layout_marginTop="30dp" android:text="切断中"
android:layout_marginRight="20dp" android:textAlignment="center"
android:background="@drawable/frame_style"> android:textColor="@color/black"
android:textSize="30dp" />
<TextView <ImageView
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/bluetooth_drive_fill0_wght400_grad0_opsz24"
android:textAlignment="center" />
<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" />
</FrameLayout>
<Button
android:id="@+id/QRprinting"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="100dp"
android:layout_marginTop="70dp" android:layout_marginTop="50dp"
android:backgroundTint="#778899" android:src="@drawable/bluetooth_drive_fill0_wght400_grad0_opsz24"
android:text="QRコード印刷" android:textAlignment="center" />
android:textColor="@color/white"
android:textSize="40dp" />
<Button <ImageView
android:id="@+id/Bluetooth_setup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="100dp"
android:backgroundTint="#778899" android:layout_marginTop="50dp"
android:text="Bluetooth設定" android:src="@drawable/close_fill0_wght400_grad0_opsz24"
android:textColor="@color/white" android:textAlignment="center" />
android:textSize="40dp" />
<Button </FrameLayout>
android:id="@+id/bt_debug" </LinearLayout>
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> </androidx.constraintlayout.widget.ConstraintLayout>