diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt index d6b217e4..4b17e638 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt @@ -21,7 +21,6 @@ import com.v2ray.ang.extension.v2RayApplication import com.v2ray.ang.util.AppManagerUtil import com.v2ray.ang.util.Utils import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt index f5a8e395..88f65d41 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt @@ -1,7 +1,7 @@ package com.v2ray.ang.ui import android.Manifest -import android.app.Activity.RESULT_OK +import androidx.appcompat.app.AppCompatActivity.RESULT_OK import android.content.Intent import android.os.Bundle import android.text.TextUtils @@ -18,7 +18,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.extension.v2RayApplication import com.v2ray.ang.util.Utils import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch class RoutingSettingsFragment : Fragment() { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt index 086c39f2..6145137b 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt @@ -1,7 +1,7 @@ package com.v2ray.ang.ui import android.Manifest -import android.app.Activity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.content.Intent import android.graphics.BitmapFactory @@ -54,7 +54,7 @@ class ScannerActivity : BaseActivity(){ private fun finished(text: String) { val intent = Intent() intent.putExtra("SCAN_RESULT", text) - setResult(Activity.RESULT_OK, intent) + setResult(AppCompatActivity.RESULT_OK, intent) finish() } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt index 13780757..ce38aa2f 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt @@ -1,6 +1,6 @@ package com.v2ray.ang.ui -import android.app.Activity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.view.View import android.widget.ArrayAdapter @@ -90,7 +90,7 @@ class TaskerActivity : BaseActivity() { intent.putExtra(AppConfig.TASKER_EXTRA_BUNDLE, extraBundle) intent.putExtra(AppConfig.TASKER_EXTRA_STRING_BLURB, blurb) - setResult(Activity.RESULT_OK, intent) + setResult(AppCompatActivity.RESULT_OK, intent) finish() } diff --git a/V2rayNG/app/src/main/res/layout/item_qrcode.xml b/V2rayNG/app/src/main/res/layout/item_qrcode.xml index 3c53162a..d5997b3f 100644 --- a/V2rayNG/app/src/main/res/layout/item_qrcode.xml +++ b/V2rayNG/app/src/main/res/layout/item_qrcode.xml @@ -1,5 +1,6 @@ + app:srcCompat="@drawable/ic_fab_check" /> diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml index 6eb0ff19..c0909a63 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:background="@color/colorPrimary" - android:foreground="?android:attr/selectableItemBackground" + android:foreground="?attr/selectableItemBackground" android:clickable="true" android:focusable="true"> 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 b2fbd63d..758814f0 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -20,7 +20,7 @@ android:focusable="true" android:nextFocusRight="@+id/layout_share" android:background="@color/colorPrimary" - android:foreground="?android:attr/selectableItemBackground" + android:foreground="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="@dimen/server_height" android:layout_gravity="center" @@ -116,7 +116,7 @@ android:id="@+id/layout_share" android:layout_width="wrap_content" android:layout_height="@dimen/server_height" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center" @@ -127,7 +127,7 @@ @@ -136,7 +136,7 @@ android:id="@+id/layout_edit" android:layout_width="wrap_content" android:layout_height="@dimen/server_height" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center" @@ -146,7 +146,7 @@ @@ -155,7 +155,7 @@ android:id="@+id/layout_remove" android:layout_width="wrap_content" android:layout_height="@dimen/server_height" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center" @@ -165,7 +165,7 @@ 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 d51f47db..89577e33 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 @@ -19,7 +19,7 @@ android:clickable="true" android:focusable="true" android:background="@color/colorPrimary" - android:foreground="?android:attr/selectableItemBackground" + android:foreground="?attr/selectableItemBackground" android:nextFocusRight="@+id/layout_edit" android:layout_width="match_parent" android:layout_height="@dimen/server_height" @@ -68,7 +68,7 @@ android:id="@+id/layout_share" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center" @@ -79,7 +79,7 @@ @@ -88,7 +88,7 @@ android:id="@+id/layout_edit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" android:gravity="center" @@ -99,7 +99,7 @@ diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml index 7121c5fe..7ae97912 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml @@ -17,7 +17,7 @@ android:orientation="horizontal" android:gravity="center" android:background="@color/colorPrimary" - android:foreground="?android:attr/selectableItemBackground" + android:foreground="?attr/selectableItemBackground" android:padding="@dimen/nav_header_vertical_spacing"> @@ -54,7 +54,7 @@ diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml index 84d65952..4d44882e 100644 --- a/V2rayNG/app/src/main/res/layout/widget_switch.xml +++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml @@ -1,6 +1,7 @@ + app:srcCompat="@drawable/ic_stat_name" />