Skip to content

Commit a2f3b43

Browse files
authored
Merge pull request #5316 from vector-im/feature/fga/update_reaction_button_layout
#5313: Update reaction button layout.
2 parents 3707b4e + e3b67fe commit a2f3b43

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

changelog.d/5313.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update reaction button layout.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<vector android:height="14dp" android:viewportHeight="16"
2-
android:viewportWidth="16" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
3-
<path android:fillColor="#737D8C" android:fillType="evenOdd" android:pathData="M13.3334,0.667C12.9652,0.667 12.6667,0.9655 12.6667,1.3337V2.667L11.3334,2.667C10.9652,2.667 10.6667,2.9655 10.6667,3.3337C10.6667,3.7018 10.9652,4.0003 11.3334,4.0003H12.6667V5.3337C12.6667,5.7018 12.9652,6.0003 13.3334,6.0003C13.7016,6.0003 14,5.7018 14,5.3337V4.0003H15.3334C15.7016,4.0003 16,3.7018 16,3.3337C16,2.9655 15.7016,2.667 15.3334,2.667L14,2.667V1.3337C14,0.9655 13.7016,0.667 13.3334,0.667ZM4.6667,6.3337C4.6667,5.7803 5.1134,5.3337 5.6667,5.3337C6.22,5.3337 6.6667,5.7803 6.6667,6.3337C6.6667,6.887 6.22,7.3337 5.6667,7.3337C5.1134,7.3337 4.6667,6.887 4.6667,6.3337ZM10.3334,7.3337C10.8867,7.3337 11.3334,6.887 11.3334,6.3337C11.3334,5.7803 10.8867,5.3337 10.3334,5.3337C9.78,5.3337 9.3334,5.7803 9.3334,6.3337C9.3334,6.887 9.78,7.3337 10.3334,7.3337ZM8,11.667C9.5534,11.667 10.8734,10.6937 11.4067,9.3337H4.5934C5.1267,10.6937 6.4467,11.667 8,11.667ZM2.6667,8.0003C2.6667,5.0548 5.0545,2.667 8,2.667C8.4073,2.667 8.803,2.7125 9.1828,2.7985C9.542,2.8797 9.8989,2.6545 9.9802,2.2954C10.0615,1.9363 9.8362,1.5793 9.4771,1.498C9.0014,1.3903 8.5069,1.3337 8,1.3337C4.3181,1.3337 1.3334,4.3184 1.3334,8.0003C1.3334,11.6822 4.3181,14.667 8,14.667C11.6819,14.667 14.6667,11.6822 14.6667,8.0003C14.6667,7.8589 14.6623,7.7184 14.6536,7.579C14.6306,7.2115 14.3141,6.9322 13.9467,6.9552C13.5792,6.9781 13.2999,7.2946 13.3228,7.6621C13.3298,7.7738 13.3334,7.8866 13.3334,8.0003C13.3334,10.9458 10.9456,13.3337 8,13.3337C5.0545,13.3337 2.6667,10.9458 2.6667,8.0003Z"/>
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="15dp"
3+
android:height="15dp"
4+
android:viewportWidth="15"
5+
android:viewportHeight="15">
6+
<path
7+
android:pathData="M12.3334,0.667C11.9652,0.667 11.6667,0.9655 11.6667,1.3337V2.667L10.3334,2.667C9.9652,2.667 9.6667,2.9655 9.6667,3.3337C9.6667,3.7018 9.9652,4.0003 10.3334,4.0003H11.6667V5.3337C11.6667,5.7018 11.9652,6.0003 12.3334,6.0003C12.7016,6.0003 13,5.7018 13,5.3337V4.0003H14.3334C14.7016,4.0003 15,3.7018 15,3.3337C15,2.9655 14.7016,2.667 14.3334,2.667L13,2.667V1.3337C13,0.9655 12.7016,0.667 12.3334,0.667ZM3.6667,6.3337C3.6667,5.7803 4.1134,5.3337 4.6667,5.3337C5.22,5.3337 5.6667,5.7803 5.6667,6.3337C5.6667,6.887 5.22,7.3337 4.6667,7.3337C4.1134,7.3337 3.6667,6.887 3.6667,6.3337ZM9.3334,7.3337C9.8867,7.3337 10.3334,6.887 10.3334,6.3337C10.3334,5.7803 9.8867,5.3337 9.3334,5.3337C8.78,5.3337 8.3334,5.7803 8.3334,6.3337C8.3334,6.887 8.78,7.3337 9.3334,7.3337ZM7.0001,11.667C8.5534,11.667 9.8734,10.6937 10.4067,9.3337H3.5934C4.1267,10.6937 5.4467,11.667 7.0001,11.667ZM1.6667,8.0003C1.6667,5.0548 4.0545,2.667 7,2.667C7.4072,2.667 7.803,2.7125 8.1828,2.7985C8.542,2.8797 8.8989,2.6545 8.9802,2.2954C9.0615,1.9363 8.8362,1.5793 8.4771,1.498C8.0014,1.3903 7.5069,1.3337 7,1.3337C3.3181,1.3337 0.3334,4.3184 0.3334,8.0003C0.3334,11.6822 3.3181,14.667 7,14.667C10.6819,14.667 13.6667,11.6822 13.6667,8.0003C13.6667,7.8589 13.6623,7.7184 13.6536,7.579C13.6306,7.2115 13.3141,6.9322 12.9467,6.9552C12.5792,6.9781 12.2999,7.2946 12.3228,7.6621C12.3298,7.7738 12.3334,7.8866 12.3334,8.0003C12.3334,10.9458 9.9456,13.3337 7,13.3337C4.0545,13.3337 1.6667,10.9458 1.6667,8.0003Z"
8+
android:fillColor="#737D8C"
9+
android:fillType="evenOdd"/>
410
</vector>

vector/src/main/res/layout/reaction_button.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<merge xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
43
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="wrap_content"
65
android:layout_height="wrap_content"
@@ -29,17 +28,14 @@
2928

3029
<TextView
3130
android:id="@+id/reactionCount"
32-
style="@style/Widget.Vector.TextView.Micro"
31+
style="@style/Widget.Vector.TextView.Caption"
3332
android:layout_width="wrap_content"
3433
android:layout_height="wrap_content"
35-
android:layout_marginStart="2dp"
34+
android:layout_marginStart="4dp"
3635
android:gravity="center"
3736
android:maxLines="1"
3837
android:textColor="?vctr_content_secondary"
3938
android:textStyle="bold"
40-
app:autoSizeMaxTextSize="14sp"
41-
app:autoSizeMinTextSize="8sp"
42-
app:autoSizeTextType="uniform"
4339
tools:text="13450" />
4440

4541
</merge>

0 commit comments

Comments
 (0)