Rearrange buttons

This commit is contained in:
serso 2016-04-02 15:26:11 +02:00
parent f577dd77d8
commit 1a31c5a053
5 changed files with 6 additions and 7 deletions

View File

@ -84,10 +84,10 @@
a:baselineAligned="false" a:baselineAligned="false"
a:orientation="horizontal"> a:orientation="horizontal">
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_paste" /> <include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_percent" />
<include layout="@layout/cpp_app_button_1" /> <include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_2" /> <include layout="@layout/cpp_app_button_2" />

View File

@ -29,6 +29,5 @@
a:id="@id/cpp_button_6" a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit" style="?attr/cpp_button_style_digit"
a:text="6" a:text="6"
c:directionTextUp="√"
c:directionTextLeft="F" c:directionTextLeft="F"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />

View File

@ -28,5 +28,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_division" a:id="@id/cpp_button_division"
style="?attr/cpp_button_style_operation" style="?attr/cpp_button_style_operation"
c:directionTextUp="√"
a:text="/" a:text="/"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />

View File

@ -24,9 +24,11 @@
<org.solovyev.android.views.dragbutton.DirectionDragButton <org.solovyev.android.views.dragbutton.DirectionDragButton
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_multiplication" a:id="@id/cpp_button_multiplication"
style="?attr/cpp_button_style_operation" style="?attr/cpp_button_style_operation"
a:text="×" a:text="×"
app:directionTextDown="^2"
app:directionTextUp="^"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />

View File

@ -26,9 +26,6 @@
a:id="@id/cpp_button_percent" a:id="@id/cpp_button_percent"
style="?attr/cpp_button_style_control" style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
a:text="%" a:text="%"
app:directionTextDown="^2"
app:directionTextUp="^"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />