TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move units to copy/paste buttons

Browse Source
This commit is contained in:
serso
2016-03-10 15:21:46 +01:00
parent 5b7205b299
commit 9ea6349946
14 changed files with 137 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/cpp_app_button_6.xml
View File

@@ -22,14 +22,12 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.view.AngleUnitsButton
<org.solovyev.android.views.dragbutton.DirectionDragButton
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit"
a:text="6"
c:directionTextDown="rad"
c:directionTextLeft="F"
c:directionTextUp="deg"
tools:ignore="HardcodedText" />

10
app/src/main/res/layout/cpp_app_button_clear.xml
View File

@@ -22,13 +22,9 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.view.NumeralBasesButton
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
<Button
a:id="@id/cpp_button_clear"
style="?attr/cpp_button_style_control_image"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="@string/c_clear"
a:textStyle="bold"
c:directionTextDown="bin"
c:directionTextLeft="hex"
c:directionTextUp="dec" />
a:textStyle="bold"/>

13
app/src/main/res/layout/cpp_app_button_copy.xml
View File

@@ -22,8 +22,13 @@
~ Site: http://se.solovyev.org
-->
<ImageButton
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_copy"
<org.solovyev.android.calculator.view.NumeralBasesButton
android:id="@id/cpp_button_copy"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/ic_content_copy_white_48dp" />
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:src="@drawable/ic_content_copy_white_48dp"
app:directionTextScale="@dimen/cpp_direction_text_scale_units"
app:directionTextDown="bin"
app:directionTextLeft="hex"
app:directionTextUp="dec"/>

12
app/src/main/res/layout/cpp_app_button_paste.xml
View File

@@ -22,8 +22,12 @@
~ Site: http://se.solovyev.org
-->
<ImageButton
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_paste"
<org.solovyev.android.calculator.view.AngleUnitsButton
android:id="@id/cpp_button_paste"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/ic_content_paste_white_48dp" />
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:directionTextScale="@dimen/cpp_direction_text_scale_units"
android:src="@drawable/ic_content_paste_white_48dp"
app:directionTextDown="rad"
app:directionTextUp="deg"/>

1
app/src/main/res/values/dimens.xml
View File

@@ -11,6 +11,7 @@
<dimen name="cpp_direction_text_default_padding">2dp</dimen>
<dimen name="cpp_direction_text_min_size">9dp</dimen>
<item name="cpp_direction_text_scale" format="float" type="dimen">0.45</item>
<item name="cpp_direction_text_scale_units" format="float" type="dimen">0.35</item>
<dimen name="cpp_button_corner">1dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding">4dp</dimen>