From 3500b5fc4f25edcc65ff3000f9acaa27bf3dc5ea Mon Sep 17 00:00:00 2001
From: jbohack <joebohack@gmail.com>
Date: Fri, 30 Dec 2022 14:13:05 -0500
Subject: [PATCH] passport compatible with sfw_mode

---
 .../settings/dolphin_passport/passport.c      |  34 ++++++++++--------
 assets/icons/Passport/flipper_sfw.png         | Bin 0 -> 1244 bytes
 assets/icons/Passport/passport_DB_sfw.png     | Bin 0 -> 750 bytes
 assets/resources/dolphin/lvl_1/frame_13.bm    | Bin 255 -> 248 bytes
 assets/resources/dolphin/lvl_1/frame_16.bm    | Bin 308 -> 305 bytes
 assets/resources/dolphin/lvl_1/frame_17.bm    | Bin 274 -> 273 bytes
 assets/resources/dolphin/lvl_1/frame_18.bm    | Bin 272 -> 270 bytes
 7 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 assets/icons/Passport/flipper_sfw.png
 create mode 100644 assets/icons/Passport/passport_DB_sfw.png

diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c
index 12e18be4a..8132b17c2 100644
--- a/applications/settings/dolphin_passport/passport.c
+++ b/applications/settings/dolphin_passport/passport.c
@@ -12,19 +12,15 @@
 #define MOODS_TOTAL 3
 #define BUTTHURT_MAX 3
 
-static const Icon* const portrait_happy[BUTTHURT_MAX] = {&I_flipper};
-// &I_passport_happy1_46x49,
-// &I_passport_happy2_46x49,
-// &I_passport_happy3_46x49};
-static const Icon* const portrait_ok[BUTTHURT_MAX] = {&I_flipper};
-// &I_passport_okay1_46x49,
-// &I_passport_okay2_46x49,
-// &I_passport_okay3_46x49};
-static const Icon* const portrait_bad[BUTTHURT_MAX] = {&I_flipper};
-// &I_passport_bad1_46x49,
-// &I_passport_bad2_46x49,
-// &I_passport_bad3_46x49};
+static const Icon* const portrait_happy_sfw[BUTTHURT_MAX] = {&I_flipper_sfw};
+static const Icon* const portrait_ok_sfw[BUTTHURT_MAX] = {&I_flipper_sfw};
+static const Icon* const portrait_bad_sfw[BUTTHURT_MAX] = {&I_flipper_sfw};
 
+static const Icon* const portrait_happy[BUTTHURT_MAX] = {&I_flipper};
+static const Icon* const portrait_ok[BUTTHURT_MAX] = {&I_flipper};
+static const Icon* const portrait_bad[BUTTHURT_MAX] = {&I_flipper};
+
+static const Icon* const* portraits_sfw[MOODS_TOTAL] = {portrait_happy_sfw, portrait_ok_sfw, portrait_bad_sfw};
 static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
 // static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy};
 
@@ -83,12 +79,22 @@ static void render_callback(Canvas* canvas, void* ctx) {
     }
 
     // multipass
-    canvas_draw_icon(canvas, 0, 0, &I_passport_DB);
+    if (settings->sfw_mode) {
+        canvas_draw_icon(canvas, 0, 0, &I_passport_DB_sfw);
+    }
+    else {
+        canvas_draw_icon(canvas, 0, 0, &I_passport_DB);
+    }
 
     // portrait
     furi_assert((stats->level > 0) && (stats->level <= 30));
     uint16_t tmpLvl = 0;
-    canvas_draw_icon(canvas, 11, 2, portraits[mood][tmpLvl]);
+    if (settings->sfw_mode) {
+        canvas_draw_icon(canvas, 11, 2, portraits_sfw[mood][tmpLvl]);
+    }
+    else {
+        canvas_draw_icon(canvas, 11, 2, portraits[mood][tmpLvl]);
+    }
 
     const char* my_name = furi_hal_version_get_name_ptr();
     snprintf(level_str, 12, "Level: %hu", stats->level);
