From 99307ab8f0a456805b3cdd847f20d5a24eeffb66 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sun, 30 Jul 2023 11:05:31 +0800 Subject: [PATCH 01/29] up 1.8.6 --- V2rayNG/app/build.gradle | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 8c6e0934..663cbc2f 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 21 targetSdkVersion Integer.parseInt("$targetSdkVer") multiDexEnabled true - versionCode 516 - versionName "1.8.5" + versionCode 518 + versionName "1.8.6" } buildTypes { @@ -36,20 +36,20 @@ android { } } - flavorDimensions "versions" - - productFlavors { - dev { - applicationIdSuffix = ".dev" - versionNameSuffix = "-dev" - } - pre_release { - applicationIdSuffix = ".pre" - versionNameSuffix = "-pre-release" - } - prod { - } - } +// flavorDimensions "versions" +// +// productFlavors { +// dev { +// applicationIdSuffix = ".dev" +// versionNameSuffix = "-dev" +// } +// pre_release { +// applicationIdSuffix = ".pre" +// versionNameSuffix = "-pre-release" +// } +// prod { +// } +// } sourceSets { main { @@ -101,16 +101,16 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.3.0' - implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.fragment:fragment-ktx:1.5.7' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' // Androidx ktx - implementation 'androidx.activity:activity-ktx:1.7.0' + implementation 'androidx.activity:activity-ktx:1.7.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' From 207ca937350bca025a92a8467e785f3787942195 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sun, 6 Aug 2023 10:31:37 -0400 Subject: [PATCH 02/29] Fix lint by adding missing translation --- V2rayNG/app/src/main/res/values-vi/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 1fbd3d1b..80abe3d8 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -204,6 +204,9 @@ Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng! Chưa kết nối, hãy chọn một cấu hình để kết nối! + Đăng ký đã nhập thành công + Nhập đăng ký không thành công + Xuất ra mã QR (Chụp màn hình để lưu) Sao chép cấu hình này From d4e80722484f7f95545e9c0349a92e008de9c2e6 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:09:14 -0400 Subject: [PATCH 03/29] Update UI for white theme --- V2rayNG/app/build.gradle | 10 +++++----- V2rayNG/app/src/main/AndroidManifest.xml | 2 ++ .../v2ray/ang/ui/ServerCustomConfigActivity.kt | 2 ++ .../app/src/main/res/layout/activity_main.xml | 2 +- .../res/layout/activity_server_custom_config.xml | 2 +- .../res/layout/fragment_routing_settings.xml | 2 +- .../src/main/res/layout/item_recycler_footer.xml | 2 +- .../src/main/res/layout/item_recycler_main.xml | 4 ++-- V2rayNG/app/src/main/res/values/colors.xml | 16 ++++++---------- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle index 663cbc2f..92e03a81 100644 --- a/V2rayNG/app/build.gradle +++ b/V2rayNG/app/build.gradle @@ -8,8 +8,8 @@ android { buildToolsVersion "$buildToolsVer" compileOptions { - targetCompatibility = "8" - sourceCompatibility = "8" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { @@ -127,9 +127,9 @@ dependencies { implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar' implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar' implementation 'me.drakeet.support:toastcompat:1.1.0' - implementation 'com.blacksquircle.ui:editorkit:2.1.1' - implementation 'com.blacksquircle.ui:language-base:2.1.1' - implementation 'com.blacksquircle.ui:language-json:2.1.1' + implementation 'com.blacksquircle.ui:editorkit:2.8.0' + implementation 'com.blacksquircle.ui:language-base:2.8.0' + implementation 'com.blacksquircle.ui:language-json:2.8.0' implementation 'io.github.g00fy2.quickie:quickie-bundled:1.6.0' implementation 'com.google.zxing:core:3.5.1' } \ No newline at end of file diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml index daa511a3..b2d5aede 100644 --- a/V2rayNG/app/src/main/AndroidManifest.xml +++ b/V2rayNG/app/src/main/AndroidManifest.xml @@ -9,6 +9,8 @@ android:largeScreens="true" android:xlargeScreens="true"/> + + diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index c8138915..99a2c5d4 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt @@ -6,6 +6,7 @@ import android.view.Menu import android.view.MenuItem import android.widget.Toast import androidx.appcompat.app.AlertDialog +import com.blacksquircle.ui.editorkit.utils.EditorTheme import com.blacksquircle.ui.language.json.JsonLanguage import com.google.gson.* import com.tencent.mmkv.MMKV @@ -38,6 +39,7 @@ class ServerCustomConfigActivity : BaseActivity() { setContentView(view) title = getString(R.string.title_server) + binding.editor.colorScheme = EditorTheme.INTELLIJ_LIGHT binding.editor.language = JsonLanguage() val config = MmkvManager.decodeServerConfig(editGuid) if (config != null) { diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index e056a8cb..ad9b9c2a 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -65,7 +65,7 @@ android:paddingStart="16dp" android:text="@string/connection_test_pending" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@color/colorWhite" /> + android:textColor="@color/colorText" /> diff --git a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml index 2f1aefc9..6d1abc29 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml @@ -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" /> + android:textColor="@color/color_secondary" /> + android:textColor="@color/color_secondary" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml index acae822a..48c3243c 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -84,7 +84,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" /> @@ -178,7 +178,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_secondary" android:textSize="10sp" /> diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index f65428fb..460dcfb5 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -2,17 +2,13 @@ #009966 #FF0099 - #247BA0 - #009966 - #999999 - #CFD8DC - #212121 + #727272 + #000000 + #FFFFFF - - - #2B2B2B - #161616 - #D81B60 + #FFFFFF + #000000 + #000000 #FFFFFF #000000 From a4833506ae65d1925e695cb3746325f355ba4046 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:55:29 -0400 Subject: [PATCH 04/29] Update UI: launching icon --- .../res/drawable-hdpi/ic_stat_name_black.png | Bin 0 -> 526 bytes .../main/res/drawable-hdpi/ic_stat_name_grey.png | Bin 0 -> 651 bytes .../res/drawable-mdpi/ic_stat_name_black.png | Bin 0 -> 386 bytes .../main/res/drawable-mdpi/ic_stat_name_grey.png | Bin 0 -> 476 bytes .../res/drawable-xhdpi/ic_stat_name_black.png | Bin 0 -> 679 bytes .../res/drawable-xhdpi/ic_stat_name_grey.png | Bin 0 -> 855 bytes .../res/drawable-xxhdpi/ic_stat_name_black.png | Bin 0 -> 984 bytes .../res/drawable-xxhdpi/ic_stat_name_grey.png | Bin 0 -> 1172 bytes .../res/drawable-xxxhdpi/ic_stat_name_black.png | Bin 0 -> 1380 bytes .../res/drawable-xxxhdpi/ic_stat_name_grey.png | Bin 0 -> 1654 bytes .../res/drawable/ic_qu_switch_black_24dp.xml | 2 +- .../res/drawable/ic_rounded_corner_theme.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../app/src/main/res/layout/widget_switch.xml | 2 +- 14 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png create mode 100644 V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png create mode 100644 V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png create mode 100644 V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png create mode 100644 V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_black.png create mode 100644 V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png create mode 100644 V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png create mode 100644 V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png create mode 100644 V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_black.png create mode 100644 V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png diff --git a/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_black.png new file mode 100644 index 0000000000000000000000000000000000000000..5361ddf6cdaff0da4be4ec699c25321f8990222b GIT binary patch literal 526 zcmV+p0`dKcP)Px$$Vo&&R9Hvt*FC6?Q5*p9-|d#cpxZ53)Gf(uu^~xr*DVQUVKI=&A{JRBN+xwn z23>;`Sr}weGF*#AF&GSDkW!NGk4_!+cDv6x=Y7t(b%*y^&-tJK@A;pP=R9Lp*fX}m zJVv10jEpK&Q=yHR>KNc1Ugidm?OU)W(f0{{{BKW9*(IFm80ZF$7Jx$hMLIXnIh-FH zXSqOO+yLo%p9#Kct;SukFf_|Q=6d$XdND6b0X0*?84{V z&a4H6bLtT`B@(^B4t&gELVFG9a>T4pBzleQcwd640WHL1U~MANTWrIdQcMjfm*YdM z%&T0-R_9PE&nN7}^IPx%MM*?KR9Hvt);)+5K@f87O8CP^bipb6+~2GqsP z60`FrCY*3s3Bq9^T8KokISa88#6lYzi538h#yJr$wGv1?9Og>R=6VD&b)cQ zd9!bK2%GGoP3FN2lyoAq3T3VkGw&v%xu^vk$NAK1wcaKz9*(!$?R_FrikmAU&zbqp zzwy{3W9DlB>M;x5X6D5tkk+~`BFjK@^AJ&>l)5^(&VK=k2x+ZDNZf`XBGPmNLEUb5$6zpc0${Hp(JRmM4%h4T?@66$1?qGrjte+IT25`6@4fSEs}#n^z7a(n?W&&=;N002ovPDHLkV1mxd8Oi_v literal 0 HcmV?d00001 diff --git a/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_black.png new file mode 100644 index 0000000000000000000000000000000000000000..01dc4ef96aeb70891bdacb01d8e75fc748d56b4d GIT binary patch literal 386 zcmV-|0e$|7P)Px$JV``BR7gwR)w?c4Q544U-$Y1gya4au0gw=dL`R{LppYoEG+I$;6e3Yl=u~<- zi4M_-3XLd4p&+g~$sQRy=ghfGreK%r?DhZFZLd?)=2L4k-~SWn#5un*JH>29DVH%9 zeLKMdJ`#IeqAt8d_G64jki>5tE0O&SBY3LY(|XX0K3s-Nu|Nm5LzIpDD-7eI(U{fb ze%z)ABpL2uI*R-TL%54eSw^4-2N;ha_aXA@v_2ITn8YClBgkW@`9;=yDk6|Le_|kl zJYx*Wlx3bG0%^|4q)p%`Zxd7zc*9gESsp)gRWwdfBP1!+4EA%$;X;`VzOaa$qVTkr zT=z}OAXy6=W#DB5*05R@UQ}QUOI6@S1a>hW-a#deW=-APx$mPtfGR7gwRm9a_#K@f)j$(@2WzJR_!Djz@tiiKdO5Gz3~0v4u>O_Kc&A_jzD zAwo(mECN>c+6n1YBp_BQ1hEhc3ytwk4iY&xm*g%Xg>E^w^L^~h&YobvO9srxKNA#- z#i44odL<&>la)!X`jt{Cl@gIP?b}5(8coFG@h><2t3)J+0la(Tj^mtLmNn~zIF2Kh zW$ggi(%_c>W=Os^<1IbN=ksH=T5a66?HhNKE+~~sMx|0Y0Fcn&w*X=!pS^M4Cg*aw ziF&>MpbHu&JOZ$+!S7AeoKC0Hk9sKs3rLOvH~}!PL7oi5h-EUFJHI{!5{SqmfKvcd z8sw!>^Xqo=)Kvh$O|}6{YLK@`Br=!HX3L$1HHg43-@R!IB+t6N1ic78MPx}S<(91L z3M+6+wLm=Rg_Ov=RdCz@wNY;BIce+J|LSe)-O*@%Pe)I!xTcUoU-u%D+PyPnAal;va S3{*P+0000Px%VM#S6Pb`QP-c>md?m_PDF%oUg%Ji~ghCm}K+1pt zDM>Pr2onkek_?oQOvpeKLcXmB8%nR+J=h;G(p$0% z2Lofj!y?>mHU3}#q&buE1W*DqI>!TLv%;6MGFX6Bk+x z7}-K2aT==w=D%Y-(%Bj?$^iN%&%&J=0HcdTzNE|$eqalZ2ehS!GY7!9VjIkk7{X2* z3Thh%n1HL89yD|SyMx+avL?6CWL(G8prNDK8r1%gH3cvY*Dxt)=oB_09o|aO1VFl} zu3&u7NxIe6;A>F-mn=8Hd|brXpqW&q75Eg?|0Bx@@DS&a-cOOZjm53rH<9Gunp^f|EbMg5sSOOld941yIGrW6Z$x_^`VycR^Nr2B-iOW?CRn;~H@D1yV4_j4F zmGn&jq=sZOPE>MIQ``i=4jiuOr*c|ufPL6o*+m-(IRTDfdmCPArRD-SSu`YR|93QU z0Hj}vYmsiAjz_xysbNnINxJg~CE5YFRWu|Y2E}9$Xmt~fQ zq|*RXiU$07yA$WiuUdgz^JW{T3y^IoYYx<{K+T2Ame#F6wxz5&&`;~Ab}=q**aiRq N002ovPDHLkV1o0$D3<^L literal 0 HcmV?d00001 diff --git a/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..def2c8a7b43e640579864e19d16023b3d3fab4bc GIT binary patch literal 855 zcmV-d1E~CoP)Px&5lKWrRA@u(mrZCBK@`XTFR5utP^2JU6v2Zay@+@cKZ;nWA5c)Jik>W}r|7}j zQkuLMlOiQp5W#~zD1wx>^dO>GFAC~G5%D1PBwiE`qF^M3Hfcsyw1<9VXLe_|RI=Cn z-pubmZ+0_7Sm6(?aDUVTEO!U%9jJG}=L-DaTWDx#sHspW+;v+dA{t@laW`)M?;>&< zz+sKL?}e0O(uaXwqK1A~Kut4pQQ51{tvmWa~KoYfGSLo%66k5cN2+t>hpMk0~6 zbUOWVvGGF>pp>FaCgX_rxCK^9l_HVIA!dHE6dP)Qv9Yn})YQ}s0B79f0hEd8C^O%$ z#nucUA`zw3hJOPP(GCC;3-+PL77~#dfI9$=X~`d_JEj z7K_eHe!xu#fC6w%L~d%ZW@jNU0Yqdi0B0NQ(h?%N#LRge)?otez`(%3`f|Da2*5T? zp`3`MG}%8`U;%Qu+@?yU@)*DtO`+=|lGJ49us{N2v)QecN@bFWHfjpp2GAuURZTv) z03zaisU8AYrz4}3njoU%B2v-ejsA(}!)`CJh_nK@2Vjk+%w%(Ob4N0noYv$QVAi$} zfVb6Zb(DyjG-aMA5{dT3&NrI%_FiHD&N*c}fK{54zlq1=`+9qOopYA2$4UoG43tvu z8yg$<_Vx9BHK|*Q4LiU`0DDB_lMQ)m{{xybU!u|I?o=xEL6g_QLg|1~>KhTYipV=H zD+4Hu00jVTBJ#?>OB)R|fO8=sqJtvxRNKf93^KqB5glRX2Zl~Ycu)amiRdIVj~dx{ zfP)C2i0CXc4}0)2F0mefh%PeoRbvy61-1iR77_O7;;GDLfNLUh!IOoLB3l7&F>@CY zIT!L!AKw9#QsXTxEhjoVJ7+^R|2vuA0M3QILquklL*DOU?iqk~5&5-T@_qumj>qHs zZCptFhWE0ChGVf-G&D^2_xFGHJF%^LqYl`b)aE$#05(_C%UJaecv&@@ hHT4eITum=y{RSdbHb9i;I70vc002ovPDHLkV1j^hd`SQR literal 0 HcmV?d00001 diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_black.png new file mode 100644 index 0000000000000000000000000000000000000000..516f08939a0841bc10d6d80ed16af1816bb2ae76 GIT binary patch literal 984 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 AJ^%m! literal 0 HcmV?d00001 diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml index 97f8859d..a2faae56 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml @@ -9,7 +9,7 @@ android:bottom="2dp" /> - + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index ad9b9c2a..767aac3a 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -92,7 +92,7 @@ android:clickable="true" android:focusable="true" android:nextFocusLeft="@+id/layout_test" - android:src="@drawable/ic_stat_name" + android:src="@drawable/ic_stat_name_grey" app:layout_anchorGravity="bottom|right|end" /> diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml index 81d26fa6..209489d2 100644 --- a/V2rayNG/app/src/main/res/layout/widget_switch.xml +++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml @@ -11,5 +11,5 @@ android:layout_width="40dp" android:layout_height="40dp" android:padding="10dp" - android:src="@drawable/ic_stat_name" /> + android:src="@drawable/ic_stat_name_grey" /> From bdbce5147e5aca390fd7a3f02963a5feb75f537a Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sun, 6 Aug 2023 17:37:24 -0400 Subject: [PATCH 05/29] Update UI: menu icons --- .../res/drawable/ic_action_done_black.xml | 9 +++++ .../main/res/drawable/ic_add_black_24dp.xml | 9 +++++ .../drawable/ic_cloud_download_black_24dp.xml | 9 +++++ .../src/main/res/drawable/ic_copy_black.xml | 9 +++++ .../main/res/drawable/ic_edit_white_24dp.xml | 9 +++++ .../main/res/drawable/ic_fab_check_black.xml | 9 +++++ .../res/drawable/ic_feedback_black_24dp.xml | 9 +++++ .../main/res/drawable/ic_file_black_24dp.xml | 34 +++++++++++++++++++ .../res/drawable/ic_image_photo_black.xml | 9 +++++ .../main/res/drawable/ic_info_white_24dp.xml | 9 +++++ .../res/drawable/ic_logcat_black_24dp.xml | 9 +++++ .../ic_outline_filter_alt_black_24.xml | 5 +++ .../main/res/drawable/ic_save_black_24dp.xml | 9 +++++ .../main/res/drawable/ic_scan_white_24dp.xml | 19 +++++++++++ .../res/drawable/ic_select_all_black_24dp.xml | 10 ++++++ .../res/drawable/ic_settings_black_24dp.xml | 9 +++++ .../app/src/main/res/menu/action_server.xml | 4 +-- .../src/main/res/menu/action_sub_setting.xml | 6 ++-- V2rayNG/app/src/main/res/menu/menu_asset.xml | 4 +-- .../src/main/res/menu/menu_bypass_list.xml | 10 +++--- V2rayNG/app/src/main/res/menu/menu_logcat.xml | 4 +-- V2rayNG/app/src/main/res/menu/menu_main.xml | 12 +++---- .../app/src/main/res/menu/menu_routing.xml | 4 +-- .../app/src/main/res/menu/menu_scanner.xml | 4 +-- 24 files changed, 200 insertions(+), 24 deletions(-) create mode 100644 V2rayNG/app/src/main/res/drawable/ic_action_done_black.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_add_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_copy_black.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_edit_white_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_fab_check_black.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_feedback_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_file_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_image_photo_black.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_info_white_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_logcat_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_black_24.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_save_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_scan_white_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_select_all_black_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_settings_black_24dp.xml diff --git a/V2rayNG/app/src/main/res/drawable/ic_action_done_black.xml b/V2rayNG/app/src/main/res/drawable/ic_action_done_black.xml new file mode 100644 index 00000000..5635bead --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_action_done_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_add_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_add_black_24dp.xml new file mode 100644 index 00000000..0258249c --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_add_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml new file mode 100644 index 00000000..aebcd40a --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_copy_black.xml b/V2rayNG/app/src/main/res/drawable/ic_copy_black.xml new file mode 100644 index 00000000..8a894a3b --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_copy_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_edit_white_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_edit_white_24dp.xml new file mode 100644 index 00000000..35a774a5 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_edit_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_fab_check_black.xml b/V2rayNG/app/src/main/res/drawable/ic_fab_check_black.xml new file mode 100644 index 00000000..6c1b1677 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_fab_check_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_feedback_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_feedback_black_24dp.xml new file mode 100644 index 00000000..29f9baab --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_feedback_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_file_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_file_black_24dp.xml new file mode 100644 index 00000000..7fcdda2d --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_file_black_24dp.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_image_photo_black.xml b/V2rayNG/app/src/main/res/drawable/ic_image_photo_black.xml new file mode 100644 index 00000000..913d9d8b --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_image_photo_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_info_white_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_info_white_24dp.xml new file mode 100644 index 00000000..f7b49e8e --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_info_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_logcat_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_logcat_black_24dp.xml new file mode 100644 index 00000000..a07a0f90 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_logcat_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_black_24.xml b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_black_24.xml new file mode 100644 index 00000000..d574422c --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_black_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_save_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_save_black_24dp.xml new file mode 100644 index 00000000..a561d632 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_save_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_scan_white_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_scan_white_24dp.xml new file mode 100644 index 00000000..5068d6e5 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_scan_white_24dp.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_select_all_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_select_all_black_24dp.xml new file mode 100644 index 00000000..966290fb --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_select_all_black_24dp.xml @@ -0,0 +1,10 @@ + + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_settings_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_settings_black_24dp.xml new file mode 100644 index 00000000..ace746c4 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/menu/action_server.xml b/V2rayNG/app/src/main/res/menu/action_server.xml index f231b056..1be0f15c 100644 --- a/V2rayNG/app/src/main/res/menu/action_server.xml +++ b/V2rayNG/app/src/main/res/menu/action_server.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/action_sub_setting.xml b/V2rayNG/app/src/main/res/menu/action_sub_setting.xml index 11cb0c1b..a542380f 100644 --- a/V2rayNG/app/src/main/res/menu/action_sub_setting.xml +++ b/V2rayNG/app/src/main/res/menu/action_sub_setting.xml @@ -3,17 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_asset.xml b/V2rayNG/app/src/main/res/menu/menu_asset.xml index 6a59f05a..e10736c6 100644 --- a/V2rayNG/app/src/main/res/menu/menu_asset.xml +++ b/V2rayNG/app/src/main/res/menu/menu_asset.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml index a7824754..fef24577 100644 --- a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml +++ b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml @@ -3,31 +3,31 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/V2rayNG/app/src/main/res/menu/menu_logcat.xml b/V2rayNG/app/src/main/res/menu/menu_logcat.xml index e7529dbd..63d0af88 100644 --- a/V2rayNG/app/src/main/res/menu/menu_logcat.xml +++ b/V2rayNG/app/src/main/res/menu/menu_logcat.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_main.xml b/V2rayNG/app/src/main/res/menu/menu_main.xml index 14ea10e8..20a4a148 100644 --- a/V2rayNG/app/src/main/res/menu/menu_main.xml +++ b/V2rayNG/app/src/main/res/menu/menu_main.xml @@ -2,7 +2,7 @@ @@ -61,7 +61,7 @@ diff --git a/V2rayNG/app/src/main/res/menu/menu_scanner.xml b/V2rayNG/app/src/main/res/menu/menu_scanner.xml index 37701804..168cdfa0 100644 --- a/V2rayNG/app/src/main/res/menu/menu_scanner.xml +++ b/V2rayNG/app/src/main/res/menu/menu_scanner.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file From 32b9e4855ce10478b36946136a1b5025d1da8e80 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sun, 6 Aug 2023 18:41:36 -0400 Subject: [PATCH 06/29] Update UI: clean up theme --- V2rayNG/app/src/main/res/layout/activity_main.xml | 3 +-- V2rayNG/app/src/main/res/layout/nav_toolbar.xml | 13 ------------- V2rayNG/app/src/main/res/values/styles.xml | 7 +------ 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 V2rayNG/app/src/main/res/layout/nav_toolbar.xml diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index 767aac3a..d1a8c04b 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -13,8 +13,7 @@ + android:layout_height="wrap_content"> - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values/styles.xml b/V2rayNG/app/src/main/res/values/styles.xml index 20e87b89..27ef1463 100644 --- a/V2rayNG/app/src/main/res/values/styles.xml +++ b/V2rayNG/app/src/main/res/values/styles.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file From 0bf8beda942d5a5b86a6d301476b077f1d6fce5f Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Wed, 9 Aug 2023 21:38:20 -0400 Subject: [PATCH 10/29] Update UI: tweak after review --- V2rayNG/app/src/main/res/layout/activity_main.xml | 1 + V2rayNG/app/src/main/res/layout/item_recycler_main.xml | 6 +++--- .../src/main/res/layout/item_recycler_sub_setting.xml | 4 ++-- V2rayNG/app/src/main/res/layout/nav_view.xml | 9 --------- V2rayNG/app/src/main/res/values-night/styles.xml | 2 +- V2rayNG/app/src/main/res/values/colors.xml | 2 ++ V2rayNG/app/src/main/res/values/styles.xml | 1 + 7 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 V2rayNG/app/src/main/res/layout/nav_view.xml diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index d1a8c04b..3bb3aaa2 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -105,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" > @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="5dp"> + android:paddingStart="9dp"> diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml index cfc4a9f8..d51f47db 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml @@ -29,7 +29,7 @@ @@ -38,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"> - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values-night/styles.xml b/V2rayNG/app/src/main/res/values-night/styles.xml index 89ef040d..ae6a211e 100644 --- a/V2rayNG/app/src/main/res/values-night/styles.xml +++ b/V2rayNG/app/src/main/res/values-night/styles.xml @@ -2,7 +2,6 @@ diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index 460dcfb5..7dcdab0a 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -2,6 +2,8 @@ #009966 #FF0099 + #f97910 + #727272 #000000 #FFFFFF diff --git a/V2rayNG/app/src/main/res/values/styles.xml b/V2rayNG/app/src/main/res/values/styles.xml index 27ef1463..b53ee512 100644 --- a/V2rayNG/app/src/main/res/values/styles.xml +++ b/V2rayNG/app/src/main/res/values/styles.xml @@ -8,6 +8,7 @@ @color/colorText @color/colorPrimary @color/colorPrimary + @color/colorAccent