katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UI

Browse Source 
https://github.com/2dust/v2rayNG/issues/3892
This commit is contained in:
2dust
2024-11-10 19:37:21 +08:00
parent 9cd5fefdca
commit 2f56104565
18 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
V2rayNG/app/src/main/res/layout/activity_about.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -18,9 +19,9 @@
android:id="@+id/layout_backup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -58,9 +59,9 @@
android:id="@+id/layout_share"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -82,9 +83,9 @@
android:id="@+id/layout_restore"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -114,9 +115,9 @@
android:id="@+id/layout_soure_ccode"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -138,9 +139,9 @@
android:id="@+id/layout_feedback"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -163,9 +164,9 @@
android:id="@+id/layout_tg_channel"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">
@@ -187,9 +188,9 @@
android:id="@+id/layout_privacy_policy"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground"
android:gravity="center|start"
android:orientation="horizontal"
android:padding="@dimen/padding">

1
V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<LinearLayout

5
V2rayNG/app/src/main/res/layout/activity_logcat.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end"
tools:context=".ui.LogcatActivity">
@@ -19,10 +20,10 @@
android:id="@+id/sv_logcat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:fillViewport="false"
android:foregroundGravity="bottom">

25
V2rayNG/app/src/main/res/layout/activity_main.xml
View File

@@ -3,12 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
@@ -24,8 +24,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:layout_height="match_parent">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main_content"
@@ -39,19 +38,19 @@
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/pb_waiting"
app:indicatorColor="@color/color_fab_active"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible" />
android:visibility="invisible"
app:indicatorColor="@color/color_fab_active" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_group"
app:tabMode="scrollable"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabIndicatorFullWidth="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
app:tabIndicatorFullWidth="false"
app:tabMode="scrollable"
app:tabTextAppearance="@style/TabLayoutTextStyle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@@ -65,11 +64,11 @@
android:layout_width="match_parent"
android:layout_height="@dimen/connection_test_height"
android:background="@color/colorPrimary"
android:gravity="center|start"
android:nextFocusRight="@+id/fab"
android:clickable="true"
android:focusable="true"
android:nextFocusLeft="@+id/recycler_view">
android:gravity="center|start"
android:nextFocusLeft="@+id/recycler_view"
android:nextFocusRight="@+id/fab">
<TextView
android:id="@+id/tv_test_state"

23
V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.SubSettingActivity">
<LinearLayout
@@ -42,9 +43,9 @@
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/chk_locked"
android:text="@string/routing_settings_locked"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/routing_settings_locked" />
</LinearLayout>
<LinearLayout
@@ -74,10 +75,10 @@
<EditText
android:id="@+id/et_domain"
android:layout_width="match_parent"
android:maxLines="10"
android:hint="@string/routing_settings_tips"
android:layout_height="wrap_content"
android:inputType="textMultiLine" />
android:hint="@string/routing_settings_tips"
android:inputType="textMultiLine"
android:maxLines="10" />
</LinearLayout>
<LinearLayout
@@ -93,11 +94,11 @@
<EditText
android:id="@+id/et_ip"
android:maxLines="10"
android:hint="@string/routing_settings_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textMultiLine" />
android:hint="@string/routing_settings_tips"
android:inputType="textMultiLine"
android:maxLines="10" />
</LinearLayout>
<LinearLayout
@@ -132,8 +133,8 @@
<EditText
android:id="@+id/et_protocol"
android:layout_width="match_parent"
android:hint="@string/routing_settings_protocol_tip"
android:layout_height="@dimen/edit_height"
android:hint="@string/routing_settings_protocol_tip"
android:inputType="text" />
</LinearLayout>
@@ -151,8 +152,8 @@
<EditText
android:id="@+id/et_network"
android:layout_width="match_parent"
android:hint="@string/routing_settings_network_tip"
android:layout_height="@dimen/edit_height"
android:hint="@string/routing_settings_network_tip"
android:inputType="text" />
</LinearLayout>
@@ -179,8 +180,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:layout_marginTop="@dimen/layout_margin_top_height"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:orientation="vertical" />
</LinearLayout>

15
V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerCustomConfigActivity">
<LinearLayout
@@ -13,8 +14,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="@dimen/layout_margin_spacing">
android:layout_margin="@dimen/layout_margin_spacing"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -27,8 +28,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="@dimen/layout_margin_spacing">
android:layout_margin="@dimen/layout_margin_spacing"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -69,11 +70,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<com.blacksquircle.ui.editorkit.widget.TextProcessor
android:id="@+id/editor"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top|start"
android:id="@+id/editor"
android:layout_marginTop="@dimen/layout_margin_top_height" />
android:layout_marginTop="@dimen/layout_margin_top_height"
android:gravity="top|start" />
</LinearLayout>
</LinearLayout>

1
V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_socks.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_vless.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

1
V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.ServerActivity">
<LinearLayout

16
V2rayNG/app/src/main/res/layout/activity_settings.xml
View File

@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_settings"
android:name="com.v2ray.ang.ui.SettingsActivity$SettingsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.SettingsActivity" />
android:fitsSystemWindows="true"
android:orientation="vertical"
tools:context=".ui.SettingsActivity">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_settings"
android:name="com.v2ray.ang.ui.SettingsActivity$SettingsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

11
V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.SubSettingActivity">
<LinearLayout
@@ -149,8 +150,8 @@
android:id="@+id/et_pre_profile"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:inputType="text"
android:hint="@string/sub_setting_pre_profile_tip" />
android:hint="@string/sub_setting_pre_profile_tip"
android:inputType="text" />
</LinearLayout>
@@ -169,8 +170,8 @@
android:id="@+id/et_next_profile"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:inputType="text"
android:hint="@string/sub_setting_pre_profile_tip" />
android:hint="@string/sub_setting_pre_profile_tip"
android:inputType="text" />
</LinearLayout>
</LinearLayout>
@@ -178,8 +179,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:layout_marginTop="@dimen/layout_margin_top_height"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:orientation="vertical" />
</LinearLayout>

5
V2rayNG/app/src/main/res/layout/activity_tasker.xml
View File

@@ -2,6 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
android:padding="@dimen/padding"
tools:context=".ui.TaskerActivity">
@@ -22,11 +23,11 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/switch_start_service"
android:layout_toStartOf="@id/switch_start_service"
android:layout_toLeftOf="@id/switch_start_service"
android:text="@string/tasker_start_service"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />

3
V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.UserAssetUrlActivity">
<LinearLayout
@@ -77,8 +78,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:layout_marginTop="@dimen/layout_margin_top_height"
android:layout_marginBottom="@dimen/layout_margin_top_height"
android:orientation="vertical" />
</LinearLayout>

2
V2rayNG/gradle/libs.versions.toml
View File

@@ -6,7 +6,7 @@ constraintlayout = "2.2.0"
core = "3.5.3"
editorkit = "2.9.0"
flexbox = "3.0.0"
fragmentKtx = "1.8.4"
fragmentKtx = "1.8.5"
gson = "2.11.0"
junit = "4.13.2"
kotlinReflect = "2.0.21"