Changed outdated abstract class to interface and fixed instructionView issues

Author: Devota Aabel

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

@@ -3,9 +3,9 @@
 import com.mapbox.api.directions.v5.models.BannerComponents;
 import com.mapbox.core.utils.TextUtils;
 
-class AbbreviationVerifier extends NodeVerifier {
+class AbbreviationVerifier implements NodeVerifier {
   @Override
-  boolean isNodeType(BannerComponents bannerComponents) {
+  public boolean isNodeType(BannerComponents bannerComponents) {
     return hasAbbreviation(bannerComponents);
   }
 

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

@@ -2,10 +2,10 @@
 
 import com.mapbox.api.directions.v5.models.BannerComponents;
 
-class ExitSignVerifier extends NodeVerifier {
+class ExitSignVerifier implements NodeVerifier {
 
   @Override
-  boolean isNodeType(BannerComponents bannerComponents) {
+  public boolean isNodeType(BannerComponents bannerComponents) {
     return bannerComponents.type().equals("exit") || bannerComponents.type().equals("exit-number");
   }
 }

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

@@ -4,10 +4,10 @@
 
 import com.mapbox.api.directions.v5.models.BannerComponents;
 
-class ImageVerifier extends NodeVerifier {
+class ImageVerifier implements NodeVerifier {
 
   @Override
-  boolean isNodeType(BannerComponents bannerComponents) {
+  public boolean isNodeType(BannerComponents bannerComponents) {
     return hasImageUrl(bannerComponents);
   }
 

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

@@ -314,14 +314,17 @@ public boolean isShowingInstructionList() {
   public void hideInstructionList() {
     rvInstructions.stopScroll();
     beginDelayedTransition();
-    int orientation = getContext().getResources().getConfiguration().orientation;
-    if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+    if (isLandscape()) {
       updateLandscapeConstraintsTo(R.layout.instruction_layout);
     }
     instructionListLayout.setVisibility(GONE);
     onInstructionListVisibilityChanged(false);
   }
 
+  private boolean isLandscape() {
+    return getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+  }
+
   /**
    * Show the instruction list.
    * <p>
@@ -332,8 +335,7 @@ public void showInstructionList() {
     onInstructionListVisibilityChanged(true);
     instructionLayout.requestFocus();
     beginDelayedListTransition();
-    int orientation = getContext().getResources().getConfiguration().orientation;
-    if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+    if (isLandscape()) {
       updateLandscapeConstraintsTo(R.layout.instruction_layout_alt);
     }
     instructionListLayout.setVisibility(VISIBLE);
@@ -435,7 +437,7 @@ private void initializeBackground() {
       int navigationViewListBackgroundColor = ThemeSwitcher.retrieveThemeColor(getContext(),
         R.attr.navigationViewListBackground);
       // Instruction Layout landscape - banner background
-      if (getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      if (isLandscape()) {
         View instructionLayoutManeuver = findViewById(R.id.instructionManeuverLayout);
         Drawable maneuverBackground = DrawableCompat.wrap(instructionLayoutManeuver.getBackground()).mutate();
         DrawableCompat.setTint(maneuverBackground, navigationViewBannerBackgroundColor);
@@ -525,9 +527,7 @@ private void showButtons() {
   }
 
   private void initializeStepListClickListener() {
-    int deviceOrientation = getContext().getResources().getConfiguration().orientation;
-    boolean isOrientationLandscape = deviceOrientation == Configuration.ORIENTATION_LANDSCAPE;
-    if (isOrientationLandscape) {
+    if (isLandscape()) {
       initializeLandscapeListListener();
     } else {
       initializePortraitListListener();
@@ -710,8 +710,7 @@ private FragmentManager obtainSupportFragmentManager() {
    * @param percentBias to be set to the text layout
    */
   private void adjustBannerTextVerticalBias(float percentBias) {
-    int orientation = getContext().getResources().getConfiguration().orientation;
-    if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+    if (!isLandscape()) {
       ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) instructionLayoutText.getLayoutParams();
       params.verticalBias = percentBias;
       instructionLayoutText.setLayoutParams(params);
@@ -748,6 +747,8 @@ private void updateDataFromInstruction(InstructionModel model) {
    * Sets new instruction text if found.
    */
   private void updateDataFromBannerText(@NonNull BannerText primaryBannerText, BannerText secondaryBannerText) {
+    updatePrimaryTextLandscapeWidthParam(isLandscape(), LinearLayout.LayoutParams.MATCH_PARENT);
+
     if (secondaryBannerText == null) {
       loadPrimary(primaryBannerText);
       return;
@@ -766,17 +767,19 @@ 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));
-
 
+    updatePrimaryTextLandscapeWidthParam(isLandscape(), LinearLayout.LayoutParams.WRAP_CONTENT);
     loadTextWith(secondaryBannerText, upcomingSecondaryText);
   }
 
+  private void updatePrimaryTextLandscapeWidthParam(boolean isLandscape, int widthParam) {
+    if (isLandscape) {
+      upcomingPrimaryText.setLayoutParams(new LinearLayout.LayoutParams(widthParam,
+        LinearLayout.LayoutParams.WRAP_CONTENT));
+    }
+  }
+
   private void loadTextWith(BannerText bannerText, TextView textView) {
     InstructionLoader instructionLoader = createInstructionLoader(textView, bannerText);
     if (instructionLoader != null) {

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

@@ -2,6 +2,6 @@
 
 import com.mapbox.api.directions.v5.models.BannerComponents;
 
-abstract class NodeVerifier {
-  abstract boolean isNodeType(BannerComponents bannerComponents);
+interface NodeVerifier {
+  boolean isNodeType(BannerComponents bannerComponents);
 }

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

@@ -2,9 +2,9 @@
 
 import com.mapbox.api.directions.v5.models.BannerComponents;
 
-class TextVerifier extends NodeVerifier {
+class TextVerifier implements NodeVerifier {
   @Override
-  boolean isNodeType(BannerComponents bannerComponents) {
+  public boolean isNodeType(BannerComponents bannerComponents) {
     return bannerComponents.text() != null && !bannerComponents.text().isEmpty();
   }
 }

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

@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/stepPrimaryText"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:gravity="center_vertical"

libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java

@@ -60,10 +60,10 @@ class TestNode extends BannerComponentNode {
     }
   }
 
-  class TestVerifier extends NodeVerifier {
+  class TestVerifier implements NodeVerifier {
 
     @Override
-    boolean isNodeType(BannerComponents bannerComponents) {
+    public boolean isNodeType(BannerComponents bannerComponents) {
       return true;
     }
   }