diff --git a/assets/icons/Passport/flipper_sfw.png b/assets/icons/Passport/flipper_sfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..198ba5436018163b26671d31780fc5b8535c0f1a
GIT binary patch
literal 1244
zcmaJ=eTWog7$3Ti4$=CfgtU@jq%>&0XLfeRTaUY)U2p03Ze3Sh<luVeop<iW+xc*2
zuHCyt<BURxC<(9NDxp9~vwuo3zt8$3P_7U%j!KD0#7HVcOY3^)_V)6R!-1LSeV=)L
z&+~h}_7-|KEL*a22|*Cca@~3nO9sDuTND27yE^<F7AvAmIojk|Q56J;=rlb8kvRtp
zq9Ow3=#H;YJ3%zPY?sPWIp3o}&tX7p!_*ufqY0wDqviuRj3UxNgSMNZZX7>Nk+zwl
zw#s=f@2Am_-8~kdO=G<!I5rGblj>Mcw%0W5z(ElpYfi-twOWdr^Q+-=tY#^4&LkR6
zQFT(~e1S}R0U{NKry<92q@pq=FaR`+XGwt*c$Sk`UZOcp6ID%;$oYrD;R4grih6cF
z7`~;bp(ye-maSH+OjTsOV36fiRb@GW6$Bbv(BY^Xfg0_Gs~aA46vDvvBinPy*ds8!
zktjuBs`VTkKc8Q4?1uA|!Zl-Sz-M`eV;v_>Y|c82is*kDi&}@JQ6I5I6nY~8#0{}l
zH^8`f_YV{sVm4Y|VB@ZUitfP?2f0yBPf_>}W7?)>ambKm!=w!)D6}N1kOnd*)3OO=
zsK{!9GhoBdVt7$WCL}%4DJ8p-JfBG?B{{2$ol063vze^W)xhT5Faj<_jo3DhJ&#rI
zi`CKr0+AP#Jg?FigTjy(dEt=flY+=_<k~!dwi|1niMv!!T1SEX0y49K=a6${*6c+n
zBur!&5^lCCSOP6cGNe`2lxf9GAd5>%f@tCN>v;2?^3~@QYj7HVgN+7x#gY>+K?5FH
zG_Oh`oire#fx^j2OIA!t<R}(XWaG)XXObE!Jf87!VKMM!VYQHp_bI@ObN$JIFYwZ}
z7J5pV+1Xiq+&p!07Z%^=^v+Uk=J2=IA38_2wOl!O=X7-Gm2Cy)RnzR)fBRacWd*tC
zO!w^0&tGpn`|%&*8<nq*xN9~%w*Gwc<n*|>f8DB<9c!Bp4m?~u^x&a`cYi-{^R3IP
zPPoVV65n0W$8J3}03V&W+H_+b^T@7We|i6jJKg_Srwr=$%B4R#Km9N*^^dcUU%vR^
zl{b6-?3!s#<R-x0PxkCQdEmrZo8G!b>7Ux3KipP+Z}O#J;?kG)wF^K0UD(|>{@Sg#
zvv-qQaz}42@A+oi2is>}bl*L5YU5{r{g!N<{OIYUyU+hS-T%N+VrsOhvhSTWpW-};
MT&7n)()IlKe@XVQIsgCw

literal 0
HcmV?d00001

diff --git a/assets/icons/Passport/passport_DB_sfw.png b/assets/icons/Passport/passport_DB_sfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..69b2ac9ad4568b6f1cdc9d38f2bedb6e5d71de6d
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq004jh002M;0ssI2U9{*Z00009a7bBm000id
z000id0mpBsWB>pHph-kQRCwC$T+5QeAQ1GhYL)A4uO4&snE(GU*N|mHiNMSd0(qFE
z`(PmjgiO;j1C|`x4u=k=;C=#a8nOrU3@w?y-76AbKix{SWoYQ^C9rJ{#u5tUV6<_8
zJPts>!W_h`3<73yZV}%EGtI$)yV!$J3>$%feGmW_v^)U_!k@UwfQ>*v=8?-Pj+ngT
z2l$+2)>F$Jg~A0bNdN!^Kmh<000jV002BZ~0Z;${1$Z;YSrC92fEWNk0Z;${1wa7+
z6aWPPPyiGFY+3<IDJTFy41fXvC;$oopa3WU+2=kK;1bX@&3n>Yxqo6!F~AV8iy!4b
zb0@qb0-yjWVBZ9MdfKp60@m_3)t?S2FL}LQ&*$@32VMB~p=(a3)A4vT1r1$TG7DPu
zzlDDZjMuVQ!9IYw&TQ1H)>JZ5IzBrzzfUy~t?;a%Y`)S4`l0TW+{Qt|W>)~MXDrNG
zypRUgj(IsKeM$G_sX1*$BO~ZU3vAiexK_5GZX0PFkpNZ!ZPv{xY!|v@9*>8aI-Rkk
zfCvHa_OIn;7hsPj$ij>$fF+F1hpstx{T+JqADSi&i0?iJ<qC)spnL*YyQDZh`XG1J
zyDmjKFQKkUibFXB^sfD2^s1`L2?#t!+y%K6{~aZv$WdqRlzJip%-6cE2L<7h=q-&X
zJ;0JQr_q_nIywPvd#ZpyysV#1q)Pd@rbK6)fVcw2y)l&f=gA4sn<ncA)!3jOzt`Ka
zz1*xOBN0zzj*X7PvY^D-&_dqfkAY6TgB@1rqg)+4nVpy3F6fSIGOFuUm)a-ha#FMG
z{4jMNP#9;l4zw?-hoE{v`WhTaTrQW}?RLN4hdxF3GRGTwggg&ZvO}6`C%mhx)7!$^
g)2FsIeteJM4=9genX?&?VE_OC07*qoM6N<$f@Tvzd;kCd

