organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: [android] Disable zoom buttons when limit is reached #6422

Draft
pratyaksh1610 wants to merge 1 commit from pratyaksh1610/branch-6024 into master
pull from: pratyaksh1610/branch-6024
merge into: organicmaps:master
Conversation 0 Commits 1 Files changed 1 +24 -2
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
View file

@ -16,6 +16,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import app.organicmaps.Framework;
import app.organicmaps.MwmActivity;
import app.organicmaps.R;
import app.organicmaps.downloader.MapManager;
@ -93,9 +95,29 @@ public class MapButtonsController extends Fragment
final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container);
mFrame.findViewById(R.id.nav_zoom_in)
.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn));
.setOnClickListener((v) -> {
mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn);
mFrame.findViewById(R.id.nav_zoom_out).setEnabled(true);
mFrame.findViewById(R.id.nav_zoom_out).setAlpha(1);
if(Framework.nativeGetDrawScale() == 20) {
mFrame.findViewById(R.id.nav_zoom_in).setEnabled(false);
mFrame.findViewById(R.id.nav_zoom_in).setAlpha(0.5f);
} else {
mFrame.findViewById(R.id.nav_zoom_in).setEnabled(true);
}
});
mFrame.findViewById(R.id.nav_zoom_out)
.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut));
.setOnClickListener((v) -> {
rtsisyk commented 2023-10-30 17:26:18 +00:00
Review
Copy link

Store findViewById(R.id.nav_zoom_in) into a variable.

Store findViewById(R.id.nav_zoom_in) into a variable.
mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut);
mFrame.findViewById(R.id.nav_zoom_in).setEnabled(true);
rtsisyk commented 2023-10-30 17:25:36 +00:00
Review
Copy link

It would be better to have 20 and 2 constants defined somewhere... Do we have them in C++ code?

It would be better to have 20 and 2 constants defined somewhere... Do we have them in C++ code?
mFrame.findViewById(R.id.nav_zoom_in).setAlpha(1);
if(Framework.nativeGetDrawScale() == 2) {
mFrame.findViewById(R.id.nav_zoom_out).setEnabled(false);
mFrame.findViewById(R.id.nav_zoom_out).setAlpha(0.5f);
} else {
mFrame.findViewById(R.id.nav_zoom_out).setEnabled(true);
}
});
final View bookmarksButton = mFrame.findViewById(R.id.btn_bookmarks);
bookmarksButton.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.bookmarks));
final View myPosition = mFrame.findViewById(R.id.my_position);