From 5ec2726d6e783063707551be2ac109595ab35737 Mon Sep 17 00:00:00 2001 From: dheerajkotwani Date: Fri, 24 Jan 2020 16:12:56 +0530 Subject: [PATCH 1/2] fix: Input of large values in setting --- .../fragments/NeuroSettingsFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java index f3ce40b1..61dd91d5 100644 --- a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java +++ b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java @@ -57,15 +57,15 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin // TODO: Set limits to following preferences case KEY_SAMPLES: samplesPref.setSummary(samplesPref.getText() + " sample" + - pluralize(Integer.valueOf(samplesPref.getText()))); + pluralize(samplesPref.getText())); break; case KEY_BINS: binsPref.setSummary(binsPref.getText() + " bin" + - pluralize(Integer.valueOf(binsPref.getText()))); + pluralize(binsPref.getText())); break; case KEY_CHANNELS: channelsPref.setSummary(channelsPref.getText() + " channel" + - pluralize(Integer.valueOf(channelsPref.getText()))); + pluralize(channelsPref.getText())); break; default: break; @@ -91,15 +91,15 @@ public void onDestroyView() { public void onResume() { super.onResume(); samplesPref.setSummary(samplesPref.getText() + " sample" + - pluralize(Integer.valueOf(samplesPref.getText()))); + pluralize(samplesPref.getText())); binsPref.setSummary(binsPref.getText() + " bin" + - pluralize(Integer.valueOf(binsPref.getText()))); + pluralize(binsPref.getText())); channelsPref.setSummary(channelsPref.getText() + " channel" + - pluralize(Integer.valueOf(channelsPref.getText()))); + pluralize(channelsPref.getText())); } - private String pluralize(int count) { - return count > 1 ? "s" : ""; + private String pluralize(String text) { + return (text.equals("0") || text.equals("1")) ? "" : "s"; } @Override From 4b4d71bc70dedaa79b7757ff8b10178f49693f51 Mon Sep 17 00:00:00 2001 From: dheerajkotwani Date: Fri, 24 Jan 2020 16:51:49 +0530 Subject: [PATCH 2/2] fix: Input of large values in setting --- .../main/java/io/neurolab/fragments/NeuroSettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java index 61dd91d5..523000a9 100644 --- a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java +++ b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java @@ -99,7 +99,7 @@ public void onResume() { } private String pluralize(String text) { - return (text.equals("0") || text.equals("1")) ? "" : "s"; + return ("0".equals(text) || "1".equals(text)) ? "" : "s"; } @Override