set the default value in OneTimeCommunication and CopySenttoIt

parent 628c9287
...@@ -35,20 +35,20 @@ public enum ViewType { ...@@ -35,20 +35,20 @@ public enum ViewType {
this.id = id; this.id = id;
this.displayString = displayString; this.displayString = displayString;
} }
/* getters */ /* getters */
public static int getId(ViewType viewType) { public static int getId(ViewType viewType) {
return viewType.id; return viewType.id;
} }
public int getId() { public int getId() {
return this.id; return this.id;
} }
public static String getDisplayString(ViewType viewType) { public static String getDisplayString(ViewType viewType) {
return viewType.displayString; return viewType.displayString;
} }
public String getDisplayString() { public String getDisplayString() {
return this.displayString; return this.displayString;
} }
......
...@@ -210,8 +210,8 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -210,8 +210,8 @@ public class CatalogueVariableScreen extends AppCompatActivity {
shortDescriptionView.setMovementMethod(LinkMovementMethod.getInstance()); shortDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription, Html.FROM_HTML_MODE_LEGACY)); shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription, Html.FROM_HTML_MODE_LEGACY));
} else { } else {
shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription)); shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription));
} }
mContainerLayout.addView(shortDescriptionView, childControlViewLayoutParams); mContainerLayout.addView(shortDescriptionView, childControlViewLayoutParams);
......
...@@ -42,7 +42,7 @@ public class Util { ...@@ -42,7 +42,7 @@ public class Util {
case YES_NO: case YES_NO:
Spinner spinner = new Spinner(context); Spinner spinner = new Spinner(context);
ArrayAdapter<String> spinnerArrayAdapter = ArrayAdapter<String> spinnerArrayAdapter =
new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, new String[] {"Yes", "No"}); new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, new String[] {"None","Yes", "No"});
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(spinnerArrayAdapter); spinner.setAdapter(spinnerArrayAdapter);
return spinner; return spinner;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment