kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review changes

Browse source
This commit is contained in:
Arsentiy Milchakov 2016-07-17 18:38:09 +03:00
parent fe4ccf09c2
commit d247b1f856
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -38,7 +38,7 @@ import org.solovyev.android.views.llm.LinearLayoutManager;
public class EditorFragment extends BaseMwmFragment implements View.OnClickListener, EditTextDialogFragment.OnTextSaveListener
{
final static String LAST_NAME_INDEX = "LastNameIndex";
final static String LAST_INDEX_OF_NAMES_ARRAY = "LastIndexOfNamesArray";
private TextView mCategory;
private View mCardAddress;
@ -341,7 +341,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mNamesAdapter.registerAdapterDataObserver(mNamesObserver);
final Bundle args = getArguments();
if (args == null || !args.containsKey(LAST_NAME_INDEX))
if (args == null || !args.containsKey(LAST_INDEX_OF_NAMES_ARRAY))
{
showAdditionalNames(false);
return;
@ -353,7 +353,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
public void onGlobalLayout()
{
LinearLayoutManager lm = (LinearLayoutManager) mNamesView.getLayoutManager();
int position = args.getInt(LAST_NAME_INDEX);
int position = args.getInt(LAST_INDEX_OF_NAMES_ARRAY);
View nameItem = lm.findViewByPosition(position);
@ -505,7 +505,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
private void refreshNamesCaption()
{
if (mNamesAdapter.getNamesCount() <= mNamesAdapter.getMandatoryNamesCount())
setNamesArrowDrawable(null);
setNamesArrowDrawable(0);
else if (mNamesAdapter.areAdditionalLanguagesShown())
setNamesArrowDrawable(R.drawable.ic_expand_less);
else
@ -519,9 +519,9 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
}
private void setNamesArrowDrawable(@DrawableRes Integer right)
private void setNamesArrowDrawable(@DrawableRes int right)
{
if(null == right)
if(0 == right)
{
mNamesCaption.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
return;

2
android/src/com/mapswithme/maps/editor/EditorHostFragment.java
View file

@ -180,7 +180,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
mToolbarController.setTitle(getTitle());
Bundle args = new Bundle();
if (focusToLastName)
args.putInt(EditorFragment.LAST_NAME_INDEX, sNames.size() - 1);
args.putInt(EditorFragment.LAST_INDEX_OF_NAMES_ARRAY, sNames.size() - 1);
final Fragment editorFragment = Fragment.instantiate(getActivity(), EditorFragment.class.getName(), args);
getChildFragmentManager().beginTransaction()
.replace(R.id.fragment_container, editorFragment, EditorFragment.class.getName())

4
android/src/com/mapswithme/maps/editor/data/NamesDataSource.java
View file

@ -9,8 +9,8 @@ package com.mapswithme.maps.editor.data;
* and mandatoryNamesCount - count of names which should be always shown.
*/
public class NamesDataSource {
private LocalizedName[] mNames;
private int mMandatoryNamesCount;
private final LocalizedName[] mNames;
private final int mMandatoryNamesCount;
public NamesDataSource(LocalizedName[] names, int mandatoryNamesCount) {
this.mNames = names;