Skip to content

Commit abaca52

Browse files
committed
flip the order of top toolbar icons
1 parent 09c18aa commit abaca52

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

app/src/main/res/layout/keyboard_view_keyboard.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,27 @@
1515
app:layout_constraintStart_toStartOf="parent">
1616

1717
<ImageView
18-
android:id="@+id/settings_cog"
18+
android:id="@+id/clipboard_clear"
1919
android:layout_width="@dimen/toolbar_icon_height"
2020
android:layout_height="@dimen/toolbar_icon_height"
2121
android:layout_marginStart="@dimen/medium_margin"
2222
android:background="?android:attr/selectableItemBackgroundBorderless"
23-
android:contentDescription="@string/settings"
23+
android:contentDescription="@string/clear_clipboard_data"
2424
android:padding="@dimen/small_margin"
25-
android:src="@drawable/ic_settings_cog_vector"
25+
android:src="@drawable/ic_delete_vector"
2626
app:layout_constraintBottom_toBottomOf="parent"
2727
app:layout_constraintStart_toStartOf="parent"
2828
app:layout_constraintTop_toTopOf="parent" />
2929

30-
<ImageView
31-
android:id="@+id/pinned_clipboard_items"
32-
android:layout_width="@dimen/toolbar_icon_height"
33-
android:layout_height="@dimen/toolbar_icon_height"
34-
android:layout_marginStart="@dimen/medium_margin"
35-
android:background="?android:attr/selectableItemBackgroundBorderless"
36-
android:contentDescription="@string/settings"
37-
android:padding="@dimen/small_margin"
38-
android:src="@drawable/ic_clipboard_vector"
39-
app:layout_constraintBottom_toBottomOf="parent"
40-
app:layout_constraintStart_toEndOf="@+id/settings_cog"
41-
app:layout_constraintTop_toTopOf="parent" />
42-
4330
<RelativeLayout
4431
android:id="@+id/clipboard_value_holder"
4532
android:layout_width="0dp"
4633
android:layout_height="wrap_content"
47-
android:layout_marginStart="@dimen/normal_margin"
48-
android:layout_marginEnd="@dimen/normal_margin"
34+
android:layout_marginStart="@dimen/medium_margin"
35+
android:layout_marginEnd="@dimen/medium_margin"
4936
app:layout_constraintBottom_toBottomOf="parent"
50-
app:layout_constraintEnd_toStartOf="@+id/clipboard_clear"
51-
app:layout_constraintStart_toEndOf="@+id/pinned_clipboard_items"
37+
app:layout_constraintEnd_toStartOf="@+id/pinned_clipboard_items"
38+
app:layout_constraintStart_toEndOf="@+id/clipboard_clear"
5239
app:layout_constraintTop_toTopOf="parent">
5340

5441
<TextView
@@ -71,14 +58,27 @@
7158
</RelativeLayout>
7259

7360
<ImageView
74-
android:id="@+id/clipboard_clear"
61+
android:id="@+id/pinned_clipboard_items"
7562
android:layout_width="@dimen/toolbar_icon_height"
7663
android:layout_height="@dimen/toolbar_icon_height"
7764
android:layout_marginEnd="@dimen/medium_margin"
7865
android:background="?android:attr/selectableItemBackgroundBorderless"
79-
android:contentDescription="@string/clear_clipboard_data"
66+
android:contentDescription="@string/settings"
8067
android:padding="@dimen/small_margin"
81-
android:src="@drawable/ic_delete_vector"
68+
android:src="@drawable/ic_clipboard_vector"
69+
app:layout_constraintBottom_toBottomOf="parent"
70+
app:layout_constraintEnd_toStartOf="@+id/settings_cog"
71+
app:layout_constraintTop_toTopOf="parent" />
72+
73+
<ImageView
74+
android:id="@+id/settings_cog"
75+
android:layout_width="@dimen/toolbar_icon_height"
76+
android:layout_height="@dimen/toolbar_icon_height"
77+
android:layout_marginEnd="@dimen/medium_margin"
78+
android:background="?android:attr/selectableItemBackgroundBorderless"
79+
android:contentDescription="@string/settings"
80+
android:padding="@dimen/small_margin"
81+
android:src="@drawable/ic_settings_cog_vector"
8282
app:layout_constraintBottom_toBottomOf="parent"
8383
app:layout_constraintEnd_toEndOf="parent"
8484
app:layout_constraintTop_toTopOf="parent" />

0 commit comments

Comments
 (0)