Skip to content

Commit 3fd8e96

Browse files
ZenluaZenlua
committed
Update
1 parent ded3f0a commit 3fd8e96

2 files changed

Lines changed: 137 additions & 122 deletions

File tree

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

Lines changed: 68 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -24,77 +24,86 @@
2424
android:visibility="gone"
2525
app:tint="@color/kr_shortcut_color" />
2626

27-
<LinearLayout
27+
<RelativeLayout
2828
android:id="@+id/kr_layout_ac"
29-
android:layout_marginStart="10dp"
30-
android:layout_marginTop="10dp"
31-
android:layout_marginBottom="10dp"
32-
android:layout_alignParentStart="true"
33-
android:layout_centerVertical="true"
34-
android:gravity="center_vertical"
35-
android:layout_toStartOf="@id/kr_widget"
36-
android:layout_width="wrap_content"
29+
android:layout_width="match_parent"
3730
android:layout_height="wrap_content">
38-
<ImageView
39-
android:padding="0dp"
40-
android:id="@id/kr_icon"
41-
android:layout_marginStart="5dp"
42-
android:layout_gravity="center_vertical"
43-
android:layout_width="35dp"
44-
android:layout_height="35dp" />
4531

32+
<ImageView
33+
android:id="@id/kr_widget"
34+
android:layout_width="30dp"
35+
android:layout_height="30dp"
36+
android:layout_alignParentEnd="true"
37+
android:layout_centerVertical="true"
38+
android:layout_marginTop="16dp"
39+
android:layout_marginEnd="19.5dp"
40+
android:layout_marginBottom="10dp"
41+
android:alpha="0.9"
42+
android:padding="5dp"
43+
app:tint="?android:colorAccent" />
44+
4645
<LinearLayout
47-
android:layout_width="match_parent"
48-
android:layout_height="wrap_content"
46+
android:orientation="horizontal"
4947
android:layout_marginStart="10dp"
50-
android:orientation="vertical">
51-
52-
<TextView
53-
android:id="@id/kr_title"
48+
android:layout_marginTop="10dp"
49+
android:layout_marginBottom="10dp"
50+
android:layout_alignParentStart="true"
51+
android:layout_centerVertical="true"
52+
android:gravity="center_vertical"
53+
android:layout_toStartOf="@id/kr_widget"
54+
android:layout_width="match_parent"
55+
android:layout_height="wrap_content">
56+
<ImageView
57+
android:padding="0dp"
58+
android:id="@id/kr_icon"
59+
android:layout_marginStart="5dp"
60+
android:layout_gravity="center_vertical"
61+
android:layout_width="35dp"
62+
android:layout_height="35dp" />
63+
64+
<LinearLayout
5465
android:layout_width="match_parent"
5566
android:layout_height="wrap_content"
56-
style="@style/textTitle" />
57-
58-
<TextView
59-
android:id="@id/kr_desc"
60-
android:layout_width="wrap_content"
61-
android:layout_height="wrap_content"
62-
android:layout_marginTop="4dp"
63-
style="@style/textSmall" />
64-
65-
<TextView
66-
android:id="@id/kr_summary"
67-
android:layout_width="wrap_content"
68-
android:layout_height="wrap_content"
69-
android:layout_marginTop="4dp"
70-
android:textColor="?android:colorAccent"
71-
style="@style/textSmall"
72-
android:visibility="gone" />
73-
67+
android:layout_marginStart="10dp"
68+
android:orientation="vertical">
69+
70+
<TextView
71+
android:id="@id/kr_title"
72+
android:ellipsize="end"
73+
android:layout_width="match_parent"
74+
android:layout_height="wrap_content"
75+
style="@style/textTitle" />
76+
77+
<TextView
78+
android:id="@id/kr_desc"
79+
android:layout_width="wrap_content"
80+
android:layout_height="wrap_content"
81+
android:layout_marginTop="4dp"
82+
style="@style/textSmall"
83+
android:visibility="gone" />
84+
85+
<TextView
86+
android:id="@id/kr_summary"
87+
android:layout_width="wrap_content"
88+
android:layout_height="wrap_content"
89+
android:layout_marginTop="4dp"
90+
android:textColor="?android:colorAccent"
91+
style="@style/textSmall"
92+
android:visibility="gone" />
93+
94+
</LinearLayout>
7495
</LinearLayout>
75-
</LinearLayout>
76-
77-
<ImageView
78-
android:id="@id/kr_widget"
79-
android:layout_width="30dp"
80-
android:layout_height="30dp"
81-
android:layout_alignParentEnd="true"
82-
android:layout_centerVertical="true"
83-
android:layout_marginTop="16dp"
84-
android:layout_marginEnd="19.5dp"
85-
android:layout_marginBottom="10dp"
86-
android:alpha="0.9"
87-
android:padding="5dp"
88-
app:tint="?android:colorAccent" />
89-
96+
</RelativeLayout>
9097
<ImageView
9198
android:id="@+id/kr_extra_icon"
92-
android:layout_below="@id/kr_layout_ac"
99+
android:visibility="gone"
93100
android:layout_width="match_parent"
94101
android:layout_height="wrap_content"
95-
android:padding="16dp"
96-
android:adjustViewBounds="true"
102+
android:layout_marginBottom="16dp"
97103
android:scaleType="fitCenter"
98-
android:visibility="gone" />
104+
android:adjustViewBounds="true"
105+
android:layout_below="@id/kr_layout_ac"
106+
android:layout_marginStart="16dp"
107+
android:layout_marginEnd="16dp" />
99108

