Skip to content

Commit

Permalink
fix: show buttons for name conflicts dialog properly in every language
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuancaG05
JuancaG05 committed Sep 25, 2024
1 parent 5380d21 commit 642c5d2
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions owncloudApp/src/main/res/layout/dialog_file_already_exists.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,31 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:gravity="end"
android:orientation="horizontal">
android:orientation="vertical">

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/dialog_file_already_exists_skip"
android:id="@+id/dialog_file_already_exists_replace"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_feature_skip_button" />
android:gravity="end|center_vertical"
android:text="@string/conflict_replace" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/dialog_file_already_exists_replace"
android:id="@+id/dialog_file_already_exists_keep_both"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/conflict_replace" />
android:gravity="end|center_vertical"
android:text="@string/conflict_keep_both" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/dialog_file_already_exists_keep_both"
android:id="@+id/dialog_file_already_exists_skip"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/conflict_keep_both" />
android:gravity="end|center_vertical"
android:text="@string/welcome_feature_skip_button" />

</LinearLayout>
</LinearLayout>
Expand Down

0 comments on commit 642c5d2

Please sign in to comment.