diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 690d610..75b5eed 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,410 +1,420 @@ - + android:background="@drawable/bg_gradient" + android:fillViewport="true"> - + android:orientation="vertical"> - - - - - - - - - - - + - - - - - - - + android:orientation="horizontal" + android:padding="16dp" + android:gravity="end"> - - - - - - + android:id="@+id/btnMore" + android:layout_width="40dp" + android:layout_height="40dp" + android:src="@drawable/ic_more" + android:background="@drawable/bg_menu_button" + android:padding="8dp" + android:contentDescription="更多"/> - - + android:id="@+id/btnScan" + android:layout_width="40dp" + android:layout_height="40dp" + android:src="@drawable/ic_scan" + android:background="@drawable/bg_menu_button" + android:padding="8dp" + android:layout_marginStart="8dp" + android:contentDescription="扫描"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="horizontal" + android:background="@drawable/bg_search" + android:padding="12dp" + android:layout_margin="16dp" + android:gravity="center_vertical"> + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/ic_search" + android:contentDescription="搜索"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + android:textSize="16sp" + android:textStyle="bold"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +