Skip to content

Commit c95b87b

Browse files
PeratXPeratX
committed
layout: update layouts with latest SDK
1 parent b5d1942 commit c95b87b

File tree

8 files changed

+58
-78
lines changed

8 files changed

+58
-78
lines changed

‎app/src/main/res/layout/activity_app_filter.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
android:layout_height="match_parent"
2626
app:layout_behavior="@string/appbar_scrolling_view_behavior">
2727

28-
2928
</androidx.recyclerview.widget.RecyclerView>
3029

31-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
30+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/card_appview.xml‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent"
4-
android:layout_height="wrap_content"
5-
android:gravity="center_vertical">
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:gravity="center_vertical">
66

77
<androidx.appcompat.widget.AppCompatImageView
8-
android:id="@+id/app_icon"
9-
android:layout_width="46dp"
10-
android:layout_height="46dp"
11-
android:paddingEnd="10dp"
12-
android:paddingLeft="14dp"
13-
android:paddingRight="10dp"
14-
android:paddingStart="14dp" />
8+
android:id="@+id/app_icon"
9+
android:layout_width="46dp"
10+
android:layout_height="46dp"
11+
android:paddingEnd="10dp"
12+
android:paddingStart="14dp"/>
1513

1614
<androidx.appcompat.widget.AppCompatTextView
17-
android:id="@+id/app_name"
18-
android:layout_width="0dp"
19-
android:layout_height="wrap_content"
20-
android:layout_weight="1.0" />
15+
android:id="@+id/app_name"
16+
android:layout_width="0dp"
17+
android:layout_height="wrap_content"
18+
android:layout_weight="1.0"/>
2119

2220
<androidx.appcompat.widget.AppCompatCheckBox
23-
android:id="@+id/app_check"
24-
android:layout_width="wrap_content"
25-
android:layout_height="wrap_content"
26-
android:clickable="false"
27-
android:paddingEnd="6dp"
28-
android:paddingLeft="2dp"
29-
android:paddingRight="6dp"
30-
android:paddingStart="2dp" />
21+
android:id="@+id/app_check"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:clickable="false"
25+
android:paddingEnd="6dp"
26+
android:paddingStart="2dp"/>
3127

32-
</LinearLayout>
28+
</LinearLayout>

‎app/src/main/res/layout/card_rule.xml‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,39 @@
1414
app:cardPreventCornerOverlap="true"
1515
android:id="@+id/cardView_indicator">
1616

17-
<LinearLayout
17+
<RelativeLayout
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:focusable="true"
2121
android:orientation="vertical"
22-
android:background="?android:attr/selectableItemBackground">
23-
<RelativeLayout
22+
android:background="?android:attr/selectableItemBackground"
23+
android:layout_marginStart="@dimen/margin_small">
24+
<TextView
2425
android:layout_width="match_parent"
2526
android:layout_height="wrap_content"
26-
android:layout_marginStart="@dimen/margin_small"
27-
android:layout_marginLeft="@dimen/margin_small">
28-
29-
<TextView
30-
android:layout_width="match_parent"
31-
android:layout_height="wrap_content"
32-
android:padding="@dimen/margin_small"
33-
android:id="@+id/textView_rule_name"
34-
android:textAppearance="?android:attr/textAppearanceLarge"
35-
android:layout_alignParentTop="true"
36-
android:layout_alignParentLeft="true"
37-
android:layout_alignParentStart="true"/>
38-
<TextView
39-
android:layout_width="match_parent"
40-
android:layout_height="wrap_content"
41-
android:layout_below="@+id/textView_rule_name"
42-
android:padding="@dimen/margin_small"
43-
android:id="@+id/textView_rule_detail"
44-
android:textAppearance="?android:attr/textAppearanceSmall"
45-
android:layout_alignParentBottom="true"
46-
android:layout_alignParentLeft="true"
47-
android:layout_alignParentStart="true"/>
48-
<TextView android:id="@+id/textView_rule_size"
49-
android:layout_width="wrap_content"
50-
android:layout_height="wrap_content"
51-
android:layout_gravity="bottom"
52-
android:padding="@dimen/margin_small"
53-
android:layout_alignParentEnd="true"
54-
android:layout_alignParentRight="true"
55-
android:ellipsize="end"
56-
android:textAppearance="?android:attr/textAppearanceSmall"/>
57-
</RelativeLayout>
58-
</LinearLayout>
27+
android:padding="@dimen/margin_small"
28+
android:id="@+id/textView_rule_name"
29+
android:textAppearance="?android:attr/textAppearanceLarge"
30+
android:layout_alignParentTop="true"
31+
android:layout_alignParentStart="true"/>
32+
<TextView
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
android:layout_below="@+id/textView_rule_name"
36+
android:padding="@dimen/margin_small"
37+
android:id="@+id/textView_rule_detail"
38+
android:textAppearance="?android:attr/textAppearanceSmall"
39+
android:layout_alignParentBottom="true"
40+
android:layout_alignParentStart="true"/>
41+
<TextView
42+
android:id="@+id/textView_rule_size"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:layout_gravity="bottom"
46+
android:padding="@dimen/margin_small"
47+
android:layout_alignParentEnd="true"
48+
android:ellipsize="end"
49+
android:textAppearance="?android:attr/textAppearanceSmall"/>
50+
</RelativeLayout>
5951
</androidx.cardview.widget.CardView>
60-
</FrameLayout>
52+
</FrameLayout>

