解决冲突

This commit is contained in:
qiji4215
2023-04-19 17:21:13 +08:00
parent 4f9f85d09d
commit 9d5b9b1755
3 changed files with 24 additions and 5 deletions

View File

@@ -92,6 +92,29 @@
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/right_fragment_nav_graph" />
<ImageButton
android:id="@+id/main_activity_camera"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginLeft="160dp"
android:layout_marginTop="20dp"
android:onClick="@{()->mainActivity.openCamera()}"
android:src="@mipmap/icon_page_video_a1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/main_activity_camera2"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="gone"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:onClick="@{()->mainActivity.openCamera()}"
android:src="@drawable/baseline_person_24"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>