Compare commits

..

2 Commits

Author SHA1 Message Date
Harry Bond
dd6d71c767 [android] slightly adjust zoom button spacing
results in the in-between spacing being the same height as the rounding, looks a tad more consistent

Signed-off-by: Harry Bond <me@hbond.xyz>
2026-01-19 21:54:44 +00:00
Jean-Baptiste
e56e54f994 [android] Update colors used in the editor
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-19 09:37:46 +01:00
12 changed files with 9 additions and 80 deletions

View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:background="@color/bg_editor"
android:background="?colorSurfaceContainerLow"
tools:context=".editor.EditorActivity">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/frameLayout"
android:background="@color/bg_editor"
android:background="?colorSurfaceContainerLow"
android:layout_marginBottom="@dimen/margin_quarter">
<androidx.recyclerview.widget.RecyclerView

View File

@@ -9,7 +9,7 @@
style="@style/MwmWidget.FrameLayout.Elevation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_editor"
android:background="?colorSurfaceContainerLow"
android:layout_above="@+id/tv__mode_switch"
android:layout_below="@id/toolbar"/>
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_alignTop="@+id/tv__mode_switch"
android:layout_alignParentBottom="true"
android:background="@color/bg_editor"/>
android:background="?colorSurfaceContainerLow"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__mode_switch"

View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_editor">
android:background="?colorSurfaceContainerLow">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -4,7 +4,7 @@
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_editor"
android:background="?colorSurfaceContainerLow"
android:paddingStart="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:scrollbars="vertical"/>

View File

@@ -7,7 +7,6 @@
android:orientation="vertical"
android:paddingEnd="@dimen/margin_base"
android:paddingStart="@dimen/margin_base"
android:background="@color/fg_editor"
android:animateLayoutChanges="true">
<com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/fg_editor"
android:scrollbars="vertical"/>
<com.google.android.material.button.MaterialButton

View File

@@ -12,7 +12,7 @@
android:tint="?iconTint"
app:srcCompat="@drawable/ic_plus"
app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
android:layout_marginBottom="@dimen/margin_eighth"
android:layout_marginBottom="@dimen/margin_eighth_plus"
android:contentDescription="@string/zoom_in"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/nav_zoom_out"

View File

@@ -16,8 +16,6 @@
<color name="bg_panel">@color/bg_window</color>
<color name="bg_primary_dark">#FF588157</color>
<color name="bg_app">#10140F</color>
<color name="bg_editor">#161b14</color>
<color name="fg_editor">#282e25</color>
<color name="bg_menu">#CC2D3237</color>

View File

@@ -65,8 +65,6 @@
<color name="bg_panel">@color/bg_window</color>
<color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
<color name="bg_app">@android:color/white</color>
<color name="bg_editor">#ebefe4</color>
<color name="fg_editor">#f9faf2</color>
<color name="bg_dialog_translucent">#BB000000</color>
<color name="bg_text_translucent">#99FFFFFF</color>

View File

@@ -8,6 +8,7 @@
<!-- margins -->
<dimen name="margin_eighth">2dp</dimen>
<dimen name="margin_eighth_plus">3dp</dimen>
<dimen name="margin_quarter">4dp</dimen>
<dimen name="margin_quarter_plus">6dp</dimen>
<dimen name="margin_half">8dp</dimen>

View File

@@ -89,7 +89,7 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/margin_half</item>
<item name="cardBackgroundColor">@color/fg_editor</item>
<item name="cardBackgroundColor">?appBackground</item>
<item name="android:padding">@dimen/margin_base</item>
<item name="cardPreventCornerOverlap">false</item>
</style>

View File

@@ -1,66 +0,0 @@
# Deploy your maps files server
This doc explain how to deploy your own instance of a CoMaps server with files from official CDNs (We are working to be able to download maps files without hardcoded countries.txt file embedded in the app)
We explain how to deploy with minimal config, but each tools have differents options to change server port or choose maps files that you want to download.
## Deploy the server
Our community has developped different tools to deploy easily an instance of a CoMaps server:
- [comaps-map-distributor](https://codeberg.org/gedankenstuecke/comaps-map-distributor)
- [comaps-server](https://github.com/myanesp/comaps-server)
### Deploy comaps-map-distributor
Prerequisites
- python3 and pip
- Launch your terminal
- Run `pip install comaps-map-distributor`
- Launch the tool with this command `comaps-map-distributor download-maps`
- Choose maps files you want to download from official CDNs
- Run `comaps-map-distributor serve-maps`
- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
- Edit URL with your URL server and enjoy
### Deploy comaps-server
Prerequisites
- Docker
- Your server is accessible from your network
#### Docker
- Launch your terminal
- Run ``` docker run -d \
--name comaps-server \
--restart unless-stopped \
-e MAPS=all \
-e OUTPUT_DIR=/maps \
-p "80:80" \
ghcr.io/myanesp/comaps-server:latest```
- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
- Edit URL with your URL server and enjoy
#### Docker compose
- Launch your terminal
- Create a `compose.yml` file with this config:
```services:
maps-server:
image: ghcr.io/myanesp/comaps-server
container_name: comaps-server
ports:
- "80:80"
environment:
- MAPS=World,WorldCoasts,Spain
- OUTPUT_DIR=/maps
volumes:
- ./maps:/maps
- TZ=Europe/Madrid```
- Execute `docker compose up`
- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
- Edit URL with your URL server and enjoy
You can find more details in the [FAQ articles](https://www.comaps.app/support/how-can-i-host-a-custom-map-server-for-downloads/) to deploy your own HTTP maps server and find more details [here](https://www.comaps.app/support/how-can-i-set-a-custom-map-server-for-downloads/) about restrictions.