From 232fa51ea8ab78b9c7fc0562d99d5ee094a6a9f6 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Tue, 21 Apr 2020 23:28:06 +0530
Subject: [PATCH] Added notification icon

---
 .../fragments/settings/ThemeSettingsFragment.kt |  12 +++---------
 .../name/monkey/retromusic/lyrics/LrcView.kt    |   7 ++++++-
 .../res/drawable-anydpi-v24/ic_notification.xml |  13 +++++++++++++
 .../main/res/drawable-hdpi/ic_notification.png  | Bin 289 -> 295 bytes
 .../main/res/drawable-mdpi/ic_notification.png  | Bin 218 -> 209 bytes
 .../main/res/drawable-xhdpi/ic_notification.png | Bin 360 -> 350 bytes
 .../res/drawable-xxhdpi/ic_notification.png     | Bin 582 -> 486 bytes
 7 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_notification.xml

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index 3e72b7014..15f054ac7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -54,9 +54,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
                     requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(theme))
                     DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
                 }
-                Handler().postDelayed({
-                    requireActivity().recreate()
-                }, 400)
+                requireActivity().recreate()
                 true
             }
         }
@@ -96,9 +94,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
                 requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue("black"))
                 DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
             }
-            Handler().postDelayed({
-                requireActivity().recreate()
-            }, 400)
+            requireActivity().recreate()
             true
         }
 
@@ -109,9 +105,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
             ThemeStore.prefs(requireContext()).edit().putBoolean("desaturated_color", desaturated)
                 .apply()
             PreferenceUtil.getInstance(requireContext()).setDesaturatedColor(desaturated)
-            Handler().postDelayed({
-                requireActivity().recreate()
-            }, 400)
+            requireActivity().recreate()
             true
         }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt
index 9541e1c60..7cb4babf4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt
@@ -37,6 +37,7 @@ import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
+import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
 import java.util.*
 
