norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

change divider attr to multiplication

Browse Source
This commit is contained in:
Adrian Ulrich 2015-10-05 20:28:01 +02:00
parent d4f17d2c9a
commit 1ede004545
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/seekbarpreference_attr.xml
View File

@ -2,7 +2,7 @@
<resources> <resources>
<declare-styleable name="SeekBarPreference"> <declare-styleable name="SeekBarPreference">
<attr name="sbpMaxValue" format="integer"/> <attr name="sbpMaxValue" format="integer"/>
<attr name="sbpSummaryValueDivider" format="float"/> <attr name="sbpSummaryValueMultiplication" format="float"/>
<attr name="sbpSummaryValueAddition" format="float"/> <attr name="sbpSummaryValueAddition" format="float"/>
<attr name="sbpSummaryText" format="string"/> <attr name="sbpSummaryText" format="string"/>
<attr name="sbpSummaryFormat" format="string"/> <attr name="sbpSummaryFormat" format="string"/>

5
res/xml/preference_replaygain.xml
View File

@ -43,8 +43,9 @@ THE SOFTWARE.
vanilla:sbpMaxValue="150" vanilla:sbpMaxValue="150"
vanilla:sbpSummaryFormat="%s%+.1fdB" vanilla:sbpSummaryFormat="%s%+.1fdB"
vanilla:sbpSummaryValueAddition="-75" vanilla:sbpSummaryValueAddition="-75"
vanilla:sbpSummaryValueDivider="5" vanilla:sbpSummaryValueMultiplication="0.2"
/> />
<!-- x0.2 = /5 -->
<ch.blinkenlights.android.vanilla.SeekBarPreference <ch.blinkenlights.android.vanilla.SeekBarPreference
android:key="replaygain_untagged_debump" android:key="replaygain_untagged_debump"
android:negativeButtonText="@null" android:negativeButtonText="@null"
@ -55,7 +56,7 @@ THE SOFTWARE.
vanilla:sbpSummaryText="@string/replaygain_untagged_debump_summary" vanilla:sbpSummaryText="@string/replaygain_untagged_debump_summary"
vanilla:sbpSummaryFormat="%s %.1fdB" vanilla:sbpSummaryFormat="%s %.1fdB"
vanilla:sbpSummaryValueAddition="-150" vanilla:sbpSummaryValueAddition="-150"
vanilla:sbpSummaryValueDivider="10" /> vanilla:sbpSummaryValueMultiplication="0.1" />
<Preference <Preference
android:selectable="false" android:selectable="false"

2
res/xml/preference_shake.xml
View File

@ -44,6 +44,6 @@ THE SOFTWARE.
android:title="@string/shake_threshold_title" android:title="@string/shake_threshold_title"
android:defaultValue="80" android:defaultValue="80"
vanilla:sbpMaxValue="300" vanilla:sbpMaxValue="300"
vanilla:sbpSummaryValueDivider="10" vanilla:sbpSummaryValueMultiplication="0.1"
android:dependency="enable_shake" /> android:dependency="enable_shake" />
</PreferenceScreen> </PreferenceScreen>

10
src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
View File

@ -64,9 +64,9 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
*/ */
private float mSummaryValueAddition; private float mSummaryValueAddition;
/** /**
* Divide summary value by this value * Multiply summary value by this value
*/ */
private float mSummaryValueDivider; private float mSummaryValueMultiplication;
/** /**
* TextView to display current summary * TextView to display current summary
*/ */
@ -89,7 +89,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.SeekBarPreference); TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.SeekBarPreference);
mMaxValue = a.getInteger(R.styleable.SeekBarPreference_sbpMaxValue, 0); mMaxValue = a.getInteger(R.styleable.SeekBarPreference_sbpMaxValue, 0);
mSummaryValueDivider = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueDivider, 0f); mSummaryValueMultiplication = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueMultiplication, 0f);
mSummaryValueAddition = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueAddition, 0f); mSummaryValueAddition = a.getFloat(R.styleable.SeekBarPreference_sbpSummaryValueAddition, 0f);
mSummaryFormat = a.getString(R.styleable.SeekBarPreference_sbpSummaryFormat); mSummaryFormat = a.getString(R.styleable.SeekBarPreference_sbpSummaryFormat);
mSummaryFormat = (mSummaryFormat == null ? "%s %.1f" : mSummaryFormat); mSummaryFormat = (mSummaryFormat == null ? "%s %.1f" : mSummaryFormat);
@ -128,8 +128,8 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
if (mSummaryValueAddition != 0f) if (mSummaryValueAddition != 0f)
fValue = fValue + mSummaryValueAddition; fValue = fValue + mSummaryValueAddition;
if (mSummaryValueDivider != 0f) if (mSummaryValueMultiplication != 0f)
fValue = fValue / mSummaryValueDivider; fValue = fValue * mSummaryValueMultiplication;
return String.format(mSummaryFormat, mSummaryText, fValue); return String.format(mSummaryFormat, mSummaryText, fValue);
} }