feat(android): update to 5 #46
+56
−123
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,17 @@ | ||
| package com.expofp | ||
|
|
||
| import android.util.Log | ||
| import com.facebook.react.bridge.ReactApplicationContext | ||
| import com.facebook.react.bridge.ReactContextBaseJavaModule | ||
| import com.facebook.react.bridge.ReactMethod | ||
| import com.facebook.react.bridge.Promise | ||
|
|
||
| class ExpofpModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { | ||
| override fun getName() = "ExpofpModule" | ||
|
|
||
| @ReactMethod | ||
| fun preload(url: String, promise: Promise) { | ||
| Log.d("ExpofpModule", "preload: not implemented") | ||
| promise.reject("PRELOAD_UNAVAILABLE", "ExpoFP Android v5 preload is not implemented yet") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,133 +1,78 @@ | ||
| package com.expofp | ||
|
|
||
| import android.app.Application | ||
| import com.expofp.fplan.api.app.ExpoFpPlan | ||
| import com.expofp.fplan.api.app.model.ExpoFpLinkType | ||
| import com.expofp.fplan.api.locationProvider.IExpoFpLocationProvider | ||
| import com.expofp.fplan.ui.ExpoFpView | ||
| import com.facebook.react.bridge.ReadableMap | ||
| import com.facebook.react.uimanager.SimpleViewManager | ||
| import com.facebook.react.uimanager.ThemedReactContext | ||
| import com.facebook.react.uimanager.annotations.ReactProp | ||
| import com.expofp.crowdconnected.ExpoFpCrowdConnectedLocationProvider | ||
| // import com.expofp.crowdconnectedbackground.ExpoFpCrowdConnectedBackgroundLocationProvider | ||
| import com.expofp.crowdconnected.ExpoFpCrowdConnectedLocationProviderSettings | ||
| import com.expofp.crowdconnected.ExpoFpCrowdConnectedNavigationType | ||
|
|
||
| class ExpofpViewManager : SimpleViewManager<ExpoFpView>() { | ||
| private var reactContext: ThemedReactContext? = null | ||
|
|
||
| override fun getName() = "ExpofpView" | ||
|
|
||
| override fun createViewInstance(reactContext: ThemedReactContext): ExpoFpView { | ||
| this.reactContext = reactContext | ||
| ExpoFpPlan.initialize(reactContext.applicationContext) | ||
| return ExpoFpView(reactContext) | ||
| } | ||
|
|
||
| override fun onDropViewInstance(view: ExpoFpView) { | ||
| super.onDropViewInstance(view) | ||
| } | ||
|
|
||
| private fun getExpoKeyFromUrl(url: String): String { | ||
| return url.substringAfter("https://").substringBefore(".expofp.com") | ||
| } | ||
|
|
||
| private fun createCrowdConnectedProvider(settingsMap: ReadableMap): IExpoFpLocationProvider? { | ||
| val context = reactContext?.applicationContext ?: return null | ||
| val application = (context as? Application) ?: return null | ||
|
|
||
| val cc = if (settingsMap.hasKey("crowdConnected")) settingsMap.getMap("crowdConnected") else settingsMap | ||
| if (cc == null) return null | ||
|
|
||
| val appKey = if (cc.hasKey("appKey")) cc.getString("appKey") else null | ||
| val token = if (cc.hasKey("token")) cc.getString("token") else null | ||
| val secret = if (cc.hasKey("secret")) cc.getString("secret") else null | ||
| if (appKey.isNullOrEmpty() || token.isNullOrEmpty() || secret.isNullOrEmpty()) return null | ||
| val aliases = mutableMapOf<String, String>() | ||
| aliases["onesignal_user_id"] = cc.getString("oneSignalUserId") ?: "" | ||
| val settings = ExpoFpCrowdConnectedLocationProviderSettings( | ||
| appKey = appKey, | ||
| token = token, | ||
| secret = secret, | ||
| navigationType = ExpoFpCrowdConnectedNavigationType.ALL, | ||
| isAllowedInBackground = false, | ||
| isHeadingEnabled = true, | ||
| aliases = aliases, | ||
| notificationText = "Indoor navigation is active", | ||
|
|
||
| serviceIcon = R.drawable.placeholder_icon | ||
|
There was a problem hiding this comment. Replace the placeholder icon with a production asset. Using 🤖 Prompt for AI Agents |
||
| ) | ||
|
|
||
| // ExpoFpCrowdConnectedBackgroundLocationProvider(application, settings) | ||
| return ExpoFpCrowdConnectedLocationProvider(application, settings) | ||
| } | ||
|
|
||
| @ReactProp(name = "settings") | ||
| fun setSettings(view: ExpoFpView, settingsMap: ReadableMap?) { | ||
| if (settingsMap == null) return | ||
| val url = settingsMap.getString("url") ?: return | ||
| val context = reactContext?.applicationContext ?: return | ||
| val expoKey = getExpoKeyFromUrl(url) | ||
|
|
||
| ExpoFpPlan.initialize(context) | ||
| val p = ExpoFpPlan.createPlanPresenter(planLink = ExpoFpLinkType.ExpoKey(expoKey)) | ||
| val ccProvider = createCrowdConnectedProvider(settingsMap) | ||
| if (ccProvider != null) p.setLocationProvider(ccProvider) | ||
| view.attachPresenter(p) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make background mode configurable from JavaScript.
The
isAllowedInBackgroundproperty is hardcoded tofalse, preventing JavaScript code from controlling background location tracking. This limits flexibility and may break use cases that require background positioning.Consider adding a React prop and backing field to expose this setting:
class ExpofpViewManager : SimpleViewManager<ExpoFpView>() { private var reactContext: ThemedReactContext? = null + private var enableBackground: Boolean = falseThen update the provider creation:
val settings = ExpoFpCrowdConnectedLocationProviderSettings( appKey = appKey, token = token, secret = secret, navigationType = ExpoFpCrowdConnectedNavigationType.ALL, - isAllowedInBackground = false, + isAllowedInBackground = enableBackground, isHeadingEnabled = true, aliases = aliases, notificationText = "Indoor navigation is active", serviceIcon = R.drawable.placeholder_icon )And add a setter:
🤖 Prompt for AI Agents