diff --git a/res/values/arrays.xml b/res/values/arrays.xml new file mode 100644 index 0000000..896c515 --- /dev/null +++ b/res/values/arrays.xml @@ -0,0 +1,7 @@ + + + + azerty + qwerty + + diff --git a/res/values/strings.xml b/res/values/strings.xml index e4629be..cc6169b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5,13 +5,21 @@ Keyboard 2.0 Settings Layout + Change keyboard layout + %s + + Azerty + Qwerty + Typing + Precision + Distance of corner values (%spx) Vibration - Vibration + Vibration Enable/Disable vibrations - Duration + Duration Change vibrations duration Other diff --git a/res/xml/settings.xml b/res/xml/settings.xml index e92fb2b..7902527 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -1,23 +1,36 @@ - + - - - + + + + - + - - + diff --git a/srcs/juloo.common/SlideBarPreference.java b/srcs/juloo.common/SlideBarPreference.java new file mode 100644 index 0000000..6bfb33e --- /dev/null +++ b/srcs/juloo.common/SlideBarPreference.java @@ -0,0 +1,127 @@ +package juloo.common; + +import android.content.Context; +import android.content.res.TypedArray; +import android.preference.DialogPreference; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; +import android.widget.SeekBar; + +/* +** SideBarPreference +** - +** Open a dialog showing a seekbar +** - +** xml attrs: +** android:defaultValue Default value (float) +** min min value (float) +** max max value (float) +** - +** Summary field allow to show the current value using %f or %s flag +*/ +public class SlideBarPreference extends DialogPreference + implements SeekBar.OnSeekBarChangeListener +{ + private static final int SEEKBAR_MAX = 1000; + + private LinearLayout _layout; + private TextView _textView; + private SeekBar _seekBar; + + private float _min; + private float _max; + private float _value; + + private String _initialSummary; + + public SlideBarPreference(Context context, AttributeSet attrs) + { + super(context, attrs); + _initialSummary = getSummary().toString(); + _textView = new TextView(context); + _textView.setPadding(48, 40, 48, 40); + _seekBar = new SeekBar(context); + _seekBar.setOnSeekBarChangeListener(this); + _seekBar.setMax(SEEKBAR_MAX); + _min = float_of_string(attrs.getAttributeValue(null, "min")); + _value = _min; + _max = Math.max(1f, float_of_string(attrs.getAttributeValue(null, "max"))); + _layout = new LinearLayout(getContext()); + _layout.setOrientation(LinearLayout.VERTICAL); + _layout.addView(_textView); + _layout.addView(_seekBar); + } + + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) + { + _value = (progress * _max) / SEEKBAR_MAX + _min; + updateText(); + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) + { + } + + @Override + public void onStopTrackingTouch(SeekBar seekBar) + { + } + + @Override + protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) + { + if (restorePersistedValue) + { + _value = getPersistedFloat(_min); + } + else + { + _value = (Float)defaultValue; + persistFloat(_value); + } + _seekBar.setProgress((int)((_value - _min) * SEEKBAR_MAX / _max)); + updateText(); + } + + @Override + protected Object onGetDefaultValue(TypedArray a, int index) + { + return (a.getFloat(index, _min)); + } + + @Override + protected void onDialogClosed(boolean positiveResult) + { + if (positiveResult) + persistFloat(_value); + } + + protected View onCreateDialogView() + { + ViewGroup parent = (ViewGroup)_layout.getParent(); + + if (parent != null) + parent.removeView(_layout); + return (_layout); + } + + private void updateText() + { + String f = String.format(_initialSummary, _value); + + _textView.setText(f); + setSummary(f); + } + + private static float float_of_string(String str) + { + if (str == null) + return (0f); + return (Float.parseFloat(str)); + } +} diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 2c2563a..c718152 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -6,6 +6,7 @@ import android.inputmethodservice.InputMethodService; import android.preference.PreferenceManager; import android.view.KeyEvent; import android.view.View; +import android.view.ViewGroup; public class Keyboard2 extends InputMethodService implements SharedPreferences.OnSharedPreferenceChangeListener @@ -25,10 +26,15 @@ public class Keyboard2 extends InputMethodService @Override public View onCreateInputView() { + ViewGroup parent = (ViewGroup)_inputView.getParent(); + + if (parent != null) + parent.removeView(_inputView); _inputView.reset(); return (_inputView); } + @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { _inputView.reset_prefs(this); diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index 4e41303..fd8a7ab 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -86,24 +86,35 @@ public class Keyboard2View extends View SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ime); _ime = ime; - _subValueDist = prefs.getFloat("sub_value_dist", _subValueDist); + try + { + _subValueDist = prefs.getFloat("sub_value_dist", _subValueDist); + } + catch (Exception e) + { + _subValueDist = 7.0f; + } _vibrateEnabled = prefs.getBoolean("vibrate_enabled", _vibrateEnabled); _vibrateDuration = prefs.getLong("vibrate_duration", _vibrateDuration); _longPressTimeout = prefs.getLong("longpress_timeout", _longPressTimeout); _longPressInterval = prefs.getLong("longpress_interval", _longPressInterval); _marginBottom = prefs.getFloat("margin_bottom", _marginBottom); - String keyboardLayout = prefs.getString("keyboard_layout", "azerty"); + String keyboardLayout = prefs.getString("keyboard_layout", null); + int xmlRes = 0; - if (keyboardLayout.equals("azerty")) // TODO change this - _keyboard = new KeyboardData(ime.getResources().getXml(R.xml.azerty)); - else - _keyboard = new KeyboardData(ime.getResources().getXml(R.xml.qwerty)); + if (keyboardLayout != null) + xmlRes = ime.getResources().getIdentifier(keyboardLayout, "xml", ime.getPackageName()); + if (xmlRes == 0) + xmlRes = R.xml.azerty; + _keyboard = new KeyboardData(ime.getResources().getXml(xmlRes)); + reset(); } public void reset() { _flags = 0; + _downKeys.clear(); requestLayout(); invalidate(); }