Skip to content

fix: deg text to symbol. #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2019
Merged

fix: deg text to symbol. #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,15 @@ public void onClick(View view) {
seekBar.setOnSeekChangeListener(new IndicatorSeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float progressFloat, boolean fromUserTouch) {
String valueText = progress + " " + unit;
String valueText;
switch (unit) {
case "\u00b0":
valueText = progress + unit;
break;
default:
valueText = progress + " " + unit;
}

if (waveMonSelected) {
waveMonPropValueSelect.setText(valueText);
} else {
Expand Down Expand Up @@ -813,7 +821,14 @@ private void toggleDigitalMode(WaveConst mode) {

private void fetchPropertyValue(WaveConst btnActive, WaveConst property, String unit, TextView propTextView) {
Double value = (double) WaveGeneratorCommon.wave.get(btnActive).get(property);
String valueText = value.intValue() + " " + unit;
String valueText;
switch (unit) {
case "\u00b0":
valueText = value.intValue() + unit;
break;
default:
valueText = value.intValue() + " " + unit;
}
propTextView.setText(valueText);
}

Expand Down Expand Up @@ -908,7 +923,14 @@ private void setValue() {
setWave();
previewWave();
Double dValue = (double) value;
String valueText = String.valueOf(dValue.intValue()) + " " + unit;
String valueText;
switch (unit) {
case "\u00b0":
valueText = String.valueOf(dValue.intValue()) + unit;
break;
default:
valueText = String.valueOf(dValue.intValue()) + " " + unit;
}
activePropTv.setText(valueText);
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@
<string name="unit_hz">Hz</string>
<string name="text_phase_colon">Phase :</string>
<string name="text_phase">Phase</string>
<string name="deg_text">deg</string>
<string name="deg_text">\u00b0</string>
<string name="selected_text_holder">Wave Frequency :</string>
<string name="text_sq1">SQR1</string>
<string name="text_sq2">SQR2</string>
Expand All @@ -678,7 +678,7 @@
<string name="view_text">View</string>
<string name="produce_sound_text">Produce Sound</string>
<string name="save_text">Save</string>
<string name="phase_holder_text">45 deg</string>
<string name="phase_holder_text">45\u00b0</string>
<string name="duty_holder_text">50 %</string>
<string name="open_instrument">Open instrument</string>

Expand Down