Merge pull request #229 from onaio/223-resize-my-location-button-on-m…

…obile

Resize drawable assets

library/src/main/java/io/ona/kujaku/views/KujakuMapView.java

@@ -73,7 +73,6 @@
 import io.ona.kujaku.utils.LogUtil;
 import io.ona.kujaku.utils.NetworkUtil;
 import io.ona.kujaku.utils.Permissions;
-import io.ona.kujaku.utils.Views;
 
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleColor;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleOpacity;
@@ -724,7 +723,7 @@ public void setOnFeatureClickListener(@NonNull OnFeatureClickListener onFeatureC
     public void focusOnUserLocation(boolean focusOnMyLocation) {
         if (focusOnMyLocation) {
             isMapScrolled = false;
-            changeTargetIcon(R.drawable.ic_cross_hair_blue);
+            changeImageButtonResource(currentLocationBtn, R.drawable.ic_cross_hair_blue);
 
             // Enable the listener & show the current user location
             updateUserLocationOnMap = true;
@@ -734,7 +733,7 @@ public void focusOnUserLocation(boolean focusOnMyLocation) {
 
         } else {
             updateUserLocationOnMap = false;
-            changeTargetIcon(R.drawable.ic_cross_hair);
+            changeImageButtonResource(currentLocationBtn, R.drawable.ic_cross_hair);
         }
     }
 
@@ -745,8 +744,8 @@ public void setBoundsChangeListener(@Nullable BoundsChangeListener boundsChangeL
         callBoundsChangedListeners();
     }
 
-    private void changeTargetIcon(int drawableIcon) {
-        Views.changeDrawable(currentLocationBtn, drawableIcon);
+    private void changeImageButtonResource(ImageButton imageButton, int resourceId) {
+        imageButton.setImageResource(resourceId);
     }
 
     private void checkPermissions() {

library/src/main/res/layout/mapbox_mapview_internal.xml

@@ -50,11 +50,11 @@
     <!-- This is the target button shown on the bottom-right -->
     <ImageButton
         android:id="@+id/ib_mapview_focusOnMyLocationIcon"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
+        android:layout_width="@dimen/my_location_button_dimen"
+        android:layout_height="@dimen/my_location_button_dimen"
         android:src="@drawable/ic_cross_hair"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginTop="@dimen/my_location_btn_margin"
+        android:layout_marginRight="@dimen/my_location_btn_margin"
         android:layout_gravity="top|right"
         android:padding="10dp"
         android:background="@drawable/circle_button"
@@ -71,8 +71,8 @@
             android:orientation="vertical">
 
             <ImageButton
-                android:layout_width="70dp"
-                android:layout_height="70dp"
+                android:layout_width="@dimen/my_location_button_dimen"
+                android:layout_height="@dimen/my_location_button_dimen"
                 android:layout_margin="20dp"
                 android:id="@+id/imgBtn_mapview_locationAdditionBtn"
                 android:background="@drawable/circle_button_black_border"
@@ -90,7 +90,6 @@
                 android:visibility="gone"
                 android:layout_marginLeft="20dp"
                 android:layout_marginBottom="20dp">
-
                 <TextView
                     android:id="@+id/feature_info_text"
                     android:layout_width="match_parent"

library/src/main/res/values-sw600dp/dimens.xml

@@ -0,0 +1,4 @@
+<resources>
+    <dimen name="my_location_button_dimen">70dp</dimen>
+    <dimen name="my_location_btn_margin">32dp</dimen>
+</resources>

library/src/main/res/values/dimens.xml

@@ -9,4 +9,6 @@
     <dimen name="info_window_nonfocus_text_size">14dp</dimen>
     <dimen name="info_window_focus_padding">14dp</dimen>
     <dimen name="info_window_nonfocus_padding">10dp</dimen>
+    <dimen name="my_location_button_dimen">48dp</dimen>
+    <dimen name="my_location_btn_margin">16dp</dimen>
 </resources>

library/src/main/res/drawable/rounded_square_bg.xml → sample/src/main/res/drawable/rounded_square_bg.xml

@@ -1,7 +1,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#ffffff" />
-    <corners android:radius="10dp" />
+    <corners android:radius="@dimen/hamburger_radius"/>
     <padding
         android:left="10dp"
         android:top="10dp"

sample/src/main/res/layout/content_card.xml

@@ -41,11 +41,11 @@
                 android:id="@+id/map_view_hamburger_menu"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
+                android:layout_width="@dimen/my_location_button_dimen"
+                android:layout_height="@dimen/my_location_button_dimen"
                 android:src="@drawable/ic_hamburger_menu"
-                android:layout_marginTop="28dp"
-                android:layout_marginLeft="28dp"
+                android:layout_marginTop="@dimen/hamburger_margin"
+                android:layout_marginLeft="@dimen/hamburger_margin"
                 android:background="@drawable/rounded_square_bg"/>
 
             <Button

sample/src/main/res/values-sw600dp/dimens.xml

@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="hamburger_margin">48dp</dimen>
+    <dimen name="hamburger_radius">10dp</dimen>
+</resources>

sample/src/main/res/values/dimens.xml

@@ -5,4 +5,6 @@
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
     <dimen name="nav_header_height">160dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="hamburger_margin">24dp</dimen>
+    <dimen name="hamburger_radius">5dp</dimen>
 </resources>