Skip to content

Commit

Permalink
Put images into binary resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@vkjr
vkjr committed Sep 26, 2019
1 parent 39d1a7f commit 69e2e27
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 125 deletions.
3 changes: 2 additions & 1 deletion desktop/build.bat
View file
Expand Up @@ -25,11 +25,12 @@ SET option
echo "build.bat external modules paths: "%option-e%
echo "build.bat JS bundle path: "%option-j%
echo "build.bat desktop fonts: "%option-f%
echo "build.bat desktop images: "%option-i%
echo "build.bat cmake generator: "%option-g%

@rem Workaround
@rem rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile

@rem Build project
echo %CD%
cmake -DCMAKE_BUILD_TYPE=Debug -G %option-g% -DEXTERNAL_MODULES_DIR=%option-e% -DJS_BUNDLE_PATH=%option-j% -DDESKTOP_FONTS=%option-f% . && cmake --build .
cmake -DCMAKE_BUILD_TYPE=Debug -G %option-g% -DEXTERNAL_MODULES_DIR=%option-e% -DJS_BUNDLE_PATH=%option-j% -DDESKTOP_FONTS=%option-f% -DDESKTOP_IMAGES=%option-i% . && cmake --build .
6 changes: 6 additions & 0 deletions desktop/build.sh
View file
Expand Up @@ -23,12 +23,17 @@ if [[ $1 == "-f" ]]; then
shift
desktopFonts="$1"
fi
if [[ $1 == "-i" ]]; then
shift
desktopImages="$1"
fi
shift
done

echo "build.sh external modules paths: "$ExternalModulesPaths
echo "build.sh JS bundle path: "$JsBundlePath
echo "build.sh desktop fonts: "$desktopFonts
echo "build.sh desktop images: "$desktopImages