100109
</RelativeLayout>

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

Lines changed: 69 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -24,77 +24,83 @@
2424
android:visibility="gone"
2525
app:tint="@color/kr_shortcut_color" />
2626

27-
<LinearLayout
27+
<RelativeLayout
2828
android:id="@+id/kr_layout_ac"
29-
android:layout_marginStart="10dp"
30-
android:layout_marginTop="10dp"
31-
android:layout_marginBottom="10dp"
32-
android:layout_alignParentStart="true"
33-
android:layout_centerVertical="true"
34-
android:gravity="center_vertical"
35-
android:layout_toStartOf="@id/kr_switch"
36-
android:layout_width="wrap_content"
29+
android:layout_width="match_parent"
3730
android:layout_height="wrap_content">
38-
<ImageView
39-
android:padding="0dp"
40-
android:id="@id/kr_icon"
41-
android:layout_marginStart="5dp"
42-
android:layout_gravity="center_vertical"
43-
android:layout_width="35dp"
44-
android:layout_height="35dp" />
4531

46-
<LinearLayout
47-
android:layout_width="match_parent"
32+
<Switch
33+
android:id="@id/kr_switch"
34+
android:layout_width="wrap_content"
4835
android:layout_height="wrap_content"
36+
android:layout_alignParentEnd="true"
37+
android:layout_centerVertical="true"
38+
android:layout_marginTop="18dp"
39+
android:layout_marginEnd="8dp"
40+
android:layout_marginBottom="10dp"
41+
android:textOff=""
42+
android:textOn=""
43+
android:switchTextAppearance="@null"
44+
android:track="@drawable/kr_switch_track"
45+
android:thumb="@drawable/kr_switch_thumb"
46+
android:padding="5dp"
47+
android:layout_gravity="center_vertical"
48+
android:clickable="false"
49+
android:elevation="5dp"
50+
android:enabled="false"
51+
android:focusable="false" />
52+
53+
<LinearLayout
54+
android:orientation="horizontal"
4955
android:layout_marginStart="10dp"
50-
android:orientation="vertical">
51-
52-
<TextView
53-
android:id="@id/kr_title"
56+
android:layout_marginTop="10dp"
57+
android:layout_marginBottom="10dp"
58+
android:layout_alignParentStart="true"
59+
android:layout_centerVertical="true"
60+
android:gravity="center_vertical"
61+
android:layout_toStartOf="@id/kr_switch"
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content">
64+
<ImageView
65+
android:padding="0dp"
66+
android:id="@id/kr_icon"
67+
android:layout_marginStart="5dp"
68+
android:layout_gravity="center_vertical"
69+
android:layout_width="35dp"
70+
android:layout_height="35dp" />
71+
72+
<LinearLayout
5473
android:layout_width="match_parent"
5574
android:layout_height="wrap_content"
56-
style="@style/textTitle" />
57-
58-
<TextView
59-
android:id="@id/kr_desc"
60-
android:layout_width="wrap_content"
61-
android:layout_height="wrap_content"
62-
android:layout_marginTop="4dp"
63-
style="@style/textSmall"
64-
android:visibility="gone" />
65-
66-
<TextView
67-
android:id="@id/kr_summary"
68-
android:layout_width="wrap_content"
69-
android:layout_height="wrap_content"
70-
android:layout_marginTop="4dp"
71-
android:textColor="?android:colorAccent"
72-
style="@style/textSmall"
73-
android:visibility="gone" />
75+
android:layout_marginStart="10dp"
76+
android:orientation="vertical">
77+
78+
<TextView
79+
android:id="@id/kr_title"
80+
android:ellipsize="end"
81+
android:layout_width="match_parent"
82+
android:layout_height="wrap_content"
83+
style="@style/textTitle" />
84+
85+
<TextView
86+
android:id="@id/kr_desc"
87+
android:layout_width="wrap_content"
88+
android:layout_height="wrap_content"
89+
android:layout_marginTop="4dp"
90+
style="@style/textSmall"
91+
android:visibility="gone" />
92+
93+
<TextView
94+
android:id="@id/kr_summary"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:layout_marginTop="4dp"
98+
android:textColor="?android:colorAccent"
99+
style="@style/textSmall"
100+
android:visibility="gone" />
101+
</LinearLayout>
74102
</LinearLayout>
75-
</LinearLayout>
76-
77-
<Switch
78-
android:id="@id/kr_switch"
79-
android:layout_width="wrap_content"
80-
android:layout_height="wrap_content"
81-
android:layout_alignParentEnd="true"
82-
android:layout_centerVertical="true"
83-
android:layout_marginTop="18dp"
84-
android:layout_marginEnd="8dp"
85-
android:layout_marginBottom="10dp"
86-
android:textOff=""
87-
android:textOn=""
88-
android:switchTextAppearance="@null"
89-
android:track="@drawable/kr_switch_track"
90-
android:thumb="@drawable/kr_switch_thumb"
91-
android:padding="5dp"
92-
android:layout_gravity="center_vertical"
93-
android:clickable="false"
94-
android:elevation="5dp"
95-
android:enabled="false"
96-
android:focusable="false" />
97-
103+
</RelativeLayout>
98104
<ImageView
99105
android:id="@+id/kr_extra_icon"
100106
android:layout_below="@id/kr_layout_ac"

0 commit comments

Comments
 (0)