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 min or max zoom is reached #7811

Draft
Dinisvgc wants to merge 2 commits from Dinisvgc/bugfix into master
pull from: Dinisvgc/bugfix
merge into: organicmaps:master
Conversation 0 Commits 2 Files changed 1 +28 -4
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,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;
@ -94,11 +96,33 @@ public class MapButtonsController extends Fragment
helpButton.getDrawable().setTintList(null);
}
final int MIN_ZOOM_LEVEL = 2;
final int MAX_ZOOM_LEVEL = 20;
final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container);
mFrame.findViewById(R.id.nav_zoom_in)
.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn));
mFrame.findViewById(R.id.nav_zoom_out)
.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut));
final View zoomInButton = mFrame.findViewById(R.id.nav_zoom_in);
final View zoomOutButton = mFrame.findViewById(R.id.nav_zoom_out);
zoomInButton.setOnClickListener((v) -> {
if (Framework.nativeGetDrawScale() < MAX_ZOOM_LEVEL) mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn);
if (!zoomOutButton.isEnabled()) {
zoomOutButton.setEnabled(true);
zoomOutButton.setAlpha(1f);
}
if (Framework.nativeGetDrawScale() >= MAX_ZOOM_LEVEL) {
zoomInButton.setEnabled(false);
zoomInButton.setAlpha(0.5f);
}
});
zoomOutButton.setOnClickListener((v) -> {
if (Framework.nativeGetDrawScale() > MIN_ZOOM_LEVEL) mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut);
if (!zoomInButton.isEnabled()) {
zoomInButton.setEnabled(true);
zoomInButton.setAlpha(1f);
}
if (Framework.nativeGetDrawScale() <= MIN_ZOOM_LEVEL) {
zoomOutButton.setEnabled(false);
zoomOutButton.setAlpha(0.5f);
}
});
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);