From f996d3a95430084a44101b7d4a1afdc2bf4bc1fa Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 15 Jan 2012 02:40:08 +0400
Subject: [PATCH] refactor

---
 res/layout-land/main_calculator.xml                       | 4 ++--
 res/layout-land/main_cellphone.xml                        | 4 ++--
 res/layout/calc_division_button.xml                       | 2 +-
 res/layout/calc_dot_button.xml                            | 2 +-
 res/layout/calc_eight_digit_button.xml                    | 2 +-
 res/layout/calc_empty_button.xml                          | 2 +-
 res/layout/calc_equals_button.xml                         | 2 +-
 res/layout/calc_five_digit_button.xml                     | 2 +-
 res/layout/calc_four_digit_button.xml                     | 2 +-
 res/layout/calc_functions_button.xml                      | 2 +-
 res/layout/calc_history_button.xml                        | 2 +-
 res/layout/calc_left_button.xml                           | 2 +-
 res/layout/calc_multiplication_button.xml                 | 2 +-
 res/layout/calc_nine_digit_button.xml                     | 2 +-
 res/layout/calc_one_digit_button.xml                      | 2 +-
 res/layout/calc_operators_button.xml                      | 2 +-
 res/layout/calc_plus_button.xml                           | 2 +-
 res/layout/calc_right_button.xml                          | 2 +-
 res/layout/calc_round_brackets_button.xml                 | 2 +-
 res/layout/calc_seven_digit_button.xml                    | 2 +-
 res/layout/calc_subtraction_button.xml                    | 2 +-
 res/layout/calc_three_digit_button.xml                    | 2 +-
 res/layout/calc_two_digit_button.xml                      | 2 +-
 res/layout/calc_vars_button.xml                           | 2 +-
 res/layout/calc_zero_digit_button.xml                     | 2 +-
 res/layout/drag_button_calibration.xml                    | 4 ++--
 .../solovyev/android/calculator/CalculatorActivity.java   | 4 +++-
 .../org/solovyev/android/calculator/CalculatorModel.java  | 2 +-
 .../solovyev/android/calculator/CursorDragProcessor.java  | 8 ++++----
 .../android/calculator/DigitButtonDragProcessor.java      | 8 ++++----
 .../solovyev/android/calculator/EvalDragProcessor.java    | 8 ++++----
 .../android/calculator/view/AngleUnitsButton.java         | 2 +-
 .../android/calculator/view/NumeralBasesButton.java       | 2 +-
 33 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/res/layout-land/main_calculator.xml b/res/layout-land/main_calculator.xml
index d56dee19..c466d2d5 100644
--- a/res/layout-land/main_calculator.xml
+++ b/res/layout-land/main_calculator.xml
@@ -24,7 +24,7 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/leftButton"
 																   c:textUp="◀◀"
@@ -67,7 +67,7 @@
 														   a:layout_height="fill_parent"
 														   a:layout_weight="1"/>
 
-			<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/rightButton"
 																   c:textUp="▶▶"
diff --git a/res/layout-land/main_cellphone.xml b/res/layout-land/main_cellphone.xml
index af5a1409..fdafbf58 100644
--- a/res/layout-land/main_cellphone.xml
+++ b/res/layout-land/main_cellphone.xml
@@ -18,7 +18,7 @@
 
 		<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
 
-			<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/leftButton"
 																   c:textUp="◀◀"
@@ -61,7 +61,7 @@
 														   a:layout_height="fill_parent"
 														   a:layout_weight="1"/>
 
-			<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+			<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 																   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 																   a:id="@+id/rightButton"
 																   c:textUp="▶▶"
diff --git a/res/layout/calc_division_button.xml b/res/layout/calc_division_button.xml
index e19550aa..82ffaf46 100644
--- a/res/layout/calc_division_button.xml
+++ b/res/layout/calc_division_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/divisionButton"
 													   c:textUp="%"
diff --git a/res/layout/calc_dot_button.xml b/res/layout/calc_dot_button.xml
index 741a3867..17c989ef 100644
--- a/res/layout/calc_dot_button.xml
+++ b/res/layout/calc_dot_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/squareBracketsButton"
 													   a:text="."
diff --git a/res/layout/calc_eight_digit_button.xml b/res/layout/calc_eight_digit_button.xml
index d3aca6b4..8e32e322 100644
--- a/res/layout/calc_eight_digit_button.xml
+++ b/res/layout/calc_eight_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/eightDigitButton" a:text="8"
 													   c:textUp="ln"
diff --git a/res/layout/calc_empty_button.xml b/res/layout/calc_empty_button.xml
index 651e2c56..0a4d6128 100644
--- a/res/layout/calc_empty_button.xml
+++ b/res/layout/calc_empty_button.xml
@@ -5,6 +5,6 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   style="?controlButtonStyle"/>
\ No newline at end of file
diff --git a/res/layout/calc_equals_button.xml b/res/layout/calc_equals_button.xml
index 188d3ab8..6d35f0b3 100644
--- a/res/layout/calc_equals_button.xml
+++ b/res/layout/calc_equals_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton
+<org.solovyev.android.view.drag.DirectionDragButton
 		xmlns:a="http://schemas.android.com/apk/res/android"
 		xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 		a:id="@+id/equalsButton"
