From 2b5930dff8ac74c93e015b1e4f7033b0daff746d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 26 Oct 2025 14:29:49 +0100
Subject: [PATCH] [android] Support drawable in PlaceHolderView

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../bookmarks/BookmarksListFragment.java           |   4 ++--
 .../organicmaps/downloader/DownloaderFragment.java |   4 ++--
 .../app/organicmaps/search/SearchFragment.java     |   2 +-
 .../organicmaps/search/SearchHistoryFragment.java  |   2 +-
 .../app/organicmaps/widget/PlaceholderView.java    |   5 ++++-
 .../res/drawable-hdpi/img_empty_bookmarks.webp     | Bin 42 -> 0 bytes
 .../res/drawable-mdpi/img_empty_bookmarks.webp     | Bin 44 -> 0 bytes
 .../res/drawable-xhdpi/img_empty_bookmarks.webp    | Bin 46 -> 0 bytes
 .../res/drawable-xxhdpi/img_empty_bookmarks.webp   | Bin 54 -> 0 bytes
 .../res/drawable-xxxhdpi/img_empty_bookmarks.webp  | Bin 66 -> 0 bytes
 .../app/src/main/res/drawable/ic_search_fail.xml   |   9 +++++++++
 .../src/main/res/layout/fragment_bookmark_list.xml |   2 +-
 .../app/src/main/res/layout/placeholder_image.xml  |   5 ++++-
 android/app/src/main/res/values/dimens.xml         |   4 ++--
 14 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable-hdpi/img_empty_bookmarks.webp
 delete mode 100644 android/app/src/main/res/drawable-mdpi/img_empty_bookmarks.webp
 delete mode 100644 android/app/src/main/res/drawable-xhdpi/img_empty_bookmarks.webp
 delete mode 100644 android/app/src/main/res/drawable-xxhdpi/img_empty_bookmarks.webp
 delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/img_empty_bookmarks.webp
 create mode 100644 android/app/src/main/res/drawable/ic_search_fail.xml

diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index bc1622879..cd84c959d 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -282,11 +282,11 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
   {
     if (isEmptySearchResults())
     {
-      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query);
+      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
     }
     else if (isEmpty())
     {
-      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message);
+      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message, R.drawable.ic_bookmarks);
     }
 
     boolean isEmptyRecycler = isEmpty() || isEmptySearchResults();
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
index 8e52cc25a..b0648bf7a 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
@@ -222,10 +222,10 @@ public class DownloaderFragment
       return;
 
     if (mAdapter != null && mAdapter.isSearchResultsMode())
-      placeholder.setContent(R.string.search_not_found, R.string.search_not_found_query);
+      placeholder.setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
     else
       placeholder.setContent(R.string.downloader_no_downloaded_maps_title,
-                             R.string.downloader_no_downloaded_maps_message);
+                             R.string.downloader_no_downloaded_maps_message, R.drawable.ic_download);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
index 945547c76..b2ca9bb35 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -273,7 +273,7 @@ public class SearchFragment extends BaseMwmFragment implements SearchListener, C
     RecyclerView mResults = mResultsFrame.findViewById(R.id.recycler);
     setRecyclerScrollListener(mResults);
     mResultsPlaceholder = mResultsFrame.findViewById(R.id.placeholder);
-    mResultsPlaceholder.setContent(R.string.search_not_found, R.string.search_not_found_query);
+    mResultsPlaceholder.setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
     mSearchAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver()
 
                                                {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
index b4b6b9512..8765d14c6 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
@@ -47,7 +47,7 @@ public class SearchHistoryFragment extends BaseMwmRecyclerFragment<SearchHistory
     super.onViewCreated(view, savedInstanceState);
     getRecyclerView().setLayoutManager(new LinearLayoutManager(view.getContext()));
     mPlaceHolder = view.findViewById(R.id.placeholder);
-    mPlaceHolder.setContent(R.string.search_history_title, R.string.search_history_text);
+    mPlaceHolder.setContent(R.string.search_history_title, R.string.search_history_text, R.drawable.ic_search_recent);
 
     getAdapter().registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
       @Override
diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
index 5f929ac2d..09b6a502b 100644
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -3,6 +3,7 @@ package app.organicmaps.widget;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +12,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
@@ -176,9 +178,10 @@ public class PlaceholderView extends LinearLayout
     return view.getMeasuredHeight() + params.bottomMargin + params.topMargin;
   }
 
-  public void setContent(@StringRes int titleRes, @StringRes int subtitleRes)
+  public void setContent(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes)
   {
     mTitle.setText(titleRes);
     mSubtitle.setText(subtitleRes);
+    mImage.setImageDrawable(ContextCompat.getDrawable(getContext(), iconRes));
   }
 }
diff --git a/android/app/src/main/res/drawable-hdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-hdpi/img_empty_bookmarks.webp
deleted file mode 100644
index e77d0196c7d9e1ce6f10bd84112346b0a9b7c7bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42
xcmWIYbaPW;U|<M$bqWXzu<#KBvh}qOdI_)#2nsR;EcyRmbJ72o|NrN6007ij4S)au

