From cdc4c0b6b41c415e3dbbca8edfa6a273687be5bc Mon Sep 17 00:00:00 2001 From: kongchanlina Date: Mon, 23 Mar 2026 16:00:52 +0700 Subject: [PATCH] changed splash_screen logo --- .../com/tavultesoft/kmapro/MainActivity.java | 19 +++++++----------- .../main/res/drawable-hdpi/keyman_text.png | Bin 2683 -> 2637 bytes .../res/drawable/branded_logo_dark_mode.xml | 2 +- .../drawable/keyman_logo_splash_dark_mode.png | Bin 8222 -> 12905 bytes .../KMAPro/kMAPro/src/main/res/menu/main.xml | 15 ++++---------- .../src/main/res/values-night/colors.xml | 2 +- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java index a17b32253f..8b0ea603b1 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java @@ -80,14 +80,11 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; -<<<<<<< Updated upstream -======= -<<<<<<< Updated upstream + import androidx.drawerlayout.widget.DrawerLayout; -======= + import androidx.core.content.ContextCompat; ->>>>>>> Stashed changes ->>>>>>> Stashed changes + import android.util.TypedValue; import android.view.KeyEvent; @@ -175,21 +172,19 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene toolbar = (Toolbar) findViewById(R.id.titlebar); setSupportActionBar(toolbar); getSupportActionBar().setTitle(null); -<<<<<<< Updated upstream + getSupportActionBar().setDisplayUseLogoEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); getSupportActionBar().setLogo(R.drawable.keyman_logo); -======= -<<<<<<< Updated upstream + getSupportActionBar().setDisplayUseLogoEnabled(false); getSupportActionBar().setDisplayShowHomeEnabled(false); -======= + getSupportActionBar().setDisplayUseLogoEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); getSupportActionBar().setLogo(R.drawable.keyman_logo_mode); // getSupportActionBar().setLogo(R.drawable.keyman_logo); ->>>>>>> Stashed changes ->>>>>>> Stashed changes + getSupportActionBar().setDisplayShowTitleEnabled(false); getSupportActionBar().setBackgroundDrawable(getActionBarDrawable(this)); diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/keyman_text.png index 2f2891cfb826a7a9845f041c797fcd50586a666d..48b555f559bfdaddd7aa2af87a5aeab11eb0923d 100644 GIT binary patch literal 2637 zcmV-T3bOTyP)IKRT=;N&Yhj^_BFeGu-loPduQ$vL9wN4oh|-z4_s-0Ace`}m zmVI<*=6wFq-R-?Iceh)*+mg^HkkFC zRbv^nwzkfxqw#%`5x=}N*neNXt1B~AL_f-i0P0i{H;hUIy#Q8)DbJrje`Zt}8%Qn+ zOlVnsI6+f~$i7uZ5uMdA;|UUh1PSEcY~Ect$-EB3hlwW1u#?GqNSx~zipJV(-u?Cz z@Hz}1)I^kQ(_BquTU2YJU+d8VxMnP+BB~r)eU}`h-}Py?gapJhzS#k#K)%@#KLxOe^$oOV#kPsa>XK9*EEEa@0AM$_9xv0>O(ZWM7!}jf zX~+wr^-8Buc(s~?8H+WkSxpO-(&s~PD#^44rYquo5xgakwKAYKINO~Lzg=5v>ye_= z-2rD>f2XfhYM&8pSV4sw0nD!#kv7wM1(otmnPTxp07BbL{fP7x3WDB@=QIu{=we0n zR8@lB)`}-Pjx$)jfD}^oY}I!vLw!B$ArIS&hFtA<-md|OowOdL;uXI6-mK>y0br=g zRN2XtLxtq%8b#lq^SrBU(|VKS38OwV)(9l86jz6F(2&22%P%NXUq`B2$Kt9*ezF zpCAztRpvwCF>v8n2?78Go<<9s$4d|Z5WFYV(vlh(_YDqi;rQG82LXMy z1B?dbf_sX^;(K9^=FFKhn^b`^T(qpsdhXnu=be;w-DCQ852gg@@;?A-y%GR)ML!rM z&t(7tTZ$sj3;2gT8pdS=TFdi2yLQgaxXv_+{u*kxPXH+CO8J_M>qPrJHzrzds8%5P zsld3R9~Uk6_7Cm0vz|LW<2td7>&zbNt5~9Ca~0=fta$u{F-eM)MQ~%rb*5!Jce-f3 zruG9RpQ%X_foTM0SId>+&BQPb)QVESe;1-dqiNu1ZObSAv%ycmc%OKF0BM z(tIqJ_m&4%2BZTkAy%|msTJe+9)%)p0GmZ{KY^t_9~S^vvBy0x3@n5QEg1F^;?8Q3 zR;uPKEe%PH9)vr`>81=jX>Fk5QfL8`0YE@yAfgPkS*aQWB{JrVFr;-&d?nHg1_^{Z z5D~2_<;9JjbFM&K{~XCn(x&<4D%VkbKxn8L0FW)XzZa1nU!=LI*4EQf^HVJ%a*B^! zxp&vDbssd|fxtGcSE#sj-_A=x)@L@vYZWinZL@^kl*dtv7`14m|~q?S=Gg*sXSBAuQ_V>-| z{$J0Wa;1D#@PjrvsM+oa?#yn>zcez=6$)Ey)4UPjZ9c6iqWWn7p9COU@RlM@-#g8X zS=ag8{*sYO^HNGDY`q zqV;Q|a#8_YXSbTaOw3Bm1%P-w{xRFM*0WCim4Zjot=11hBMBY|#PDx*f+qolHhohK zf$Rtf$mIb1XEEDM>pqZem}E@21kZJKb!uG+R%~R1b?T8=EY>KZuL_jcWCIQLy=hI6 zt~M*RyFOC)Z;}@Qh=Pnz;U}qh@`~y>LsD5Q;f*Jt%VYLNQx2{F;vW(`+O{mO&9XMx zX6jYjvWg(by%PJN*sngx$>-OKmf-CG*)liQ_*kw`*izD!GexAoYF+_|l2vu3;HgM^ z{)y@sg+gJ6h<>_SE+TK|3We9JX}5;uL}lM5JFt3X>jte+_mH z^j#|=)s5uRv}s5i(hRq)c*wWH6eRjJh<+0tVB1?7(VY&92a-n<2Mkx0|%xeouab^fVP^O({*ISi0*)4bQX)n_fkmJM_L90@waw# zWB~-?n=!K~+Ay?WbS;_~rg)6h3d&i;Xcc}4y0Pbt79ZyWg00000NkvXXu0mjfn%4Mt literal 2683 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 diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml index 9d467ae156..5cb427161f 100644 --- a/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml +++ b/android/KMAPro/kMAPro/src/main/res/drawable/branded_logo_dark_mode.xml @@ -10,7 +10,7 @@ android:bottom="@dimen/product_logo_bottom" > diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png b/android/KMAPro/kMAPro/src/main/res/drawable/keyman_logo_splash_dark_mode.png index f26f30c78647e1e3459361ea6532b80f489cb121..0ed8dd4e0d6df94498352cd09c2b6d31e38ab7ce 100644 GIT binary patch literal 12905 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%0A8&a!4Z?nlaikl{YT(`@Yve zQw-vz$(lRhwM)yl4K{ajl?Wl=s+O>U*W5n#r~vVTwR8!tmH`k!NkoAYgX6w*B4= z?R-CTI0q{!gfUyTSK7xt<`9RzmEy@QwauUP?5^je0YD$=fKkJBG_mAKj%HcXmMlW| zlU3(@knoi}zKuo&P2J^Q8$&PgsW1WXLZz2lsUqU-dJPfwO`KP%c-THI9fNa3$i1ll|KKtKPyxWrZ=D%dXZS{^sg+xY*#S^kyp!-xuJHDGR@M@Y;Qzqk27+> z0bV*YzqRW_wVpXxsj>_P9Gd0Ny?f>ANqgW&r!U>LH!kJFH(<(r=1@bxp>S+G+uKBE zW)+w;R(7w_bED26*Ggr_QuH?o+mJc;~-uduqiJCY|n^!xSa(nE5}nvAq&Fd8$UjO|{8xX<(PG z_=kgz2VOTKWmjan%L4>6q8F>NAaR8Q=C83X`74P zUpnONWYBaU-F#2{`KNQDea#U?J9wepn>Gl-cJ|&!*qX=bC`3hu%@=y!AKY?)sbMv-`)j&NERHltv^X9Y4(LcRd-u%N?At{7`$XmU%+=+wkkZSF)`7j_2dq&a=6KvfaO3|GEKVKiOPHw^>i@N8hFe(t4}JX@RB3J9@o049shOY zCg-~HDusKP8$vx;{&-F_ZYd~9X6|W6!8QZT}LAlms?~HJ@Sk5E zR|~J16;5MAUi=#Nc{*Vf#!H#?RqlJB$UsfVE7<2()@RejC#$&>c)z;zu9u@=9`J@l z^P7nma+XRZo|d#BVefM$8ZQ;Mp@E56UZ^|VRg7&YAbGl&0&U_icT6}`w~G0viV5OLw^MuOrB1J15*@0kt=LUAc|x%Q^n2hO;IG${N~l4;UD z9o2dq6=PLhs*$-oE2!D85YyyG`R$pfw=vP}qE~i7k6GV--S3RNbJg_!4KdpJ(ng|5U=@P+KhOpWu&a2=B|wA#%$DLOq^}drROJh0t4Nn=@N#6&;DOh#2 zw*k!zf#Z;Y1Yi16Gi9WWv&dE8Ef${5{N%XBamT;uW~d`yJRv7+i;|H7qVN2w7$2B8 zz(i$g_KYsTD-*Qi;gz)sR;IkFP8l05zFT>xPvwYS&6w$gUV>*X;4azEZTpg96xECe ze9Azd6zJG3iB9S`QZ*D*;E%6}kuUD_TY;y`O;bv|l|w?4nEg)$8pp}afWYHi;+z{h z0jg7FU`5h+N;|lX|JH0>uv}i9^7|qK<#k|Z!9TG_4MX6`W7UfW`IzAPUcJS3&cpwe zjUFsoh*3%h44SQz-p#gDv>cNrr79(ApG*rReQxnI6hewSx2Bw%`S)$mg}a!2G2Pf< zxmnn1(nn+`t8Z8$a*3Nc>oeaxtV7KsxnTZSZcKYw33Oa3!8ea=t$3fj*p^JGsWF8O zpCLS0rK|m}y7QQvf4i{w5 zsC}ufh+iYiE^Wz4IA*WiTY+580>iqZHQ=~@aSQuufdk5h!9V@~7bByL$~ogC+n8h>R$tZ}S7n#6d3eS5ZCRU^lB|_`9lO4P5j^qmWmn*Dw)CKN zGqOHJ^u>uUsSNmJ7;k^~*R}^^{YYKK@u1!f2+e78zGRW;D0@z;pK_`pm>l?o8Xl_k zU9IGHW@n{ibx9(e@mlRuzmwTbum_9y2YPWChK)~2z4|hVU{Ke5$JT|HtipjWD^;sW zQfu-?)a|=qo?iG5SKmRCDD!>Qep9cP}~7%=sjyYKPaCGtW>sonrr)(gAXO5=g0 zzs^rF#uRv^WMBZZekT{#4h4hgAFubEuJwA`jww`4XtE~9Jje{9f>5Dh%%q{JE=lqm zvSV$%qiZQ37g#pBu4!SJR{LZs{Z^` z534`I=FJl>F#~etdB#Jg4FO2#2OPA(%Z&~IX^XP0n$&@>L|-Op!yl&q>fry2!2c@* dY9A<8BPyGntF2T1{T;#5RMl0fe)Tr|e*pREYn%W8 literal 8222 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 + + + + -<<<<<<< Updated upstream - -<<<<<<< Updated upstream -======= - -======= ->>>>>>> Stashed changes ->>>>>>> Stashed changes - #171717 + #131313 #FFFFFF @color/ms_black