review fixes

5 files changed, 41 insertions, 36 deletions

diff --git a/android/res/layout/localized_name.xml b/android/res/layout/localized_name.xml
index 26471aa0ef..124d9c151b 100644
--- a/android/res/layout/localized_name.xml
+++ b/android/res/layout/localized_name.xml
@@ -45,4 +45,4 @@
     android:text="@string/add_language"
     android:textAppearance="@style/MwmTextAppearance.Button" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java
index 160d009c6c..3c8ea0e36b 100644
--- a/android/src/com/mapswithme/maps/editor/EditorFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java
@@ -81,8 +81,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private MultilanguageAdapter mNamesAdapter;
   private TextView mNamesCaption;
-  private TextView  mAddLanguage;
-  private TextView  mMoreLanguages;
+  private TextView mAddLanguage;
+  private TextView mMoreLanguages;
 
   private TextView mStreet;
   private EditText mHouseNumber;
@@ -329,10 +329,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   {
     mNamesCaption = (TextView) view.findViewById(R.id.show_additional_names);
     mNamesCaption.setOnClickListener(this);
+
     mAddLanguage = (TextView) view.findViewById(R.id.add_langs);
     mAddLanguage.setOnClickListener(this);
+
     mMoreLanguages = (TextView) view.findViewById(R.id.more_names);
     mMoreLanguages.setOnClickListener(this);
+
     mNamesView = (RecyclerView) view.findViewById(R.id.recycler);
     mNamesView.setNestedScrollingEnabled(false);
     mNamesView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -505,23 +508,23 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   private void refreshNamesCaption()
   {
     if (mNamesAdapter.getNamesCount() <= mNamesAdapter.getMandatoryNamesCount())
-      setNamesArrowDrawable(0);
+      setNamesArrow(0 /* arrowResourceId */);  // bind arrow with empty resource (do not draw arrow)
     else if (mNamesAdapter.areAdditionalLanguagesShown())
-      setNamesArrowDrawable(R.drawable.ic_expand_less);
+      setNamesArrow(R.drawable.ic_expand_less);
     else
-      setNamesArrowDrawable(R.drawable.ic_expand_more);
+      setNamesArrow(R.drawable.ic_expand_more);
 
     boolean showAddLanguage = mNamesAdapter.getNamesCount() <= mNamesAdapter.getMandatoryNamesCount() ||
       mNamesAdapter.areAdditionalLanguagesShown();
 
     UiUtils.showIf(showAddLanguage, mAddLanguage);
     UiUtils.showIf(!showAddLanguage, mMoreLanguages);
-
   }
 
-  private void setNamesArrowDrawable(@DrawableRes int right)
+  // Bind arrow in the top right corner of names caption with needed resource.
+  private void setNamesArrow(@DrawableRes int arrowResourceId)
   {
-    if(0 == right)
+    if (arrowResourceId == 0)
     {
       mNamesCaption.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
       return;
@@ -530,7 +533,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mNamesCaption.setCompoundDrawablesWithIntrinsicBounds(
       null,
       null,
-      Graphics.tint(getActivity(), right, R.attr.iconTint),
+      Graphics.tint(getActivity(), arrowResourceId, R.attr.iconTint),
       null);
   }
 
diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index d05dbc1a39..fec816accc 100644
--- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
@@ -73,9 +73,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
     sNames.clear();
     for (LocalizedName name : names)
     {
-      if (name.code == LocalizedName.DEFAULT_LANG_CODE)
-        continue;
-      sNames.add(name);
+      addName(name);
     }
   }
 
@@ -160,6 +158,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
     case OPENING_HOURS:
     case STREET:
     case CUISINE:
+    case LANGUAGE:
       editMapObject();
       break;
     default:
diff --git a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java
index 7118b66ef3..3b8e9ce611 100644
--- a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java
+++ b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java
@@ -64,18 +64,18 @@ public class MultilanguageAdapter extends RecyclerView.Adapter<MultilanguageAdap
     return mAdditionalLanguagesShown;
   }
 
-  public void showAdditionalLanguages(boolean showAdditionalLanguages)
+  public void showAdditionalLanguages(boolean show)
   {
-    if(mAdditionalLanguagesShown == showAdditionalLanguages)
+    if (mAdditionalLanguagesShown == show)
       return;
 
-    mAdditionalLanguagesShown = showAdditionalLanguages;
+    mAdditionalLanguagesShown = show;
 
-    if(mNames.size() !=  mMandatoryNamesCount)
+    if (mNames.size() != mMandatoryNamesCount)
     {
-      if(showAdditionalLanguages)
+      if (show)
       {
-        notifyItemRangeInserted(mMandatoryNamesCount , mNames.size() - mMandatoryNamesCount);
+        notifyItemRangeInserted(mMandatoryNamesCount, mNames.size() - mMandatoryNamesCount);
       }
       else
       {
diff --git a/android/src/com/mapswithme/maps/editor/data/NamesDataSource.java b/android/src/com/mapswithme/maps/editor/data/NamesDataSource.java
index fd8ff8f631..b121057efa 100644
--- a/android/src/com/mapswithme/maps/editor/data/NamesDataSource.java
+++ b/android/src/com/mapswithme/maps/editor/data/NamesDataSource.java
@@ -2,26 +2,29 @@ package com.mapswithme.maps.editor.data;
 
 /**
  * Class which contains array of localized names with following priority:
- *  1. Names for Mwm languages;
- *  2. User`s language name;
- *  3. International name;
- *  4. Other names;
+ * 1. Names for Mwm languages;
+ * 2. User`s language name;
+ * 3. Other names;
  * and mandatoryNamesCount - count of names which should be always shown.
  */
-public class NamesDataSource {
-        private final LocalizedName[] mNames;
-        private final int mMandatoryNamesCount;
+public class NamesDataSource
+{
+  private final LocalizedName[] mNames;
+  private final int mMandatoryNamesCount;
 
-        public NamesDataSource(LocalizedName[] names, int mandatoryNamesCount) {
-            this.mNames = names;
-            this.mMandatoryNamesCount = mandatoryNamesCount;
-        }
+  public NamesDataSource(LocalizedName[] names, int mandatoryNamesCount)
+  {
+    this.mNames = names;
+    this.mMandatoryNamesCount = mandatoryNamesCount;
+  }
 
-        public LocalizedName[] getNames() {
-            return mNames;
-        }
+  public LocalizedName[] getNames()
+  {
+    return mNames;
+  }
 
-        public int getMandatoryNamesCount() {
-            return mMandatoryNamesCount;
-        }
+  public int getMandatoryNamesCount()
+  {
+    return mMandatoryNamesCount;
+  }
 }