Gui: Add nightmode css for popups and search suggest

400_xowa/src/gplx/xowa/htmls/core/htmls/utls/Xoh_img_path.java

@@ -15,11 +15,11 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
 package gplx.xowa.htmls.core.htmls.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.htmls.*;
 public class Xoh_img_path {
-	public static final byte[]
+	public static final    byte[]
 	  Img_cancel = Bry_.new_a7("app.general/cancel.png")	// 32,32
 	, Img_go_bwd = Bry_.new_a7("app.general/go_bwd.png")
 	, Img_go_fwd = Bry_.new_a7("app.general/go_fwd.png")
-	, Img_search = Bry_.new_a7("app.window/search_exec.png")
+	, Img_search = Bry_.new_a7("app.window/32px/search_exec.png")
 	, Img_option = Bry_.new_a7("app.menu/tools/options.png")
 	;
 }

400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__popups.java

@@ -23,8 +23,11 @@ public class Xoh_head_itm__popups extends Xoh_head_itm__base {
 	public boolean Bind_hover_area() {return bind_hover_area;} public void Bind_hover_area_(boolean v) {bind_hover_area = v;} private boolean bind_hover_area;
 	@Override public void Clear() {this.Enabled_n_(); bind_hover_area = false;}
 	@Override public void Write_css_include(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xoh_head_wtr wtr) {
-		if (Css_url == null) Css_url = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "popups", "popups.css").To_http_file_bry();
-		wtr.Write_css_include(Css_url);
+		if (Css_url_day == null) {
+			Css_url_day = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "popups", "popups.css").To_http_file_bry();
+			Css_url_night = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "popups", "popups_night.css").To_http_file_bry();
+		}
+		wtr.Write_css_include(app.Gui_mgr().Nightmode_mgr().Enabled() ? Css_url_night : Css_url_day);
 	}
 	@Override public void Write_js_head_global(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xoh_head_wtr wtr) {
 		Xocfg_mgr cfg_mgr = app.Cfg();
@@ -40,7 +43,7 @@ public class Xoh_head_itm__popups extends Xoh_head_itm__base {
 		wtr.Write_js_line(Jquery_init);	// NOTE: must assert that jquery is init'd, else popup.js will not compile after going back / forward; DATE:2014-09-10
 		wtr.Write_js_tail_load_lib(app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "popups", "popups.js"));
 	}	public static final    byte[] Jquery_init = Bry_.new_a7("xowa.js.jquery.init();"), Mw_init = Bry_.new_a7("xowa.js.mediaWiki.init();");
-	private static byte[] Css_url;
+	private static byte[] Css_url_day, Css_url_night;
 	private static final    byte[]
 	  Key_win_show_delay			= Bry_.new_a7("popups-win-show_delay")
 	, Key_win_hide_delay			= Bry_.new_a7("popups-win-hide_delay")

400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__search_suggest.java

@@ -19,12 +19,15 @@ public class Xoh_head_itm__search_suggest extends Xoh_head_itm__base {
 	@Override public byte[] Key() {return Xoh_head_itm_.Key__search_suggest;}
 	@Override public int Flags() {return Flag__css_include | Flag__js_include;}
 	@Override public void Write_css_include(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xoh_head_wtr wtr) {
-		if (Url_css == null) Url_css = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "search-suggest", "search-suggest.css").To_http_file_bry();
-		wtr.Write_css_include(Url_css);
+		if (Url_css_day == null) {
+			Url_css_day = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "search-suggest", "search-suggest.css").To_http_file_bry();
+			Url_css_night = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "search-suggest", "search-suggest_night.css").To_http_file_bry();
+		}
+		wtr.Write_css_include(app.Gui_mgr().Nightmode_mgr().Enabled() ? Url_css_night : Url_css_day);
 	}
 	@Override public void Write_js_include(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xoh_head_wtr wtr) {
 		if (Url_js == null) Url_js = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "src", "xowa", "search-suggest", "search-suggest.js").To_http_file_bry();
 		wtr.Write_js_include(Url_js);
 	}
-	private static byte[] Url_css, Url_js;
+	private static byte[] Url_css_day, Url_css_night, Url_js;
 }