Skip to content

Commit 879e25b

Browse files
2dust2dust
committed
sdk28
1 parent c0e968a commit 879e25b

14 files changed

+88
-85
lines changed

‎V2rayNG/app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 27
7-
buildToolsVersion '27.0.3'
6+
compileSdkVersion 28
7+
buildToolsVersion '28.0.3'
88

99
compileOptions {
1010
targetCompatibility = "8"
@@ -16,8 +16,8 @@ android {
1616
minSdkVersion 17
1717
targetSdkVersion Integer.parseInt("$targetSdkVer")
1818
multiDexEnabled true
19-
versionCode 210
20-
versionName "1.0.1"
19+
versionCode 212
20+
versionName "1.0.2"
2121
}
2222

2323
signingConfigs {
@@ -96,7 +96,7 @@ dependencies {
9696
implementation "org.jetbrains.anko:anko-support-v4:$ankoVersion"
9797
implementation "org.jetbrains.anko:anko-appcompat-v7:$ankoVersion"
9898
implementation "org.jetbrains.anko:anko-design:$ankoVersion"
99-
implementation 'com.google.code.gson:gson:2.8.2'
99+
implementation 'com.google.code.gson:gson:2.8.5'
100100
implementation 'io.reactivex:rxjava:1.3.4'
101101
implementation 'io.reactivex:rxandroid:1.2.1'
102102
implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'

‎V2rayNG/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
1010
<uses-permission android:name="android.permission.CAMERA" />
1111
<uses-permission android:name="com.android.vending.BILLING" />
12-
12+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1313
<!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
1414
<application
1515
android:name=".AngApplication"

‎V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class PerAppProxyActivity : BaseActivity() {
9898
recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
9999
var dst = 0
100100
val threshold = resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 3
101-
override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) {
101+
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
102102
dst += dy
103103
if (dst > threshold) {
104104
header_view.hide()

‎V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyAdapter.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
6262

6363
val icon = itemView.icon!!
6464
val name = itemView.name!!
65+
val package_name = itemView.package_name!!
6566
val checkBox = itemView.check_box!!
6667

6768
fun bind(appInfo: AppInfo) {
@@ -71,10 +72,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
7172
// name.text = appInfo.appName
7273

7374
checkBox.isChecked = inBlacklist
74-
75-
// name.textColor = mActivity.resources.getColor(if (appInfo.isSystemApp)
76-
// R.color.color_highlight_material else R.color.abc_secondary_text_material_light)
77-
75+
package_name.text = appInfo.packageName
7876
if (appInfo.isSystemApp) {
7977
name.text = String.format("** %1s", appInfo.appName)
8078
name.textColor = Color.RED

‎V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class SettingsActivity : BaseActivity() {
3434
const val PREF_DOMESTIC_DNS = "pref_domestic_dns"
3535

3636
// const val PREF_SOCKS_PORT = "pref_socks_port"
37-
// const val PREF_LANCONN_PORT = "pref_lanconn_port"
37+
// const val PREF_HTTP_PORT = "pref_http_port"
3838

3939
const val PREF_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
4040
const val PREF_ROUTING_MODE = "pref_routing_mode"
@@ -67,7 +67,7 @@ class SettingsActivity : BaseActivity() {
6767
val forwardIpv6 by lazy { findPreference(PREF_FORWARD_IPV6) as CheckBoxPreference }
6868

6969
// val socksPort by lazy { findPreference(PREF_SOCKS_PORT) as EditTextPreference }
70-
// val lanconnPort by lazy { findPreference(PREF_LANCONN_PORT) as EditTextPreference }
70+
// val httpPort by lazy { findPreference(PREF_HTTP_PORT) as EditTextPreference }
7171

7272
val routingCustom: Preference by lazy { findPreference(PREF_ROUTING_CUSTOM) }
7373
// val donate: Preference by lazy { findPreference(PREF_DONATE) }
@@ -132,8 +132,8 @@ class SettingsActivity : BaseActivity() {
132132
// socksPort.summary = any as String
133133
// true
134134
// }
135-
// lanconnPort.setOnPreferenceChangeListener { preference, any ->
136-
// lanconnPort.summary = any as String
135+
// httpPort.setOnPreferenceChangeListener { preference, any ->
136+
// httpPort.summary = any as String
137137
// true
138138
// }
139139

@@ -156,7 +156,7 @@ class SettingsActivity : BaseActivity() {
156156
}
157157

158158
// socksPort.summary = defaultSharedPreferences.getString(PREF_SOCKS_PORT, "10808")
159-
// lanconnPort.summary = defaultSharedPreferences.getString(PREF_LANCONN_PORT, "")
159+
// lanconnPort.summary = defaultSharedPreferences.getString(PREF_HTTP_PORT, "")
160160

161161
defaultSharedPreferences.registerOnSharedPreferenceChangeListener(this)
162162
}

‎V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ object V2rayConfigUtil {
131131
try {
132132
v2rayConfig.inbounds[0].port = 10808
133133
// val socksPort = Utils.parseInt(app.defaultDPreference.getPrefString(SettingsActivity.PREF_SOCKS_PORT, "10808"))
134-
// val lanconnPort = Utils.parseInt(app.defaultDPreference.getPrefString(SettingsActivity.PREF_LANCONN_PORT, ""))
134+
// val lanconnPort = Utils.parseInt(app.defaultDPreference.getPrefString(SettingsActivity.PREF_HTTP_PORT, ""))
135135

136136
// if (socksPort > 0) {
137137
// v2rayConfig.inbounds[0].port = socksPort

‎V2rayNG/app/src/main/res/layout/activity_bypass_list.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
android:layout_toLeftOf="@id/switch_per_app_proxy"
5555
android:layout_toStartOf="@id/switch_per_app_proxy"
5656
android:text="@string/title_pref_per_app_proxy"
57-
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
57+
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
5858

5959
</RelativeLayout>
6060

@@ -81,7 +81,7 @@
8181
android:layout_toLeftOf="@id/switch_bypass_apps"
8282
android:layout_toStartOf="@id/switch_bypass_apps"
8383
android:text="@string/switch_bypass_apps_mode"
84-
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
84+
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
8585

8686
</RelativeLayout>
8787

‎V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml

+26-10
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,41 @@
88
android:id="@+id/icon"
99
android:layout_width="46dp"
1010
android:layout_height="46dp"
11-
android:paddingEnd="10dp"
11+
android:paddingStart="14dp"
1212
android:paddingLeft="14dp"
13-
android:paddingRight="10dp"
14-
android:paddingStart="14dp" />
13+
android:paddingEnd="10dp"
14+
android:paddingRight="10dp" />
1515

16-
<android.support.v7.widget.AppCompatTextView
17-
android:id="@+id/name"
16+
<LinearLayout
1817
android:layout_width="0dp"
19-
android:layout_height="wrap_content"
20-
android:layout_weight="1.0" />
18+
android:layout_height="46dp"
19+
android:layout_weight="1.0"
20+
android:gravity="center"
21+
android:orientation="vertical"
22+
android:paddingStart="@dimen/layout_margin_right_height"
23+
android:paddingEnd="@dimen/layout_margin_right_height">
24+
25+
<android.support.v7.widget.AppCompatTextView
26+
android:id="@+id/name"
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content" />
29+
30+
<android.support.v7.widget.AppCompatTextView
31+
android:id="@+id/package_name"
32+
android:layout_width="match_parent"
33+
android:layout_height="wrap_content"
34+
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
35+
</LinearLayout>
36+
2137

2238
<android.support.v7.widget.AppCompatCheckBox
2339
android:id="@+id/check_box"
2440
android:layout_width="wrap_content"
2541
android:layout_height="wrap_content"
2642
android:clickable="false"
27-
android:paddingEnd="6dp"
43+
android:paddingStart="2dp"
2844
android:paddingLeft="2dp"
29-
android:paddingRight="6dp"
30-
android:paddingStart="2dp" />
45+
android:paddingEnd="6dp"
46+
android:paddingRight="6dp" />
3147

3248
</LinearLayout>

‎V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<string name="title_pref_socks_port">SOCKS5代理端口</string>
113113
<string name="summary_pref_socks_port">SOCKS5代理端口</string>
114114

115-
<string name="title_pref_lanconn_port">HTTP代理端口(0=不允许)</string>
116-
<string name="summary_pref_lanconn_port">HTTP代理端口</string>
115+
<string name="title_pref_http_port">HTTP代理端口</string>
116+
<string name="summary_pref_http_port">HTTP代理端口</string>
117117

118118
<string name="title_pref_feedback">反馈</string>
119119
<string name="summary_pref_feedback">反馈改进或漏洞至 GitHub</string>

‎V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
<string name="title_pref_socks_port">SOCKS5代理端口</string>
114114
<string name="summary_pref_socks_port">SOCKS5代理端口</string>
115115

116-
<string name="title_pref_lanconn_port">HTTP代理端口(0=不允許)</string>
117-
<string name="summary_pref_lanconn_port">HTTP代理端口</string>
116+
<string name="title_pref_http_port">HTTP代理端口</string>
117+
<string name="summary_pref_http_port">HTTP代理端口</string>
118118

119119

120120
<string name="title_pref_feedback">回饋</string>

‎V2rayNG/app/src/main/res/values/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
<string name="title_pref_socks_port">SOCKS5 proxy port</string>
114114
<string name="summary_pref_socks_port">SOCKS5 proxy port</string>
115115

116-
<string name="title_pref_lanconn_port">HTTP proxy port(0=not allowed)</string>
117-
<string name="summary_pref_lanconn_port">HTTP proxy port</string>
116+
<string name="title_pref_http_port">HTTP proxy port</string>
117+
<string name="summary_pref_http_port">HTTP proxy port</string>
118118

119119
<string name="title_pref_feedback">Feedback</string>
120120
<string name="summary_pref_feedback">Feedback enhancements or bugs to GitHub</string>

‎V2rayNG/app/src/main/res/xml/pref_settings.xml

+32-43
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
33
<PreferenceCategory android:title="@string/title_settings">
4-
<!--<CheckBoxPreference-->
5-
<!--android:key="pref_bypass_mainland"-->
6-
<!--android:summary="@string/summary_pref_bypass_mainland"-->
7-
<!--android:title="@string/title_pref_bypass_mainland" />-->
84
<CheckBoxPreference
95
android:key="pref_per_app_proxy"
106
android:summary="@string/summary_pref_per_app_proxy"
@@ -28,6 +24,29 @@
2824

2925
</PreferenceCategory>
3026

27+
<PreferenceCategory android:title="@string/title_pref_routing">
28+
<ListPreference
29+
android:defaultValue="IPIfNonMatch"
30+
android:entries="@array/routing_domain_strategy"
31+
android:entryValues="@array/routing_domain_strategy"
32+
android:key="pref_routing_domain_strategy"
33+
android:summary="%s"
34+
android:title="@string/title_pref_routing_domain_strategy" />
35+
36+
<ListPreference
37+
android:defaultValue="0"
38+
android:entries="@array/routing_mode"
39+
android:entryValues="@array/routing_mode_value"
40+
android:key="pref_routing_mode"
41+
android:summary="%s"
42+
android:title="@string/title_pref_routing_mode" />
43+
44+
<Preference
45+
android:key="pref_routing_custom"
46+
android:summary="@string/title_pref_routing_custom"
47+
android:title="@string/title_pref_routing_custom" />
48+
</PreferenceCategory>
49+
3150
<PreferenceCategory android:title="@string/title_advanced">
3251

3352
<CheckBoxPreference
@@ -50,53 +69,23 @@
5069
android:summary="@string/summary_pref_remote_dns"
5170
android:title="@string/title_pref_remote_dns" />
5271

53-
54-
<!--<EditTextPreference-->
55-
<!--android:enabled="false"-->
56-
<!--android:defaultValue="10808"-->
57-
<!--android:key="pref_socks_port"-->
58-
<!--android:summary="@string/summary_pref_socks_port"-->
59-
<!--android:title="@string/title_pref_socks_port" />-->
60-
61-
<!--<EditTextPreference-->
62-
<!--android:defaultValue="0"-->
63-
<!--android:key="pref_lanconn_port"-->
64-
<!--android:summary="@string/summary_pref_lanconn_port"-->
65-
<!--android:title="@string/title_pref_lanconn_port" />-->
66-
67-
68-
</PreferenceCategory>
69-
70-
<PreferenceCategory android:title="@string/title_pref_routing">
71-
<ListPreference
72-
android:defaultValue="IPIfNonMatch"
73-
android:entries="@array/routing_domain_strategy"
74-
android:entryValues="@array/routing_domain_strategy"
75-
android:key="pref_routing_domain_strategy"
76-
android:summary="%s"
77-
android:title="@string/title_pref_routing_domain_strategy" />
78-
79-
<ListPreference
80-
android:defaultValue="0"
81-
android:entries="@array/routing_mode"
82-
android:entryValues="@array/routing_mode_value"
83-
android:key="pref_routing_mode"
84-
android:summary="%s"
85-
android:title="@string/title_pref_routing_mode" />
72+
<Preference
73+
android:key="pref_socks_port"
74+
android:summary="10808"
75+
android:title="@string/title_pref_socks_port" />
8676

8777
<Preference
88-
android:key="pref_routing_custom"
89-
android:summary="@string/title_pref_routing_custom"
90-
android:title="@string/title_pref_routing_custom" />
78+
android:key="pref_http_port"
79+
android:summary="10809"
80+
android:title="@string/title_pref_http_port" />
81+
</PreferenceCategory>
9182

83+
<PreferenceCategory android:title="@string/title_about">
9284
<!--<Preference-->
9385
<!--android:key="pref_donate"-->
9486
<!--android:summary="@string/summary_pref_donate"-->
9587
<!--android:title="@string/title_pref_donate" />-->
9688

97-
</PreferenceCategory>
98-
99-
<PreferenceCategory android:title="@string/title_about">
10089
<!--<Preference-->
10190
<!--android:key="pref_licenses"-->
10291
<!--android:title="@string/notices_title" />-->

‎V2rayNG/dpreference/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion '27.0.3'
4+
compileSdkVersion 28
5+
buildToolsVersion '28.0.3'
66

77
defaultConfig {
88
minSdkVersion 17

‎V2rayNG/gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
# org.gradle.parallel=true
1515
#Fri Jun 02 14:08:42 CST 2017
1616
ankoVersion=0.10.8
17-
kotlinVersion=1.3.10
18-
supportLibVersion=27.1.1
19-
buildToolsVer=27.0.3
20-
compileSdkVer=27
17+
kotlinVersion=1.3.40
18+
supportLibVersion=28.0.0
19+
buildToolsVer=28.0.3
20+
compileSdkVer=28
2121
kotlin.incremental=true
22-
targetSdkVer=27
22+
targetSdkVer=28

0 commit comments

Comments
 (0)