Merge pull request #39 from OpenSRP/35-make-views-mobile-friendly

Make views mobile friendly

Author: vincent-karuri

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.2.8-SNAPSHOT
+VERSION_NAME=1.2.9-SNAPSHOT
 VERSION_CODE=2
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Immunization

opensrp-immunization/jacoco.exec

@@ -31,6 +31,7 @@
 import org.smartregister.immunization.listener.ServiceActionListener;
 import org.smartregister.immunization.service.intent.RecurringIntentService;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.immunization.util.VaccinatorUtils;
 import org.smartregister.util.DatePickerUtils;
 import org.smartregister.util.OpenSRPImageLoader;
@@ -529,7 +530,9 @@ public void run() {
 
                 int width = size.x;
 
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
+
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
 
             }

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/ServiceDialogFragment.java

@@ -30,6 +30,7 @@
 import org.smartregister.immunization.domain.ServiceWrapper;
 import org.smartregister.immunization.listener.ServiceActionListener;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.immunization.util.VaccinatorUtils;
 import org.smartregister.util.DatePickerUtils;
 import org.smartregister.util.OpenSRPImageLoader;
@@ -240,11 +241,11 @@ private void updateDateRanges(DatePicker datePicker, Button set) {
         }
 
         if (maxDate.getMillis() >= minDate.getMillis()) {
-            set.setVisibility(View.INVISIBLE);
+            set.setVisibility(View.GONE);
             datePicker.setMinDate(minDate.getMillis());
             datePicker.setMaxDate(maxDate.getMillis());
         } else {
-            set.setVisibility(View.INVISIBLE);
+            set.setVisibility(View.GONE);
             Toast.makeText(getActivity(), R.string.problem_applying_vaccine_constraints, Toast.LENGTH_LONG).show();
         }
     }
@@ -330,7 +331,9 @@ public void run() {
 
                 int width = size.x;
 
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
+
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
 
             }

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/ServiceEditDialogFragment.java

@@ -22,6 +22,7 @@
 import org.smartregister.immunization.domain.ServiceWrapper;
 import org.smartregister.immunization.listener.ServiceActionListener;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.util.OpenSRPImageLoader;
 import org.smartregister.view.activity.DrishtiApplication;
 
@@ -150,8 +151,9 @@ public void run() {
                 display.getSize(size);
 
                 int width = size.x;
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
 
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
             }
         });

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/UndoServiceDialogFragment.java

@@ -23,6 +23,7 @@
 import org.smartregister.immunization.domain.VaccineWrapper;
 import org.smartregister.immunization.listener.VaccinationActionListener;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.util.OpenSRPImageLoader;
 import org.smartregister.view.activity.DrishtiApplication;
 
@@ -152,8 +153,8 @@ public void run() {
                 display.getSize(size);
 
                 int width = size.x;
-
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
 
             }

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/UndoVaccinationDialogFragment.java

@@ -34,6 +34,7 @@
 import org.smartregister.immunization.domain.VaccineWrapper;
 import org.smartregister.immunization.listener.VaccinationActionListener;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.util.DatePickerUtils;
 import org.smartregister.util.OpenSRPImageLoader;
 import org.smartregister.view.activity.DrishtiApplication;
@@ -573,8 +574,9 @@ public void run() {
                 display.getSize(size);
 
                 int width = size.x;
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
 
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
             }
         });

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/VaccinationDialogFragment.java

@@ -32,6 +32,7 @@
 import org.smartregister.immunization.domain.VaccineWrapper;
 import org.smartregister.immunization.listener.VaccinationActionListener;
 import org.smartregister.immunization.util.ImageUtils;
+import org.smartregister.immunization.util.Utils;
 import org.smartregister.util.DatePickerUtils;
 import org.smartregister.util.OpenSRPImageLoader;
 import org.smartregister.view.activity.DrishtiApplication;
@@ -300,6 +301,9 @@ public void onClick(View view) {
                 @Override
                 public void onClick(View view) {
                     CheckBox childSelect = (CheckBox) view.findViewById(R.id.select);
+                    if (childSelect == null) {
+                        return;
+                    }
                     childSelect.toggle();
                 }
             });
@@ -507,7 +511,9 @@ public void run() {
 
                 int width = size.x;
 
-                window.setLayout((int) (width * 0.7), FrameLayout.LayoutParams.WRAP_CONTENT);
+                double widthFactor = Utils.calculateDialogWidthFactor(getActivity());
+
+                window.setLayout((int) (width * widthFactor), FrameLayout.LayoutParams.WRAP_CONTENT);
                 window.setGravity(Gravity.CENTER);
             }
         });

opensrp-immunization/src/main/java/org/smartregister/immunization/fragment/VaccinationEditDialogFragment.java

@@ -0,0 +1,19 @@
+package org.smartregister.immunization.util;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+
+/**
+ * Created by vkaruri on 29/03/2018.
+ */
+
+public class Utils {
+    public static double calculateDialogWidthFactor(Activity activity) {
+        double widthFactor = 0.7;
+        int screenSize = activity.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+        if (screenSize >= Configuration.SCREENLAYOUT_SIZE_NORMAL && screenSize < Configuration.SCREENLAYOUT_SIZE_LARGE) {
+            widthFactor = 0.9;
+        }
+        return widthFactor;
+    }
+}

opensrp-immunization/src/main/java/org/smartregister/immunization/util/Utils.java

@@ -32,7 +32,8 @@ public class ImmunizationRowCard extends LinearLayout {
     private Button undoB;
     private State state;
     private VaccineWrapper vaccineWrapper;
-    public boolean editmode;
+    private boolean editmode;
+    private boolean statusForMoreThanThreeMonths = false;
 
     public ImmunizationRowCard(Context context, boolean editmode) {
         super(context);
@@ -128,7 +129,6 @@ public void setState(State state) {
     }
 
     private void updateStateUi() {
-        boolean statusForMoreThanThreeMonths = false;
         if (getDbKey() != null) {
             statusForMoreThanThreeMonths = VaccinateActionUtils.moreThanThreeMonths(getCreatedAt());
         }
@@ -259,4 +259,12 @@ private Long getDbKey() {
     public Button getUndoB() {
         return undoB;
     }
+
+    public boolean isEditmode() {
+        return editmode;
+    }
+
+    public boolean isStatusForMoreThanThreeMonths() {
+        return statusForMoreThanThreeMonths;
+    }
 }