From bda3b05624a85772d2af74614153cf29062cdd6a Mon Sep 17 00:00:00 2001
From: serso <serso@serso-laptop.(none)>
Date: Sat, 29 Oct 2011 12:12:06 +0400
Subject: [PATCH] haptic feedback duration preference

---
 res/values-ru/strings.xml                     |  9 +++++++-
 res/values/arrays.xml                         | 11 +++++++++
 res/values/default_values.xml                 |  5 +++-
 res/values/strings.xml                        |  7 ++++++
 res/xml/main_preferences.xml                  |  6 +++++
 .../calculator/CalculatorActivity.java        |  4 ++--
 .../CalculatorPreferencesActivity.java        |  4 ++++
 .../view/widgets/OnClickListenerVibrator.java |  4 ++--
 .../view/widgets/VibratorContainer.java       | 23 ++++++++++++++-----
 .../org/solovyev/common/NumberParser.java     |  2 ++
 10 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cdb22f0e..dc32f56c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -107,7 +107,14 @@
 	<string name="p_layout_calculator">Калькулятор</string>
 	<string name="c_calc_layout_summary">Устанавливает раскладку кнопок</string>
 
-	<string name="c_calc_haptic_feedback_title">Тактильный ввод</string>
+	<string name="c_calc_haptic_feedback_title">Отклик на нажатие</string>
 	<string name="c_calc_haptic_feedback_summary">Включает/выключает вибрацию по нажатию клавиши</string>
 
+	<string name="p_calc_haptic_feedback_strength_short">Маленькая</string>
+	<string name="p_calc_haptic_feedback_strength_middle">Средняя</string>
+	<string name="p_calc_haptic_feedback_strength_long">Большая</string>
+
+	<string name="p_calc_haptic_feedback_duration_title">Длительность отклика</string>
+	<string name="p_calc_haptic_feedback_duration_summary">Длительность вибрации по нажатию клавиши</string>
+
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 19744b9e..3e88a0d8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -36,4 +36,15 @@
 		<item>main_calculator</item>
 	</string-array>
 
+	<string-array name="p_calc_haptic_feedback_duration_names">
+		<item>@string/p_calc_haptic_feedback_strength_short</item>
+		<item>@string/p_calc_haptic_feedback_strength_middle</item>
+		<item>@string/p_calc_haptic_feedback_strength_long</item>
+	</string-array>
+	<string-array name="p_calc_haptic_feedback_duration_values">
+		<item>30</item>
+		<item>60</item>
+		<item>100</item>
+	</string-array>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/default_values.xml b/res/values/default_values.xml
index eea88c45..80035004 100644
--- a/res/values/default_values.xml
+++ b/res/values/default_values.xml
@@ -34,6 +34,9 @@
 	<string name="p_calc_layout">main_calculator</string>
 
 	<string name="p_calc_grouping_separator_key">org.solovyev.android.calculator.CalculatorActivity_calc_grouping_separator</string>
-	<string name="p_calc_grouping_separator"> </string>
+	<string name="p_calc_grouping_separator">" "</string>
+
+	<string name="p_calc_haptic_feedback_duration_key">org.solovyev.android.calculator.CalculatorActivity_calc_haptic_feedback_duration_key</string>
+	<string name="p_calc_haptic_feedback_duration">" "</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d7fcd38c..30136621 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -111,4 +111,11 @@
 	<string name="c_calc_haptic_feedback_title">Haptic feedback</string>
 	<string name="c_calc_haptic_feedback_summary">Toggles vibration on button click</string>
 
+	<string name="p_calc_haptic_feedback_strength_short">Short</string>
+	<string name="p_calc_haptic_feedback_strength_middle">Middle</string>
+	<string name="p_calc_haptic_feedback_strength_long">Long</string>
+
+	<string name="p_calc_haptic_feedback_duration_title">Haptic feedback duration</string>
+	<string name="p_calc_haptic_feedback_duration_summary">Duration vibration on button click</string>
+
 </resources>
diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml
index e8cce53f..14adcc94 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/main_preferences.xml
@@ -40,6 +40,12 @@
 				a:title="@string/c_calc_haptic_feedback_title"
 				a:defaultValue="false"/>
 