diff --git a/res/layout/calc_five_digit_button.xml b/res/layout/calc_five_digit_button.xml
index ee62bf25..1b5c10cb 100644
--- a/res/layout/calc_five_digit_button.xml
+++ b/res/layout/calc_five_digit_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/fiveDigitButton"
 													   a:text="5"
diff --git a/res/layout/calc_four_digit_button.xml b/res/layout/calc_four_digit_button.xml
index 6e250b0e..17acfe6e 100644
--- a/res/layout/calc_four_digit_button.xml
+++ b/res/layout/calc_four_digit_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/fourDigitButton"
 													   a:text="4"
diff --git a/res/layout/calc_functions_button.xml b/res/layout/calc_functions_button.xml
index 5ff6a061..66674a3a 100644
--- a/res/layout/calc_functions_button.xml
+++ b/res/layout/calc_functions_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/functionsButton"
 													   a:text="ƒ(x)"
diff --git a/res/layout/calc_history_button.xml b/res/layout/calc_history_button.xml
index 22cfa1d7..dfb3b4ef 100644
--- a/res/layout/calc_history_button.xml
+++ b/res/layout/calc_history_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/historyButton"
 													   a:text="@string/c_history_button"
diff --git a/res/layout/calc_left_button.xml b/res/layout/calc_left_button.xml
index 43340b4b..fb80b8e5 100644
--- a/res/layout/calc_left_button.xml
+++ b/res/layout/calc_left_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/leftButton"
 													   c:textUp="◀◀"
diff --git a/res/layout/calc_multiplication_button.xml b/res/layout/calc_multiplication_button.xml
index ef1eac0d..ab577d24 100644
--- a/res/layout/calc_multiplication_button.xml
+++ b/res/layout/calc_multiplication_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/multiplicationButton"
 													   a:text="×"
diff --git a/res/layout/calc_nine_digit_button.xml b/res/layout/calc_nine_digit_button.xml
index 5e339232..74d1bfa2 100644
--- a/res/layout/calc_nine_digit_button.xml
+++ b/res/layout/calc_nine_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/nineDigitButton" a:text="9"
 													   c:textDown="e"
diff --git a/res/layout/calc_one_digit_button.xml b/res/layout/calc_one_digit_button.xml
index a282586b..a5311385 100644
--- a/res/layout/calc_one_digit_button.xml
+++ b/res/layout/calc_one_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/oneDigitButton"
 													   a:text="1"
diff --git a/res/layout/calc_operators_button.xml b/res/layout/calc_operators_button.xml
index 8e6d298a..78e793a3 100644
--- a/res/layout/calc_operators_button.xml
+++ b/res/layout/calc_operators_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   a:id="@+id/functionsButton"
 													   a:text="∂,…"
 													   a:onClick="operatorsButtonClickHandler"
diff --git a/res/layout/calc_plus_button.xml b/res/layout/calc_plus_button.xml
index 3a9997f9..cc6be7ba 100644
--- a/res/layout/calc_plus_button.xml
+++ b/res/layout/calc_plus_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/plusButton"
 													   c:directionTextScale="0.5"
diff --git a/res/layout/calc_right_button.xml b/res/layout/calc_right_button.xml
index 28394559..c51a0d3e 100644
--- a/res/layout/calc_right_button.xml
+++ b/res/layout/calc_right_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/rightButton"
 													   c:textUp="▶▶"
diff --git a/res/layout/calc_round_brackets_button.xml b/res/layout/calc_round_brackets_button.xml
index 9e16a1d5..73e1c89b 100644
--- a/res/layout/calc_round_brackets_button.xml
+++ b/res/layout/calc_round_brackets_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/roundBracketsButton"
 													   c:textUp="("
diff --git a/res/layout/calc_seven_digit_button.xml b/res/layout/calc_seven_digit_button.xml
index 07effc70..59417e4c 100644
--- a/res/layout/calc_seven_digit_button.xml
+++ b/res/layout/calc_seven_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/sevenDigitButton" a:text="7"
 													   c:textUp="i"
diff --git a/res/layout/calc_subtraction_button.xml b/res/layout/calc_subtraction_button.xml
index 09c7c109..4ce38f8b 100644
--- a/res/layout/calc_subtraction_button.xml
+++ b/res/layout/calc_subtraction_button.xml
@@ -5,7 +5,7 @@
   ~ For more information, please, contact se.solovyev@gmail.com
   ~ or visit http://se.solovyev.org
   -->
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/subtractionButton"
 													   c:textDown="∂,…"
diff --git a/res/layout/calc_three_digit_button.xml b/res/layout/calc_three_digit_button.xml
index c0516441..65bcc852 100644
--- a/res/layout/calc_three_digit_button.xml
+++ b/res/layout/calc_three_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/threeDigitButton"
 													   a:text="3"
