From a61e73b91bccdf7fd7917e7ee91ca5fdc7814922 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 10 Apr 2017 22:51:10 +0200 Subject: [PATCH] Improve color selector, selection is still a little bit weird, however, much better. --- .../java/com/b44t/ui/Cells/TextColorCell.java | 50 +++++++----------- .../b44t/ui/Components/ColorPickerView.java | 14 ++--- .../b44t/ui/ProfileNotificationsActivity.java | 6 +-- .../ui/SettingsNotificationsActivity.java | 4 +- .../res/drawable-hdpi/switch_to_on1.9.png | Bin 17227 -> 0 bytes .../res/drawable-hdpi/switch_to_on2.9.png | Bin 17243 -> 0 bytes .../res/drawable-mdpi/switch_to_on1.9.png | Bin 707 -> 0 bytes .../res/drawable-mdpi/switch_to_on2.9.png | Bin 789 -> 0 bytes .../res/drawable-xhdpi/switch_to_on1.9.png | Bin 17992 -> 0 bytes .../res/drawable-xhdpi/switch_to_on2.9.png | Bin 18134 -> 0 bytes .../res/drawable-xxhdpi/switch_to_on1.9.png | Bin 19313 -> 0 bytes .../res/drawable-xxhdpi/switch_to_on2.9.png | Bin 19985 -> 0 bytes .../src/main/res/drawable/switch_thumb.xml | 5 -- 13 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/switch_to_on1.9.png delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/switch_to_on2.9.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/switch_to_on1.9.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/switch_to_on2.9.png delete mode 100644 MessengerProj/src/main/res/drawable-xhdpi/switch_to_on1.9.png delete mode 100644 MessengerProj/src/main/res/drawable-xhdpi/switch_to_on2.9.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/switch_to_on1.9.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/switch_to_on2.9.png delete mode 100644 MessengerProj/src/main/res/drawable/switch_thumb.xml diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/TextColorCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/TextColorCell.java index 37aa4098d..3bb8d6387 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/TextColorCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/TextColorCell.java @@ -26,38 +26,34 @@ package com.b44t.ui.Cells; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.graphics.drawable.Drawable; import android.util.TypedValue; import android.view.Gravity; import android.widget.FrameLayout; import android.widget.TextView; -import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; -import com.b44t.messenger.R; import com.b44t.ui.Components.LayoutHelper; +import static com.b44t.messenger.AndroidUtilities.dp; + public class TextColorCell extends FrameLayout { private TextView textView; private boolean needDivider; - private int currentColor; + private Paint dividerpaint; + private Paint circlepaint; - private Drawable colorDrawable; - private static Paint paint; public TextColorCell(Context context) { super(context); - if (paint == null) { - paint = new Paint(); - paint.setColor(0xffd9d9d9); - paint.setStrokeWidth(1); - } + dividerpaint = new Paint(); + dividerpaint.setColor(0xffd9d9d9); + dividerpaint.setStrokeWidth(1); + dividerpaint.setAntiAlias(true); - colorDrawable = getResources().getDrawable(R.drawable.switch_to_on2); + circlepaint = new Paint(); + circlepaint.setAntiAlias(true); textView = new TextView(context); textView.setTextColor(0xff212121); @@ -71,33 +67,27 @@ public class TextColorCell extends FrameLayout { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY)); + super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY)); } public void setTextAndColor(String text, int color, boolean divider) { textView.setText(text); needDivider = divider; - currentColor = color; - colorDrawable.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY)); - setWillNotDraw(!needDivider && currentColor == 0); + circlepaint.setColor(color); + setWillNotDraw(false); invalidate(); } @Override protected void onDraw(Canvas canvas) { if (needDivider) { - canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, paint); - } - if (currentColor != 0 && colorDrawable != null) { - int x; - int y = (getMeasuredHeight() - colorDrawable.getMinimumHeight()) / 2; - if (!LocaleController.isRTL) { - x = getMeasuredWidth() - colorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(14.5f); - } else { - x = AndroidUtilities.dp(14.5f); - } - colorDrawable.setBounds(x, y, x + colorDrawable.getIntrinsicWidth(), y + colorDrawable.getIntrinsicHeight()); - colorDrawable.draw(canvas); + canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, dividerpaint); } + + final int RADIUS = dp(8); + int x = getWidth()-getPaddingRight()-dp(17)-RADIUS; + int y = getHeight()/2; + canvas.drawCircle(x+dp(1), y+dp(1), RADIUS, dividerpaint); + canvas.drawCircle(x, y, RADIUS, circlepaint); } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ColorPickerView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ColorPickerView.java index fe8750acb..cebf9d3a2 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ColorPickerView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ColorPickerView.java @@ -36,7 +36,7 @@ public class ColorPickerView extends View { private static final String STATE_PARENT = "parent"; private static final String STATE_ANGLE = "angle"; private static final String STATE_OLD_COLOR = "color"; - private static final String STATE_SHOW_OLD_COLOR = "showColor"; + //private static final String STATE_SHOW_OLD_COLOR = "showColor"; private static final int[] COLORS = new int[] { 0xFFFF0000, 0xFFFF00FF, 0xFF0000FF, 0xFF00FFFF, 0xFF00FF00, 0xFFFFFFFF, 0xFFFFFF00, 0xFFFF0000 }; @@ -56,7 +56,7 @@ public class ColorPickerView extends View { private RectF mCenterRectangle = new RectF(); private boolean mUserIsMovingPointer = false; private int mCenterOldColor; - private boolean mShowCenterOldColor; + private final boolean mShowCenterOldColor = false; private int mCenterNewColor; private float mTranslationOffset; private float mSlopX; @@ -145,7 +145,7 @@ public class ColorPickerView extends View { mCenterNewColor = calculateColor(mAngle); mCenterOldColor = calculateColor(mAngle); - mShowCenterOldColor = true; + //mShowCenterOldColor = true; } @Override @@ -344,14 +344,14 @@ public class ColorPickerView extends View { return mCenterOldColor; } - public void setShowOldCenterColor(boolean show) { + /*public void setShowOldCenterColor(boolean show) { mShowCenterOldColor = show; invalidate(); } public boolean getShowOldCenterColor() { return mShowCenterOldColor; - } + }*/ @Override protected Parcelable onSaveInstanceState() { @@ -361,7 +361,7 @@ public class ColorPickerView extends View { state.putParcelable(STATE_PARENT, superState); state.putFloat(STATE_ANGLE, mAngle); state.putInt(STATE_OLD_COLOR, mCenterOldColor); - state.putBoolean(STATE_SHOW_OLD_COLOR, mShowCenterOldColor); + //state.putBoolean(STATE_SHOW_OLD_COLOR, mShowCenterOldColor); return state; } @@ -375,7 +375,7 @@ public class ColorPickerView extends View { mAngle = savedState.getFloat(STATE_ANGLE); setOldCenterColor(savedState.getInt(STATE_OLD_COLOR)); - mShowCenterOldColor = savedState.getBoolean(STATE_SHOW_OLD_COLOR); + //mShowCenterOldColor = savedState.getBoolean(STATE_SHOW_OLD_COLOR); int currentColor = calculateColor(mAngle); mPointerColor.setColor(currentColor); setNewCenterColor(currentColor); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index c01c75b10..29ab9a548 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -259,12 +259,12 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); if (preferences.contains("color_" + dialog_id)) { - colorPickerView.setOldCenterColor(preferences.getInt("color_" + dialog_id, 0xff00ff00)); + colorPickerView.setColor(preferences.getInt("color_" + dialog_id, 0xff00ff00)); } else { if ((int) dialog_id < 0) { - colorPickerView.setOldCenterColor(preferences.getInt("GroupLed", 0xff00ff00)); + colorPickerView.setColor(preferences.getInt("GroupLed", 0xff00ff00)); } else { - colorPickerView.setOldCenterColor(preferences.getInt("MessagesLed", 0xff00ff00)); + colorPickerView.setColor(preferences.getInt("MessagesLed", 0xff00ff00)); } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java index d7be446be..650961b7c 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java @@ -285,9 +285,9 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); if (i == messageLedRow) { - colorPickerView.setOldCenterColor(preferences.getInt("MessagesLed", 0xff00ff00)); + colorPickerView.setColor(preferences.getInt("MessagesLed", 0xff00ff00)); } else if (i == groupLedRow) { - colorPickerView.setOldCenterColor(preferences.getInt("GroupLed", 0xff00ff00)); + colorPickerView.setColor(preferences.getInt("GroupLed", 0xff00ff00)); } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); diff --git a/MessengerProj/src/main/res/drawable-hdpi/switch_to_on1.9.png b/MessengerProj/src/main/res/drawable-hdpi/switch_to_on1.9.png deleted file mode 100644 index 8e7b62f046b6ccfc7a0491e302e932c59368bbbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17227 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 T8%h1=00000NkvXXu0mjf*M^0^ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/switch_to_on1.9.png b/MessengerProj/src/main/res/drawable-xhdpi/switch_to_on1.9.png deleted file mode 100644 index 8a648b8ba4ebefdca2880aea25881d2ed5d32fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17992 zcmeI3dpJ~U+rZa|w&X3+0jZ{`Eq0AL7|aYNNluw^ED9MjYZ#2t%s7Nf*%e!5i{wx# zdykT$a;RZTdzX})LdhxZts_Mx3DLI(p;fJKfA9Cc*L%I!HFI5axS#v*tmk(>_r0F^ zV@2Dpv-pRCx&idU0CFe_;aMj=!v02dT8&>>tue*rbb7&8)=3jLN0<1pwE6QQp$ zW|d?@v@_iny_&}d(Rw<1SSFrGKpRkW2zn$6fv^Hi#1nLJ1U!yN!4e2mk^z;Vj~;tr zXbR9TBR-2wwKp>#n+}qUG2TL902PM|4i44{*45$hy>J8yg@VHqaYP~(vcL+q`3o5# zSbxEi(IB7Vn1KQ&pA#VD@chw|xC~ETpwJkDkxVrH8e11PV0WT> z<$iT)fpAR_gkTKmS3L!e+X6tGJt*J>@|ob8AZRH|zP5THhdq&;&mu`Q-@JA(g!2tI ziDuMoWGjqj$Ou|1bu}Mk2zh)*9?y?9y31@oAw;iUjn<+wm>hozQf(s~+E82pu^#?s7$t}o`D{;R3^w|V@V9Q9@Y~igIE&501tXn zh|mXf1R|Y2+5L;qW;|w~q*TU2v!KunPhEWjvL^$p&-5f?NqQ7K)>Dr`#Io^3eUMDi zCxQBuPoXEde-U~;p98fyhTkL`$<_Z~r}#>kFQ&5O2%ycmZPKQNw(dwHa{#w~KKe=F z#~Eoz0SvwXl$4t>=2N|mcd+pWCGi<4TPlMoX=OB~q#8h$5$?0miOU-I9CPD*nZUnC zc{Khc_ixV;><#)O71U^`5vy+p5%Ac;UK0+x)Y7+@*7cnTX2G8qOS`BRSni5x%;2~UOk8bS9{ zL;4TpU}FC=y&3*qAd80kw5(49|4nK8d%f?UE}bv$BmeDb8?C|5Tj8e;{$=Ylk{lkW zP}_xC0Ar-x5sYwOj7@BqQF~`e`}7MOu{R*%p%-+@gkEE=lhtrn7i8DTYPjo!r;|TN zNF$ET1{&1(F+pp8l8*T=7*$ zmv1>vQj9r{rfSl$d8BWSjzWiW=>Gt2{13qwEp`01^RN6dv7&!vR9GzOBrqVzq7)Z0 zADC8(3kC#Pl;T3>1Jg=z!GIu(Qe4P$iVFq=S(M^J z<^$78alwEfi&9+3d|+BBE*KDGQHl$h4@@h?1p|UCN^v3cfoY||Bt4s9tl2LJ_qE3;LOAx$kQcHXla)XP4$9Zjy(bP3LNY0Yn~apjRR zUZ4E6VCKskMhS^Q%9!1%n+WGD?=;uaEVpx%MYfo{_ce*`-dCqzakhD!?pU}+dHen8 zwHcd~GBqzW)IZi_#9wZF!S<@E=<~cbz9WH;`14NuT^TVT_ZQR?5*iB(!MeJt%W${)|-#)K1B9m_h zZxO7D$c~{YooMT}(2PeZFIGQL8`fRCOrz`$ZQ$9G=d@#}2=}m;`Q`LfeJ9z-RVbjn zy}c@0Wm$z8hT!yJXIl81=*2(UZV7+AC*E3=l&mZ-izg5WJQIw}l(Q?N48z|wdZ97Y zfQJ#PYHBBQy{gL>?Rbw`zTvFAf6L|9rQq$v(jS#7O`}Sb?PN_vgFTrG41*L65B6*+ z+nUYFZG4pJaB8>*T1{-pKu6a7JWjmwjD5*bN7t_$N?7^+VWb>({-&rHpOmSh*+5Nh zHEr$d5Z9UeuDu)VF3H(3)Z36)SXj7VVXT*~@?H8CFa3?n7kWKOO$3JqpH!xP^zrd2 zeBb{x&3DO?B?EnJJ9!^J^i(TG#B{kGl0&_ETiX3hkYAZwHbSrBYf*ydt=D}$2~A0KZaG2fefVduvk z>n$wy&4_3TtDY7z@7f2zkV*w23b@S~iwuKofD=OM&_PbhC0D$Y?Dd`(byv&fiVv?l z)rK-DJGellxqw^O8ttZj)dURy^^J|3`nz}S)~}DnrB*K7`aAnN7I@J`)3vg|OfTlmM?b|MP?Gh><-6V6lsDbd5FRt4+bJ06gjVtz%PpXP- zQQI#CwpwWQ1NJ2KyGbtG*23Pk*YNIBJ&NLL?5B1
o&vHkJ6&6jrEs`x?ufX^N8 z1cg1OoWVxFxqjZ>P@#5oyus_5TUfLOdfjt3&8ob|y?rr6D17V2Hs84M$ajEPecqGw zKLb>Yf?n1pt4*0Qg`UC5h&i4(bH1%hV(A{!#m0Di&Gm}=`MyUM&e#Xp(&_ZmSy@ZU zw#oyTxSRXTW_z*+m5(i+7IBWVNo!VgxIAF3jfJk)!J+QOu3LUnhK7csNW$8ZY`3uC&YY5hO`A9O4i69aPr297P*)h(nc>!prPm4j zet)B-3)F3>zxL;=&A@s8R%$(@{|#VXP;F{z^6u+ueRpO1;2-Wemx>k72Jf3w?9LmM z3={=-7c@6DY0Zr}JR`|QQ#qzoR#)KV^)$vbih8A(e|z!H)fE+{QH51iRr8XQnHQ2Q zHRDB7%rVMmGBXzgr!zC7#c^T>^JMvbQML{aDgr(GrL#^RLS5pu9c(X)U5r|{|VFu^$Vf_HwM335UH?q5-xC+7Ea!1AzSK{r9LRg{z+GEp z^Ur|5hT4dAr?wvJ|k|ln$T?vbY9@r!&;btq8RI^T(%l{l@t2KMaA`Oj-OL=*= zOJ`}f?rv>u)rc*dW}=f?`A%#RcM)~;9+5z}^BsC#Y*}VeQIT-EdvWNTWShMxZz!=V ze-N3NrMm*rmRcg{xwThI0BroNS9h~EJ`GNJ|NK;%25{r|$nV1FbsFi-JIcYoj+_?A8@2Wax7%T`0dA~n{{26jA`1Uc*~`s!1;vQh4bgPiw`c$y{8EEoVOdIMhyYTxTm14cI7nMw%69cn~iUyYh1xkNZJngC4UAK46oH>98Nnbx3 zIREBDf6t=kg31gI?QPykP72g=!iPWf$D+;(_0+O&xa9iuVbj$1opBlLyI4#Wg zutT+~xX`v%h#Wo3K;(z036*_oM{(?s?AFYlRaa%!2CcBunYN6}{K(@g|uCFgd? zRMz&T&(%Y~I$j=dW;?B|94hF1U_*C{IJY<_r#pd@Qk(xw(Jv1CSRYd+N_at@k(!}B zI54p8C1kPSYKO#}md5)&qGM1_Jw}GS;DyX-q9RkWYBxK(3v*3+9u$YQU502HH2MYI zFW_#lzR*tgYt~<@-Tkb9o7+x4o8Z}8KuN8fvE@p5e`;}9-xbseaeBHZ7Ye~uy`ca& ziDc(ZZ_<1cQJ>Vb&Mv{D$42EA>X0&j$qvM;p4Ch*zjMcqAD>%M;RKy0vVJoE<#wR#}PcH|VEUs@NS* zo)#g$$F!ot0XiyB*vDl&#Jx&7Ti1#scg;hcCwn)bLP+$U5Tk`TZQXqxg;1&Z zmCfEz^^#qrSN6Q?^4xYgS-DcBn7`5mzx%AIDNVDJJ<;{Le^vVNm8gzVd`wahaqKO0OVr4rvLx| diff --git a/MessengerProj/src/main/res/drawable-xhdpi/switch_to_on2.9.png b/MessengerProj/src/main/res/drawable-xhdpi/switch_to_on2.9.png deleted file mode 100644 index 435ce2150d54aa2944e5eb8dfb5c72f1c555a4a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18134 zcmeI4dpuNm|Ge7!tV@{PBp*%{hsG}J+J5Wn)AY(&-HuG`}6&NzGwb8 zq8uG;CTq;n003a}DqETp^huQes;fbNQzMt^Lm!jGwr)}Y(ENw|R|SYq)B}K}(LB1V z%+-E1nJp5SFgYR?Xc8z8L*4*DSr#Z}vVB1rf(3f>gciu|3nfSdk7I#!!P}eKi>*N) zo^7xMTpR2_X9xSTNgU)dss<&H3?&eNGA1HWz!yr%ffmT&ykzKHu0|sf!!9yk3#6rd zK!mHkBf?rF0TFl;Jc@0K#URW{CK$XK34<|4U`;VNG{zK-C801FvY9yO zMv-v1WGC9n(cvJ;0_h`@iOFbmKtO;=0M0}t@kV1vBof*bi^gJ6kOxW{B$P1&Q9|j0 zkt84T&_F3$!V}AQA|XPam&p?O$t;ja`9NdG=zR&qV*?4LqwFAx=s>0zjWIDre<_H= z9*YtCN%+H;#$lsDJ}3Z%GAR^?`C^>dMndFwQUOO1b`%0MHG7>gC z6-FvVf$o)TEdiM_k%TT1@u?%T%<%(4gtaxoz@EwG3FSx)DQLL=$6|j>1=5%@kP1yk zGnA=03QM44v1BtW8AF6bvZ?8~BqN@%9QGm(j~n!94iX(hB;zq;Q{4C*<2>OxpvA*s z%9wvE%Xr^$c{pq`S0oWIWmKMk=?$XALT?KCqjH?**pwn$i})f5bXg!3M?rr{JuYf^ znvqutr81_F4X&b5A%zK#$02h-0s)5sO;P3`mWeWBn{!c242Ofl;kh^x$YB#eB4!w( zz5V#`&r;JwY(M!@8BNWBQggX%Q#_GFM1foq5oLxoBcPagHV%a~Cz%n<%at4i?w9wQYZe(l0pFY)oFz|W94N1(D zNJ05>vp{}WZ(|*7tU<|RhLwW)B*u2d1KqwBILE8t z6!U>umAGI)6pKn+iuu5-N?b4?ibW+Z#e85^B`z2c#iA0IVm>gd5*G}JVo`}pF&~&! zi31p}g3RN_+12WC~`f&o!1Dsd_11G6e|!GI_hmADl1fmxNfU_ca$N?eNhz^qDK zFd&LWg}5|6zG4dsq4#P7pciOWI^Xf3mv0elTPJ$}2wnsLVcP*s(73vaW=Rix&=~LOLwC`?R#GDED(cySCA8ngtiSz0&-%`?_{jDj zu1;4iE6mb7qF*YCl2ZwfGEa^E)gC(V1EmMp4WK;Idz6MKWR zfA!)UXN}LEK6NdExzkjufMFudb`7tMpA7^VG7oF)-?{Th95O~-Qjpl$-u|<1UFLVz z*47jvF_oK215#5`Y^Z&WQZp(w(`Mz$yDu8@4|cz8O$l7J{P}zjy3W)iaVKJPL;8d> z_pHo77xyDo9dT+Ed3kvpPtRX+{9m|F0$N&H+SAVzr#&q6OV?UH)608k@cp5-pvMuK zGh&@~O*R0Ym6ao=ZdDm92&2&u$UE-4la>a!15fgsLpu)IE$V&XdnO~a?_q#vB{yg3 z@!LK-K)2aZK6`YK+JJk95pGR5v;ViYprPWBzOItJ`WC?hIW^P^haFNt==J1jVTH2i zP6pw(D*Y@I*5+!fhoxZmKCikwX}&5D=aBNkWX4&+Ln<6x*B_c)cpLqrgOe7lq81+;6%`3ye4t3?rznEhRJ}J z;6bk8gSxuIUfe|L<~MOx$Hd2-)7R}Oeen8{3=Doh)Z5+LQRtk`lZwtc8YB`ozj=+T zj4m!NzIxI=;W%L2!w;s1aoi38Ugz@jul?2aaP|a*sOe(R{l526YFW4RYIb*4G^TGy zcs2Je5kh+Pu*M4kqSHl17HXHU1jn4P<8Jw}PELA}$AA0n%1<6HZ4y!(blq+xq3=B- zbTTR#HL<#3{WB-6ITBJ@X{Ua>F!cSKe++CIJistn;!$^R?%cT!dXZLk_3y%uO`4d( z&iw7S1!@S%yZ)E!lAWI4gyv1@#Gt4PY4P0e)4i-~F-}M^-Q`uK8V(L>LS-HuA zH?7YXCaueGE~`#j`t;P=6o)cac2VV=`24}tlb%}3r^Y-j>^l7I6n#qI^E->a+jp%O zs`KT7@|)$x zW-VB-z*0x`nA0wAhu&E#Wmemhoa`>Xs`$S4>CMC6v)OD>dCSWyi<|Uk%mG|0Pyg|< z|8aJ9wmI6fm=QGa^e`$p_SXotZW3$%YF3PghsTdV?Lbdke&Er72F^{JsZz~yj*e<) zP}7T^wi=O&m!F^CisV>Ht5NbPV>{ZkC>m|?ff(R&Q&UrZa%@L*@HhKPCUKpeD*TFy zibNCCadFYnG-OYjLFS~UO_^$4Bp>gwudOil$i2df)ZNix}0Fg>k+ z;gCp@u7s9i_YDrVV9Wfnc`3U9XqkIH%ojBu@UBk$5pt=_&N|xgsH;n;f*?ws*zN<} z5}d?)T`#$y^XCQlI3 zVmC2Y5W+^r*m@R7A`aYGh@ZRNN*%kqIyF|(Yd100DYNUvi#@fPj4A`ylBvLcyJS9c z*O^DUn<)qF>h}<8rm>tSo~u<|u4;*J30_ox-yph5)98BZVnAnL(+1y+hX*xM&iVHY zTqLk6-IpI-SL&Xj2I%SQYi~nbU*nSM?7&7^>8K7oe*E~?+pXN6wOrEIHDxikzoyh= zIH$8u{#C#N;^Lyz?``y}?4bl)iJW}aJ)_#)07_(+d|4n6s9r)%(=c~V+dZqHF)xn* z&Ai6f%WEnb2GgbiAwE9Ob~$O#a#_0CQ&%NVi;RrS1hOi=k zadmEf{xTAg*uR3JKXkBup{Si9!3}+jtK!feQ9d$#$-?`%ymzemvk^rFTXT5+z zhDmx=g8A>~eCx_>Y;1;@e>k2A>;Ih=e*5dB27m7S7;IR?qCn_f!S-Mb!J!CpgoN#n9u zmka%0JjhP@CG<@`Q!nl5E*q}%A@Ig*bK$#;qN4X}d}~in+VbXk%5kR(eEM8rURwFu zmQ?M{&1Y0DWwWon@u(~E-bJ~24Ecj$az|m`-nmO_rvSy>b-A^V8C?apzBv@@O-+q@RFL=Qc|gU>%j;2#Tz9tK81jfW-1d^?AuH5hMf(wHx9GqPsK>0@ z1oilCLH*gM=9W6)G>*mMIxRs%Uh&Z2TO8C_HlvdqIwS=QuhzGfomGrzbC3Rszs8a7 zy1&ira88cRWnbGnrM$e{sJZ11QcGY`DbD%bIwy;`NWfDOclKUDd5Q8}Fsvhc>gp`}Oq$z8QGvXDX_!6v^eH zPR{Zu3hwQ`5YRm+J?1DDG-MWJE}is<3W!WDm7VwTSP^l`dg8h|zwY&iz6(6+($Uow zI@DR8W3##W7ib9ui>B^yXL6HgNF~_7q5H07d|W{Txb2- zQ}lf;#0Hg%;%B#x)qVTzx64q|cjvdO`DT!`thKL*-`ui%AM!p}N0nhbT{Kx+J2Y7C zr*iQTvHCB%(Y*!X_cb0F_EcWA65~{6ghZdv<|Q0i4eW%v^?4nn`zg8=S6f=p*q+}M zoZgdsctbEDp-Q+q<@XL`%ylC}@b2mf7R`N{&|Xyi@It_rcdZGc$Yt;Typj&BsA3zM zGcqPCw|2uh_l$Vg^dlvfEzuzL5|^;NZF}tG{l8o2@3Y}I_%B|vI%hanAp6bTynR`{DkJRi1 z-5iXk=PZcXd75tYq_FGs$}$$lZlP}H+hU1_x%!nXuC8sB)`X)2lx|rkw6DyceJ{5o ztThMZTAd9ojySpR4~G}&-zT@n;mj<204;86`EEV$upQ#t1$SfpQfC&0o<5QNieY}9 zsv40aJEwQARh4o1#*QP$()d71#Sa9jr+L+LvsOH-Y-E5FU)OyaFw4_u8w&tt&*yz$KwP{m0BDEPt?k%$ zW}AoLP4$W+*ey^`Hyg z$d3tb@iVuk__|E)hEC4I>foNfWlKE@B;T zLb#ooC44=D3BqyeI5i3igNADn)X_LB0gYY*$Dq&}NHhwGA*i9zM64DOtqK2pAoL`l zGaV+CMzkVr_&gmX=^|X%Y)>K*>Fw>U?yaHDU^*kw1Ofqx!XPmiHONAZ1)a zl%|4wi9-Te6eiu1O=oz(d2z{33@^4W0>PW;>+$)%+&#ZeL}#T zoT!wqKAv7ox5-PRQjnk<=ni_YS&$$4r+%I;3^s%1!uZ9MU)8^y7|My6+1I&$dcE%M zKb@MzHrxXt_>Af z@@K=-ye5|!(b$8;piZY#iFhZxrY05(s^KXFoEnyf!mE)98U!^O=mb)5 zP8fm{ehQ+Q*>v|GLX#L2FJ7s94o&5S#*#HqTAFAz3<`&WLKA3eWExphO%udvP&Dvb z7(570<_8Kr&Haba7EC(S=E!c-YL-HguSs<_6bP-?b?P~}7+MswolVwXJQ+TaRkHV`4kg9|HZuHw_ef9k8M*m3y z{}JV>_|x2fJ%_go=pm?}rb10x{W=JXL1TN9nczBSXifaLg+3MXdmsMTI!IpMcccFw zWPwHA^S{dhK?9A(;b>GfEdo|c4Xc5ss1ayXO*I@Ahr!aIG6M1FFFF1fasV|X6cG(I zHC~UKY-;~cIrz4IDK2CWXOOCg{Bm1g2L6-M_Ro6Xzg#*$K1cr3(>7Iu-?zdq9sI}E zsl(em5TUjUwE*&DyMv10hp}%9X3E}<*FN36ChfH_DCmH8nb7gsb-J40b(>(<>1ux0 zZ=PE{=xjaA=h^s%r+M*qI8#sHEzo8h)YHV_G;lgd{$YL(OS%u}W=En!k4hHr0f2`d z-IG52ik~`e`<3G~#b?KR{U1Pn{X_6WOa1!T`FEatyQ6<+RK8fk zN%(*W7KOM3^WoD9aq$5WEDCW6=EJ8I;^G4$SQO$C%!f}a#Ki|huqebOm=B*;h>H)1 zU{Q!mFdsgx5Ema1!J-hCU_N|WAuc{3f<+-N!F>3%LR@@61dBpkg8A@ig}C^D2o{C7 z1oPq33UToP5iAOE3FgD672@IpB3KmS63mBBE5yYIM6f8tC72JNR)~uah+t8OOE4ck ztq>O<5W%7lmta18S|KhzAc939F2Q{Gv_f2bKm?0IT!Q)VX@$7>fCv_axCHaz(+Y9% z0TC<;aS7(brxoJj10q-y;u6e3D5@s#QvG-A3{0JqcQStLNvWn#PmC1C75|$ z6Fv7HTy*OIfD5{SU4D@w+y`JeYNj8c2bqrzHo4q*fBt>zqAWtfXo*+2AsU&>*nM1@ z>TUCZ)$7|DL95)~f}Rl3ybgnBgV=^+Td|po67I= zW_dLiNqsC`nfNC?E|}vYdhwk64Ha_kawn9m*xjax)wUVbj@ooeR#ukJV9#q2nb?zd z0XH)`cTlP8;N6`ul3=U-Tgz+=%Q6}6uprYdlS|5s!iaAMD$=FRRyQv@VqF56007_E}dak7;qSX5^qnolQ+0BQpw7`A3SI?<&g5 z+I8%3ofsd>A0GCTlF3P-;~mc4keaWnI9CJ+BOz|5r<=_L%t^bG=XBfOAD>4 z@{IN!l9+R4d};;l#-W4KO6shv_o8lpIn=i%8zku)aE`la?j02v`l7p z_Fi>|T&kp`Bq=T~uJVt{L;#@AeBQs}WW<2a@2#VUQ&Lh`qN1Y5O;4%Ib#-+qB1Ep# z&F0E=Tifclee_!=Ua)=p_Q9ytwi1nvjb#ab?@}WOtrfu87GFOL7;w^RAh7r0Vx-PU z=Z$R0P{%f7$8pCiwzHNi@7QmiDH8V=4FLp8i)6di--o6@o1Lw7m0TD)U(?7H_QqHa zu#4|+k&@SpZ|mxk!s2iR(Q5WF(jpiCl!&)t%EACy%HxKHBOP^DoL5>TSg*FZ>|(ll%(Y7Xxo$XPVG;Vcc?z}EZ;-lfSWJ#`uIl0b;}PB|M>gC zQ?M+03;i>-NAlja_+aWS@;o|%%OoPPd%;cf%lLkyy?aL(+C<{z=;%des&8YoD><}P$vv+MLj3EmgNP^-T{&^Ffyd82 z+4DptRB#}4_xj$J#TGY{m6VijXJouT6@G2W-lyAo zP%wQ=(e8Ke-Ua$Xed~R%&ojubo~n$nS!D#=OSjLyuC(!(?3LSnj~evhJ+tjsFE-7I zsc#qx3m6$l*JZxpT=VL%`J@vJYCvSfZLc^UEGpXYvY}yEr*$-GhIG6|t;s^@thTnc zRbF0xs3y&JxvXS#O?jzf@2j_Er&Lc@{I)*nvB#~vYKbs$m4gOJjrDGtK0|$ApWhw3 z-CdV{m*t2bH#z_dCVIWACPoxFHq>bf@uZG)@1{7B>oVISJ2rnYv#Q~lIxEEemjLeBFurYX)jBm-Q63L^o%$gxwN zdRSbR@)}ycegNElye}pvqeBund+wZ*9HpF6d@3wQwJ7EyB*xm0Gt+~MH2Yk(C$p{@ zdbIpy^sqn~haYUbBhDs1&K$1f7K+J60sU*;M%?7-D>ww4cM7 zD<#!vW0D*sF>a+ArMP5Ct{F+^xRG?^@);We09tG&To|ZUG&A!=-)n6yFf!IwGUx51Owr&Y51nlE5?dD|9dBnEJ<9tO zV$3^@tZMaLv*?CNg<)jwZ1a8}otFkl(&AzwHEYKQn{zBxGWW>rR#}d?z-=E74Gq1y zLw)flA02}B%S`3%V`h66FI7#hKC!~|9=4)9%e8Kty4ErKlJar{g7m<(E@P||8ius` zM|F>H&BxCNj7*G^ERD8DZ^iE&=yW#VXop`j6piF?(4o+|b5+7v`Sr^NDhp0nnXFn! zOQjtH&idYQY1n>)9am~MI~OKA%D2Xbs*R8y~k(7)MEAh?2*BS#(o}jO? zuy+Ao)p+Sb`>CyRVGn&6jPARa?Xx{1z-`P`5sxcgi)CQVngap?R-Qh6dLrxQO&jHT zha>56+W^@JwXpHc_2vFAs?E3yhWs6^ZEPMj=6NrZS5zF|!Nr=BW}joW2QP&r|4;85 zi&w2)4eBK>PN5%3jTxj?yl{U%PiA&Io5+Yu>Fnq*-FW^<_TRmOH3xxem|R5hl?{+Q zJUsj~h5m?5JhPEh{D5A&t0C|yN>a&o>(*qVwl+h7$Zpe0wcf4I#nRRWpqH&PG2_~; ziduqaw>@U?44`{bEkrRnF49jT$>yyJ3gxq+0J!Dm&6{IOsjr|^AGzKGb(BOKv``x=-xjBba zV>hM1;In~HslNQ}ge|B>eXot{p&*8sSSqwPy^IeUAKh21xVLjz*G9*92ROb=`Y^gE z(yFH`yJ@_2pzHYr#l=Ns{+vTwF|p;huus=KyzM-%WiYpKMs@e6kq{^iqQIWMH>GON zZ@TZ*T_BMzBAaHYgh(V`B9Tt8GGG8yWE~C;4#fkV^(+}6vZ*_}Z^*wkv@JN(r1zwT z6t_2VDR7(9w&GlHMhCRJ?y$JXJ$O`JYkX|xGXI`F=y|ylDqPbGk!K_04#z}tjL=2+ z)}_px7iS6z3LyQzbyjQTVrXZbg_9PyHdQU2*?M40hSZ$FZ2z+-$5|#-1LN?Lx6EE> z>o8FVJy)uSDz&?JzyJ$F!-M6m{RSrOF<#dqE)0oq)o#;7YZNYpqj%z$4m@n`6#-s# zT)8{$VsHPP3wZ}6UB8am&xuFdjP8Mfh3E1P9S|STeiNS&DS|kWYW;2mvK?-QE+!zb z^VzjDK)fmq@f)KW8LHMM`@n58RKX%_1y%i&{P^ob%lxVm z*G@Eb-}&@%=ZRA4B7o}Um8G7H-I5ylTBOaTIg(OZAKDIp>X(Rs5A0rwWtlMXk=y64IlzX!B%MLgc{#JIKnq+AiO2*d*&5RVS zka~PZEpboftAyLMXXV|_!{y28?=4!Njh*>>Tch0N^H~q$+!hA>)gJSKO0J|W4}T9U zkb3V}JimZlxqKx)g}HuBa)sg6C+;5RhzI-gnqD3>?Co$UD?Hc#XIk3c;GNZ|uo+Q? zOYkx!hl49;-7+qWe>*m#U!t6S|5Q$Jwoe0gxBlFQ0Brxn1SQ#O>)^^-lT2GC{AuLq heNm2g($HNPU~|FjHui10m*L_|0bHA_azV7?^W1`GV zw=WY~D+B<*GD8DA0sP)Q^AT7K{_V>D1N;jJdKg&I0br@v%!dz1PL%`z&2*}{CBxFh z7)PSHsS?RFdx|R4&10rJpsB<3Ad*}t3|V`MBh_6C@~)%|B1UHn$}-(t-RU@{7G%~h4!oafhCyU!yD(g|Ai6UH z%37M3$?DU*D6(i(G?WBaL&$1iRS{?u7J*QaRf8jtFa#W?hJ_*!IFtqsp)ULNf@lkY zcbZ;g2OI&v?dx!$qy=$eFg$QDn6Iy|sxMNN=H&=OV6j*jTn(nC1_gUS>3;4EA`|LP z-!SLon;$%dPV%C9FsL+l*%`k?dzv>x3j&!L===3`UTz-W2Xd!>Wd~A(F^L{9gen~N zDQslewN8K1^t2s)OIpKCtEp3=W0Csln&_ znAelj2e^31LC<;~$ip7#qPzMwOj5Ln_j*YnK(;d-YR6)gTl*Li)u(M0?= zhWLe>e+*?nokSIeQV%+od45d`?qS}9GL%E*f@6A|Lj7as7#8hC7ueNOXxEj00unJ%-V1&erag+ zJHvU3uZDA>n)fm>yL-*Gg0CvzTN3R1Ytlb9w(r}{|K`n)8U1g1LUcaevSJ0A`$4;Kdz z?jjEtcRn0i9xe_b+(jNP?tD13JX{<=xQjeo-1%^5dAK-$a2I*FxbxxA@^Eng;V$xU zap%LK<>BH0!d>Ly;?9Rd%frP1guBSY#hnj_mWPW22zQZ(i#s0{I#(!__N}_Hm{?CKS`D)84yeWz<(nE zgoFXW_%!(42LRr10O&se0JuZ|kf5F1U%3qcMEVTzy5`K*w`Z(f&9^6qOqb=d%q$Y0wSQ*P_ zY9qEmvT?~3In>drh0~eDspY{zPpy^YR>dBP;sex$52$o?QWw5iVWB1?yG5$|-OCQ0 zlk(cAYp>*hj~Q?bb?@RAPt0w@wX?P%#C9)tkTf>Sw|s+cYHsd&UPQNYbAxXCb5|yH zt$^Hd`f`Gihi!t?{m?+|s}mCwZaC~>uG71!*j`|-q>tlU?u0pAx+0EV zk21N3hg9^`pQ$cv39HUZ>t2e61_9Q-m|f{8n`_m+D*A<1|f_Lx4w zXf?m#p9Z6aQX&w3zQ_1`DwM87_L-xsa+Hayv-7KXO5WI*&m!Pym|{wDat?d2tr-(A z_Eu3W3Lln9^~9srkctV_3XmGlR9A&lMfA^OgJor7tu7j^ZEZ_LP6X_$0?iVs$vLH^ zw)^6@vIOuK_%lPc!PmtK*AkRt&dSP(zD(a5ePd$6->3iYY<{4;VW-Y|zkw^a&QhsV zE3xRxz0~9;77NX?jA7*wx?~};=~AN0M0Qnsrmicp8M?kyLN(QYax&fZ^EVs6T#swjkVDI#T0(BuELZe>x@e%nOt7_l38Vgq*5dZ?4E?cErst|&MgY&Lj z8MKIri75#e*>Rg)L^>TIl>DI>06c8jHS09ozXZ_fBiU<^4w4bX7wsj!wvWbl$tq-c z4LT~NJgjxxlm=L+TIJ&bfL&D=k<|RmyUZ9p9qPOxoe$_av}kD#u%+{+OY>U>Zc_Jw z^i%z}>|mWUroq=-nsZx#w16&j>3fR{AH;~rdv?}9$YQ{OL?W#Q-h5`i3swNb)YG!f zcjenx%(vMCnC0DGMUTebbxsQdZ#oK1XwvC6Fdb2Kq?61Vl5ia1a#4|$i;D|gd;ImO zmP-~_r({eTf^_ji`t?T3nr-l_j&<2+gK1xO=i}2Iw3x*7aYsCB{U1KJ-6X4EGQ=ohbyIvUQL^lL9_fDD z!Gi~_?|k{Nqw&d;ijv~u*Oo|=?ws-C!%IZ1G^KmN70{q+ciXa%-dmsI?d?rt%3_UU zOmO@_6zf&VyE|>|j~@@8d!#cRc;Wi>hKCNxa=IQ&dDx<{`RBe_0TNJF68&KkCnUl{p zLY$~n(IT5%=7-l0&ncdI*!dXMvRMIQq;RSX>-XXHqw6iMc^Mg%or~{#?J0$%P?Htb zM#$yvFH@C(?z<5~?|8AsNxjla4KPa`iP#z~?l$oDZCnIVpaJEX?$$F2v$=L46yrN& z^YV;u2X)5ja?PT?$H!T+NybwXgSR@}aiEe|acEIGUeD1O9=6W>0oJj|X1QZ+VknrG z2X_g)e~mg(E%#LEFw<+W^(Jhug#}49LBGDJY;V>Rd4~LwRW|3;Y@3VR+W3Kw6%`e+ z#tk-oEj4}o4Ze6MtEQryoSbFAfq~+o)&l6u&yyQI7`wJCf3qYD3YPQ*fcNVMC$`;# z#|Pv+WAF{s|%8Zfwc4ILlsvF-n6egg0_pG;56JSkF0iC z8Fkp%$>~LRzWoN3n-R=>OO+~Q($N%S1q-JAl}sgraMp3~o~*V;Lp<8^6S!-|_$@-w zdyH>;c15&aBkG?aO6pue@xdGQOab5?JgAs>FQOQ%3>TA-j`6GW;#RM%OGZbtKYlD6 zXue7#AFaEHLZcTYB$i92^d<~L{&N(jb3J?v?dB)-71ko zUUXQGl@l_ORDUvCMD(!89=*_}ETg+`W&zy>$rzBQlMB$5!3wq#f%50C-!$piIpk z2?+mZ>8(9=!Is*mFJfB?Vt{gJO|>7q1?BjVC7=S{p0sLu@21{r1OV5}HW}dm9(rEX zusK8JlRBeVXd@&&F5jcK{)`>|Z=rBKkIxBJ89hnHi=zx|io7zm8zoI4R1`Df`ZinS zeiS+JfUJfQbv6aIELgBWSvuB5(KNMiV@9npeR=^)fKXiIN!`s_7 zvB#7pDmrr~q9;(3|3%+MR~qAhUIG|oH9YmU4f^uweVKB`^FEc+MoR2Y@4JG%Z4#`%5y+TzNDY=~(|o1CV^3 z+M5w44m|UCCs1@qh#hk1WHt~IM~E|!-y(3L%zw21enj;Xy<)I7q7v}EJ6X;$a ztF)uB#uLJhZCWNQj2Rsrop|!+_CLT&XSum)l4=Ex;o}n&`0>q?dhoDu@W6p`!TR9a zQOD%^bK?ldx}HT4hxH?uAB=m{8?c7tx)#`2C0WxuQX08@{lo*f@DS$M;F*VeyX&vo zr1V7>8)p!Fm%qO6tZtFMhqhKmIO z(Rx3WcyuMWs3*RRJn~hwE^v(`7~N&MGqpY)j<7%a9^780*+*7y9s`R*d`)*gp;{AI z1(bhCD~9VjwuU(m?a11YaU;4i{fx1~cvZ~0&cXiv3GiH*Wpwd%xZdqcmj)VQ)@j@U zONL*b<&BIubpXScow^F071GY&D~Ez(+o&p*l$5laq^J)L4Gxy79A>@_U3p@q-f%}p zM@@>lTWfoJ`(Te3)=EV@x?;TI@hO_vVx&q^F8iZYvv+i!rSVO0<9YYIXe2hQ`3~CN~TRSbb>C_Qj_1itIu0!`hybNHLLT_OzJjhO}fPX zz`Utvd8Cqa%vVvprFS>PRzrpPfmf;5X=RgRuX^fIIx%2Pi=`$zS?!euKAesD7yy@7 z9yP0?Aj6*aT`CzIO{ZAxMXjv_6Zm7U^{t^58nh10dy=G%wRT#rR6L%1G!Lv}wqae&wkP>2OMxSyMTO`6?vf21Few+pm>E7Bv+nDbv4`w*@}NUT{kr~brn3GvrA5IwwMZM z+1NH8Jihn9+j^%Qtu-eF;UDXZ#7~+n0EFcZi$>wWjYs!$cGlUPpy^5W{-B|v-l>h! zv5(>ihX_WHSNQuE@c1K$Ds1oZI){L(wk2aPGfh&C1&`EeEZDPWkN@@tu zmhGc2GUVx+Xk4JTqqMP>fY|MHNCfdsxE>#0x&LUR#kuw(dasTK8a)Z_YtHcmWu~B= zUzx2B6r*$Q2&?vwdj6vbNhzt@Z5*{( z?UZ@d?i7#2ipE`LdfqE8E@m5bI=yGw$Vf>sfb#ZyN(~ZL_Qk6PylDdW3l;mLRCYXD zUs?F@(m&c^nC_dOyUdM33Dt%f1dB)Kbf(Mh$I6s>d>VdP#usuiC+BH?%ViV1DUkfm zQ2 zMk#vR?i7-HrN|YoZc7#JNjEZ(Rzc z6&LS=iATGiHyhSntq+e5Wfr}je6VC0^74m@;`RO)mjaJPPNZaJi;8wc8x6I8UJPig zjoC|U$)}9n4PSaL5$R}Zt0^7pob2$XSoQYA+DcdTly^fzQ$v@o-kBI1etGZK$oLmv zp|eY3rXb58o`SWDe=ZpAsT;Z5Q;md4L{-4~f-D8L#sU4l$5=<{_1?C<#kpPO%B4AhcJYc%gV5zP5S3i@j}>~w8_nTB0MpPs}8N{xFqO!aFy`> zm!l^l*DUNm=Vs2=IJ%J)E`L%#3P(RrQ8_GqQrOT*GEJy5=TyN>wU*Jyi-+;!a4TTn z@Y!XTw$$x;Q?dgaFL(*5sa%_O-4DpJy_->*PqF|2 diff --git a/MessengerProj/src/main/res/drawable/switch_thumb.xml b/MessengerProj/src/main/res/drawable/switch_thumb.xml deleted file mode 100644 index 3d6207ceb..000000000 --- a/MessengerProj/src/main/res/drawable/switch_thumb.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file