Use Drag Button library
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,4 +21,4 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control" />
|
||||
<org.solovyev.android.views.dragbutton.DirectionDragButton style="?attr/cpp_button_style_control" />
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<org.solovyev.android.views.dragbutton.DirectionDragButton
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:c="http://schemas.android.com/apk/res-auto"
|
||||
a:id="@id/cpp_button_history"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<org.solovyev.android.views.dragbutton.DirectionDragButton
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
a:id="@id/cpp_button_operators"
|
||||
|
@@ -21,7 +21,7 @@
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<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"
|
||||
|
@@ -57,7 +57,7 @@
|
||||
a:background="?attr/cpp_main_bg"
|
||||
a:padding="3dp">
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<org.solovyev.android.views.dragbutton.DirectionDragButton
|
||||
a:id="@+id/wizard_mode_button"
|
||||
style="?attr/cpp_button_style_operation"
|
||||
a:layout_width="100dp"
|
||||
|
@@ -42,7 +42,7 @@
|
||||
a:text="@string/cpp_wizard_dragbutton_action_center"
|
||||
a:textStyle="bold" />
|
||||
|
||||
<org.solovyev.android.calculator.drag.DirectionDragButton
|
||||
<org.solovyev.android.views.dragbutton.DirectionDragButton
|
||||
a:id="@+id/wizard_dragbutton"
|
||||
style="?attr/cpp_button_style_operation"
|
||||
a:layout_width="wrap_content"
|
||||
|
@@ -36,6 +36,5 @@
|
||||
<dimen name="activity_horizontal_margin">5dp</dimen>
|
||||
<dimen name="activity_vertical_margin">5dp</dimen>
|
||||
<dimen name="control_margin">5dp</dimen>
|
||||
<dimen name="cpp_min_drag_distance">25dp</dimen>
|
||||
<dimen name="cpp_onscreen_main_padding">1dp</dimen>
|
||||
</resources>
|
@@ -21,15 +21,6 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<string name="p_drag_distance_key" translatable="false">org.solovyev.android.calculator.DragButtonCalibrationActivity_distance</string>
|
||||
<string name="p_drag_distance" translatable="false">35;350</string>
|
||||
|
||||
<string name="p_drag_angle_key" translatable="false">org.solovyev.android.calculator.DragButtonCalibrationActivity_angle</string>
|
||||
<string name="p_drag_angle" translatable="false">0;45</string>
|
||||
|
||||
<string name="p_drag_duration_key" translatable="false">org.solovyev.android.calculator.DragButtonCalibrationActivity_duration</string>
|
||||
<string name="p_drag_duration" translatable="false">40;2500</string>
|
||||
|
||||
<string name="p_calc_result_precision_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_result_precision</string>
|
||||
<string name="p_calc_result_precision" translatable="false">5</string>
|
||||
|
||||
|
Reference in New Issue
Block a user