diff --git a/res/layout/calc_two_digit_button.xml b/res/layout/calc_two_digit_button.xml
index 09bf4f9e..62dfdb34 100644
--- a/res/layout/calc_two_digit_button.xml
+++ b/res/layout/calc_two_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/twoDigitButton"
 													   a:text="2"
diff --git a/res/layout/calc_vars_button.xml b/res/layout/calc_vars_button.xml
index b2922747..0005f0f3 100644
--- a/res/layout/calc_vars_button.xml
+++ b/res/layout/calc_vars_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/varsButton"
 													   c:directionTextScale="0.5"
diff --git a/res/layout/calc_zero_digit_button.xml b/res/layout/calc_zero_digit_button.xml
index 08c863f3..fd5cbc4e 100644
--- a/res/layout/calc_zero_digit_button.xml
+++ b/res/layout/calc_zero_digit_button.xml
@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/zeroDigitButton"
 													   c:textUp="00"
diff --git a/res/layout/drag_button_calibration.xml b/res/layout/drag_button_calibration.xml
index c5753aa1..cf8e9b99 100644
--- a/res/layout/drag_button_calibration.xml
+++ b/res/layout/drag_button_calibration.xml
@@ -21,7 +21,7 @@
 					   a:layout_width="80dp"
 					   a:layout_height="80dp"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
+			<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonLeft"
 														   a:text=""
 														   c:textUp="@string/c_up"
 														   c:textDown="@string/c_down"
@@ -29,7 +29,7 @@
 														   a:layout_height="80dp"
 														   style="?digitButtonStyle"/>
 
-			<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
+			<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonRight"
 														   a:text=""
 														   c:textUp="@string/c_up"
 														   c:textDown="@string/c_down"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index f3998844..412152f3 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -40,9 +40,11 @@ import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.view.AngleUnitsButton;
 import org.solovyev.android.calculator.view.NumeralBasesButton;
+import org.solovyev.android.history.HistoryDragProcessor;
 import org.solovyev.android.prefs.IntegerPreference;
 import org.solovyev.android.prefs.Preference;
 import org.solovyev.android.view.*;
+import org.solovyev.android.view.drag.*;
 import org.solovyev.common.utils.Announcer;
 import org.solovyev.common.utils.Point2d;
 import org.solovyev.common.utils.StringUtils;
@@ -343,7 +345,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		}
 
 		@Override
-		public boolean onDrag(@NotNull DragButton dragButton, @NotNull org.solovyev.android.view.DragEvent event) {
+		public boolean onDrag(@NotNull DragButton dragButton, @NotNull org.solovyev.android.view.drag.DragEvent event) {
 			boolean result = super.onDrag(dragButton, event);
 
 			if (result) {
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index cf261d69..a7c7871f 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -23,7 +23,7 @@ import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.CursorControl;
-import org.solovyev.android.HistoryControl;
+import org.solovyev.android.history.HistoryControl;
 import org.solovyev.android.calculator.history.CalculatorHistory;
 import org.solovyev.android.calculator.history.CalculatorHistoryState;
 import org.solovyev.android.calculator.history.TextViewEditorAdapter;
diff --git a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
index d25e425b..401d400f 100644
--- a/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
@@ -8,10 +8,10 @@ package org.solovyev.android.calculator;
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.CursorControl;
-import org.solovyev.android.view.DirectionDragButton;
-import org.solovyev.android.view.DragButton;
-import org.solovyev.android.view.DragDirection;
-import org.solovyev.android.view.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DragDirection;
+import org.solovyev.android.view.drag.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DirectionDragButton;
+import org.solovyev.android.view.drag.DragButton;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
index 82fc5b3a..936bb202 100644
--- a/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
@@ -7,10 +7,10 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.DirectionDragButton;
-import org.solovyev.android.view.DragDirection;
-import org.solovyev.android.view.DragButton;
-import org.solovyev.android.view.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DragDirection;
+import org.solovyev.android.view.drag.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DirectionDragButton;
+import org.solovyev.android.view.drag.DragButton;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
index 43c42b58..f2fc386a 100644
--- a/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
+++ b/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
@@ -8,10 +8,10 @@ package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.view.DirectionDragButton;
-import org.solovyev.android.view.DragButton;
-import org.solovyev.android.view.DragDirection;
-import org.solovyev.android.view.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DragDirection;
+import org.solovyev.android.view.drag.SimpleOnDragListener;
+import org.solovyev.android.view.drag.DirectionDragButton;
+import org.solovyev.android.view.drag.DragButton;
 import org.solovyev.common.utils.Point2d;
 
 /**
diff --git a/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
index ed5f25e3..9a105ea2 100644
--- a/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
+++ b/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.DirectionDragButton;
+import org.solovyev.android.view.drag.DirectionDragButton;
 
 /**
  * User: serso
diff --git a/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
index 8701cff1..6afac4fe 100644
--- a/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
+++ b/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.view.DirectionDragButton;
+import org.solovyev.android.view.drag.DirectionDragButton;
 
 /**
  * User: serso