Skip to content

Commit 642c5d2

Browse files
committed
fix: show buttons for name conflicts dialog properly in every language
1 parent 5380d21 commit 642c5d2

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

owncloudApp/src/main/res/layout/dialog_file_already_exists.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,31 @@
5353
android:layout_height="wrap_content"
5454
android:layout_marginTop="@dimen/activity_horizontal_margin"
5555
android:gravity="end"
56-
android:orientation="horizontal">
56+
android:orientation="vertical">
5757

5858
<androidx.appcompat.widget.AppCompatButton
59-
android:id="@+id/dialog_file_already_exists_skip"
59+
android:id="@+id/dialog_file_already_exists_replace"
6060
style="@style/Button.Borderless"
6161
android:layout_width="wrap_content"
6262
android:layout_height="wrap_content"
63-
android:text="@string/welcome_feature_skip_button" />
63+
android:gravity="end|center_vertical"
64+
android:text="@string/conflict_replace" />
6465

6566
<androidx.appcompat.widget.AppCompatButton
66-
android:id="@+id/dialog_file_already_exists_replace"
67+
android:id="@+id/dialog_file_already_exists_keep_both"
6768
style="@style/Button.Borderless"
6869
android:layout_width="wrap_content"
6970
android:layout_height="wrap_content"
70-
android:text="@string/conflict_replace" />
71+
android:gravity="end|center_vertical"
72+
android:text="@string/conflict_keep_both" />
7173

7274
<androidx.appcompat.widget.AppCompatButton
73-
android:id="@+id/dialog_file_already_exists_keep_both"
75+
android:id="@+id/dialog_file_already_exists_skip"
7476
style="@style/Button.Borderless"
7577
android:layout_width="wrap_content"
7678
android:layout_height="wrap_content"
77-
android:text="@string/conflict_keep_both" />
79+
android:gravity="end|center_vertical"
80+
android:text="@string/welcome_feature_skip_button" />
7881

7982
</LinearLayout>
8083
</LinearLayout>

0 commit comments

Comments
 (0)