From b58150162087aa13178ee4b575ec19fadbda17aa Mon Sep 17 00:00:00 2001 From: kernelkind Date: Fri, 29 Nov 2024 12:42:59 -0500 Subject: [PATCH] add missing light mode icons Closes: #502 Signed-off-by: kernelkind --- assets/icons/add_column_light_4x.png | Bin 0 -> 1267 bytes assets/icons/column_delete_icon_light_4x.png | Bin 0 -> 1089 bytes assets/icons/help_icon_inverted_4x.png | Bin 0 -> 554 bytes assets/icons/repost_light_4x.png | Bin 0 -> 1145 bytes assets/icons/settings_light_4x.png | Bin 0 -> 3055 bytes src/nav.rs | 6 ++++- src/ui/note/mod.rs | 12 ++++++---- src/ui/side_panel.rs | 22 ++++++++++++++----- 8 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 assets/icons/add_column_light_4x.png create mode 100644 assets/icons/column_delete_icon_light_4x.png create mode 100644 assets/icons/help_icon_inverted_4x.png create mode 100644 assets/icons/repost_light_4x.png create mode 100644 assets/icons/settings_light_4x.png diff --git a/assets/icons/add_column_light_4x.png b/assets/icons/add_column_light_4x.png new file mode 100644 index 0000000000000000000000000000000000000000..cecabf534e893683849bbdd5ee653f1d838fc0c7 GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c@N+zw9{$B+ufw{z{wF2@KQRX=(Cc%*|+t+ql* ziG?VZ=Y7)o6Hr!plnc+ZZ)^=(52Wr`!{d? zEP1+^!*B}AKj9>%w*7HtbvOP?tmc~*?Af4uz~M#NzI9s7?_QWJwZ0{~NlapYwnniM zXF$W*ixXKi8jM8_%Hf`5iRb$w^K*G&F( zP3|ZH#CH_0T@{iR%)}z9h z@F#oCxhL`ohTDX-n*$CzpQ#An*FUW>Rxf<2W|!>Ld7Rm2kFVl1{ckS8{BPH}h@AA> zI>-CGwl*9-eAqZLxn@r#|7l*cVx8K%?fjQ>Mb~eTdi(Zm>L$ixj|=m3rMute%zk=f zVkErNKn83D%v&Q=kpIi!>!IZ;)xmQsnp?XFh55&5thpeJ^6*qgXs))>C zgxHU443e`52_MsPh}#kz9O-pBGO;;^X9H`<@}Rt|)eIY>zfPVv`%{0QM#HktBFtfo zbs}%)_^8dCaLCJIuAh6-0Tl-wOZkvG6DNU5_ianot#x645Mkz; z{fTcfgJPuXLyLyI7g50ny-#!W=V{jLnEmblH4!#oiEJyT)~Z)9*#K^fOk)$m8XmJo}=4C$8pCI#N^Lkj8zmeShPw_e!o?RR7r6 z*|mR(Z@%UFfX5$yu(X}M^3ovXW^M4Zs$jXqPjOlQQk2}+u{9rbohkmt z)6;G7#p!?l{{7!Nc|)q*p&$B7RF<*^C>%=fC}=p#?lfh!$YX6!CXHJ{e0+R)PtUuH zZR>h4WzVWlOZKHOPI*{xqn*Rt>g_d0uP7xKgFn$0QvUh*`PD&QEU-#;s6rvb&R1RhxTi0C@TZYC@~0drDELIAGL9O(c600d`2O+f$vv5yPEP5F;h|0~T~CB0)tFxo|;|k}CBg zr6-||ZQe0w3GA8k?cJ`|Cih6Ivv$|}F*iFOzB5rlK|#SirbM1-wOVg*c{LaeRwxIh zQt1YlkBvs7P9CU`2eA2LY5vwv%0ad@fd3RlyceuHiEDx@0-o$9u*WgM~wqq`SH+9iz7rE;Mk9c zCNYlCyucRyXJ~Om5eG<>p8R-d#5h8<0WSS`Xr{#xsk1>CM)nBDLQ}h3E+0|=psBBM z*&eUQI_uc*Nt!WI+W-uDBh^E~k0=n@+_CFRMQQ=yE{lUgFu??Xxg)6_0x*=4+!_Fa z3BU!Z1#owFXOyOh0-+s&gqt{?0V*iY(VU!7Mc345b!-W?_6lsR{k6DD2ioo8mraFuq=GjI98SRH@x5oKfCH zB-C#TV@R42!S+EfcX=^JVt|g zu@%6rR3AbB+VMiYAq#AefT#g5NHZ5e!ko8c!NMK^7f~Q%C4hNKh!WF#z*` zEMY&3O{@w{d{?B!wjqcMe6Nba?N{2^{D6h~vX5U{TDph@D6PRs6v$W$AWJkD-^FW6 z0s0P)2R5(vahZHsAAxyDi4$S~LzY+zKs#qPKY!&VVJ@pwn8_jlqcqJ@0O2%1vjMZz z0Q&P2`ULPUhAgob07A{K(!@W3SIIMR3{X?r3|W%tZShvC^;3C!j4l03$#=UT-aJ2O zk+jY1?(RMzOELvQ39rzM7RV1dsxF@D@EA~SexkGu`}37_ThpZsSjPd(^78TtQsW&( z3x@S6uvQDh|HB!|wdR*k4?1yr7_^rrYHnc``4y00000NkvXX Hu0mjf>(ku+ literal 0 HcmV?d00001 diff --git a/assets/icons/help_icon_inverted_4x.png b/assets/icons/help_icon_inverted_4x.png new file mode 100644 index 0000000000000000000000000000000000000000..b4d5de724f85c0fee66057ca4b76579ad655c377 GIT binary patch literal 554 zcmV+_0@eMAP)0005;Nkl0 z!FI$T2weO6|G#Vx+t(OlWPkzVcFqB2B%-3F*818RU#kgt@y&HtN)f-|=DhgbA*Am> zi0*OWq29v9!Dh^&-onU4YZgJhg_;j;5KX-W&I&D~ne0{JpbX&d7I+gsiYx6D&w>Ck zM#3^O4>6kq3GClaJcD>EU~VQx)xxY{EI?!r(o(^uLA{v+*>~|kt6HnJUJoYm#D%|P zIqU4zTyY+t6x>n@w>I@*b84nyt96}~oPmX>ekAlE zfIj@Sfx#RMDrCSs{GB1o&lMqUm0{GNUy&~$dCvR_82*b0l?1xO5PyUTjjgrK$-LHL z(5X5}KwM8CLx5*{D}vnIZIRQ7iON7)n|j&(0IPO|2*_z?ys;ny+;t;wFZ2p%#=PP( zaNUgtE!am_!n_@d#+=ypx0IhQAo*UyK;YO)7}|Px?6^*_{0mVI`*97MlK{LQwh$f3 z=T2g9)OrCANdn%YRb(JdgDTKK0Hu-E?HwrB=|d;#6Im&W%l(9R4C7zOdG~6Atyz6L z2QoE?*ESO}vq>y!pvZ6@-#-1R0UimA$M;~zaaJDKhK=@~0drDELIAGL9O(c600d`2O+f$vv5yPQ1e6m1Cm^h5Ik1}@VFO4kD7)EBMsNUT z+4432Ck3el+p(Pht>T|lC5=B~Kiluw?}fWL^70=-=+$bqM z`~552dXl=j5a4Uig7fq9t7vpUIe{tsJuMF_JzQ2PodaE^XeEHS@?H8s@Xj`b)YZ)1V9UVEB`u?s z0HEmBDf_g41sZ%POJji}-BjQnbj8oKOjZKGNVF+OP~VQs62zTnbEjol68KoEO2HXh zfu#L?RavPNpfkt#Y1`s@z1~x4f2{i}HgS}V&iVQIo+!b1AHcR=^qf17Q8co_Y4GUf z(0OJXf(+5VUNXUW38160skl!$!ZQt*Ey{-m1bHAzFcttR@62X!PDMu7D@h=%7Tmtv^_v}xz`sPN!K7<-lzHEvfnna{tkcP%$rI#rJ z%rgnrV^)^V$`NjC?Z^)=B}ArHWUh5{5? z3Pu&{e@8mDyG^aLKwP;_==(?(ff)uf;FNNLBS2WHM`VfiVTfNMi?78*ST0)M2h?h{ zJ;h!_mk<_YHjV&UWBi2(6j&fw!;x;>E>Tw-+h;a|Uo?yS!+ZE$y}b4o#sXm5Js1p5 zhPS;o_IFe;_6M+1j6>8B|L0{fuAR>WADZ|xS#mfW4u`|x7*qZORgc+Q00AQ&00000 LNkvXXu0mjfQQ{2v literal 0 HcmV?d00001 diff --git a/assets/icons/settings_light_4x.png b/assets/icons/settings_light_4x.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6cde81dbac48560bd118f031768275f02da1e0 GIT binary patch literal 3055 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 literal 0 HcmV?d00001 diff --git a/src/nav.rs b/src/nav.rs index 2783a9bb..f4573833 100644 --- a/src/nav.rs +++ b/src/nav.rs @@ -352,7 +352,11 @@ fn delete_column_button( let img_size = 16.0; let max_size = icon_width * ICON_EXPANSION_MULTIPLE; - let img_data = egui::include_image!("../assets/icons/column_delete_icon_4x.png"); + let img_data = if ui.visuals().dark_mode { + egui::include_image!("../assets/icons/column_delete_icon_4x.png") + } else { + egui::include_image!("../assets/icons/column_delete_icon_light_4x.png") + }; let img = egui::Image::new(img_data).max_width(img_size); let button_rect = { diff --git a/src/ui/note/mod.rs b/src/ui/note/mod.rs index 0e6e0442..8122f839 100644 --- a/src/ui/note/mod.rs +++ b/src/ui/note/mod.rs @@ -370,7 +370,7 @@ impl<'a> NoteView<'a> { ui.horizontal(|ui| { ui.vertical(|ui| { ui.add_space(2.0); - ui.add_sized([20.0, 20.0], repost_icon()); + ui.add_sized([20.0, 20.0], repost_icon(ui.visuals().dark_mode)); }); ui.add_space(6.0); let resp = ui.add(one_line_display_name_widget( @@ -714,8 +714,12 @@ fn reply_button(ui: &mut egui::Ui, note_key: NoteKey) -> egui::Response { resp.union(put_resp) } -fn repost_icon() -> egui::Image<'static> { - let img_data = egui::include_image!("../../../assets/icons/repost_icon_4x.png"); +fn repost_icon(dark_mode: bool) -> egui::Image<'static> { + let img_data = if dark_mode { + egui::include_image!("../../../assets/icons/repost_icon_4x.png") + } else { + egui::include_image!("../../../assets/icons/repost_light_4x.png") + }; egui::Image::new(img_data) } @@ -726,7 +730,7 @@ fn quote_repost_button(ui: &mut egui::Ui, note_key: NoteKey) -> egui::Response { let expand_size = 5.0; let rect = rect.translate(egui::vec2(-(expand_size / 2.0), 0.0)); - let put_resp = ui.put(rect, repost_icon().max_width(size)); + let put_resp = ui.put(rect, repost_icon(ui.visuals().dark_mode).max_width(size)); resp.union(put_resp) } diff --git a/src/ui/side_panel.rs b/src/ui/side_panel.rs index bbe9c6e9..cce3641e 100644 --- a/src/ui/side_panel.rs +++ b/src/ui/side_panel.rs @@ -263,11 +263,14 @@ impl<'a> DesktopSidePanel<'a> { } fn settings_button(dark_mode: bool) -> impl Widget { - let _ = dark_mode; - |ui: &mut egui::Ui| { + move |ui: &mut egui::Ui| { let img_size = 24.0; let max_size = ICON_WIDTH * ICON_EXPANSION_MULTIPLE; // max size of the widget - let img_data = egui::include_image!("../../assets/icons/settings_dark_4x.png"); + let img_data = if dark_mode { + egui::include_image!("../../assets/icons/settings_dark_4x.png") + } else { + egui::include_image!("../../assets/icons/settings_light_4x.png") + }; let img = egui::Image::new(img_data).max_width(img_size); let helper = AnimationHelper::new(ui, "settings-button", vec2(max_size, max_size)); @@ -285,12 +288,15 @@ fn settings_button(dark_mode: bool) -> impl Widget { } fn add_column_button(dark_mode: bool) -> impl Widget { - let _ = dark_mode; move |ui: &mut egui::Ui| { let img_size = 24.0; let max_size = ICON_WIDTH * ICON_EXPANSION_MULTIPLE; // max size of the widget - let img_data = egui::include_image!("../../assets/icons/add_column_dark_4x.png"); + let img_data = if dark_mode { + egui::include_image!("../../assets/icons/add_column_dark_4x.png") + } else { + egui::include_image!("../../assets/icons/add_column_light_4x.png") + }; let img = egui::Image::new(img_data).max_width(img_size); @@ -418,7 +424,11 @@ fn support_button() -> impl Widget { let img_size = 16.0; let max_size = ICON_WIDTH * ICON_EXPANSION_MULTIPLE; // max size of the widget - let img_data = egui::include_image!("../../assets/icons/help_icon_dark_4x.png"); + let img_data = if ui.visuals().dark_mode { + egui::include_image!("../../assets/icons/help_icon_dark_4x.png") + } else { + egui::include_image!("../../assets/icons/help_icon_inverted_4x.png") + }; let img = egui::Image::new(img_data).max_width(img_size); let helper = AnimationHelper::new(ui, "help-button", vec2(max_size, max_size));