Commit 848dc3be authored by wanglei's avatar wanglei

...

parent 27a932ec
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
tools:context=".ui.activity.MainActivity"> tools:context=".ui.activity.MainActivity">
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
...@@ -14,14 +15,20 @@ ...@@ -14,14 +15,20 @@
app:layout_constraintBottom_toTopOf="@id/ll_bottom_nav" app:layout_constraintBottom_toTopOf="@id/ll_bottom_nav"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
<androidx.cardview.widget.CardView
android:id="@+id/ll_bottom_nav" android:id="@+id/ll_bottom_nav"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" app:cardElevation="10dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
tools:ignore="DisableBaselineAlignment"> tools:ignore="DisableBaselineAlignment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/ll_home" android:id="@+id/ll_home"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -145,7 +152,9 @@ ...@@ -145,7 +152,9 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -4,9 +4,15 @@ ...@@ -4,9 +4,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal" android:orientation="vertical"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:ignore="DisableBaselineAlignment">
<LinearLayout <LinearLayout
android:id="@+id/ll_clean" android:id="@+id/ll_clean"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -80,8 +86,8 @@ ...@@ -80,8 +86,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="45dp" android:layout_width="50dp"
android:layout_height="45dp" android:layout_height="50dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/process" android:src="@mipmap/process"
...@@ -111,8 +117,8 @@ ...@@ -111,8 +117,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="45dp" android:layout_width="50dp"
android:layout_height="45dp" android:layout_height="50dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/bookmark" android:src="@mipmap/bookmark"
...@@ -129,5 +135,14 @@ ...@@ -129,5 +135,14 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginHorizontal="26dp"
android:layout_marginTop="20dp"
android:background="#E5E6EB" />
</LinearLayout> </LinearLayout>
...@@ -10,14 +10,8 @@ ...@@ -10,14 +10,8 @@
android:id="@+id/rv_website" android:id="@+id/rv_website"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/item_website_grid" /> tools:listitem="@layout/item_website_grid" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginHorizontal="26dp"
android:layout_marginTop="16dp"
android:background="#E5E6EB" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment