From 63d2b073d2dce8206ee8def88c199eb5a8d43553 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sat, 11 Mar 2023 20:20:35 -0800 Subject: [PATCH] checkpoint --- .../java/org/y20k/trackbook/MapFragment.kt | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/MapFragment.kt b/app/src/main/java/org/y20k/trackbook/MapFragment.kt index 00fbbcc..0826576 100644 --- a/app/src/main/java/org/y20k/trackbook/MapFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/MapFragment.kt @@ -160,27 +160,6 @@ class MapFragment : Fragment() compassOverlay.setCompassCenter((screen_width / densityScalingFactor) - 36f, 36f) mapView.overlays.add(compassOverlay) - trackbook.load_homepoints() - create_homepoint_overlays(requireContext(), mapView, trackbook.homepoints) - if (database_changed_listener !in trackbook.database_changed_listeners) - { - trackbook.database_changed_listeners.add(database_changed_listener) - } - - centerMap(currentBestLocation) - - // initialize track overlays - currentTrackOverlay = null - currentTrackSpecialMarkerOverlay = null - - // initialize main button state - update_main_button() - - mapView.setOnTouchListener { v, event -> - continuous_auto_center = false - false - } - val receiver: MapEventsReceiver = object: MapEventsReceiver { override fun singleTapConfirmedHelper(p: GeoPoint?): Boolean @@ -224,6 +203,27 @@ class MapFragment : Fragment() } mapView.overlays.add(MapEventsOverlay(receiver)) + trackbook.load_homepoints() + create_homepoint_overlays(requireContext(), mapView, trackbook.homepoints) + if (database_changed_listener !in trackbook.database_changed_listeners) + { + trackbook.database_changed_listeners.add(database_changed_listener) + } + + centerMap(currentBestLocation) + + // initialize track overlays + currentTrackOverlay = null + currentTrackSpecialMarkerOverlay = null + + // initialize main button state + update_main_button() + + mapView.setOnTouchListener { v, event -> + continuous_auto_center = false + false + } + // set up buttons mainButton.setOnClickListener { handleTrackingManagementMenu()