pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed findViewById - potential conflict between activity's method and this method

Browse source
This commit is contained in:
Dmitry Donskoy 2019-04-08 13:03:32 +03:00 • committed by Aleksandr Zatsepin
parent 924711534c
commit 3ffcf8cf50
7 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
{
super.onViewCreated(view, savedInstanceState);
getToolbarController().findViewById(R.id.save).setOnClickListener(this);
getToolbarController().getToolbar().findViewById(R.id.save).setOnClickListener(this);
getToolbarController().getToolbar().setNavigationOnClickListener(new View.OnClickListener()
{
@Override
@ -193,7 +193,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
mMode = Mode.MAP_OBJECT;
((SearchToolbarController) getToolbarController()).showControls(false);
getToolbarController().setTitle(getTitle());
UiUtils.show(getToolbarController().findViewById(R.id.save));
UiUtils.show(getToolbarController().getToolbar().findViewById(R.id.save));
Bundle args = new Bundle();
if (focusToLastName)
args.putInt(EditorFragment.LAST_INDEX_OF_NAMES_ARRAY, sNames.size() - 1);

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

@ -92,7 +92,7 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
private void initViews(View view)
{
mMore = getToolbarController().findViewById(R.id.more);
mMore = getToolbarController().getToolbar().findViewById(R.id.more);
mMore.setOnClickListener(this);
View editsBlock = view.findViewById(R.id.block_edits);
UiUtils.show(editsBlock);

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

@ -38,7 +38,7 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
super.onViewCreated(view, savedInstanceState);
getToolbarController().setTitle(R.string.editor_report_problem_title);
mSave = getToolbarController().findViewById(R.id.save);
mSave = getToolbarController().getToolbar().findViewById(R.id.save);
mSave.setOnClickListener(this);
mSimpleProblems = view.findViewById(R.id.ll__problems);
mSimpleProblems.findViewById(R.id.problem_not_exist).setOnClickListener(this);

4
android/src/com/mapswithme/maps/routing/RoutingPlanController.java
View file

@ -99,7 +99,7 @@ public class RoutingPlanController extends ToolbarController
mRoutingBottomMenuController = RoutingBottomMenuController.newInstance(getActivity(), mFrame, listener);
mDrivingOptionsBtnContainer = findViewById(R.id.driving_options_btn_container);
mDrivingOptionsBtnContainer = activity.findViewById(R.id.driving_options_btn_container);
View btn = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn);
btn.setOnClickListener(v -> DrivingOptionsActivity.start(getActivity()));
mDriverOptionsLayoutListener = new SelfTerminatedDrivingOptionsLayoutListener();
@ -346,7 +346,7 @@ public class RoutingPlanController extends ToolbarController
{
mDrivingOptionsBtnContainer.addOnLayoutChangeListener(mDriverOptionsLayoutListener);
UiUtils.show(mDrivingOptionsBtnContainer);
View image = findViewById(R.id.driving_options_btn_img);
View image = getToolbar().findViewById(R.id.driving_options_btn_img);
UiUtils.showIf(RoutingOptions.hasAnyOptions(), image);
TextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title);
title.setText(RoutingOptions.hasAnyOptions() ? R.string.change_driving_options_btn

3
android/src/com/mapswithme/maps/search/FilterFragment.java
View file

@ -342,8 +342,7 @@ public class FilterFragment extends BaseMwmToolbarFragment
{
super.onViewCreated(view, savedInstanceState);
getToolbarController().setTitle(R.string.booking_filters);
getToolbarController()
.findViewById(R.id.reset)
getToolbarController().getToolbar().findViewById(R.id.reset)
.setOnClickListener(
v ->
{

2
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -80,7 +80,7 @@ public class UGCEditorFragment extends BaseToolbarAuthFragment
{
super.onViewCreated(view, savedInstanceState);
getToolbarController().setTitle(getArguments().getString(ARG_TITLE));
View submitButton = getToolbarController().findViewById(R.id.submit);
View submitButton = getToolbarController().getToolbar().findViewById(R.id.submit);
submitButton.setOnClickListener(v -> onSubmitButtonClick());
}

5
android/src/com/mapswithme/maps/widget/ToolbarController.java
View file

@ -95,11 +95,6 @@ public class ToolbarController
return appCompatActivity.getSupportActionBar();
}
public View findViewById(@IdRes int res)
{
return getToolbar().findViewById(res);
}
@NonNull
public Activity getActivity()
{