Updated public API for InstructionLoader and fixed abbreviations so that primary text is wrapped and takes precendence over the secondary text

Author: Devota Aabel

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoader.java

@@ -30,7 +30,7 @@ public class InstructionLoader {
    * @param textView to populate with instruction
    * @param bannerText containing components to populate into textView
    */
-  InstructionLoader(TextView textView, @NonNull BannerText bannerText) {
+  public InstructionLoader(TextView textView, @NonNull BannerText bannerText) {
     this(textView, new BannerComponentTree(bannerText, new ExitSignCreator(),
       ImageCreator.getInstance(), new AbbreviationCreator(), new TextCreator()));
   }

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java

@@ -766,7 +766,14 @@ private void loadPrimaryAndSecondary(BannerText primaryBannerText, BannerText se
     upcomingPrimaryText.setMaxLines(1);
     upcomingSecondaryText.setVisibility(VISIBLE);
     adjustBannerTextVerticalBias(0.65f);
+
+    upcomingPrimaryText.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT));
     loadTextWith(primaryBannerText, upcomingPrimaryText);
+    upcomingPrimaryText.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT));
+
+
     loadTextWith(secondaryBannerText, upcomingSecondaryText);
   }
 

libandroid-navigation-ui/src/main/res/layout-land/instruction_layout.xml

@@ -73,8 +73,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
@@ -90,6 +90,8 @@
             android:layout_weight="1"
             android:visibility="gone"
             android:ellipsize="end"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:includeFontPadding="false"
             android:maxLines="1"
             android:textColor="?attr/navigationViewBannerSecondaryText"