rkp/v2rayNG
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch '2dust:master' into master

Browse Source
This commit is contained in:
Hadi Norouzi authored and GitHub committed 2023-09-12 22:08:12 +03:30
2 parents 062c0d8ddb a46b0d58eb
commit ed26120581
101 files changed
+551 -125
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

V2rayNG/app/src/main/res/layout/activity_logcat.xml
+2 -1
View File
@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
tools:context=".ui.MainActivity">
<ProgressBar
V2rayNG/app/src/main/res/layout/activity_main.xml
+3 -3
View File
@@ -13,8 +13,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@@ -65,7 +64,7 @@
android:paddingStart="16dp"
android:text="@string/connection_test_pending"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWhite" />
android:textColor="@color/colorText" />
</LinearLayout>
</LinearLayout>
@@ -106,6 +105,7 @@
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/nav_header"
app:itemIconTint="@color/colorAccent"
app:menu="@menu/menu_drawer" >
<LinearLayout
V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:text="@string/server_lab_need_inbound"
android:textAppearance="@style/TextAppearance.AppCompat.Tooltip"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
</LinearLayout>
<LinearLayout
V2rayNG/app/src/main/res/layout/fragment_routing_settings.xml
+1 -1
View File
@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/routing_settings_tips"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
<EditText
android:id="@+id/et_routing_content"
V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+2 -1
View File
@@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true">
V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
+1 -1
View File
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:text="@string/summary_pref_promotion"
android:textAppearance="@style/TextAppearance.AppCompat.Tooltip"
android:textColor="@color/fab_orange_dark" />
android:textColor="@color/color_secondary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+9 -8
View File
@@ -19,7 +19,8 @@
android:clickable="true"
android:focusable="true"
android:nextFocusRight="@+id/layout_share"
android:background="?android:attr/selectableItemBackground"
android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:layout_gravity="center"
@@ -28,7 +29,7 @@
<LinearLayout
android:id="@+id/layout_indicator"
android:layout_width="10dp"
android:layout_width="6dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical" />
@@ -38,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="5dp">
android:paddingStart="9dp">
<TextView
android:id="@+id/tv_name"
@@ -84,7 +85,7 @@
android:layout_weight="1"
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorSubscription"
android:textColor="@color/color_secondary"
android:textSize="10sp"
tools:text="Sub" />
@@ -121,7 +122,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_black_24dp"
android:src="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -140,7 +141,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_black_24dp"
android:src="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -159,7 +160,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_black_24dp"
android:src="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
@@ -178,7 +179,7 @@
android:layout_height="wrap_content"
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_orange_dark"
android:textColor="@color/color_fab_orange"
android:textSize="10sp" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+6 -5
View File
@@ -18,7 +18,8 @@
android:id="@+id/info_container"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground"
android:nextFocusRight="@+id/layout_edit"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
@@ -28,7 +29,7 @@
<LinearLayout
android:id="@+id/chk_enable"
android:layout_width="10dp"
android:layout_width="6dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical" />
@@ -37,7 +38,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="5dp"
android:paddingStart="9dp"
android:orientation="vertical">
<TextView
@@ -78,7 +79,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_black_24dp"
android:src="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText"/>
</LinearLayout>
@@ -98,7 +99,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_black_24dp"
android:src="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
+3 -1
View File
@@ -16,6 +16,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/nav_header_vertical_spacing">
<LinearLayout
@@ -52,7 +54,7 @@
<ImageView
android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_black_24dp"
android:src="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" />
</LinearLayout>
</LinearLayout>
V2rayNG/app/src/main/res/layout/nav_header.xml
+4 -3
View File
@@ -14,12 +14,13 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_gravity="center"
android:fontFamily="@font/montserrat_thin"
android:gravity="center"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/app_name"
android:textColor="@color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
android:textColor="@color/colorText" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/nav_toolbar.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_scrollFlags="scroll|enterAlways" />
</com.google.android.material.appbar.AppBarLayout>
V2rayNG/app/src/main/res/layout/nav_view.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/nav_header"
app:menu="@menu/menu_drawer" />
V2rayNG/app/src/main/res/layout/widget_switch.xml
+1
View File
@@ -8,6 +8,7 @@
android:orientation="vertical">
<ImageView
android:id="@+id/image_switch"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="10dp"