diff --git a/android/app/src/main/res/drawable-mdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-mdpi/img_empty_bookmarks.webp
deleted file mode 100644
index 5f9e10f22b0686b4da8bcf1b423af7b4f7dfef5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44
zcmWIYbaPW-U|<M$bqWXzu<(%pvh|N2Fce@H5EKlUu#GYJ|F_-37ym!`pUnXP`DhNm

diff --git a/android/app/src/main/res/drawable-xhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xhdpi/img_empty_bookmarks.webp
deleted file mode 100644
index d27e02071cbeb7e9f4fa57b243cc0398ba42dd06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ycmWIYbaPW<U|<M$bqWXzu<(%tvi189CJV3&2nsR;EcyRmbJ72o|3RRdg8={~91#rw

diff --git a/android/app/src/main/res/drawable-xxhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xxhdpi/img_empty_bookmarks.webp
deleted file mode 100644
index 5e12b700bed1349a76cbde3cab73f8fc24143224..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
ycmWIYbaT^VU|<M$bqWXzu<%g?vh~9cO%-4l5ENtxSn~hB=A!>E|09EZ8wLR9Dj7Hc

diff --git a/android/app/src/main/res/drawable-xxxhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xxxhdpi/img_empty_bookmarks.webp
deleted file mode 100644
index c21bd2a34f21a6d6cb3a4a70ce27effadafd3ecd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66
zcmWIYbaS&}U|<M$bqWXzu<+3Xvi0Q;9~WR35EK-cpz`;>zuOo4&-?%XeP93o_x=C>
KzN0et%L4#Dt|JKm

diff --git a/android/app/src/main/res/drawable/ic_search_fail.xml b/android/app/src/main/res/drawable/ic_search_fail.xml
new file mode 100644
index 000000000..cafb42c32
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_search_fail.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m280,708 l56,57q6,6 14,6t14,-6q6,-6 6,-14.5t-6,-14.5l-56,-56 57,-57q6,-6 6,-14t-6,-14q-6,-6 -14,-6t-14,6l-57,57 -57,-57q-6,-6 -14,-6t-14,6q-6,6 -6,14t6,14l57,57 -57,57q-6,6 -6,14t6,14q6,6 14,6t14,-6l57,-57ZM280,880q-83,0 -141.5,-58.5T80,680q0,-83 58.5,-141.5T280,480q83,0 141.5,58.5T480,680q0,83 -58.5,141.5T280,880ZM568,584q-12,-13 -25.5,-26.5T516,532q38,-24 61,-64t23,-88q0,-75 -52.5,-127.5T420,200q-75,0 -127.5,52.5T240,380q0,6 0.5,11.5T242,403q-18,2 -39.5,8T164,425q-2,-11 -3,-22t-1,-23q0,-109 75.5,-184.5T420,120q109,0 184.5,75.5T680,380q0,43 -13.5,81.5T629,532l223,224q11,11 11.5,27.5T852,812q-11,11 -28,11t-28,-11L568,584Z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/android/app/src/main/res/layout/fragment_bookmark_list.xml b/android/app/src/main/res/layout/fragment_bookmark_list.xml
index c308cfb7c..bce10f52e 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_list.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_list.xml
@@ -29,7 +29,7 @@
       android:paddingStart="@dimen/margin_double_and_half"
       android:paddingTop="@dimen/placeholder_margin_top"
       android:paddingEnd="@dimen/margin_double_and_half"
-      app:imgSrcDefault="@drawable/img_empty_bookmarks"
+      app:imgSrcDefault="@drawable/ic_close"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/android/app/src/main/res/layout/placeholder_image.xml b/android/app/src/main/res/layout/placeholder_image.xml
index 0280655a0..edc1733e8 100644
--- a/android/app/src/main/res/layout/placeholder_image.xml
+++ b/android/app/src/main/res/layout/placeholder_image.xml
@@ -2,8 +2,11 @@
 <com.google.android.material.imageview.ShapeableImageView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/image"
   android:layout_width="@dimen/placeholder_size"
   android:layout_height="@dimen/placeholder_size"
+  android:layout_marginTop="@dimen/placeholder_size"
   android:layout_marginBottom="@dimen/margin_half_plus"
-  tools:src="@drawable/ic_search"/>
+  app:tint="?iconTint"
+  tools:src="@drawable/ic_search" />
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 77c248fdb..4f7919801 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -54,8 +54,8 @@
 
   <dimen name="panel_width">360dp</dimen>
   <dimen name="button_width">240dp</dimen>
-  <dimen name="placeholder_size">200dp</dimen>
-  <dimen name="placeholder_size_small">160dp</dimen>
+  <dimen name="placeholder_size">100dp</dimen>
+  <dimen name="placeholder_size_small">80dp</dimen>
 
   <dimen name="width_dialog_base">300dp</dimen>