Skip to content

Commit 3428242

Browse files
improvement layout main
1 parent ff931f3 commit 3428242

4 files changed

Lines changed: 33 additions & 15 deletions

File tree

V2rayNG/app/src/main/res/drawable/uwu_bg_banner_fade.xml renamed to V2rayNG/app/src/main/res/drawable/uwu_bg_fade_bottom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
android:shape="rectangle">
44
<gradient
55
android:angle="90"
6-
android:endColor="@android:color/transparent"
7-
android:startColor="?colorBg"/>
6+
android:startColor="?colorBg"
7+
android:endColor="@android:color/transparent"/>
88
</shape>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<gradient
5+
android:angle="270"
6+
android:startColor="?colorBg"
7+
android:endColor="@android:color/transparent"/>
8+
</shape>

V2rayNG/app/src/main/res/layout/activity_main.xml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<View
2323
android:id="@+id/header_image_fade"
24-
android:background="@drawable/uwu_bg_banner_fade"
24+
android:background="@drawable/uwu_bg_fade_bottom"
2525
android:layout_width="match_parent"
2626
android:layout_height="match_parent" />
2727
</FrameLayout>
@@ -134,7 +134,7 @@
134134
android:gravity="center_vertical"
135135
android:orientation="horizontal"
136136
android:paddingTop="3dp"
137-
android:paddingBottom="4dp"
137+
android:paddingBottom="8dp"
138138
android:layout_width="match_parent"
139139
android:layout_height="wrap_content"
140140
android:paddingStart="12dp"
@@ -194,20 +194,29 @@
194194
</LinearLayout>
195195
</com.google.android.material.appbar.AppBarLayout>
196196

197-
<LinearLayout
198-
android:orientation="vertical"
197+
<RelativeLayout
199198
android:layout_width="match_parent"
200199
android:layout_height="match_parent"
201200
android:layout_below="@+id/app_bar">
202201

202+
<androidx.viewpager2.widget.ViewPager2
203+
android:id="@+id/view_pager"
204+
android:scrollbars="vertical"
205+
android:nextFocusRight="@+id/fab"
206+
android:layout_width="match_parent"
207+
android:layout_height="match_parent" />
208+
209+
<View
210+
android:layout_width="match_parent"
211+
android:layout_height="70dp"
212+
android:background="@drawable/uwu_bg_fade_top" />
213+
203214
<LinearLayout
204215
android:id="@+id/layout_tab_wrapper"
205216
android:gravity="center_vertical"
206217
android:orientation="horizontal"
207218
android:layout_width="match_parent"
208219
android:layout_height="wrap_content"
209-
android:layout_marginTop="4dp"
210-
android:layout_marginBottom="6dp"
211220
android:layout_marginStart="16dp"
212221
android:layout_marginEnd="12dp">
213222

@@ -257,13 +266,13 @@
257266
style="@style/Widget.Material3Expressive.Button.IconButton.Filled" />
258267
</LinearLayout>
259268

260-
<androidx.viewpager2.widget.ViewPager2
261-
android:id="@+id/view_pager"
262-
android:scrollbars="vertical"
263-
android:nextFocusRight="@+id/fab"
264-
android:layout_width="match_parent"
265-
android:layout_height="match_parent" />
266-
</LinearLayout>
269+
</RelativeLayout>
270+
271+
<View
272+
android:layout_width="match_parent"
273+
android:layout_height="140dp"
274+
android:layout_alignParentBottom="true"
275+
android:background="@drawable/uwu_bg_fade_bottom" />
267276

268277
<com.google.android.material.card.MaterialCardView
269278
android:id="@+id/card_bottom_status"

V2rayNG/app/src/main/res/layout/fragment_group_server.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<androidx.recyclerview.widget.RecyclerView
1212
android:id="@+id/recycler_view"
1313
android:paddingBottom="60dp"
14+
android:paddingTop="62dp"
1415
android:clipToPadding="false"
1516
android:layout_width="match_parent"
1617
android:layout_height="match_parent"

0 commit comments

Comments
 (0)