Merge branch 'main' into kyou/layout

This commit is contained in:
ろむねこ authored and GitHub committed 2024-01-16 11:55:46 +09:00
commit cdea661646
11 files changed
+307 -101

No files matched your search

@@ -1,14 +0,0 @@
<?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=".UrlPageActivity">
<WebView
android:id="@+id/url_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
-7
View File
@@ -5,13 +5,6 @@
android:layout_height="match_parent"
tools:context=".QRFragment">
<!-- TODO: Update blank fragment layout -->
<Button
android:id="@+id/camera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
/>
</FrameLayout>