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

Refactor

Browse Source
This commit is contained in:
2dust
2024-02-04 12:28:58 +08:00
parent 6d0384b6f1
commit 267a43fd97
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt
View File

@@ -21,7 +21,6 @@ import com.v2ray.ang.extension.v2RayApplication
import com.v2ray.ang.util.AppManagerUtil import com.v2ray.ang.util.AppManagerUtil
import com.v2ray.ang.util.Utils import com.v2ray.ang.util.Utils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import rx.android.schedulers.AndroidSchedulers import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers import rx.schedulers.Schedulers

3
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt
View File

@@ -1,7 +1,7 @@
package com.v2ray.ang.ui package com.v2ray.ang.ui
import android.Manifest import android.Manifest
import android.app.Activity.RESULT_OK import androidx.appcompat.app.AppCompatActivity.RESULT_OK
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
@@ -18,7 +18,6 @@ import com.v2ray.ang.extension.toast
import com.v2ray.ang.extension.v2RayApplication import com.v2ray.ang.extension.v2RayApplication
import com.v2ray.ang.util.Utils import com.v2ray.ang.util.Utils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class RoutingSettingsFragment : Fragment() { class RoutingSettingsFragment : Fragment() {

4
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt
View File

@@ -1,7 +1,7 @@
package com.v2ray.ang.ui package com.v2ray.ang.ui
import android.Manifest import android.Manifest
import android.app.Activity import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import android.content.Intent import android.content.Intent
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
@@ -54,7 +54,7 @@ class ScannerActivity : BaseActivity(){
private fun finished(text: String) { private fun finished(text: String) {
val intent = Intent() val intent = Intent()
intent.putExtra("SCAN_RESULT", text) intent.putExtra("SCAN_RESULT", text)
setResult(Activity.RESULT_OK, intent) setResult(AppCompatActivity.RESULT_OK, intent)
finish() finish()
} }

4
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt
View File

@@ -1,6 +1,6 @@
package com.v2ray.ang.ui package com.v2ray.ang.ui
import android.app.Activity import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
@@ -90,7 +90,7 @@ class TaskerActivity : BaseActivity() {
intent.putExtra(AppConfig.TASKER_EXTRA_BUNDLE, extraBundle) intent.putExtra(AppConfig.TASKER_EXTRA_BUNDLE, extraBundle)
intent.putExtra(AppConfig.TASKER_EXTRA_STRING_BLURB, blurb) intent.putExtra(AppConfig.TASKER_EXTRA_STRING_BLURB, blurb)
setResult(Activity.RESULT_OK, intent) setResult(AppCompatActivity.RESULT_OK, intent)
finish() finish()
} }

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

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
@@ -11,5 +12,5 @@
android:layout_width="330dp" android:layout_width="330dp"
android:layout_height="330dp" android:layout_height="330dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_fab_check" /> app:srcCompat="@drawable/ic_fab_check" />
</LinearLayout> </LinearLayout>

2
V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">

14
V2rayNG/app/src/main/res/layout/item_recycler_main.xml
View File

@@ -20,7 +20,7 @@
android:focusable="true" android:focusable="true"
android:nextFocusRight="@+id/layout_share" android:nextFocusRight="@+id/layout_share"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/server_height" android:layout_height="@dimen/server_height"
android:layout_gravity="center" android:layout_gravity="center"
@@ -116,7 +116,7 @@
android:id="@+id/layout_share" android:id="@+id/layout_share"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/server_height" android:layout_height="@dimen/server_height"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
@@ -127,7 +127,7 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_24dp" app:srcCompat="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText" /> app:tint="?attr/colorMainText" />
</LinearLayout> </LinearLayout>
@@ -136,7 +136,7 @@
android:id="@+id/layout_edit" android:id="@+id/layout_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/server_height" android:layout_height="@dimen/server_height"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
@@ -146,7 +146,7 @@
<ImageView <ImageView
android:layout_width="@dimen/png_height" android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_24dp" app:srcCompat="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" /> app:tint="?attr/colorMainText" />
</LinearLayout> </LinearLayout>
@@ -155,7 +155,7 @@
android:id="@+id/layout_remove" android:id="@+id/layout_remove"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/server_height" android:layout_height="@dimen/server_height"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
@@ -165,7 +165,7 @@
<ImageView <ImageView
android:layout_width="@dimen/png_height" android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_24dp" app:srcCompat="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" /> app:tint="?attr/colorMainText" />
</LinearLayout> </LinearLayout>

10
V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
View File

@@ -19,7 +19,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:nextFocusRight="@+id/layout_edit" android:nextFocusRight="@+id/layout_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/server_height" android:layout_height="@dimen/server_height"
@@ -68,7 +68,7 @@
android:id="@+id/layout_share" android:id="@+id/layout_share"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
@@ -79,7 +79,7 @@
<ImageView <ImageView
android:layout_width="@dimen/png_height" android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_share_24dp" app:srcCompat="@drawable/ic_share_24dp"
app:tint="?attr/colorMainText"/> app:tint="?attr/colorMainText"/>
</LinearLayout> </LinearLayout>
@@ -88,7 +88,7 @@
android:id="@+id/layout_edit" android:id="@+id/layout_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
@@ -99,7 +99,7 @@
<ImageView <ImageView
android:layout_width="@dimen/png_height" android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_edit_24dp" app:srcCompat="@drawable/ic_edit_24dp"
app:tint="?attr/colorMainText" /> app:tint="?attr/colorMainText" />
</LinearLayout> </LinearLayout>

6
V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
View File

@@ -17,7 +17,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center" android:gravity="center"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:padding="@dimen/nav_header_vertical_spacing"> android:padding="@dimen/nav_header_vertical_spacing">
<LinearLayout <LinearLayout
@@ -46,7 +46,7 @@
android:id="@+id/layout_remove" android:id="@+id/layout_remove"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:padding="@dimen/nav_header_vertical_spacing"> android:padding="@dimen/nav_header_vertical_spacing">
@@ -54,7 +54,7 @@
<ImageView <ImageView
android:layout_width="@dimen/png_height" android:layout_width="@dimen/png_height"
android:layout_height="@dimen/png_height" android:layout_height="@dimen/png_height"
android:src="@drawable/ic_delete_24dp" app:srcCompat="@drawable/ic_delete_24dp"
app:tint="?attr/colorMainText" /> app:tint="?attr/colorMainText" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_switch" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/layout_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@@ -12,5 +13,5 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_stat_name" /> app:srcCompat="@drawable/ic_stat_name" />
</LinearLayout> </LinearLayout>