Merge remote-tracking branch 'origin/development' into development

app/build.gradle

@@ -34,7 +34,7 @@ android {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion 24
         targetSdkVersion 24
         versionCode 1
         versionCode 1
-        versionName "0.0.9"
+        versionName "0.0.10"
         multiDexEnabled true
         multiDexEnabled true
     }
     }
     buildTypes {
     buildTypes {

app/src/main/java/com/vsoft/uoflservicenow/utils/Util.java

@@ -42,7 +42,10 @@ 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[] {"None","Yes", "No"});
+                        new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, new String[] {
+                                context.getResources().getString(R.string.none_string),
+                                context.getResources().getString(R.string.yes_string),
+                                context.getResources().getString(R.string.no_string)});
                 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;

app/src/main/res/values/strings.xml

@@ -6,6 +6,8 @@
 	<string name="back_string">Back</string>
 	<string name="back_string">Back</string>
 	<string name="error_string">* Required</string>
 	<string name="error_string">* Required</string>
 	<string name="none_string">-None-</string>
 	<string name="none_string">-None-</string>
+	<string name="yes_string">Yes</string>
+	<string name="no_string">No</string>
 	<string name="search_for_reference_string">Reference</string>
 	<string name="search_for_reference_string">Reference</string>
 	<string name="home_screen_string">Home Screen</string>
 	<string name="home_screen_string">Home Screen</string>
 	<string name="login_screen_string">Login Screen</string>
 	<string name="login_screen_string">Login Screen</string>