Merge pull request #894 from Humilton/master

Support keyboard navigation for fab
2021-02-21 12:56:05 +08:00 · 2021-02-18 23:01:31 +08:00 · 2021-02-01 08:05:37 +08:00 · 2021-01-30 21:59:54 -05:00
2 changed files with 8 additions and 9 deletions
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+++ b/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", "")
-                        .split(",")
-                        .forEach {
+                userRule.split(",").map { it.trim() }.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 {
-            if ((it.startsWith("geosite:") || it.startsWith("domain:")) &&
-                    it.isNotBlank() && it.isNotEmpty()) {
+        userRule.split(",").map { it.trim() }.forEach {
+            if (it.startsWith("geosite:") || it.startsWith("domain:")) {
                domain.add(it)
            }
        }
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/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>
Author	SHA1	Message	Date
2dust	b4f02c9bd6	Merge pull request #894 from Humilton/master Support keyboard navigation for fab	2021-02-21 12:56:05 +08:00
hubaozhong	e567719f5b	Support keyboard navigation for fab Signed-off-by: hubaozhong <d63hbz@gmail.com>	2021-02-18 23:01:31 +08:00
2dust	8407fc5825	Merge pull request #866 from yuhan6665/trim-r Fix the string list trim	2021-02-01 08:05:37 +08:00
yuhan6665	a3e49dcc3d	Fix the string list trim	2021-01-30 21:59:54 -05:00