diff --git a/docs/developers/android/build.mdx b/docs/developers/android/build.mdx index d663ac2f..e735268a 100644 --- a/docs/developers/android/build.mdx +++ b/docs/developers/android/build.mdx @@ -15,19 +15,10 @@ If you would like to develop this application we'd love your help! These build i ``` rm ./app/google-services.json cp ./app/google-services-example.json ./app/google-services.json - rm ./app/src/main/res/values/mapbox-token.xml - cp ./app/special/mapbox-token.xml ./app/src/main/res/values/ rm ./app/src/main/res/values/curfirmwareversion.xml cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/ ``` -- (Unfortunately) you need to get a (free) mapbox developer token [here](https://docs.mapbox.com/android/maps/guides/install) and put that token in your user gradle.properties. - -``` -~/development/meshtastic/MeshUtil$ cat ~/.gradle/gradle.properties -MAPBOX_DOWNLOADS_TOKEN=sk.yourtokenherexxx -``` - - Now you should be able to select "Run / Run" in the IDE and it will happily start running on your phone or the emulator. :::note diff --git a/docs/developers/android/mapbox.mdx b/docs/developers/android/mapbox.mdx deleted file mode 100644 index 252d22f9..00000000 --- a/docs/developers/android/mapbox.mdx +++ /dev/null @@ -1,29 +0,0 @@ ---- -id: mapbox -title: Setting up Mapbox with Meshtastic -sidebar_label: Mapbox Setup ---- - -If you build Meshtastic as per the standard instructions then you may notice that the maps are not shown. This is because there is an extra step to setting up MapBox (an external service) with Meshtastic. - -## Getting MapBox to work with your local copy of Meshtastic - -In order to compile a new version of Meshtastic that can use MapBox you will need to provide a token associated with your MapBox user account. - -This is fairly simple to do. - -- Create an account at MapBox -- Copy the public token associated with that account to the clipboard -- Paste that into the file "…/src/main/res/values/mapbox-token.xml" - -## Examples of what can be achieved with MapBox - -MapBox is an external service with many features that can be included in the Meshtastic app. - -The following link shows many of the available features: -https://docs.mapbox.com/mapbox-gl-js/examples/ - -## Basics of using MapBox with Android Apps - -MapBox provide a simple example of how to display a basic map in an Android App: -https://docs.mapbox.com/android/maps/overview/#add-a-map diff --git a/docs/software/android/index.mdx b/docs/software/android/index.mdx index f1503d9e..e3133fc0 100644 --- a/docs/software/android/index.mdx +++ b/docs/software/android/index.mdx @@ -5,20 +5,21 @@ sidebar_label: Android App sidebar_position: 1 --- -Our Android application is available to download on Google Play Store. This allows you to connect to your Meshtastic® device from your Android phone. +Our Android application is available on F-Droid and Google Play Store. This allows you to connect to your Meshtastic device from your Android phone.

+ + Get it on F-Droid + - Download at https://play.google.com/store/apps/details?id=com.geeksville.mesh + width="49%"/>

-The app is also distributed via F-Droid repo: [https://mesh.tastic.app/fdroid/repo](https://mesh.tastic.app/fdroid/repo) - The application may not be found if your phone/Android version are too old. The minimum Android version is 5.0 (Lollipop 2014, first BLE support). However, Android 6, Marshmallow 2015, is recommended as the Bluetooth is more stable. The app can also be sideloaded by downloading the .apk from the GitHub releases page. If you do sideload, you may have to give your browser permissions to run a package installer. If you wish to view the code or contribute to development of the app, please visit the app's GitHub page. @@ -26,12 +27,10 @@ The app can also be sideloaded by downloading the .apk from the