Merge pull request #300 from yuhan6665/master

Fix UI touch issues for Android TV
Merge pull request #314 from yuhan6665/chrome-os
2020-04-12 10:04:52 +08:00 · 2020-03-16 16:24:58 +08:00 · 2020-03-16 16:24:08 +08:00 · 2020-03-14 14:07:31 -04:00 · 2020-03-14 13:03:51 -04:00 · 2020-03-08 12:06:44 -04:00
8 changed files with 81 additions and 41 deletions
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -2,6 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.v2ray.ang">

+    <supports-screens
+            android:anyDensity="true"
+            android:smallScreens="true"
+            android:normalScreens="true"
+            android:largeScreens="true"
+            android:xlargeScreens="true"/>
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.INTERNET" />
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
@@ -69,36 +69,28 @@ class V2RayVpnService : VpnService() {
        *
        * Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
        */
-    private val defaultNetworkRequest by lazy {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            NetworkRequest.Builder()
+    private val defaultNetworkRequest by lazy @RequiresApi(Build.VERSION_CODES.P) {
+        NetworkRequest.Builder()
                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
                .build()
-        } else {
-            null
-        }
    }


    private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }

-    private val defaultNetworkCallback by lazy {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            object : ConnectivityManager.NetworkCallback() {
-                override fun onAvailable(network: Network) {
-                    setUnderlyingNetworks(arrayOf(network))
-                }
-                override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
-                    // it's a good idea to refresh capabilities
-                    setUnderlyingNetworks(arrayOf(network))
-                }
-                override fun onLost(network: Network) {
-                    setUnderlyingNetworks(null)
-                }
+    private val defaultNetworkCallback by lazy @RequiresApi(Build.VERSION_CODES.P) {
+        object : ConnectivityManager.NetworkCallback() {
+            override fun onAvailable(network: Network) {
+                setUnderlyingNetworks(arrayOf(network))
+            }
+            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
+                // it's a good idea to refresh capabilities
+                setUnderlyingNetworks(arrayOf(network))
+            }
+            override fun onLost(network: Network) {
+                setUnderlyingNetworks(null)
            }
-        } else {
-            null
        }
    }
    private var listeningForDefaultNetwork = false
--- a/V2rayNG/app/src/main/res/drawable/background_test_button.xml
+++ b/V2rayNG/app/src/main/res/drawable/background_test_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_focused="true"
+            android:drawable="@color/secondary_text" />
+    <item android:state_hovered="true"
+            android:drawable="@color/secondary_text" />
+    <item android:drawable="@color/colorPrimary_text" />
+</selector>
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -54,8 +54,10 @@
                        android:id="@+id/layout_test"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/connection_test_height"
-                        android:background="@color/colorPrimary_text"
-                        android:gravity="center|left">
+                        android:background="@drawable/background_test_button"
+                        android:gravity="center|left"
+                        android:clickable="true"
+                        android:focusable="true">

                        <TextView
                            android:id="@+id/tv_test_state"
@@ -92,6 +94,8 @@
                        android:layout_marginLeft="16dp"
                        android:layout_marginTop="16dp"
                        android:src="@drawable/ic_v_idle"
+                        android:clickable="true"
+                        android:focusable="true"
                        app:layout_anchorGravity="bottom|right|end" />

                </com.github.jorgecastilloprz.FABProgressCircle>
--- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
@@ -2,7 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true">

    <android.support.v7.widget.AppCompatImageView
        android:id="@+id/icon"
@@ -40,6 +43,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:clickable="false"
+        android:focusable="false"
        android:paddingStart="2dp"
        android:paddingLeft="2dp"
        android:paddingEnd="6dp"
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -9,10 +9,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="3dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:orientation="horizontal"
        card_view:cardCornerRadius="5dp">

        <LinearLayout
@@ -21,7 +17,11 @@
            android:layout_height="@dimen/server_height"
            android:layout_gravity="center"
            android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:nextFocusRight="@+id/layout_share">

            <LinearLayout
                android:layout_width="wrap_content"
@@ -111,10 +111,14 @@
                    <LinearLayout
                        android:id="@+id/layout_share"
                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                        android:gravity="center"
                        android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:nextFocusLeft="@+id/info_container">

                        <ImageView
                            android:layout_width="wrap_content"
@@ -126,10 +130,13 @@
                    <LinearLayout
                        android:id="@+id/layout_edit"
                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                        android:gravity="center"
                        android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">

                        <ImageView
                            android:layout_width="@dimen/png_height"
@@ -141,10 +148,13 @@
                    <LinearLayout
                        android:id="@+id/layout_remove"
                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/server_height"
+                        android:layout_height="match_parent"
                        android:gravity="center"
                        android:orientation="vertical"
-                        android:paddingEnd="@dimen/layout_margin_right_height">
+                        android:padding="@dimen/layout_margin_spacing"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true">

                        <ImageView
                            android:layout_width="@dimen/png_height"
--- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -6,6 +6,7 @@
    android:gravity="center_vertical">

    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/item_cardview"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="3dp"
@@ -13,7 +14,8 @@
        android:focusable="true"
        android:foreground="?android:attr/selectableItemBackground"
        android:orientation="horizontal"
-        card_view:cardCornerRadius="5dp">
+        card_view:cardCornerRadius="5dp"
+        android:nextFocusRight="@+id/layout_edit">

        <LinearLayout
            android:id="@+id/info_container"
@@ -62,11 +64,14 @@
                <LinearLayout
                    android:id="@+id/layout_share"
                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                    android:gravity="center"
                    android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height"
-                    android:visibility="invisible">
+                    android:padding="@dimen/layout_margin_spacing"
+                    android:visibility="invisible"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true">

                    <ImageView
                        android:layout_width="@dimen/png_height"
@@ -78,10 +83,14 @@
                <LinearLayout
                    android:id="@+id/layout_edit"
                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="wrap_content"
                    android:gravity="center"
                    android:orientation="vertical"
-                    android:paddingEnd="@dimen/layout_margin_right_height">
+                    android:padding="@dimen/layout_margin_spacing"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:nextFocusLeft="@+id/item_cardview">

                    <ImageView
                        android:layout_width="@dimen/png_height"
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
    <dimen name="bypass_list_header_height">50dp</dimen>
    <dimen name="layout_margin_top_height">16dp</dimen>
    <dimen name="layout_margin_right_height">16dp</dimen>
+    <dimen name="layout_margin_spacing">8dp</dimen>
    <dimen name="edit_height">50dp</dimen>
    <dimen name="png_height">24dp</dimen>
    <dimen name="server_height">72dp</dimen>
Author	SHA1	Message	Date
2dust	c105d84b35	Merge pull request #300 from yuhan6665/master Fix UI touch issues for Android TV	2020-04-12 10:04:52 +08:00
2dust	3ea04c076c	Merge pull request #314 from yuhan6665/chrome-os Add tags in AndroidManifest to support PlayStore filtering	2020-03-16 16:24:58 +08:00
2dust	98475460bf	Merge pull request #313 from yuhan6665/lint-fix Use annotation to fix lint error	2020-03-16 16:24:08 +08:00
yuhan6665	68ee61a753	Add tags in AndroidManifest to support PlayStore filtering Google Playstore is using uses-feature and supports-screens to filter devices. By setting all screens to true and specifing features as "not required" should make app compatible with more devices Particularly it includes Chrome OS devices.	2020-03-14 14:07:31 -04:00
yuhan6665	90ba9ef2b7	Use annotation to fix lint error	2020-03-14 13:03:51 -04:00
yuhan6665	0ec114322e	Fix UI touch issues for Android TV	2020-03-08 12:06:44 -04:00