Merge pull request #894 from Humilton/master

Support keyboard navigation for fab

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

@@ -458,12 +458,10 @@ object V2rayConfigUtil {
                 rulesIP.outboundTag = tag
                 rulesIP.ip = ArrayList<String>()
 
-                userRule.trim().replace("\n", "")
+                userRule.split(",").map { it.trim() }.forEach {
-                        .split(",")
-                        .forEach {
                             if (Utils.isIpAddress(it) || it.startsWith("geoip:")) {
                                 rulesIP.ip?.add(it)
-                            } else if (it.isNotBlank() || it.isNotEmpty())
+                            } else if (it.isNotEmpty())
 //                                if (Utils.isValidUrl(it)
 //                                    || it.startsWith("geosite:")
 //                                    || it.startsWith("regexp:")
@@ -487,9 +485,8 @@ object V2rayConfigUtil {
 
     private fun userRule2Domian(userRule: String): ArrayList<String> {
         val domain = ArrayList<String>()
-        userRule.trim().replace("\n", "").split(",").forEach {
+        userRule.split(",").map { it.trim() }.forEach {
-            if ((it.startsWith("geosite:") || it.startsWith("domain:")) &&
+            if (it.startsWith("geosite:") || it.startsWith("domain:")) {
-                    it.isNotBlank() && it.isNotEmpty()) {
                 domain.add(it)
             }
         }

V2rayNG/app/src/main/res/layout/activity_main.xml

@@ -48,7 +48,8 @@
                         android:id="@+id/recycler_view"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
-                        android:layout_weight="1" />
+                        android:layout_weight="1"
+                        android:nextFocusRight="@+id/fab" />
 
                     <LinearLayout
                         android:id="@+id/layout_test"
@@ -96,7 +97,8 @@
                         android:src="@drawable/ic_v_idle"
                         android:clickable="true"
                         android:focusable="true"
-                        app:layout_anchorGravity="bottom|right|end" />
+                        app:layout_anchorGravity="bottom|right|end"
+                        android:nextFocusLeft="@+id/recycler_view" />
 
                 </com.github.jorgecastilloprz.FABProgressCircle>
             </android.support.design.widget.CoordinatorLayout>