From 64803bef1ef6bdee20dd77e7822f81de7a8c0bef Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Tue, 10 Dec 2019 00:32:32 +0800
Subject: [PATCH] compatible with legacy rules

---
 app/src/main/java/com/github/kr328/clash/model/ClashRule.kt | 3 +++
 app/src/main/res/layout/activity_main.xml                   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/kr328/clash/model/ClashRule.kt b/app/src/main/java/com/github/kr328/clash/model/ClashRule.kt
index baa411f..37ed8a1 100644
--- a/app/src/main/java/com/github/kr328/clash/model/ClashRule.kt
+++ b/app/src/main/java/com/github/kr328/clash/model/ClashRule.kt
@@ -46,6 +46,9 @@ data class ClashRule(val matcher: Matcher, val pattern: String, val target: Stri
                     "DST-PORT" -> DST_PORT
                     "SRC-PORT" -> SRC_PORT
                     "MATCH" -> MATCH
+                    // Deprecated
+                    "SOURCE-IP-CIDR" -> SRC_IP_CIDR
+                    "FINAL" -> MATCH
                     else -> throw YamlException("Invalid matcher $s", 0, 0)
                 }
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 559651c..4070bf4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main_root"
     android:layout_width="match_parent"
@@ -26,7 +25,7 @@
             android:text="@string/launch_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"/>
+            android:layout_marginStart="25dp"/>
         <View
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>