diff --git a/lib/desktop/fallback.ex b/lib/desktop/fallback.ex index a7dcb2a..1dcddec 100644 --- a/lib/desktop/fallback.ex +++ b/lib/desktop/fallback.ex @@ -56,10 +56,10 @@ defmodule Desktop.Fallback do do_webview_new(frame, backend: String.to_charlist(webview_backend_env())) backend_available?("wxWebViewChromium") -> - do_webview_new(frame, backend: 'wxWebViewChromium') + do_webview_new(frame, backend: ~c"wxWebViewChromium") backend_available?("wxWebViewEdge") -> - do_webview_new(frame, backend: 'wxWebViewEdge') + do_webview_new(frame, backend: ~c"wxWebViewEdge") OS.type() == Windows -> error_missing_edge(frame) diff --git a/lib/desktop/menu.ex b/lib/desktop/menu.ex index 80b79e8..f7e03fa 100644 --- a/lib/desktop/menu.ex +++ b/lib/desktop/menu.ex @@ -131,7 +131,10 @@ defmodule Desktop.Menu do @doc false defmacro __using__(opts) do - Module.register_attribute(__CALLER__.module, :is_menu_server, persist: true, accumulate: false) + Module.register_attribute(__CALLER__.module, :is_menu_server, + persist: true, + accumulate: false + ) Module.put_attribute(__CALLER__.module, :is_menu_server, Keyword.get(opts, :server, true)) @@ -310,7 +313,7 @@ defmodule Desktop.Menu do } |> do_mount() - if is_module_server?(module) do + if module_server?(module) do Process.register(menu_pid, module) end @@ -480,7 +483,7 @@ defmodule Desktop.Menu do end end - defp is_module_server?(module) do + defp module_server?(module) do try do case Keyword.get(module.__info__(:attributes), :is_menu_server, false) do [true] -> true diff --git a/lib/desktop/menu/adapters/wx.ex b/lib/desktop/menu/adapters/wx.ex index 5e7c665..be8bedd 100644 --- a/lib/desktop/menu/adapters/wx.ex +++ b/lib/desktop/menu/adapters/wx.ex @@ -305,10 +305,10 @@ defmodule Desktop.Menu.Adapter.Wx do :wxMenu.append(parent_menu, item) if attr[:checked] != nil do - :wxMenuItem.check(item, check: is_true(attr[:checked])) + :wxMenuItem.check(item, check: true?(attr[:checked])) end - if is_true(attr[:disabled]) do + if true?(attr[:disabled]) do :wxMenu.enable(parent_menu, id, false) end @@ -347,7 +347,7 @@ defmodule Desktop.Menu.Adapter.Wx do parent_menu end - defp is_true(value) do + defp true?(value) do value != nil and value != "false" and value != "0" and value != "" end end diff --git a/lib/desktop/menu/html_tokenizer.ex b/lib/desktop/menu/html_tokenizer.ex index 744be38..e6c0c10 100644 --- a/lib/desktop/menu/html_tokenizer.ex +++ b/lib/desktop/menu/html_tokenizer.ex @@ -3,8 +3,8 @@ defmodule Desktop.Menu.HTMLTokenizer do # unfortunately the token/4 API changed into token/6 so copying it inplace... @moduledoc false - @space_chars '\s\t\f' - @name_stop_chars @space_chars ++ '>/=\r\n' + @space_chars ~c"\s\t\f" + @name_stop_chars @space_chars ++ ~c">/=\r\n" defmodule ParseError do defexception [:file, :line, :column, :description] diff --git a/lib/desktop/window.ex b/lib/desktop/window.ex index d8444d2..1bfb7b8 100644 --- a/lib/desktop/window.ex +++ b/lib/desktop/window.ex @@ -638,13 +638,17 @@ defmodule Desktop.Window do def prepare_url(url) when is_function(url), do: prepare_url(url.()) def prepare_url(nil), do: nil + def prepare_url(url) when is_binary(url) do query = %{"k" => Desktop.Auth.login_key()} uri = URI.parse(url) case uri do - %URI{query: nil} -> %URI{uri | query: URI.encode_query(query)} - %URI{query: other} -> %URI{uri | query: URI.encode_query(Map.merge(URI.decode_query(other), query))} + %URI{query: nil} -> + %URI{uri | query: URI.encode_query(query)} + + %URI{query: other} -> + %URI{uri | query: URI.encode_query(Map.merge(URI.decode_query(other), query))} end |> URI.to_string() end diff --git a/lib/desktop/wx/task_bar_icon.ex b/lib/desktop/wx/task_bar_icon.ex index 24c83a2..cbb259c 100644 --- a/lib/desktop/wx/task_bar_icon.ex +++ b/lib/desktop/wx/task_bar_icon.ex @@ -135,7 +135,7 @@ defmodule Desktop.Wx.TaskBarIcon do if supports_method?(:new, 1) do # Supports :wxTaskBarIcon.new(opts) - if is_module?(:wxWebView) do + if module?(:wxWebView) do # Proper OTP24 release create_taskbar_icon(createPopupMenu: fn_create_popup) else @@ -186,14 +186,14 @@ defmodule Desktop.Wx.TaskBarIcon do end defp supports_method?(method, arity) do - if is_module?(:wxTaskBarIcon) do + if module?(:wxTaskBarIcon) do Kernel.function_exported?(:wxTaskBarIcon, method, arity) else false end end - defp is_module?(module) do + defp module?(module) do Code.ensure_loaded?(module) end end