diff --git a/android/res/drawable-hdpi/ic_dog.png b/android/res/drawable-hdpi/ic_dog.png
deleted file mode 100755
index 0c51dcc078..0000000000
Binary files a/android/res/drawable-hdpi/ic_dog.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_booking_popup_pholder_light.png b/android/res/drawable-hdpi/img_booking_popup_pholder_light.png
deleted file mode 100644
index 925fb90833..0000000000
Binary files a/android/res/drawable-hdpi/img_booking_popup_pholder_light.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_booking_popup_pholder_night.png b/android/res/drawable-hdpi/img_booking_popup_pholder_night.png
deleted file mode 100644
index 347397f36e..0000000000
Binary files a/android/res/drawable-hdpi/img_booking_popup_pholder_night.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_bookmarks.png b/android/res/drawable-hdpi/img_bookmarks.png
deleted file mode 100644
index 2c5859d205..0000000000
Binary files a/android/res/drawable-hdpi/img_bookmarks.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_discover_guides.png b/android/res/drawable-hdpi/img_discover_guides.png
deleted file mode 100755
index f74ff96e28..0000000000
Binary files a/android/res/drawable-hdpi/img_discover_guides.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_dream_and_plan.png b/android/res/drawable-hdpi/img_dream_and_plan.png
deleted file mode 100755
index 89bc81b1d6..0000000000
Binary files a/android/res/drawable-hdpi/img_dream_and_plan.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_editonweb.png b/android/res/drawable-hdpi/img_editonweb.png
deleted file mode 100644
index b89eda745e..0000000000
Binary files a/android/res/drawable-hdpi/img_editonweb.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_experience.png b/android/res/drawable-hdpi/img_experience.png
deleted file mode 100755
index 84262f3673..0000000000
Binary files a/android/res/drawable-hdpi/img_experience.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_guides_gallery_placeholder.png b/android/res/drawable-hdpi/img_guides_gallery_placeholder.png
deleted file mode 100644
index f3c6f1260c..0000000000
Binary files a/android/res/drawable-hdpi/img_guides_gallery_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_guides_placeholder.png b/android/res/drawable-hdpi/img_guides_placeholder.png
deleted file mode 100644
index c699c46d20..0000000000
Binary files a/android/res/drawable-hdpi/img_guides_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_guides_placeholder_land.png b/android/res/drawable-hdpi/img_guides_placeholder_land.png
deleted file mode 100644
index 3707fc87b0..0000000000
Binary files a/android/res/drawable-hdpi/img_guides_placeholder_land.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_guidespp_placeholder.png b/android/res/drawable-hdpi/img_guidespp_placeholder.png
deleted file mode 100755
index b05643f99e..0000000000
Binary files a/android/res/drawable-hdpi/img_guidespp_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_mappy_heart.png b/android/res/drawable-hdpi/img_mappy_heart.png
deleted file mode 100644
index 3e738a8d62..0000000000
Binary files a/android/res/drawable-hdpi/img_mappy_heart.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_no_storage_permission.png b/android/res/drawable-hdpi/img_no_storage_permission.png
deleted file mode 100644
index 801dd65b33..0000000000
Binary files a/android/res/drawable-hdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_onboarding_guide.png b/android/res/drawable-hdpi/img_onboarding_guide.png
deleted file mode 100755
index e2fde0ede1..0000000000
Binary files a/android/res/drawable-hdpi/img_onboarding_guide.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_search_empty_history_light.png b/android/res/drawable-hdpi/img_search_empty_history_light.png
deleted file mode 100644
index b1446c048c..0000000000
Binary files a/android/res/drawable-hdpi/img_search_empty_history_light.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_search_nothing_found_light.png b/android/res/drawable-hdpi/img_search_nothing_found_light.png
deleted file mode 100644
index bbf0aa336c..0000000000
Binary files a/android/res/drawable-hdpi/img_search_nothing_found_light.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_share_emptions.png b/android/res/drawable-hdpi/img_share_emptions.png
deleted file mode 100755
index e19e8134ae..0000000000
Binary files a/android/res/drawable-hdpi/img_share_emptions.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_welcome.png b/android/res/drawable-hdpi/img_welcome.png
deleted file mode 100755
index cf7a3815ce..0000000000
Binary files a/android/res/drawable-hdpi/img_welcome.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_dog.png b/android/res/drawable-mdpi/ic_dog.png
deleted file mode 100755
index 0bcf716b92..0000000000
Binary files a/android/res/drawable-mdpi/ic_dog.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_booking_popup_pholder_light.png b/android/res/drawable-mdpi/img_booking_popup_pholder_light.png
deleted file mode 100644
index 3505222342..0000000000
Binary files a/android/res/drawable-mdpi/img_booking_popup_pholder_light.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_booking_popup_pholder_night.png b/android/res/drawable-mdpi/img_booking_popup_pholder_night.png
deleted file mode 100644
index 0037178539..0000000000
Binary files a/android/res/drawable-mdpi/img_booking_popup_pholder_night.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_bookmarks.png b/android/res/drawable-mdpi/img_bookmarks.png
deleted file mode 100644
index d13272cf3b..0000000000
Binary files a/android/res/drawable-mdpi/img_bookmarks.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_discover_guides.png b/android/res/drawable-mdpi/img_discover_guides.png
deleted file mode 100755
index 7dedb5cf02..0000000000
Binary files a/android/res/drawable-mdpi/img_discover_guides.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_dream_and_plan.png b/android/res/drawable-mdpi/img_dream_and_plan.png
deleted file mode 100755
index 06c71671e5..0000000000
Binary files a/android/res/drawable-mdpi/img_dream_and_plan.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_editonweb.png b/android/res/drawable-mdpi/img_editonweb.png
deleted file mode 100644
index f3535d3e1d..0000000000
Binary files a/android/res/drawable-mdpi/img_editonweb.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_experience.png b/android/res/drawable-mdpi/img_experience.png
deleted file mode 100755
index a3806cdfa5..0000000000
Binary files a/android/res/drawable-mdpi/img_experience.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_guides_gallery_placeholder.png b/android/res/drawable-mdpi/img_guides_gallery_placeholder.png
deleted file mode 100644
index 7e848c2dc0..0000000000
Binary files a/android/res/drawable-mdpi/img_guides_gallery_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_guides_placeholder.png b/android/res/drawable-mdpi/img_guides_placeholder.png
deleted file mode 100644
index b66842c411..0000000000
Binary files a/android/res/drawable-mdpi/img_guides_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_guides_placeholder_land.png b/android/res/drawable-mdpi/img_guides_placeholder_land.png
deleted file mode 100644
index f81c91da3c..0000000000
Binary files a/android/res/drawable-mdpi/img_guides_placeholder_land.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_guidespp_placeholder.png b/android/res/drawable-mdpi/img_guidespp_placeholder.png
deleted file mode 100755
index 919135994a..0000000000
Binary files a/android/res/drawable-mdpi/img_guidespp_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_mappy_heart.png b/android/res/drawable-mdpi/img_mappy_heart.png
deleted file mode 100644
index 93c9be3f73..0000000000
Binary files a/android/res/drawable-mdpi/img_mappy_heart.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_no_storage_permission.png b/android/res/drawable-mdpi/img_no_storage_permission.png
deleted file mode 100644
index 4fc6e1f46d..0000000000
Binary files a/android/res/drawable-mdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_onboarding_guide.png b/android/res/drawable-mdpi/img_onboarding_guide.png
deleted file mode 100755
index 042583e8b9..0000000000
Binary files a/android/res/drawable-mdpi/img_onboarding_guide.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_search_empty_history_light.png b/android/res/drawable-mdpi/img_search_empty_history_light.png
deleted file mode 100644
index 51cb38de69..0000000000
Binary files a/android/res/drawable-mdpi/img_search_empty_history_light.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_search_nothing_found_light.png b/android/res/drawable-mdpi/img_search_nothing_found_light.png
deleted file mode 100644
index 923d3430d8..0000000000
Binary files a/android/res/drawable-mdpi/img_search_nothing_found_light.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_share_emptions.png b/android/res/drawable-mdpi/img_share_emptions.png
deleted file mode 100755
index 33906469fa..0000000000
Binary files a/android/res/drawable-mdpi/img_share_emptions.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_welcome.png b/android/res/drawable-mdpi/img_welcome.png
deleted file mode 100755
index e085ec0f48..0000000000
Binary files a/android/res/drawable-mdpi/img_welcome.png and /dev/null differ
diff --git a/android/res/drawable-sw600dp-hdpi/img_no_storage_permission.png b/android/res/drawable-sw600dp-hdpi/img_no_storage_permission.png
deleted file mode 100644
index 7b63505bbf..0000000000
Binary files a/android/res/drawable-sw600dp-hdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-sw600dp-mdpi/img_no_storage_permission.png b/android/res/drawable-sw600dp-mdpi/img_no_storage_permission.png
deleted file mode 100644
index 2cbde10490..0000000000
Binary files a/android/res/drawable-sw600dp-mdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-sw600dp-xhdpi/img_no_storage_permission.png b/android/res/drawable-sw600dp-xhdpi/img_no_storage_permission.png
deleted file mode 100644
index 0ac9defc14..0000000000
Binary files a/android/res/drawable-sw600dp-xhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-sw600dp-xxhdpi/img_no_storage_permission.png b/android/res/drawable-sw600dp-xxhdpi/img_no_storage_permission.png
deleted file mode 100644
index 5c38582d92..0000000000
Binary files a/android/res/drawable-sw600dp-xxhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-sw600dp-xxxhdpi/img_no_storage_permission.png b/android/res/drawable-sw600dp-xxxhdpi/img_no_storage_permission.png
deleted file mode 100644
index 8ed888f773..0000000000
Binary files a/android/res/drawable-sw600dp-xxxhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_dog.png b/android/res/drawable-xhdpi/ic_dog.png
deleted file mode 100755
index b372007b01..0000000000
Binary files a/android/res/drawable-xhdpi/ic_dog.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_booking_popup_pholder_light.png b/android/res/drawable-xhdpi/img_booking_popup_pholder_light.png
deleted file mode 100644
index 1b44b4a313..0000000000
Binary files a/android/res/drawable-xhdpi/img_booking_popup_pholder_light.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_booking_popup_pholder_night.png b/android/res/drawable-xhdpi/img_booking_popup_pholder_night.png
deleted file mode 100644
index d9e30be3ec..0000000000
Binary files a/android/res/drawable-xhdpi/img_booking_popup_pholder_night.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_bookmarks.png b/android/res/drawable-xhdpi/img_bookmarks.png
deleted file mode 100644
index 60a7e1a292..0000000000
Binary files a/android/res/drawable-xhdpi/img_bookmarks.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_discover_guides.png b/android/res/drawable-xhdpi/img_discover_guides.png
deleted file mode 100755
index 920810e50f..0000000000
Binary files a/android/res/drawable-xhdpi/img_discover_guides.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_dream_and_plan.png b/android/res/drawable-xhdpi/img_dream_and_plan.png
deleted file mode 100755
index 70a3a0af5f..0000000000
Binary files a/android/res/drawable-xhdpi/img_dream_and_plan.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_editonweb.png b/android/res/drawable-xhdpi/img_editonweb.png
deleted file mode 100644
index 7bf4e0975d..0000000000
Binary files a/android/res/drawable-xhdpi/img_editonweb.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_experience.png b/android/res/drawable-xhdpi/img_experience.png
deleted file mode 100755
index b181249117..0000000000
Binary files a/android/res/drawable-xhdpi/img_experience.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_guides_gallery_placeholder.png b/android/res/drawable-xhdpi/img_guides_gallery_placeholder.png
deleted file mode 100644
index 0aad792c15..0000000000
Binary files a/android/res/drawable-xhdpi/img_guides_gallery_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_guides_placeholder.png b/android/res/drawable-xhdpi/img_guides_placeholder.png
deleted file mode 100644
index 26d66ef4d1..0000000000
Binary files a/android/res/drawable-xhdpi/img_guides_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_guides_placeholder_land.png b/android/res/drawable-xhdpi/img_guides_placeholder_land.png
deleted file mode 100644
index 0dd8a34c76..0000000000
Binary files a/android/res/drawable-xhdpi/img_guides_placeholder_land.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_guidespp_placeholder.png b/android/res/drawable-xhdpi/img_guidespp_placeholder.png
deleted file mode 100755
index 2e1f5a3141..0000000000
Binary files a/android/res/drawable-xhdpi/img_guidespp_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_mappy_heart.png b/android/res/drawable-xhdpi/img_mappy_heart.png
deleted file mode 100644
index e8dce4410d..0000000000
Binary files a/android/res/drawable-xhdpi/img_mappy_heart.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_no_storage_permission.png b/android/res/drawable-xhdpi/img_no_storage_permission.png
deleted file mode 100644
index fa722acdfb..0000000000
Binary files a/android/res/drawable-xhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_onboarding_guide.png b/android/res/drawable-xhdpi/img_onboarding_guide.png
deleted file mode 100755
index eacef9a6d3..0000000000
Binary files a/android/res/drawable-xhdpi/img_onboarding_guide.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_search_empty_history_light.png b/android/res/drawable-xhdpi/img_search_empty_history_light.png
deleted file mode 100644
index 6cff2039a5..0000000000
Binary files a/android/res/drawable-xhdpi/img_search_empty_history_light.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_search_nothing_found_light.png b/android/res/drawable-xhdpi/img_search_nothing_found_light.png
deleted file mode 100644
index 4ad6299da0..0000000000
Binary files a/android/res/drawable-xhdpi/img_search_nothing_found_light.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_share_emptions.png b/android/res/drawable-xhdpi/img_share_emptions.png
deleted file mode 100755
index 0dd363cebb..0000000000
Binary files a/android/res/drawable-xhdpi/img_share_emptions.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_welcome.png b/android/res/drawable-xhdpi/img_welcome.png
deleted file mode 100755
index a8439577a9..0000000000
Binary files a/android/res/drawable-xhdpi/img_welcome.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_dog.png b/android/res/drawable-xxhdpi/ic_dog.png
deleted file mode 100755
index 2b63819ed2..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_dog.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_booking_popup_pholder_light.png b/android/res/drawable-xxhdpi/img_booking_popup_pholder_light.png
deleted file mode 100644
index 5d956277fc..0000000000
Binary files a/android/res/drawable-xxhdpi/img_booking_popup_pholder_light.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_booking_popup_pholder_night.png b/android/res/drawable-xxhdpi/img_booking_popup_pholder_night.png
deleted file mode 100644
index 2b1f1ee482..0000000000
Binary files a/android/res/drawable-xxhdpi/img_booking_popup_pholder_night.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_bookmarks.png b/android/res/drawable-xxhdpi/img_bookmarks.png
deleted file mode 100644
index c31d335f51..0000000000
Binary files a/android/res/drawable-xxhdpi/img_bookmarks.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_discover_guides.png b/android/res/drawable-xxhdpi/img_discover_guides.png
deleted file mode 100755
index 2353bcc999..0000000000
Binary files a/android/res/drawable-xxhdpi/img_discover_guides.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_dream_and_plan.png b/android/res/drawable-xxhdpi/img_dream_and_plan.png
deleted file mode 100755
index 75da9b355b..0000000000
Binary files a/android/res/drawable-xxhdpi/img_dream_and_plan.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_editonweb.png b/android/res/drawable-xxhdpi/img_editonweb.png
deleted file mode 100644
index 541d2419a9..0000000000
Binary files a/android/res/drawable-xxhdpi/img_editonweb.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_experience.png b/android/res/drawable-xxhdpi/img_experience.png
deleted file mode 100755
index 5f7af63c43..0000000000
Binary files a/android/res/drawable-xxhdpi/img_experience.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_guides_gallery_placeholder.png b/android/res/drawable-xxhdpi/img_guides_gallery_placeholder.png
deleted file mode 100644
index a28a2bb393..0000000000
Binary files a/android/res/drawable-xxhdpi/img_guides_gallery_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_guides_placeholder.png b/android/res/drawable-xxhdpi/img_guides_placeholder.png
deleted file mode 100644
index 6697340d2c..0000000000
Binary files a/android/res/drawable-xxhdpi/img_guides_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_guides_placeholder_land.png b/android/res/drawable-xxhdpi/img_guides_placeholder_land.png
deleted file mode 100644
index b8c765c706..0000000000
Binary files a/android/res/drawable-xxhdpi/img_guides_placeholder_land.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_guidespp_placeholder.png b/android/res/drawable-xxhdpi/img_guidespp_placeholder.png
deleted file mode 100755
index 089e179f11..0000000000
Binary files a/android/res/drawable-xxhdpi/img_guidespp_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_mappy_heart.png b/android/res/drawable-xxhdpi/img_mappy_heart.png
deleted file mode 100644
index 2fdcd3d6ad..0000000000
Binary files a/android/res/drawable-xxhdpi/img_mappy_heart.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_no_storage_permission.png b/android/res/drawable-xxhdpi/img_no_storage_permission.png
deleted file mode 100644
index 77e64f9720..0000000000
Binary files a/android/res/drawable-xxhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_onboarding_guide.png b/android/res/drawable-xxhdpi/img_onboarding_guide.png
deleted file mode 100755
index a533c4ea5e..0000000000
Binary files a/android/res/drawable-xxhdpi/img_onboarding_guide.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_search_empty_history_light.png b/android/res/drawable-xxhdpi/img_search_empty_history_light.png
deleted file mode 100644
index fbaa250935..0000000000
Binary files a/android/res/drawable-xxhdpi/img_search_empty_history_light.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_search_nothing_found_light.png b/android/res/drawable-xxhdpi/img_search_nothing_found_light.png
deleted file mode 100644
index 3af194e012..0000000000
Binary files a/android/res/drawable-xxhdpi/img_search_nothing_found_light.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_share_emptions.png b/android/res/drawable-xxhdpi/img_share_emptions.png
deleted file mode 100755
index 5a533e8c9b..0000000000
Binary files a/android/res/drawable-xxhdpi/img_share_emptions.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_welcome.png b/android/res/drawable-xxhdpi/img_welcome.png
deleted file mode 100755
index 96a17e6803..0000000000
Binary files a/android/res/drawable-xxhdpi/img_welcome.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_dog.png b/android/res/drawable-xxxhdpi/ic_dog.png
deleted file mode 100755
index 0ad3ca344d..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_dog.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_booking_popup_pholder_light.png b/android/res/drawable-xxxhdpi/img_booking_popup_pholder_light.png
deleted file mode 100644
index b92294105d..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_booking_popup_pholder_light.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_booking_popup_pholder_night.png b/android/res/drawable-xxxhdpi/img_booking_popup_pholder_night.png
deleted file mode 100644
index 6417d83412..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_booking_popup_pholder_night.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_bookmarks.png b/android/res/drawable-xxxhdpi/img_bookmarks.png
deleted file mode 100644
index 17a3c27cca..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_bookmarks.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_discover_guides.png b/android/res/drawable-xxxhdpi/img_discover_guides.png
deleted file mode 100755
index 01b731d363..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_discover_guides.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_dream_and_plan.png b/android/res/drawable-xxxhdpi/img_dream_and_plan.png
deleted file mode 100755
index 291eb92942..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_dream_and_plan.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_editonweb.png b/android/res/drawable-xxxhdpi/img_editonweb.png
deleted file mode 100644
index 99fdc516ee..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_editonweb.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_experience.png b/android/res/drawable-xxxhdpi/img_experience.png
deleted file mode 100755
index 54561b311a..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_experience.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_guides_gallery_placeholder.png b/android/res/drawable-xxxhdpi/img_guides_gallery_placeholder.png
deleted file mode 100644
index ba0ab6b189..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_guides_gallery_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_guides_placeholder.png b/android/res/drawable-xxxhdpi/img_guides_placeholder.png
deleted file mode 100644
index b75c269ab8..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_guides_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_guides_placeholder_land.png b/android/res/drawable-xxxhdpi/img_guides_placeholder_land.png
deleted file mode 100644
index f0485b0387..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_guides_placeholder_land.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_guidespp_placeholder.png b/android/res/drawable-xxxhdpi/img_guidespp_placeholder.png
deleted file mode 100755
index ca81592af7..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_guidespp_placeholder.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_mappy_heart.png b/android/res/drawable-xxxhdpi/img_mappy_heart.png
deleted file mode 100644
index d6d87972bb..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_mappy_heart.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_no_storage_permission.png b/android/res/drawable-xxxhdpi/img_no_storage_permission.png
deleted file mode 100644
index fdb77c59d0..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_no_storage_permission.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_onboarding_guide.png b/android/res/drawable-xxxhdpi/img_onboarding_guide.png
deleted file mode 100755
index 3dd7112a8b..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_onboarding_guide.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_search_empty_history_light.png b/android/res/drawable-xxxhdpi/img_search_empty_history_light.png
deleted file mode 100644
index cd9edf3bf4..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_search_empty_history_light.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_search_nothing_found_light.png b/android/res/drawable-xxxhdpi/img_search_nothing_found_light.png
deleted file mode 100644
index 682e9d99d7..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_search_nothing_found_light.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_share_emptions.png b/android/res/drawable-xxxhdpi/img_share_emptions.png
deleted file mode 100755
index 9421f1ba19..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_share_emptions.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/img_welcome.png b/android/res/drawable-xxxhdpi/img_welcome.png
deleted file mode 100755
index 3e2f70d700..0000000000
Binary files a/android/res/drawable-xxxhdpi/img_welcome.png and /dev/null differ
diff --git a/android/res/drawable/img_sharing_editor.png b/android/res/drawable/img_sharing_editor.png
deleted file mode 100644
index 0cb66b37c8..0000000000
Binary files a/android/res/drawable/img_sharing_editor.png and /dev/null differ
diff --git a/android/res/layout-land/fragment_bookmark_payment.xml b/android/res/layout-land/fragment_bookmark_payment.xml
index 199f807479..2681d82b11 100644
--- a/android/res/layout-land/fragment_bookmark_payment.xml
+++ b/android/res/layout-land/fragment_bookmark_payment.xml
@@ -9,8 +9,7 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
- android:scaleType="centerCrop"
- android:src="@drawable/img_guides_placeholder_land"/>
+ android:scaleType="centerCrop" />
+ android:layout_gravity="center"/>
diff --git a/android/res/layout/catalog_promo_item_card.xml b/android/res/layout/catalog_promo_item_card.xml
index d6a6389172..ccf8889344 100644
--- a/android/res/layout/catalog_promo_item_card.xml
+++ b/android/res/layout/catalog_promo_item_card.xml
@@ -24,7 +24,6 @@
android:orientation="vertical">
diff --git a/android/res/layout/fragment_ads_removal_purchase_dialog.xml b/android/res/layout/fragment_ads_removal_purchase_dialog.xml
index 62667cbed5..5189da5cf9 100644
--- a/android/res/layout/fragment_ads_removal_purchase_dialog.xml
+++ b/android/res/layout/fragment_ads_removal_purchase_dialog.xml
@@ -39,7 +39,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/margin_half"
- android:src="@drawable/img_mappy_heart"
android:visibility="invisible"
tools:visibility="visible"/>
+ android:scaleType="centerCrop"/>
diff --git a/android/res/layout/fragment_ugc_route_send_link.xml b/android/res/layout/fragment_ugc_route_send_link.xml
index 1444753d50..da08ba8062 100644
--- a/android/res/layout/fragment_ugc_route_send_link.xml
+++ b/android/res/layout/fragment_ugc_route_send_link.xml
@@ -28,7 +28,6 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_weight="1"
- mapsme:imgSrcDefault="@drawable/img_editonweb"
mapsme:titleDefault="@string/edit_guide_title"
mapsme:subTitleDefault="@string/edit_guide_subtitle"/>
+ android:tag="@string/tag_height_limited" />
+ android:layout_gravity="center" />
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index df7ad35c00..b96084df88 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -176,7 +176,6 @@
- @drawable/bookmark_subscription_screen_bg
- @drawable/subscription_card_edge
- @color/subscription_card_bg
- - @drawable/img_booking_popup_pholder_light
- @color/subscription_card_color
- @color/bookmarks_subs_title
- @color/bookmarks_subs_subtitle
@@ -382,7 +381,6 @@
- @drawable/bookmark_subscription_screen_bg_night
- @drawable/subscription_card_edge
- @color/subscription_card_bg_night
- - @drawable/img_booking_popup_pholder_night
- @color/subscription_card_color_night
- @color/bookmarks_subs_title_night
- @color/bookmarks_subs_subtitle_night
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index bf9e38db25..2b612c37c9 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -303,14 +303,12 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment
{
if (isEmptySearchResults())
{
- requirePlaceholder().setContent(R.drawable.img_search_nothing_found_light,
- R.string.search_not_found,
+ requirePlaceholder().setContent(R.string.search_not_found,
R.string.search_not_found_query);
}
else if (isEmpty())
{
- requirePlaceholder().setContent(R.drawable.img_empty_bookmarks,
- R.string.bookmarks_empty_list_title,
+ requirePlaceholder().setContent(R.string.bookmarks_empty_list_title,
R.string.bookmarks_empty_list_message);
}
diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
index c0aff88f74..a2ea890e03 100644
--- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
+++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
@@ -346,7 +346,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove
UiUtils.hide(view, R.id.galleriesLayout);
PlaceholderView placeholder = (PlaceholderView) view.findViewById(R.id.placeholder);
- placeholder.setContent(R.drawable.img_cactus, R.string.discovery_button_404_error_title,
+ placeholder.setContent(R.string.discovery_button_404_error_title,
R.string.discovery_button_404_error_message);
UiUtils.show(placeholder);
}
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
index 6800847212..b2ed44394a 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
@@ -227,10 +227,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
CHECK_OUT_SIGHTS(R.string.new_onboarding_step5_3_button,
R.string.later,
R.string.new_onboarding_step5_1_header,
- R.string.new_onboarding_step5_3_message,
- R.drawable.img_check_sights_out)
+ R.string.new_onboarding_step5_3_message)
{
@NonNull
@Override
@@ -25,8 +24,7 @@ public enum OnboardingStep implements StatisticValueConverter
SUBSCRIBE_TO_CATALOG(R.string.new_onboarding_step5_2_button,
R.string.later,
R.string.new_onboarding_step5_1_header,
- R.string.new_onboarding_step5_2_message,
- R.drawable.img_discover_guides)
+ R.string.new_onboarding_step5_2_message)
{
@NonNull
@Override
@@ -38,8 +36,7 @@ public enum OnboardingStep implements StatisticValueConverter
DISCOVER_GUIDES(R.string.new_onboarding_step5_1_button,
R.string.later,
R.string.new_onboarding_step5_1_header,
- R.string.new_onboarding_step5_1_message,
- R.drawable.img_discover_guides)
+ R.string.new_onboarding_step5_1_message)
{
@NonNull
@Override
@@ -52,7 +49,7 @@ public enum OnboardingStep implements StatisticValueConverter
UiUtils.NO_ID,
R.string.new_onboarding_step4_header,
R.string.new_onboarding_step4_message,
- R.drawable.img_share_emptions, false)
+ false)
{
@NonNull
@Override
@@ -65,7 +62,7 @@ public enum OnboardingStep implements StatisticValueConverter
UiUtils.NO_ID,
R.string.new_onboarding_step3_header,
R.string.new_onboarding_step3_message,
- R.drawable.img_experience, false)
+ false)
{
@NonNull
@Override
@@ -78,7 +75,7 @@ public enum OnboardingStep implements StatisticValueConverter
UiUtils.NO_ID,
R.string.new_onboarding_step2_header,
R.string.new_onboarding_step2_message,
- R.drawable.img_dream_and_plan, false)
+ false)
{
@NonNull
@Override
@@ -90,8 +87,7 @@ public enum OnboardingStep implements StatisticValueConverter
PERMISSION_EXPLANATION(R.string.new_onboarding_button,
R.string.learn_more,
R.string.onboarding_permissions_title,
- R.string.onboarding_permissions_message,
- R.drawable.img_welcome)
+ R.string.onboarding_permissions_message)
{
@NonNull
@Override
@@ -109,27 +105,25 @@ public enum OnboardingStep implements StatisticValueConverter
private final int mTitle;
@StringRes
private final int mSubtitle;
- @DrawableRes
- private final int mImage;
+
private final boolean mDeclinedButton;
OnboardingStep(@StringRes int acceptButtonResId, @StringRes int declineButtonResId,
- @StringRes int title, @StringRes int subtitle, @DrawableRes int image)
+ @StringRes int title, @StringRes int subtitle)
{
- this(acceptButtonResId, declineButtonResId, title, subtitle, image, true);
+ this(acceptButtonResId, declineButtonResId, title, subtitle,true);
}
OnboardingStep(@StringRes int acceptButtonResId, @StringRes int declineButtonResId,
- @StringRes int title, @StringRes int subtitle, @DrawableRes int image,
+ @StringRes int title, @StringRes int subtitle,
boolean hasDeclinedButton)
{
mAcceptButtonResId = acceptButtonResId;
mDeclineButtonResId = declineButtonResId;
mTitle = title;
mSubtitle = subtitle;
- mImage = image;
mDeclinedButton = hasDeclinedButton;
}
@@ -154,7 +148,7 @@ public enum OnboardingStep implements StatisticValueConverter
@DrawableRes
public int getImage()
{
- return mImage;
+ return 0;
}
public boolean hasDeclinedButton()
diff --git a/android/src/com/mapswithme/maps/onboarding/IntroductionDialogFragment.java b/android/src/com/mapswithme/maps/onboarding/IntroductionDialogFragment.java
index 0f6a516fce..b435d14735 100644
--- a/android/src/com/mapswithme/maps/onboarding/IntroductionDialogFragment.java
+++ b/android/src/com/mapswithme/maps/onboarding/IntroductionDialogFragment.java
@@ -46,8 +46,8 @@ public class IntroductionDialogFragment extends BaseMwmDialogFragment
TextView button = content.findViewById(R.id.accept_btn);
button.setText(factory.getAction());
button.setOnClickListener(v -> onAcceptClicked());
- ImageView image = content.findViewById(R.id.iv__image);
- image.setImageResource(factory.getImage());
+// ImageView image = content.findViewById(R.id.iv__image);
+// image.setImageResource(factory.getImage());
TextView title = content.findViewById(R.id.tv__title);
title.setText(factory.getTitle());
TextView subtitle = content.findViewById(R.id.tv__subtitle1);
diff --git a/android/src/com/mapswithme/maps/onboarding/IntroductionScreenFactory.java b/android/src/com/mapswithme/maps/onboarding/IntroductionScreenFactory.java
index 9a06fcbe66..3ea4ce0e29 100644
--- a/android/src/com/mapswithme/maps/onboarding/IntroductionScreenFactory.java
+++ b/android/src/com/mapswithme/maps/onboarding/IntroductionScreenFactory.java
@@ -43,7 +43,7 @@ public enum IntroductionScreenFactory implements StatisticValueConverter
@Override
public int getImage()
{
- return R.drawable.img_onboarding_guide;
+ return 0;
}
@NonNull
@@ -92,7 +92,7 @@ public enum IntroductionScreenFactory implements StatisticValueConverter
@Override
public int getImage()
{
- return R.drawable.img_onboarding_guide;
+ return 0;
}
@NonNull
diff --git a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
index 76b89e29aa..db6d416eed 100644
--- a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
+++ b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
@@ -55,9 +55,9 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View
@NonNull
private View mContentView;
- @SuppressWarnings("NullableProblems")
- @NonNull
- private ImageView mImage;
+// @SuppressWarnings("NullableProblems")
+// @NonNull
+// private ImageView mImage;
@SuppressWarnings("NullableProblems")
@NonNull
@@ -179,8 +179,8 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View
res.setContentView(mContentView);
mAcceptBtn = mContentView.findViewById(R.id.accept_btn);
mAcceptBtn.setOnClickListener(this);
- mImage = mContentView.findViewById(R.id.iv__image);
- mImage.setImageResource(R.drawable.img_welcome);
+// mImage = mContentView.findViewById(R.id.iv__image);
+// mImage.setImageResource(R.drawable.img_welcome);
mTitle = mContentView.findViewById(R.id.tv__title);
List headers = Arrays.asList(getString(R.string.new_onboarding_step1_header),
getString(R.string.new_onboarding_step1_header_2));
@@ -300,7 +300,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View
return;
mTitle.setText(mOnboardinStep.getTitle());
- mImage.setImageResource(mOnboardinStep.getImage());
+// mImage.setImageResource(mOnboardinStep.getImage());
mAcceptBtn.setText(mOnboardinStep.getAcceptButtonResId());
declineBtn.setOnClickListener(v -> onDeclineBtnClicked());
mSubtitle.setText(mOnboardinStep.getSubtitle());
diff --git a/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java b/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java
index 0f6b05b2df..5227d75061 100644
--- a/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java
+++ b/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java
@@ -42,7 +42,7 @@ public class PermissionsDialogFragment extends BasePermissionsDialogFragment
@Override
protected int getImageRes()
{
- return R.drawable.img_welcome;
+ return 0;
}
@StringRes
diff --git a/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java b/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java
index 8f51c0ae1b..41842735dd 100644
--- a/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java
+++ b/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java
@@ -76,7 +76,6 @@ public class StoragePermissionsDialogFragment extends BaseMwmDialogFragment impl
declineBtn.setText(R.string.back);
ImageView image = (ImageView) content.findViewById(R.id.iv__image);
- image.setImageResource(R.drawable.img_no_storage_permission);
TextView title = (TextView) content.findViewById(R.id.tv__title);
title.setText(R.string.onboarding_storage_permissions_title);
TextView subtitle = (TextView) content.findViewById(R.id.tv__subtitle1);
diff --git a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java
index 5496365403..18513f34b0 100644
--- a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java
+++ b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java
@@ -270,11 +270,6 @@ public class CatalogPromoController implements Promo.Listener, Detachable
}
}
- public static void shareViralEditor(Activity context, @DrawableRes int imageId, @StringRes int subject, @StringRes int text)
+ public static void shareViralEditor(Activity context,@StringRes int subject, @StringRes int text)
{
- shareOutside(new ViralEditorShareable(context, imageId)
+ shareOutside(new ViralEditorShareable(context)
.setText(text)
.setSubject(subject));
}
diff --git a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
index 5a2d553086..c9ca6d64fa 100644
--- a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
+++ b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
@@ -12,19 +12,16 @@ public class ViralEditorShareable extends BaseShareable
{
private static final String VIRAL_TAIL = " https://omaps.app/im_get";
- private final Uri mUri;
-
- public ViralEditorShareable(Activity context, @DrawableRes int resId)
+ public ViralEditorShareable(Activity context)
{
super(context);
- mUri = UiUtils.getUriToResId(context, resId);
}
@Override
protected void modifyIntent(Intent intent, @Nullable SharingTarget target)
{
super.modifyIntent(intent, target);
- intent.putExtra(Intent.EXTRA_STREAM, mUri);
+// intent.putExtra(Intent.EXTRA_STREAM);
}
@Override
diff --git a/iphone/Maps/Images.xcassets/Promo/img_booking_popup_pholder_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Promo/img_booking_popup_pholder_light.imageset/Contents.json
index 3291d76c49..f8f827e40b 100644
--- a/iphone/Maps/Images.xcassets/Promo/img_booking_popup_pholder_light.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Promo/img_booking_popup_pholder_light.imageset/Contents.json
@@ -2,17 +2,14 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "img_booking_popup_pholder_light.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "img_booking_popup_pholder_light@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "img_booking_popup_pholder_light@3x.png",
"scale" : "3x"
}
],
diff --git a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift
index 2fdbbb9659..8ca251feab 100644
--- a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift
+++ b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift
@@ -50,8 +50,7 @@ class PromoAfterBookingViewController: UIViewController {
private func setCityImage(_ imageUrl: String) {
cityImageView.image = UIColor.isNightMode()
- ? UIImage(named: "img_booking_popup_pholder_dark")
- : UIImage(named: "img_booking_popup_pholder_light")
+
if !imageUrl.isEmpty, let url = URL(string: imageUrl) {
cityImageView.wi_setImage(with: url, transitionDuration: kDefaultAnimationDuration)
}
diff --git a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib
index 8b735dfc18..c4d552ca7d 100644
--- a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib
+++ b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib
@@ -20,7 +20,7 @@
-
+
@@ -107,7 +107,5 @@
-
-
-
+