@@ -71,8 +72,10 @@ class LrcView @JvmOverloads constructor(
     private var mCurrentPlayLineColor: Int = 0
     private var mNoLrcTextSize: Float = 0.toFloat()
     private var mNoLrcTextColor: Int = 0
+
     //是否拖拽中，否的话响应onClick事件
     private var isDragging: Boolean = false
+
     //用户开始操作
     private var isUserScroll: Boolean = false
     private var isAutoAdjustPosition = true
@@ -213,7 +216,9 @@ class LrcView @JvmOverloads constructor(
             isAntiAlias = true
             textAlign = Paint.Align.LEFT
             textSize = mLrcTextSize
-            typeface = ResourcesCompat.getFont(context, R.font.circular)
+           /* if (BuildConfig.FLAVOR != "nofont") {
+                typeface = ResourcesCompat.getFont(context, R.font.circular)
+            }*/
         }
         mDefaultContent = DEFAULT_CONTENT
 
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
new file mode 100644
index 000000000..4dbbe7f3d
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956"
+    android:tint="#FFFFFF">
+  <group android:translateX="1.0434783"
+      android:translateY="1.0434783">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,5v8.55c-0.94,-0.54 -2.1,-0.75 -3.33,-0.32 -1.34,0.48 -2.37,1.67 -2.61,3.07 -0.46,2.74 1.86,5.08 4.59,4.65 1.96,-0.31 3.35,-2.11 3.35,-4.1V7h2c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2h-2c-1.1,0 -2,0.9 -2,2z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
index 99464a03b54a363c1f364ee23019f7e78e001d0d..73792fe258521d2d5b9936b53623965449e6e016 100755
GIT binary patch
delta 268
zcmV+n0rUQ$0;d9yB!BKnL_t(|+U=L23Iah8h7W^5K@i2DAV!l>xFBd2Y=X^4u-JSD
zqwTUypTUb3L9p3unzV>`I{pWHaG-atAhQ?dgD=k)c4t}35(FU{BC5av9ENO|ifO|O
zz4L?<6G0n_#)D<<Adlj)xr5?3!faB4_ONB*3<a!VO<6K|<$nX*r0gIGk{}8C*WeWF
z!YOp%NWJp>K^Rtt+Yj6L#vX)0Rd}NBumvqi50@jR0Pjf(vPqv6M^N*Jpan-z23|FT
z#$1PbrV(?7MXsP6+{MH^{4Wsqmd?Yu8Xo2VdnVs4e@XV$N3a9a@=X?m2wrRQ_4V-s
SsLucZ002ovP6b4+LSTaY%6fAE

delta 261
zcmV+g0s8)@0-*wsB!B2hL_t(|+GAiC1*3q5;Q#;shk^JbmGL@C97GH7a@0Yi4jOgP
zsDnlwH0q#{?4VynSn!t!{09l|pu|DNK>Uw@gX-zsCMqGqQH}I=R1p!5YNEHJ3W;!3
zGrb*^PlTgdftZn=j>?1P9DJaS-j2#4!ciSmcNEY-0U+kUA%2%dgrhpC>L{RL&w=<H
z5DVjw&m_W8-BfcFQUX2$#DX}~q!Zz&9;!GBEk~UMMIjD#sYE!ck77q*$>Ilb8446n
zA;M9$lsafHsCEY8w?O;~%4fo(J_(3l0P!2B`j=>!zV+TH7?A(~&~}IFU)?va00000
LNkvXXu0mjfI@Nan

diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
index 03d796b765d83966826f3f84f603ecdbdcb7dd56..d14b8bdc70a2ac1d258f508ce176076bbf9f5033 100755
GIT binary patch
delta 181
zcmV;m080Pb0nq`FB!8GmL_t(|+GAiC1+)PF|Nl1zVh1P|p|;`E{-c7AK&(Yg3%>uy
z1m)DU03G}SVl!%6@DzySp;(jJaR36>XqkdWEuf<XK!b#UcnMP4KS?zUfQGOD@u~mV
z0aYvr{Er(@#ey0<7F?i)1qpa8SVj#Cc%elCI`{{~=G00>dM-eG9m()_KpaW!bk79D
jhCpls#O$NhE!6=4?Z;s#IFxTb00000NkvXXu0mjfW!y~b

delta 190
zcmV;v073uJ0onnOB!8hvL_t(|+GAiC1>}JL|NlP#;%{W&i^N($F8DBN!KekJ7W{un
ztOW~j7%(4*b#P#9AeJW90%kmxR8Xrt0$DN_hb7h2vV;kUXXCJ>mYSB#z+p)PxrU|y
zF+Z9mQ*l_*OpXQrfcO{?^C5{b0`X)Vmb8*;0Sp`gVqP>$CO6=)q=OU-?f~&8P|gHm
sA2d0TCEZZ@k5Dxr`~rvthhO~;00uy&^YtOM!vFvP07*qoM6N<$f}wy;;{X5v

diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
index ce0c680d054f8124b2e71cf5005d9c16f86cb109..35ccc8aafc9c6063f36d186b2281d295b70d020a 100755
GIT binary patch
delta 323
zcmV-J0lfa`0^S0UB!4AIL_t(|+U=RKY63wNMK@T4U?D;f?9${9l;9T#31VsKM`#fO
zYA=|2%aDExi*y04l49`_Lac-c7Lrt=KJUU7Q%IPZ>JGdEr@sf$nO&nuQ4~dCM?@}Q
z3l8AOa0uJ5z&ySP=kh-vu*4ehEOx}K0pFGZKdb>q%YfhPyMMwMV9OipCt$+{-i8pc
zhBL!=IDu8>pHY(}#6wI2G(ZD1Km#-&i~tO*z?<wLCYS(>x`t!8G=}csC+t!OU{Dio
z9j?p?)A)P16E_l;@nyIYcW45h#1EQ)H1vSK&;t&h0WT~8U!DOYmVj5!fCfuI&0~DZ
zb_&N1<Ff;=#yl2q38$9hJFK_Q?7e?4e_?fw1-uL4&VL0T;A8&BMIY89MNt%mofCVw
V0uPe1Th{;p002ovPDHLkV1k*xiah`T

delta 333
zcmV-T0kZzy0_XyeB!4eSL_t(|+U?mvN<vW-#&K;2f|9N#Ov|*TxC#eSl4e@a&^@>d
z5zU}MIFM41C~9KrM7w>$9f(Np9k}mu&F{b;Cms&Ji9C6s5QoFz?8GRg8t4OkTId}W
zO#_z7?!1@=*q$K)1Q0*~0R#|0009ILu(yDLX~37@_yYCNgMZJusIyiZ<xK<5(OiJI
zL}Azd*h>*57ZEuj;>uOTY}XN4A)@Re;tWj%h>DAdj1Y0{BH~ntsJe(a`45P+5OHG-
zfkOq<L<x`YrO>wkQ9}nd01JKa2^|_n)B{K0z|Y#jM-=mcm<SNJfg&~lN<TqHJ$8<r
zL2Lmi{n#7v*hWhV5qE(g{&+)k;bT{dNCg47N3Upv-t=dG_0#Ed{|G&!v2L|L+)@k0
f`Bsv{*^~JN68IHNH)kY700000NkvXXu0mjfua=V4

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
index d22f7944e6be932cfbc6831608b8d5771ab0a7ef..927de0a584ba6a4d390a66eee972bd73c6020a48 100755
GIT binary patch
delta 461
zcmX@c@{D<cay{c(PZ!6Kid%1ITYDc4kZ4O@cyAj=*Mmok9z9y)rzb0#u3ma^;jUX7
zJq{c^d-~O)$&)8P2<cMz!M#hw^@!t(fPg&>AAYhKiFmH|^>f(wzV?Bn(Y*EpJD(i+
z%%RvK;KZSLgiq-b|Mmx}YYzUF$bZN=XS-Os)U~D7e2M3rWaRBU>W#{DS-4az<qLeO
z7tC6c>|DLz{FKITTiCt4I~%Qxk2}0w88PGNq@Zy7W>uaqO#KfhObsoOSze%cjPpi%
z?rcH#19vr<4F#~EzxNsT7VJ5?=cmKNO!+&F*FU^H{^0O)tvfyYj^E~NY5aO1_r{;c
zAM0Okp6MWQg<+3?Im@j_PaaO);T*f5w$OWl<~g1}NejL;o;zyWIL%^T^KHph%(`A?
zD>y?^7MyGJl4RA&<_tNf5fJFTU}_JOZYHP6RL405zE86`r!<%MF^6u=HI6x-a{3k%
z?;&^h!n}}waSe`Vts(;VAM!lAyyLZ|+1mFT5+43>+sPmud#sY{y?j*|$NFc7nqRE_
z@pi3c)8Top1|I}>NV%@qQo(lp!3uY1aGL#KyX_z({P%TVFar>Hy85}Sb4q9e01BVe
A`Tzg`

delta 558
zcmaFHe2is+ay=8Tr;B4q#jUrqcY8G(O0-4$KZvam_Ty?=u)?+bs8W~vl&(jn9YGph
ziyle7ei6IFVr4PwMkPM07mpO?^?&3}(^z_SR?UPz4{IMvTK)NX`0(rr)6_(q1Xvt_
z=%1*fOV0^`aK2(s8Nsb)EO$E|q?~VCu%3bQ)C~a@1&$^Kj(Q*_jGCs@N;l=rRQrGK
zfb_?x2JuHt8Cw)J9BT|XW+@%A`}bGX$46*>Tho)zm*c#G7OBmcW#T;Lr&i`1$4P&z
zeJ?#%>s`rv*~D}H>?sKoRAx{4w9|93kFVFyJ4*yh>&*;vFReL0scoj&JInd1yeoy*
zW<IN(W^&-l64v?V@9LJR=?XpF=k+Stib)5kA?_>hZIjb><}2G1cb-&RYjIa)R*Y((
z|CJ1z+h?yV2~D5vB78e^a*e{GX(~Wz%Sx6L)|&Q$g1v^1e0-zSwPJ*))ZczSG2^Pl
z^6rYX30q!XsV@?4UGIGI>9r+>VLdB7qtBUmitN`fTmM<v()RMoX{$1~&7Gi9w?ClV
z-6W$&GBqpc)~_Pr`ui4BCcQE__BP=6%*?ViW}Z{ZR6qO7n{IL}Fa6ez$7Zat(+wOe
zKkx7={=?xsnJt$qOOdZ5*>#$Qy5E)O&Wp}|kUjh8c~rSs`{g<6<zmip;rA6*IYXkM
bBWxez<(0i=?;9q)V*mnAS3j3^P6<r_OuqQ9