From c95b87b5a807fa79d64d0db22dffbeab850ed4d2 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Wed, 23 Oct 2019 13:34:21 +0800
Subject: [PATCH] layout: update layouts with latest SDK
---
.../main/res/layout/activity_app_filter.xml | 3 +-
app/src/main/res/layout/card_appview.xml | 42 ++++++------
app/src/main/res/layout/card_rule.xml | 66 ++++++++-----------
app/src/main/res/layout/card_server.xml | 5 +-
.../main/res/layout/fragment_dns_servers.xml | 3 +-
app/src/main/res/layout/fragment_dns_test.xml | 7 +-
app/src/main/res/layout/fragment_main.xml | 7 +-
app/src/main/res/layout/fragment_rules.xml | 3 +-
8 files changed, 58 insertions(+), 78 deletions(-)
diff --git a/app/src/main/res/layout/activity_app_filter.xml b/app/src/main/res/layout/activity_app_filter.xml
index 0668267..a0e5c87 100644
--- a/app/src/main/res/layout/activity_app_filter.xml
+++ b/app/src/main/res/layout/activity_app_filter.xml
@@ -25,7 +25,6 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/card_appview.xml b/app/src/main/res/layout/card_appview.xml
index a41bd15..97e14a3 100644
--- a/app/src/main/res/layout/card_appview.xml
+++ b/app/src/main/res/layout/card_appview.xml
@@ -1,32 +1,28 @@
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical">
+ android:id="@+id/app_icon"
+ android:layout_width="46dp"
+ android:layout_height="46dp"
+ android:paddingEnd="10dp"
+ android:paddingStart="14dp"/>
+ android:id="@+id/app_name"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.0"/>
+ android:id="@+id/app_check"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="false"
+ android:paddingEnd="6dp"
+ android:paddingStart="2dp"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/card_rule.xml b/app/src/main/res/layout/card_rule.xml
index d448b35..d90ecad 100644
--- a/app/src/main/res/layout/card_rule.xml
+++ b/app/src/main/res/layout/card_rule.xml
@@ -14,47 +14,39 @@
app:cardPreventCornerOverlap="true"
android:id="@+id/cardView_indicator">
-
-
+
-
-
-
-
-
-
+ android:padding="@dimen/margin_small"
+ android:id="@+id/textView_rule_name"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentStart="true"/>
+
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/card_server.xml b/app/src/main/res/layout/card_server.xml
index 1a350a2..6191267 100644
--- a/app/src/main/res/layout/card_server.xml
+++ b/app/src/main/res/layout/card_server.xml
@@ -5,6 +5,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:clickable="true"
+ android:focusable="true"
android:foreground="?attr/selectableItemBackground"
app:cardCornerRadius="10dp"
app:cardPreventCornerOverlap="true"
@@ -23,7 +24,6 @@
android:id="@+id/textView_custom_dns_name"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_dns_servers.xml b/app/src/main/res/layout/fragment_dns_servers.xml
index d012c3e..5021ef3 100644
--- a/app/src/main/res/layout/fragment_dns_servers.xml
+++ b/app/src/main/res/layout/fragment_dns_servers.xml
@@ -11,7 +11,6 @@
android:layout_height="match_parent"
android:scrollbars="horizontal"
android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_dns_test.xml b/app/src/main/res/layout/fragment_dns_test.xml
index 66d3cb2..eb1e1f9 100644
--- a/app/src/main/res/layout/fragment_dns_test.xml
+++ b/app/src/main/res/layout/fragment_dns_test.xml
@@ -41,18 +41,15 @@
android:layout_alignParentStart="true"
android:layout_marginTop="10dp"
android:id="@+id/button_start_test"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentLeft="true"/>
+ android:layout_alignParentEnd="true"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 30b23a1..2924b70 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -13,7 +13,6 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="org.itxtech.daedalus.fragment.HomeFragment">
+ app:layout_marginTopPercent="15%"
+ android:layout_alignTop="@+id/textView_app_name" android:layout_centerHorizontal="true"/>
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index 05d0491..f10b62d 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -11,7 +11,6 @@
android:layout_height="match_parent"
android:scrollbars="horizontal"
android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
-
\ No newline at end of file
+