From 3bc208154038b845c59274fbad949bb9604ee224 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sun, 21 Apr 2024 12:05:42 +0800 Subject: [PATCH] Adjust UI --- V2rayNG/app/build.gradle.kts | 3 +- .../v2ray/ang/service/V2RayServiceManager.kt | 7 +++- .../kotlin/com/v2ray/ang/ui/MainActivity.kt | 35 +----------------- .../com/v2ray/ang/ui/MainRecyclerAdapter.kt | 6 +-- .../res/drawable-hdpi/ic_stat_name_grey.png | Bin 651 -> 0 bytes .../res/drawable-mdpi/ic_stat_name_grey.png | Bin 476 -> 0 bytes .../main/res/drawable-night/ic_play_24dp.xml | 9 +++++ .../res/drawable-night/ic_qu_switch_24dp.xml | 18 --------- .../main/res/drawable-night/ic_stop_24dp.xml | 9 +++++ .../res/drawable-xhdpi/ic_stat_name_grey.png | Bin 855 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_name_grey.png | Bin 1172 -> 0 bytes .../main/res/drawable-xxhdpi/side_nav_bar.xml | 9 ----- .../drawable-xxxhdpi/ic_stat_name_grey.png | Bin 1654 -> 0 bytes .../res/drawable/ic_close_grey_800_24dp.xml | 10 ----- .../src/main/res/drawable/ic_play_24dp.xml | 9 +++++ .../main/res/drawable/ic_qu_settings_24dp.xml | 13 ------- .../main/res/drawable/ic_qu_switch_24dp.xml | 29 ++++++--------- .../res/drawable/ic_shortcut_background.xml | 7 ---- .../src/main/res/drawable/ic_stop_24dp.xml | 9 +++++ .../app/src/main/res/layout/activity_main.xml | 4 +- .../main/res/layout/item_recycler_main.xml | 2 +- .../app/src/main/res/values-night/colors.xml | 1 + V2rayNG/app/src/main/res/values/colors.xml | 3 +- V2rayNG/app/src/main/res/xml/shortcuts.xml | 14 ------- 24 files changed, 64 insertions(+), 133 deletions(-) delete mode 100644 V2rayNG/app/src/main/res/drawable-hdpi/ic_stat_name_grey.png delete mode 100644 V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png create mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_play_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png delete mode 100644 V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png delete mode 100644 V2rayNG/app/src/main/res/drawable-xxhdpi/side_nav_bar.xml delete mode 100644 V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts index cb1dffe9..7d0773e1 100644 --- a/V2rayNG/app/build.gradle.kts +++ b/V2rayNG/app/build.gradle.kts @@ -96,7 +96,7 @@ dependencies { implementation("androidx.viewpager2:viewpager2:1.1.0-beta02") // Androidx ktx - implementation("androidx.activity:activity-ktx:1.8.2") + implementation("androidx.activity:activity-ktx:1.9.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") @@ -111,7 +111,6 @@ dependencies { implementation("io.reactivex:rxjava:1.3.8") implementation("io.reactivex:rxandroid:1.2.1") 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.9.0") implementation("com.blacksquircle.ui:language-base:2.9.0") diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt index 5a00685c..fe6df1ff 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt @@ -1,6 +1,9 @@ package com.v2ray.ang.service -import android.app.* +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -290,7 +293,7 @@ object V2RayServiceManager { .setShowWhen(false) .setOnlyAlertOnce(true) .setContentIntent(contentPendingIntent) - .addAction(R.drawable.ic_close_grey_800_24dp, + .addAction(R.drawable.ic_delete_24dp, service.getString(R.string.notification_action_stop_v2ray), stopV2RayPendingIntent) //.build() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index e20eb12e..5f335ec4 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -146,21 +146,16 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList mainViewModel.isRunning.observe(this) { isRunning -> adapter.isRunning = isRunning if (isRunning) { - if (!Utils.getDarkModeStatus(this)) { - binding.fab.setImageResource(R.drawable.ic_stat_name) - } + binding.fab.setImageResource(R.drawable.ic_stop_24dp) binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_orange)) setTestState(getString(R.string.connection_connected)) binding.layoutTest.isFocusable = true } else { - if (!Utils.getDarkModeStatus(this)) { - binding.fab.setImageResource(R.drawable.ic_stat_name) - } + binding.fab.setImageResource(R.drawable.ic_play_24dp) binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_grey)) setTestState(getString(R.string.connection_not_connected)) binding.layoutTest.isFocusable = false } - hideCircle() } mainViewModel.startListenBroadcast() } @@ -208,10 +203,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList if (mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) { return } - showCircle() -// toast(R.string.toast_services_start) V2RayServiceManager.startV2Ray(this) - hideCircle() } fun restartV2Ray() { @@ -657,29 +649,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList return super.onKeyDown(keyCode, event) } - - fun showCircle() { - binding.fabProgressCircle.show() - } - - fun hideCircle() { - try { - Observable.timer(300, TimeUnit.MILLISECONDS) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { - try { - if (binding.fabProgressCircle.isShown) { - binding.fabProgressCircle.hide() - } - } catch (e: Exception) { - Log.w(ANG_PACKAGE, e) - } - } - } catch (e: Exception) { - Log.d(ANG_PACKAGE, e.toString()) - } - } - override fun onNavigationItemSelected(item: MenuItem): Boolean { // Handle navigation view item clicks here. when (item.itemId) { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt index 8ad9fe86..92b02cfd 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt @@ -3,12 +3,12 @@ package com.v2ray.ang.ui import android.content.Intent import android.graphics.Color import android.text.TextUtils -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import com.google.gson.Gson import com.tencent.mmkv.MMKV import com.v2ray.ang.AngApplication.Companion.application @@ -166,13 +166,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.AdapterPx%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 diff --git a/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-mdpi/ic_stat_name_grey.png deleted file mode 100644 index 43703233d33900d9d1f7772be86d0543e1b8c7cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmV<20VDp2P)Px$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+0000 + + diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml deleted file mode 100644 index 97f8859d..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml new file mode 100644 index 00000000..d3fbe696 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml @@ -0,0 +1,9 @@ + + + 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 deleted file mode 100644 index def2c8a7b43e640579864e19d16023b3d3fab4bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png deleted file mode 100644 index 01f688ab4681287f05150d905e9f2d8d3d59e469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1172 zcmV;F1Z(?=P)Px(PDw;TRCr$Pn@wn3RTRhnXB=@bATlDj5p*SH<-(1iZNwnfFEoo_i7Qb9A`z9b z0h4$C&qzdKQA0r#zjo5-M#NfIe$<6%yHm+RtKbKsC0HSa4rz`Y8KjkDX5PDR-n*0D zvz>F!yXW`Ly)*ZJ?+BuGB_NSccLEVmj}D1|A|Ss-Bz92jpx8lv1Y!sI@r!Fv?4Z~| zegul_Ad(jYcp5;SsreeopNgy|P1Czn^@f}|Hvt?V`FpqcOoc8kE?(AdxBmc8%Q`4k zy(vx8FS5pM=bxtOw5lEeP|uN50X#+WgB4X5T3q5Xnmcd;s9atc9KBe`I82WKXNrTF;XsSU@DN z0Pqoj>+%%Vi8UIpMVfNSy=2H-mYHqektyfg!9l>O1Q1Enl1ztr z+_Na#a88qa-7`A9h0d%O@ zY)<46yv_$epPQOU(ta(MZlO=Hqm4#m+(+>8B^olIZvl*vv>ke77Am0Q^?H5R+}zx+ zm67Q@I7C1OWfw_P1uM7E0G+7SYGX-~*z^j*f&tVKyv9i$4T4NyQ|wf&R=Yh(lFved zV`B-SgHDUcz0Ns10}IZo24sTQUgw-0EeB~;0y4qtA(Ey?2WwRUGQsOf=iH0IlBsx+ zb|g)Y4&F-dAXVK@vQ?Jg<@*N824n)e3GIE~@bWFtH@-|j2S-OorzR&S&-f0y%=oeZ z*`eM9$#$8=74fWr15(vbMC8t@1TSAm0|lh2U)ymH$-jLET2=fY0ofH4yWv%-;N=T; zP=J2uXgYS8X{fDmK&tw4y;Zzh#Ho?Rn`|+2%xMF9VY(>sK?uifFdBj2^~8qc2Mjf mKLW9X{P@K+D0Yxv2mJ$MK>b+U_ygMj0000 - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png deleted file mode 100644 index b1478e0757cb45e6c59cfc8f57c5a1567d16c216..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1654 zcmV-+28sEJP)Px*FiAu~RCr$PoLgueMHt8bv*&n9Oawiaii#j8mF7WwQSm{VkVb7usn}YoEq(CX ziUdlV8f&ui%}HX6NQ%)H5k()oMJp&(st;Q6f>ITv8U*WwqJo#i)Wjz7v`T45$F4ah>iq}8A`amzP<~~^~s`Fwt5S6A0B3yqt307FAVOUA~=)Wud^bfX;V&qs4D|9Iv~o@oF? z)BxZW0BfRD9>5=tz}m&?r=$Md|~0BjF9$w>c(_V@RnH#0Ny z27v1W<_}~hr976)bR4SFO_B?MtfMtI3s`2*oEvD>!HpzlWWg0M$*khX9l`9YE^Nc?%KE zYN)EyLK;;8!^6Y5k&zK~W4A+-_-_@9#r1JDg^a3z>W=190PfIqWFD-quW#$<==eud z{5iuKQ2}a4b98j{1;*HV9pXqS57pJxwRU!P9@7zjzL=>8FfcH1&eYV@J^-zn#Q6q5 z(?T06Vds=;07SGDz?%TB3%k%W_#esV^G#tIDq-i9S^&Mhy%*2U&Z>>CE5k1G4F0O2 zqFRYRXo?>wY$^ft^z>X-sZ`W<^5ub6QM=La09uIX>)KtT^++9n@$vEHp64m?FN$`l zr=qDR7g~wvb4~GU3Y#hbj^ngdDwTbVvGZ$MMR4Qej^o_qy6%U;UG!R}2|z_kIn5ZW z*R*8SP`R0iRCT3hqzQmdQOb<5&7AXBbtYLz?8N{;J?wiA5vg6%)QzkIkc_dNob$b@ zQ@%Q(Oaowyxt#N!w2H6hm1O{ran5(gv8Nvfa8?1R2KqK4^1_G{hi?`EyaZrtTn&}5 zkg^6~f3aBH5NAWh0;nn=rF_4kp$>XIP~(Sb04AlBtA!9B8Lzy7n{hLYv2~nt_4Z3tOy_Ol}4XOau zP`QhU)Vsc!8)>fq)lk{NIaiONXL6(+KsOQfW>R?rPC)~l^9R%3Pzif*q_qOnW9avp z&``-DfEODZ8@I;!>9VjQhVf5Z1*j*XZzZCC!z{`q-!uVu55QU?I&PAHVdt6_0G|T5 z(Zq&I765!zC=^;uZK#+I;JfPULB=*zOa^eY+RgeY>>^C|PwE=*TlL8Q)@1Rbn0pcc z{;Gas^UEj}V0w(W0ZcfKv)Xmtk4+aYs`fjd8_>C3TOpDM7sb?6OsB-xgB#Tpc}w4B2v%r*l`90v;wfI`zv4p z_-mxq!UE7LuYYh0z+WS+78Zb3dHsW10R9?jwXguR%IhE80`S*JtAz!iRbKz#7J$D- zS}iO9t@8Q@w*dS#(rRG=XqDGLxCP*^kyeZU04-2Ej@iQP&Hw-a07*qoM6N<$f(wQH AJ^%m! diff --git a/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml deleted file mode 100644 index 8a9a5226..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml new file mode 100644 index 00000000..935408fb --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml deleted file mode 100644 index d8b29fc4..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml index 73d5e641..6b52da8c 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml @@ -1,18 +1,13 @@ - - + + - - - - - \ No newline at end of file + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml deleted file mode 100644 index 1ce21f0a..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml new file mode 100644 index 00000000..b827ebf9 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index d7ace3e6..7bddcc1c 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -70,7 +70,7 @@ - - + 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 758814f0..2cfe1ee2 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -184,7 +184,7 @@ android:layout_height="wrap_content" android:lines="1" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@color/color_fab_orange" + android:textColor="@color/colorConfigType" android:textSize="10sp" /> diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml index 1b70ce04..210d238d 100644 --- a/V2rayNG/app/src/main/res/values-night/colors.xml +++ b/V2rayNG/app/src/main/res/values-night/colors.xml @@ -1,5 +1,6 @@ + #f97910 #424242 #646464 #BDBDBD diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index dc2bb118..7a5054da 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -2,8 +2,9 @@ #009966 #FF0099 - #f97910 + #f97910 + #f97910 #CDCDCD #9C9C9C #727272 diff --git a/V2rayNG/app/src/main/res/xml/shortcuts.xml b/V2rayNG/app/src/main/res/xml/shortcuts.xml index 9db1e36f..8874a718 100644 --- a/V2rayNG/app/src/main/res/xml/shortcuts.xml +++ b/V2rayNG/app/src/main/res/xml/shortcuts.xml @@ -28,18 +28,4 @@ android:targetPackage="com.v2ray.ang" /> - - - - - \ No newline at end of file