‎app/src/main/res/layout/card_server.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
android:layout_height="wrap_content"
66
android:layout_width="match_parent"
77
android:clickable="true"
8+
android:focusable="true"
89
android:foreground="?attr/selectableItemBackground"
910
app:cardCornerRadius="10dp"
1011
app:cardPreventCornerOverlap="true"
@@ -23,7 +24,6 @@
2324
android:id="@+id/textView_custom_dns_name"
2425
android:textAppearance="?android:attr/textAppearanceLarge"
2526
android:layout_alignParentTop="true"
26-
android:layout_alignParentLeft="true"
2727
android:layout_alignParentStart="true"/>
2828
<TextView
2929
android:layout_width="match_parent"
@@ -34,8 +34,7 @@
3434
android:id="@+id/textView_custom_dns_address"
3535
android:textAppearance="?android:attr/textAppearanceSmall"
3636
android:layout_alignParentBottom="true"
37-
android:layout_alignParentLeft="true"
3837
android:layout_alignParentStart="true"/>
3938

4039
</RelativeLayout>
41-
</androidx.cardview.widget.CardView>
40+
</androidx.cardview.widget.CardView>

‎app/src/main/res/layout/fragment_dns_servers.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
android:layout_height="match_parent"
1212
android:scrollbars="horizontal"
1313
android:layout_alignParentTop="true"
14-
android:layout_alignParentLeft="true"
1514
android:layout_alignParentStart="true"/>
1615

1716
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -23,4 +22,4 @@
2322
android:src="@drawable/ic_note_add"
2423
android:tint="#FFFFFF"/>
2524

26-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
25+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/fragment_dns_test.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,15 @@
4141
android:layout_alignParentStart="true"
4242
android:layout_marginTop="10dp"
4343
android:id="@+id/button_start_test"
44-
android:layout_alignParentEnd="true"
45-
android:layout_alignParentRight="true"
46-
android:layout_alignParentLeft="true"/>
44+
android:layout_alignParentEnd="true"/>
4745
<TextView
4846
android:layout_width="wrap_content"
4947
android:layout_height="wrap_content"
5048
android:layout_below="@+id/button_start_test"
5149
android:layout_alignParentStart="true"
52-
android:layout_alignParentLeft="true"
5350
android:layout_marginTop="10dp"
5451
android:id="@+id/textView_test_info"
5552
android:textIsSelectable="true"
5653
android:textSize="18sp"/>
5754
</RelativeLayout>
58-
</ScrollView>
55+
</ScrollView>

‎app/src/main/res/layout/fragment_main.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
app:layout_behavior="@string/appbar_scrolling_view_behavior"
1414
tools:context="org.itxtech.daedalus.fragment.HomeFragment">
1515
<ImageView
16-
android:contentDescription="icon"
1716
android:id="@+id/imageView_icon"
1817
android:layout_width="0dp"
1918
android:layout_height="0dp"
2019
android:clickable="false"
2120
app:srcCompat="@mipmap/ic_launcher"
2221
app:layout_widthPercent="40%"
2322
app:layout_heightPercent="20%"
24-
app:layout_marginTopPercent="5%"
23+
app:layout_marginTopPercent="10%"
2524
android:layout_alignParentTop="true" android:layout_centerHorizontal="true"/>
2625
<TextView
2726
android:text="@string/app_name"
@@ -39,6 +38,6 @@
3938
android:layout_width="wrap_content"
4039
android:layout_height="wrap_content"
4140
android:id="@+id/button_activate"
42-
app:layout_marginTopPercent="10%"
43-
android:layout_alignTop="@+id/textView_notice" android:layout_centerHorizontal="true"/>
41+
app:layout_marginTopPercent="15%"
42+
android:layout_alignTop="@+id/textView_app_name" android:layout_centerHorizontal="true"/>
4443
</androidx.percentlayout.widget.PercentRelativeLayout>

‎app/src/main/res/layout/fragment_rules.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
android:layout_height="match_parent"
1212
android:scrollbars="horizontal"
1313
android:layout_alignParentTop="true"
14-
android:layout_alignParentLeft="true"
1514
android:layout_alignParentStart="true"/>
1615

1716
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -23,4 +22,4 @@
2322
android:src="@drawable/ic_note_add"
2423
android:tint="#FFFFFF"/>
2524

26-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
25+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)