Fix for font size

Signed-off-by: Ephraim Muhia <emuhia@ona.io>
opensrp · Oct 6, 2017 · 831f618 · 831f618
1 parent 04539c0
commit 831f618
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/opensrp-path/src/main/java/org/smartregister/path/activity/HIA2ReportsActivity.java b/opensrp-path/src/main/java/org/smartregister/path/activity/HIA2ReportsActivity.java
@@ -385,7 +385,7 @@ protected Intent doInBackground(Void... params) {
                     jsonObject.put(JsonFormConstants.OPENMRS_ENTITY_PARENT, "");
                     jsonObject.put(JsonFormConstants.OPENMRS_ENTITY, "");
                     jsonObject.put(JsonFormConstants.OPENMRS_ENTITY_ID, "");
-                    jsonObject.put("hia2_indicator", hia2Indicator.getIndicatorCode());
+                    jsonObject.put(PathConstants.KEY.HIA_2_INDICATOR, hia2Indicator.getIndicatorCode());
                     indicatorCategory = hia2Indicator.getCategory();
                     JSONArray fields = null;
                     if (fieldsMap.containsKey(indicatorCategory)) {

diff --git a/opensrp-path/src/main/java/org/smartregister/path/widgets/PathEditTextFactory.java b/opensrp-path/src/main/java/org/smartregister/path/widgets/PathEditTextFactory.java
@@ -30,7 +30,6 @@
  * Created by keyman on 11/04/2017.
  */
 public class PathEditTextFactory extends EditTextFactory {
-    private static final int HIA2_REPORT_FORM_HINT_FONT_SIZE = 51;
 
     @Override
     public void attachJson(String stepName, Context context, JsonFormFragment formFragment, JSONObject jsonObject, MaterialEditText editText) throws Exception {
@@ -57,7 +56,9 @@ public void attachJson(String stepName, Context context, JsonFormFragment formFr
 
         if (jsonObject.has(PathConstants.KEY.HIA_2_INDICATOR)) {
             editText.setTag(jsonObject.get(PathConstants.KEY.HIA_2_INDICATOR));
-            editText.setFloatingLabelTextSize(HIA2_REPORT_FORM_HINT_FONT_SIZE);
+            editText.setFloatingLabelTextSize((int) context.getResources().getDimension(R.dimen.hia2_indicator_hint_font_size));
+            editText.setTextSize((int) context.getResources().getDimension(R.dimen.hia2_indicator_default_font_size));
+
             editText.addTextChangedListener(new HIA2ReportFormTextWatcher(formFragment, jsonObject.get(PathConstants.KEY.HIA_2_INDICATOR).toString()));
         }
     }

diff --git a/opensrp-path/src/main/res/values-w720dp/dimens.xml b/opensrp-path/src/main/res/values-w720dp/dimens.xml
@@ -4,4 +4,6 @@
     <dimen name="noti_message_text_size">26sp</dimen>
     <dimen name="loc_picker_text_max_width">300dp</dimen>
     <dimen name="title_label_text_max_width">250dp</dimen>
+    <dimen name="hia2_indicator_hint_font_size">20sp</dimen>
+    <dimen name="hia2_indicator_default_font_size">10sp</dimen>
 </resources>
diff --git a/opensrp-path/src/main/res/values/dimens.xml b/opensrp-path/src/main/res/values/dimens.xml
@@ -107,4 +107,6 @@
     <dimen name="registerlinkheight">85dp</dimen>
     <dimen name="custom_navigation_icon_size">35dp</dimen>
     <dimen name="illustration_report_empty_state_size">175dp</dimen>
+    <dimen name="hia2_indicator_hint_font_size">18sp</dimen>
+    <dimen name="hia2_indicator_default_font_size">18sp</dimen>
 </resources>