mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-30 03:30:30 +02:00
Code Issues Releases Wiki Activity

Merge getNameText() into getName()

Browse Source
This commit is contained in:
Erik Johansson
2018-02-22 19:27:36 +01:00
parent f0940e7dee
commit f3c5d2fd75
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
View File

@@ -330,7 +330,7 @@ public class MeasurementPreferences extends PreferenceFragment implements Shared
parentGroup = parent; parentGroup = parent;
measurement = measurementView; measurement = measurementView;
setIcon(measurement.getIcon()); setIcon(measurement.getIcon());
setTitle(measurement.getNameText()); setTitle(measurement.getName());
} }
public PreferenceGroup getParent() { public PreferenceGroup getParent() {

3
android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
View File

@@ -271,7 +271,8 @@ public abstract class FloatMeasurementView extends MeasurementView {
return value; return value;
} }
public String getName() { @Override
public CharSequence getName() {
return nameText; return nameText;
} }

4
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -247,7 +247,7 @@ public abstract class MeasurementView extends TableLayout {
public abstract void updatePreferences(SharedPreferences preferences); public abstract void updatePreferences(SharedPreferences preferences);
public CharSequence getNameText() { return nameView.getText(); } public CharSequence getName() { return nameView.getText(); }
public abstract String getValueAsString(); public abstract String getValueAsString();
public void appendDiffValue(SpannableStringBuilder builder) { } public void appendDiffValue(SpannableStringBuilder builder) { }
public Drawable getIcon() { return iconView.getDrawable(); } public Drawable getIcon() { return iconView.getDrawable(); }
@@ -379,7 +379,7 @@ public abstract class MeasurementView extends TableLayout {
protected AlertDialog getInputDialog() { protected AlertDialog getInputDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(getNameText()); builder.setTitle(getName());
builder.setIcon(getIcon()); builder.setIcon(getIcon());
final EditText input = new EditText(getContext()); final EditText input = new EditText(getContext());