Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Fixes #2594 Fixes L10n with the prompt widget #2607

Merged
merged 1 commit into from
Jan 13, 2020
Merged

Fixes #2594 Fixes L10n with the prompt widget #2607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/res/layout/prompt_auth.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@

<CheckBox
android:id="@+id/showPasswordCheckbox"
android:layout_marginStart="5dp"
style="@style/settingsSwitch" />
style="@style/checkbox"
android:layout_marginStart="5dp"/>

</LinearLayout>

Expand Down
7 changes: 1 addition & 6 deletions app/src/main/res/layout/prompt_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,7 @@
android:layout_above="@+id/buttonsLayout">
<CheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:button="@drawable/checkbox"
android:layout_gravity="center_horizontal"
android:textSize="@dimen/text_medium_size"
android:text="Checkbox"
style="@style/checkbox"
tools:text="Checkbox" />
</FrameLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/dimen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

<!-- Prompt dialog -->
<dimen name="prompt_dialog_width">450dp</dimen>
<dimen name="prompt_dialog_height">365dp</dimen>
<dimen name="prompt_dialog_height">375dp</dimen>
<dimen name="prompt_dialog_padding_top">20dp</dimen>
<dimen name="prompt_dialog_padding_bottom">42dp</dimen>
<dimen name="prompt_dialog_padding_sides">64dp</dimen>
Expand Down
11 changes: 10 additions & 1 deletion app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,23 @@

<style name="settingsSwitch">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:switchMinWidth">0dp</item>
<item name="android:textOff">""</item>
<item name="android:textOn">""</item>
<item name="android:thumb">@drawable/switch_thumb</item>
<item name="android:track">@drawable/switch_track</item>
</style>

<style name="checkbox">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:button">@drawable/checkbox</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:textSize">@dimen/text_medium_size</item>
<item name="android:paddingStart">5dp</item>
</style>

<style name="settingsHelpButton">
<item name="android:layout_width">20dp</item>
<item name="android:layout_height">20dp</item>
Expand Down