# Workaround
rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile
Expand All @@ -38,6 +43,7 @@ cmake -DCMAKE_BUILD_TYPE=Debug \
-DEXTERNAL_MODULES_DIR="$ExternalModulesPaths" \
-DJS_BUNDLE_PATH="$JsBundlePath" \
-DDESKTOP_FONTS="$desktopFonts" \
-DDESKTOP_IMAGES="$desktopImages" \
-DCMAKE_INSTALL_COMPONENT='' \
. && \
make
119 changes: 118 additions & 1 deletion desktop/js_files/package.json
View file
Expand Up @@ -95,5 +95,122 @@
},
"optionalDependencies": {
"appdmg": "^0.5.2"
}
},
"desktopImages": [
"../../../../../desktop/resources/add.png",
"../../../../../desktop/resources/address.png",
"../../../../../desktop/resources/add_contact.png",
"../../../../../desktop/resources/arrow_left.png",
"../../../../../desktop/resources/arrow_right.png",
"../../../../../desktop/resources/arrow_up.png",
"../../../../../desktop/resources/back.png",
"../../../../../desktop/resources/backspace.png",
"../../../../../desktop/resources/bell.png",
"../../../../../desktop/resources/browser.png",
"../../../../../desktop/resources/camera.png",
"../../../../../desktop/resources/cancel.png",
"../../../../../desktop/resources/change.png",
"../../../../../desktop/resources/check.png",
"../../../../../desktop/resources/close.png",
"../../../../../desktop/resources/commands.png",
"../../../../../desktop/resources/copy.png",
"../../../../../desktop/resources/corner_left_bottom.png",
"../../../../../desktop/resources/corner_left_top.png",
"../../../../../desktop/resources/corner_right_bottom.png",
"../../../../../desktop/resources/corner_right_top.png",
"../../../../../desktop/resources/dapp.png",
"../../../../../desktop/resources/delete.png",
"../../../../../desktop/resources/desktop.png",
"../../../../../desktop/resources/download.png",
"../../../../../desktop/resources/dropdown.png",
"../../../../../desktop/resources/dropdown_up.png",
"../../../../../desktop/resources/edit.png",
"../../../../../desktop/resources/filter.png",
"../../../../../desktop/resources/fingerprint.png",
"../../../../../desktop/resources/flash.png",
"../../../../../desktop/resources/flash_active.png",
"../../../../../desktop/resources/group_chat.png",
"../../../../../desktop/resources/help.png",
"../../../../../desktop/resources/history.png",
"../../../../../desktop/resources/home.png",
"../../../../../desktop/resources/home_1.png",
"../../../../../desktop/resources/icon_action_back.png",
"../../../../../desktop/resources/icon_action_forward.png",
"../../../../../desktop/resources/icon_action_fullscreen_collapse.png",
"../../../../../desktop/resources/icon_action_fullscreen_expand.png",
"../../../../../desktop/resources/icon_arrow_top.png",
"../../../../../desktop/resources/icon_avatar.png",
"../../../../../desktop/resources/icon_check_on.png",
"../../../../../desktop/resources/icon_close_light_gray.png",
"../../../../../desktop/resources/icon_forward_gray.png",
"../../../../../desktop/resources/icon_lock_gray.png",
"../../../../../desktop/resources/icon_lock_white.png",
"../../../../../desktop/resources/icon_menu_group.png",
"../../../../../desktop/resources/icon_money_white.png",
"../../../../../desktop/resources/icon_muted.png",
"../../../../../desktop/resources/icon_notifications_on.png",
"../../../../../desktop/resources/icon_phone_white.png",
"../../../../../desktop/resources/ic_background.png",
"../../../../../desktop/resources/ic_foreground.png",
"../../../../../desktop/resources/ic_stat_status_notification.png",
"../../../../../desktop/resources/info.png",
"../../../../../desktop/resources/in_contacts.png",
"../../../../../desktop/resources/keycard.png",
"../../../../../desktop/resources/keycard_logo.png",
"../../../../../desktop/resources/language.png",
"../../../../../desktop/resources/launch_logo.png",
"../../../../../desktop/resources/link.png",
"../../../../../desktop/resources/logo.png",
"../../../../../desktop/resources/log_out.png",
"../../../../../desktop/resources/mailserver.png",
"../../../../../desktop/resources/make_admin.png",
"../../../../../desktop/resources/max.png",
"../../../../../desktop/resources/message.png",
"../../../../../desktop/resources/mobile.png",
"../../../../../desktop/resources/more.png",
"../../../../../desktop/resources/network.png",
"../../../../../desktop/resources/next.png",
"../../../../../desktop/resources/notification.png",
"../../../../../desktop/resources/one_on_one_chat.png",
"../../../../../desktop/resources/password.png",
"../../../../../desktop/resources/paste.png",
"../../../../../desktop/resources/photo.png",
"../../../../../desktop/resources/profile.png",
"../../../../../desktop/resources/public_chat.png",
"../../../../../desktop/resources/qr.png",
"../../../../../desktop/resources/receive.png",
"../../../../../desktop/resources/refresh.png",
"../../../../../desktop/resources/remove_contact.png",
"../../../../../desktop/resources/reply.png",
"../../../../../desktop/resources/rotate_camera.png",
"../../../../../desktop/resources/search.png",
"../../../../../desktop/resources/security.png",
"../../../../../desktop/resources/send.png",
"../../../../../desktop/resources/settings.png",
"../../../../../desktop/resources/settings_advanced.png",
"../../../../../desktop/resources/share.png",
"../../../../../desktop/resources/stickers.png",
"../../../../../desktop/resources/text.png",
"../../../../../desktop/resources/tiny_arrow_down.png",
"../../../../../desktop/resources/tiny_check.png",
"../../../../../desktop/resources/tiny_clear.png",
"../../../../../desktop/resources/tiny_edit.png",
"../../../../../desktop/resources/tiny_external.png",
"../../../../../desktop/resources/tiny_group.png",
"../../../../../desktop/resources/tiny_lock.png",
"../../../../../desktop/resources/tiny_lock_broken.png",
"../../../../../desktop/resources/tiny_new_contact.png",
"../../../../../desktop/resources/tiny_pending.png",
"../../../../../desktop/resources/tiny_public.png",
"../../../../../desktop/resources/tiny_reply.png",
"../../../../../desktop/resources/tiny_settings.png",
"../../../../../desktop/resources/tiny_tribute_to_talk.png",
"../../../../../desktop/resources/tribute_to_talk.png",
"../../../../../desktop/resources/two_arrows.png",
"../../../../../desktop/resources/username.png",
"../../../../../desktop/resources/user_profile.png",
"../../../../../desktop/resources/user_profile_1.png",
"../../../../../desktop/resources/wallet.png",
"../../../../../desktop/resources/warning.png"
]
}
2 changes: 1 addition & 1 deletion desktop/js_files/yarn.lock
View file
Expand Up @@ -6276,7 +6276,7 @@ react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:

