From 6020ae0c7df6c6ca386d6b19613a0534d120cb26 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Fri, 22 Aug 2025 16:41:25 +0100
Subject: [PATCH] [Android] Use ExtendedFab, download icon for download maps
 screen fab

Signed-off-by: Harry Bond <me@hbond.xyz>


Signed-off-by: Harry Bond <me@hbond.xyz>

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../main/java/app/organicmaps/downloader/BottomPanel.java | 4 ++--
 android/app/src/main/res/layout/fragment_downloader.xml   | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
index 2cf9b99e8..320079ff6 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -17,12 +17,12 @@ import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 
 class BottomPanel
 {
   private final DownloaderFragment mFragment;
-  private final FloatingActionButton mFab;
+  private final ExtendedFloatingActionButton mFab;
   private final MaterialButton mButton;
 
   private final View.OnClickListener mDownloadListener = new View.OnClickListener() {
diff --git a/android/app/src/main/res/layout/fragment_downloader.xml b/android/app/src/main/res/layout/fragment_downloader.xml
index dbbaffc71..1d3e9bb45 100644
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/android/app/src/main/res/layout/fragment_downloader.xml
@@ -24,7 +24,7 @@
     android:layout_below="@id/toolbar"
     android:layout_above="@id/action"/>
 
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
+  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     android:id="@+id/fab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -33,8 +33,10 @@
     android:layout_alignParentEnd="true"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginBottom="@dimen/margin_base"
-    app:tint="?android:textColorPrimaryInverse"
-    app:srcCompat="@drawable/ic_plus"/>
+    android:text="@string/download_maps"
+    android:textColor="?accentButtonTextColor"
+    app:iconTint="?android:textColorPrimaryInverse"
+    app:icon="@drawable/ic_download"/>
 
   <app.organicmaps.widget.PlaceholderView
     android:id="@+id/placeholder"