literal 0
HcmV?d00001

diff --git a/assets/resources/dolphin/lvl_1/frame_13.bm b/assets/resources/dolphin/lvl_1/frame_13.bm
index d56ded472483aa9a4d2129b0e50c89e530455174..c93bbb3578ae2231b1cdae9f4a83d099a30e7414 100644
GIT binary patch
literal 248
zcmZQ%_`>kN!G`exKSKrc0Xc>b>=2Io0oe_94A#nT*OiJl$OeDE?|krC;0g(wBSLbH
ztjtp!8J{umG01HYaA=wFZ2HHOj>n9o>>oBdete*D#%4CdSCJjIr<?dMq)NN--Ly!s
z+{;(wdxD|<#9<dJfxAX)Ce#`S{7q(Nzj5H?SB3}7KOW`W`NRJBheJVieb<XZg=*d#
z4GN!{#Qgp_Bvd-Ka|rl1)ONG{G~CI2>;S*&$p#L&=^P0&8n}3bcE&3=KL3CG;LAFG
qOO7Vje^C<{55C}={-UEpzM!CD%?U=sFB^Uw{9ex%f$TS+N7(>FXKIN6

literal 255
zcmZQ%_|5SD|Gx){3>C}=<QP7%H`p*f;D>Ph8>|y*7|PslyD=;etYExqU%P@y@xf<}
zD?D;Zocsz+ji(eEJ~Oa0@JDbcIQbNN|9G<Cu_UkjhXV_Kd=N>K^KGc=ijjMIko|>G
z?_&0xIR-NK+AY<dFxWpyTqMhpH#5w`Zsv-*jg8H35>kFO6fpiNG|Q`F{`g11!gl}B
z5{n78ZEqX|Djm7i>lF-a794KjP(NUIw5evsoyNxr?311xVBz;}G4OF<W#f!lKk>ll
x|BoMh+0Q<w#Zl?Mt_Q<|FYMl5TwM5fSlEQ6FwFQBQIqg{f3ptUZxD|%0{}c`YTEz+

diff --git a/assets/resources/dolphin/lvl_1/frame_16.bm b/assets/resources/dolphin/lvl_1/frame_16.bm
index 4f15db4924a30af0a528a5cc4ce2e45b180eda38..fad6d98d04ce4f78371637aa8bea38155bb171d4 100644
GIT binary patch
literal 305
zcmV-10nYvb04)LkfGZvhumNDf{qYBF|KJbU{{SDbJOFb4-}neV;NbDVN5z-^zmJTC
z5FhmXyixT0KtIv{z?6aSe*_Fa_yr()&&y*62Z*>q?+*uwL`B38csXETBti$o55No&
zpo8WCfWM4J9uI=SN5~`(g26xtBoAD9IDsTF5FrE32AB~^z$1Y6fR@BkU<D<aBtg&$
z5P3mA0Qh&36sQ3B9ST(d5%34`s6qPU6<L?8ABEz2p*n%_1}7*z@D4L45Iy_`a|hSp
zu0`VqxM)kv4>)6>-h#a#ddG!F12-t#xCF5U6dnQm2bo-i;w~@zJP2U+1R*&=@Bm<W
z5zrst`ePsg&E#i51SQ3cfC%rv!TP8WcK_yJ{s4Fbz#ahb2Y@^Q;12+J1Hc{t@CSe_
D5|n};

literal 308
zcmV-40n7dY05AdnfGZvhumNDf{qX{)oE-Q6fO}*70Di#m0n7h?;2`^hgU10M7GL`Q
zJ~9+Qf79~uN7L~D|407<QU|^K5HSDX6oKzQEsPu<BH;(TJRT(x7Z5$*<$-{a2p<qX
z05C>^510l5{xKMMJ_`jOAdo%_1ppwBJ#pmX1dzl)gbz3xU_~bYjsw~PTM<cs6qaO>
z2S6x6<plf#;oeA6pabA^DO3PQz#qn;2kVSgW?ry<7m4bG>IcLaoS^r>ILw?t_wX6a
zA76sG7mOa^p)W8z;f{lP3iN^N9u*u6+@o^f62ufxcn9zvWpWdUxWDl5A%oZugyjdo
z0fFR4K!1bjjDQC>k(~e#mliSrBfkR&>Yzc}|CxjM0pJe+cmu#50PqKZJOSVj0C)qy
G9sscL<$-Jf

diff --git a/assets/resources/dolphin/lvl_1/frame_17.bm b/assets/resources/dolphin/lvl_1/frame_17.bm
index a82613f83bb7ce342c8f763e815574230ccbbad3..923dcccc4574055a81e0684f713d29d945d097ac 100644
GIT binary patch
literal 273
zcmV+s0q*_*01W~EfF2+I1wcQ+>JHF<ga7{r2W|Y*AOw$t*9I<tdWm8K06(1k9^ioo
zq&yzt;RmD)9_*6-4N$u92w*(h?l%|&I37e&A3%J>#0)Pv9KZwk6Cgfk8~`zc%f>H5
z373Q(a1qFZ)Bs@f{6HYU{4Nkaz@-ES@B%^pKTv;z@i<`r06qb@pa}2-`N%;0{{!Yc
zPGEarC*VTh1LuK%0vEs@)4)*!&-f2(;bh0n|A&={W+jmUiZsFN0|gK~NyraKI$)OK
zoiG5$!Q~$;ksMQ|4^TRRkRD)kpOcgyAOF}r;{b&KGT>*x{s(9N{zqU0ctQLC@CSfA
X0pJe+cmu#50PqKZJOSVj0C)nx=s|O-

literal 274
zcmV+t0qy<)01g5FfF2+I1wcQ+>JHF+`@{YKSU5Xx=9vH_d>*(lbOY2&5Eudc=iv7Q
z2t6U-_ZJ8~AYk`om+)$Z*MLI-=HGF+z#+i$B9Qt6<|ZIvdC2AfAHbOb^EluEj2>Pw
zdKgT+AoGBZL>{062cO~r1_$AAf%XL`AU}W-5Aphg{2z(K2lxT-4aERQfFI662j}=7
zG2(Lr+W|iU7XTkT3-}Pe0QQ~&h#r5ydtVDCK5zUytV=O0hzwDt4_Fu|f#Oa;dO_0!
zw-o7s20jlc`DBRVoiKWV)C_?01El<%p!om(!S5IZC;^uPJ_qnSKlk!G03*T=;0J&_
Y0pJe+cmu#50PqKZJOSVj0C)qy7MTBW=>Px#

diff --git a/assets/resources/dolphin/lvl_1/frame_18.bm b/assets/resources/dolphin/lvl_1/frame_18.bm
index c9bf0d8c39773d523599cbaaf8eca09178983eeb..0a60f3b79c1197ab9e9257b12466daad2e62d54f 100644
GIT binary patch
literal 270
zcmZQ%;9~sWApe20f$0z9KmHH(&D;L@zo@WZp!9eD0mk3*4HXP8pR;e_kvsK0hQn6<
z!MFD2;|=TqMTtibH#}(K<Kqt~Xm635AW*gU^ub1}1-3~Hg$J0=yi)kG{}>BvgSLjq
z&d)y{*fgs7321(N_~1+b)C+Pk5)!sTDylI&Jo6mb*=JsH{K2=OzWI+_!fW;)`w#v*
zYEZl4Nd5kX`g+E{|JaW|=&4~SWWN39kK!lh+yB|c4fi}a-o!q`;^1>WnJG3k2b&(a
zA6H=($ztI@Xm2CH<9Uif;zx|TYQ5VEhV}pX|H+(dc*?*rH$mkogNsbf0e*%G<^ysJ
NAJ`jg7$0D87y!{ab>9F0

literal 272
zcmZQ%;9>mVApe20f$0z9KmHH(P4f3xy?@#-eDJTK|J#2C_BVBm515zFk-K0}t$nvZ
z;miEyTXOtz46=?V+r{~qn>Z{iY#k5D2~;^azWT1u#`3D+YX{?T27coe&6oa52#7JP
zSrGL6{NsjCEHf<}mLG3#zGN5fP+5?W@Wo@o)B*#eN(LFZ^g#9pRtJHWS2nMafApXI
zx5&Y7iv|DvWBmJv{reAj`6j~;j7RwMKYwUH!Jq#}Cg#}ZW;qVIgvac2EQ$g?erDrt
zl$V*n6SzXap5@O62SarYhUABZGE@IbEnwRJ$NopL74sAZrP7AUQy2vbKQq`cKHz7l
PU_Kzn@PWMnox=kFwV89<