"react-native@git+https://github.com/status-im/react-native-desktop.git#master":
version "0.57.8"
resolved "git+https://github.com/status-im/react-native-desktop.git#cad20cb8c42d07473e1bbb7caf8888334d115775"
resolved "git+https://github.com/status-im/react-native-desktop.git#6cf317a82ef82ad1102e292110928929c3b68aec"
dependencies:
"@babel/runtime" "^7.0.0"
absolute-path "^0.0.0"
Expand Down
125 changes: 3 additions & 122 deletions src/status_im/ui/components/icons/vector_icons.cljs
View file
Expand Up @@ -21,129 +21,10 @@
:else
colors/black))

(def icons
(when platform/desktop?
{"add" (js/require "./desktop/resources/add.png")
"address" (js/require "./desktop/resources/address.png")
"add_contact" (js/require "./desktop/resources/add_contact.png")
"arrow_left" (js/require "./desktop/resources/arrow_left.png")
"arrow_right" (js/require "./desktop/resources/arrow_right.png")
"arrow_up" (js/require "./desktop/resources/arrow_up.png")
"back" (js/require "./desktop/resources/back.png")
"backspace" (js/require "./desktop/resources/backspace.png")
"bell" (js/require "./desktop/resources/bell.png")
"browser" (js/require "./desktop/resources/browser.png")
"camera" (js/require "./desktop/resources/camera.png")
"cancel" (js/require "./desktop/resources/cancel.png")
"change" (js/require "./desktop/resources/change.png")
"check" (js/require "./desktop/resources/check.png")
"close" (js/require "./desktop/resources/close.png")
"commands" (js/require "./desktop/resources/commands.png")
"copy" (js/require "./desktop/resources/copy.png")
"corner_left_bottom" (js/require "./desktop/resources/corner_left_bottom.png")
"corner_left_top" (js/require "./desktop/resources/corner_left_top.png")
"corner_right_bottom" (js/require "./desktop/resources/corner_right_bottom.png")
"corner_right_top" (js/require "./desktop/resources/corner_right_top.png")
"dapp" (js/require "./desktop/resources/dapp.png")
"delete" (js/require "./desktop/resources/delete.png")
"desktop" (js/require "./desktop/resources/desktop.png")
"download" (js/require "./desktop/resources/download.png")
"dropdown" (js/require "./desktop/resources/dropdown.png")
"dropdown_up" (js/require "./desktop/resources/dropdown_up.png")
"edit" (js/require "./desktop/resources/edit.png")
"filter" (js/require "./desktop/resources/filter.png")
"fingerprint" (js/require "./desktop/resources/fingerprint.png")
"flash" (js/require "./desktop/resources/flash.png")
"flash_active" (js/require "./desktop/resources/flash_active.png")
"group_chat" (js/require "./desktop/resources/group_chat.png")
"help" (js/require "./desktop/resources/help.png")
"history" (js/require "./desktop/resources/history.png")
"home" (js/require "./desktop/resources/home.png")
"home_1" (js/require "./desktop/resources/home_1.png")
"icon_action_back" (js/require "./desktop/resources/icon_action_back.png")
"icon_action_forward" (js/require "./desktop/resources/icon_action_forward.png")
"icon_action_fullscreen_collapse" (js/require "./desktop/resources/icon_action_fullscreen_collapse.png")
"icon_action_fullscreen_expand" (js/require "./desktop/resources/icon_action_fullscreen_expand.png")
"icon_arrow_top" (js/require "./desktop/resources/icon_arrow_top.png")
"icon_avatar" (js/require "./desktop/resources/icon_avatar.png")
"icon_check_on" (js/require "./desktop/resources/icon_check_on.png")
"icon_close_light_gray" (js/require "./desktop/resources/icon_close_light_gray.png")
"icon_forward_gray" (js/require "./desktop/resources/icon_forward_gray.png")
"icon_lock_gray" (js/require "./desktop/resources/icon_lock_gray.png")
"icon_lock_white" (js/require "./desktop/resources/icon_lock_white.png")
"icon_menu_group" (js/require "./desktop/resources/icon_menu_group.png")
"icon_money_white" (js/require "./desktop/resources/icon_money_white.png")
"icon_muted" (js/require "./desktop/resources/icon_muted.png")
"icon_notifications_on" (js/require "./desktop/resources/icon_notifications_on.png")
"icon_phone_white" (js/require "./desktop/resources/icon_phone_white.png")
"ic_background" (js/require "./desktop/resources/ic_background.png")
"ic_foreground" (js/require "./desktop/resources/ic_foreground.png")
"ic_stat_status_notification" (js/require "./desktop/resources/ic_stat_status_notification.png")
"info" (js/require "./desktop/resources/info.png")
"in_contacts" (js/require "./desktop/resources/in_contacts.png")
"keycard" (js/require "./desktop/resources/keycard.png")
"keycard_logo" (js/require "./desktop/resources/keycard_logo.png")
"language" (js/require "./desktop/resources/language.png")
"launch_logo" (js/require "./desktop/resources/launch_logo.png")
"link" (js/require "./desktop/resources/link.png")
"logo" (js/require "./desktop/resources/logo.png")
"log_out" (js/require "./desktop/resources/log_out.png")
"mailserver" (js/require "./desktop/resources/mailserver.png")
"make_admin" (js/require "./desktop/resources/make_admin.png")
"max" (js/require "./desktop/resources/max.png")
"message" (js/require "./desktop/resources/message.png")
"mobile" (js/require "./desktop/resources/mobile.png")
"more" (js/require "./desktop/resources/more.png")
"network" (js/require "./desktop/resources/network.png")
"next" (js/require "./desktop/resources/next.png")
"notification" (js/require "./desktop/resources/notification.png")
"one_on_one_chat" (js/require "./desktop/resources/one_on_one_chat.png")
"password" (js/require "./desktop/resources/password.png")
"paste" (js/require "./desktop/resources/paste.png")
"photo" (js/require "./desktop/resources/photo.png")
"profile" (js/require "./desktop/resources/profile.png")
"public_chat" (js/require "./desktop/resources/public_chat.png")
"qr" (js/require "./desktop/resources/qr.png")
"receive" (js/require "./desktop/resources/receive.png")
"refresh" (js/require "./desktop/resources/refresh.png")
"remove_contact" (js/require "./desktop/resources/remove_contact.png")
"reply" (js/require "./desktop/resources/reply.png")
"rotate_camera" (js/require "./desktop/resources/rotate_camera.png")
"search" (js/require "./desktop/resources/search.png")
"security" (js/require "./desktop/resources/security.png")
"send" (js/require "./desktop/resources/send.png")
"settings" (js/require "./desktop/resources/settings.png")
"settings_advanced" (js/require "./desktop/resources/settings_advanced.png")
"share" (js/require "./desktop/resources/share.png")
"stickers" (js/require "./desktop/resources/stickers.png")
"text" (js/require "./desktop/resources/text.png")
"tiny_arrow_down" (js/require "./desktop/resources/tiny_arrow_down.png")
"tiny_check" (js/require "./desktop/resources/tiny_check.png")
"tiny_clear" (js/require "./desktop/resources/tiny_clear.png")
"tiny_edit" (js/require "./desktop/resources/tiny_edit.png")
"tiny_external" (js/require "./desktop/resources/tiny_external.png")
"tiny_group" (js/require "./desktop/resources/tiny_group.png")
"tiny_lock" (js/require "./desktop/resources/tiny_lock.png")
"tiny_lock_broken" (js/require "./desktop/resources/tiny_lock_broken.png")
"tiny_new_contact" (js/require "./desktop/resources/tiny_new_contact.png")
"tiny_pending" (js/require "./desktop/resources/tiny_pending.png")
"tiny_public" (js/require "./desktop/resources/tiny_public.png")
"tiny_reply" (js/require "./desktop/resources/tiny_reply.png")
"tiny_settings" (js/require "./desktop/resources/tiny_settings.png")
"tiny_tribute_to_talk" (js/require "./desktop/resources/tiny_tribute_to_talk.png")
"tribute_to_talk" (js/require "./desktop/resources/tribute_to_talk.png")
"two_arrows" (js/require "./desktop/resources/two_arrows.png")
"username" (js/require "./desktop/resources/username.png")
"user_profile" (js/require "./desktop/resources/user_profile.png")
"user_profile_1" (js/require "./desktop/resources/user_profile_1.png")
"wallet" (js/require "./desktop/resources/wallet.png")
"warning" (js/require "./desktop/resources/warning.png")}))

(defn icon-source [name]
(let [file-name (string/replace (clojure.core/name name) "-" "_")]
(if platform/desktop?
{:source (get icons file-name)}
{:source {:uri (keyword (clojure.core/name name))}})))
(if platform/desktop?
{:source {:uri (keyword (string/replace (clojure.core/name name) "-" "_"))}}
{:source {:uri (keyword (clojure.core/name name))}}))

(defn icon
([name] (icon name nil))
Expand Down

0 comments on commit 69e2e27

Please sign in to comment.