Page MenuHomeGitPull.it
Files F13482773

D194.1781856826.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D194.1781856826.diff
View Options

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -132,7 +132,7 @@
android:name=".ActivitySettings"
android:label="@string/title_activity_settings"
android:parentActivityName=".ActivityPrincipal"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="it.reyboz.bustorino.ActivityPrincipal"/>
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
@@ -297,8 +297,6 @@
mapStyle = style
//setupLayers(style)
- // Start observing data
- observeStops()
initMapLocation(style, mapReady, requireContext())
//init stop layer with this
val stopsInCache = stopsViewModel.getAllStopsLoaded()
@@ -308,25 +306,8 @@
displayStops(stopsInCache)
if(showBusLayer) setupBusLayer(style)
-
- /*symbolManager = SymbolManager(mapView,mapReady,style, null, "symbol-transit-airfield")
- symbolManager.iconAllowOverlap = true
- symbolManager.textAllowOverlap = false
- symbolManager.textIgnorePlacement =true
-
-
- */
- /*symbolManager.addClickListener{ _ ->
- if (stopActiveSymbol!=null){
- hideStopBottomSheet()
-
- return@addClickListener true
- } else
- return@addClickListener false
- }
-
- */
-
+ // Start observing data now that everything is set up
+ observeStops()
}
@@ -683,7 +664,7 @@
displayStops(stopsShowing)
initialStopToShow?.let{ s->
//show the stop in the bottom sheet
- if(!initialStopShown) {
+ if(!initialStopShown && (s.ID in stopsShowing.map { it.ID })) {
openStopInBottomSheet(s)
initialStopShown = true
}

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 19, 10:13 (4 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1964727
Default Alt Text
D194.1781856826.diff (2 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register