+		<ListPreference a:key="@string/p_calc_haptic_feedback_duration_key"
+						a:title="@string/p_calc_haptic_feedback_duration_title"
+						a:entries="@array/p_calc_haptic_feedback_duration_names"
+						a:summary="@string/p_calc_haptic_feedback_duration_summary"
+						a:entryValues="@array/p_calc_haptic_feedback_duration_values"/>
+
 		<ListPreference a:key="@string/p_calc_theme_key"
 						a:title="@string/c_calc_theme"
 						a:entries="@array/p_theme_names"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index b300f15d..a943f0d4 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -152,7 +152,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 
 	private class OnDragListenerVibrator extends OnDragListenerWrapper {
 
-		private static final long VIBRATION_TIME = 50;
+		private static final float VIBRATION_TIME_SCALE = 0.5f;
 
 		@NotNull
 		private final VibratorContainer vibrator;
@@ -161,7 +161,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 									  @Nullable Vibrator vibrator,
 									  @NotNull SharedPreferences preferences) {
 			super(onDragListener);
-			this.vibrator = new VibratorContainer(vibrator, preferences, VIBRATION_TIME);
+			this.vibrator = new VibratorContainer(vibrator, preferences, VIBRATION_TIME_SCALE);
 		}
 
 		@Override
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
index 314f6808..dacae2ef 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import org.solovyev.android.calculator.model.CalculatorEngine;
+import org.solovyev.android.view.widgets.VibratorContainer;
 
 /**
  * User: serso
@@ -26,12 +27,15 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
 		final SharedPreferences preferences = getPreferenceManager().getSharedPreferences();
 		preferences.registerOnSharedPreferenceChangeListener(this);
 		onSharedPreferenceChanged(preferences, CalculatorEngine.ROUND_RESULT_P_KEY);
+		onSharedPreferenceChanged(preferences, VibratorContainer.HAPTIC_FEEDBACK_P_KEY);
 	}
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
 		if (CalculatorEngine.ROUND_RESULT_P_KEY.equals(key)) {
 			findPreference(CalculatorEngine.RESULT_PRECISION_P_KEY).setEnabled(preferences.getBoolean(key, true));
+		} else if (VibratorContainer.HAPTIC_FEEDBACK_P_KEY.equals(key)) {
+			findPreference(VibratorContainer.HAPTIC_FEEDBACK_DURATION_P_KEY).setEnabled(preferences.getBoolean(key, true));
 		}
 	}
 }
diff --git a/src/main/java/org/solovyev/android/view/widgets/OnClickListenerVibrator.java b/src/main/java/org/solovyev/android/view/widgets/OnClickListenerVibrator.java
index 39c30103..78c01d64 100644
--- a/src/main/java/org/solovyev/android/view/widgets/OnClickListenerVibrator.java
+++ b/src/main/java/org/solovyev/android/view/widgets/OnClickListenerVibrator.java
@@ -19,14 +19,14 @@ import org.jetbrains.annotations.Nullable;
 */
 public class OnClickListenerVibrator implements View.OnClickListener {
 
-	private static final long VIBRATION_TIME = 100;
+	private static final float VIBRATION_TIME_SCALE = 1.0f;
 
 	@NotNull
    	private VibratorContainer vibrator;
 
 	public OnClickListenerVibrator(@Nullable Vibrator vibrator,
 								   @NotNull SharedPreferences preferences) {
-		this.vibrator = new VibratorContainer(vibrator, preferences, VIBRATION_TIME);
+		this.vibrator = new VibratorContainer(vibrator, preferences, VIBRATION_TIME_SCALE);
 	}
 
 	@Override
diff --git a/src/main/java/org/solovyev/android/view/widgets/VibratorContainer.java b/src/main/java/org/solovyev/android/view/widgets/VibratorContainer.java
index 09999560..d85684ea 100644
--- a/src/main/java/org/solovyev/android/view/widgets/VibratorContainer.java
+++ b/src/main/java/org/solovyev/android/view/widgets/VibratorContainer.java
@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
 import android.os.Vibrator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.common.NumberMapper;
 
 /**
  * User: serso
@@ -18,18 +19,23 @@ import org.jetbrains.annotations.Nullable;
  */
 public class VibratorContainer implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-	private static final String HAPTIC_FEEDBACK_PREFERENCE = "org.solovyev.android.calculator.CalculatorModel_haptic_feedback";
+	public static final String HAPTIC_FEEDBACK_P_KEY = "org.solovyev.android.calculator.CalculatorModel_haptic_feedback";
+	public static final String HAPTIC_FEEDBACK_DURATION_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_calc_haptic_feedback_duration_key";
 
-	private final long defaultVibrationTime;
+	private final static NumberMapper<Long> mapper = new NumberMapper<Long>(Long.class);
+
+	private static final long defaultVibrationTime = 100;
+
+	private final float vibrationTimeScale;
 
 	@Nullable
 	private final Vibrator vibrator;
 
 	private long time = 0;
 
-	public VibratorContainer(@Nullable Vibrator vibrator, @NotNull SharedPreferences preferences, long defaultVibrationTime) {
+	public VibratorContainer(@Nullable Vibrator vibrator, @NotNull SharedPreferences preferences, float vibrationTimeScale) {
 		this.vibrator = vibrator;
-		this.defaultVibrationTime = defaultVibrationTime;
+		this.vibrationTimeScale = vibrationTimeScale;
 
 		preferences.registerOnSharedPreferenceChangeListener(this);
 		onSharedPreferenceChanged(preferences, null);
@@ -44,10 +50,15 @@ public class VibratorContainer implements SharedPreferences.OnSharedPreferenceCh
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences, @Nullable String key) {
-		if (preferences.getBoolean(HAPTIC_FEEDBACK_PREFERENCE, false)) {
-			this.time = defaultVibrationTime;
+		if (preferences.getBoolean(HAPTIC_FEEDBACK_P_KEY, false)) {
+			//noinspection ConstantConditions
+			this.time = getScaledValue(mapper.parseValue(preferences.getString(HAPTIC_FEEDBACK_DURATION_P_KEY, mapper.formatValue(getScaledValue(defaultVibrationTime)))));
 		} else {
 			this.time = 0;
 		}
 	}
+
+	private long getScaledValue(long vibrationTime) {
+		return (long) (vibrationTime * vibrationTimeScale);
+	}
 }
diff --git a/src/main/java/org/solovyev/common/NumberParser.java b/src/main/java/org/solovyev/common/NumberParser.java
index ce4bdb33..9cb7de97 100644
--- a/src/main/java/org/solovyev/common/NumberParser.java
+++ b/src/main/java/org/solovyev/common/NumberParser.java
@@ -33,6 +33,8 @@ public class NumberParser<T extends Number> implements Parser<T> {
 				result = (T) Integer.valueOf(value);
 			} else if (this.clazz.equals(Float.class)) {
 				result = (T) Float.valueOf(value);
+			} else if (this.clazz.equals(Long.class)) {
+				result = (T) Long.valueOf(value);
 			} else {
 				throw new UnsupportedOperationException(this.clazz + " is not supported!");
 			}