From 81eadbb794d88bbd805ced9fb3ebdeaf6434b09c Mon Sep 17 00:00:00 2001 From: seven332 Date: Fri, 19 Oct 2018 18:11:33 +0800 Subject: [PATCH] Apply theme to image_failed --- .../java/com/hippo/widget/LoadImageView.java | 5 ++- .../main/res/drawable-hdpi/image_failed.png | Bin 361 -> 0 bytes .../main/res/drawable-mdpi/image_failed.png | Bin 271 -> 0 bytes .../main/res/drawable-xhdpi/image_failed.png | Bin 435 -> 0 bytes .../main/res/drawable-xxhdpi/image_failed.png | Bin 574 -> 0 bytes app/src/main/res/drawable/image_failed.xml | 29 ++++++++++++++++++ app/src/main/res/values/pathdata.xml | 1 + 7 files changed, 32 insertions(+), 3 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/image_failed.png delete mode 100644 app/src/main/res/drawable-mdpi/image_failed.png delete mode 100644 app/src/main/res/drawable-xhdpi/image_failed.png delete mode 100644 app/src/main/res/drawable-xxhdpi/image_failed.png create mode 100644 app/src/main/res/drawable/image_failed.xml diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java index 26fb2ab4d..e96a05bb7 100644 --- a/app/src/main/java/com/hippo/widget/LoadImageView.java +++ b/app/src/main/java/com/hippo/widget/LoadImageView.java @@ -29,7 +29,6 @@ import android.support.annotation.NonNull; import android.util.AttributeSet; import android.util.Log; import android.view.View; - import com.hippo.conaco.Conaco; import com.hippo.conaco.ConacoTask; import com.hippo.conaco.DataContainer; @@ -40,7 +39,7 @@ import com.hippo.ehviewer.R; import com.hippo.image.ImageBitmap; import com.hippo.image.ImageDrawable; import com.hippo.image.RecycledException; - +import com.hippo.util.DrawableManager; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -309,7 +308,7 @@ public class LoadImageView extends FixedAspectImageView implements Unikeryr5NV7Z2IBm}MPP7c`u546y9bVs=bbSS7bo#zwY1r5B#6Gd!N{{W~&oU{@X1s3BM?k zZ?|oqr?evJ{DRXQXSPlkI5x*yU$Mt>x|~#>;dPuuTz?`914DF!*5{2b_H#gC=IQF^ Jvd$@?2>^sVj=2B; diff --git a/app/src/main/res/drawable-mdpi/image_failed.png b/app/src/main/res/drawable-mdpi/image_failed.png deleted file mode 100644 index 90244a27609fffad34c7666320b170035b1ad9ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38bP)6 zTz-R^BlyYtBZgiW5dMH80>Tu)2!DWpFb6QgAD|;#0gUhm=m=K;BkTc;a0M{peZX?G z9i5-HqsuVt%YfzR^yAzF2rEE?v+W-MGn}0R$WO@jBhKIG2Mr(qZU6xU5I_L^=?1OM zSA)x+=m?%44dCS(LZ2^(m#YYUz8qSvBlP)dgyn!J%vU2U2Sj0h0H9Z9%kxQ+V0Oc3 VJ8gobjMD%B002ovPDHLkV1hT@YJUI# diff --git a/app/src/main/res/drawable-xhdpi/image_failed.png b/app/src/main/res/drawable-xhdpi/image_failed.png deleted file mode 100644 index 76cfd7eb41bd8ae734922e2700d1da7916f7d615..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3#Q>iWS0K$Wtpg9rz02VTRKr~o z%gZKRb4gyVo-dQm)Fq(O~IEGX(zMW`Vn%-U04EScEE{5Ys!!44+Ibq)>M5(=#BF^r6w77w^MJPtC3J2-Ih?O zfVbu6tNC8Y9TB-^?9jYy!#pM_lh)D?uix6Tn`CgkmR#T%9&w(5ch{jRwu}p+_k_E)u7P#boFyt=akR{0BS(4 A1poj5 diff --git a/app/src/main/res/drawable-xxhdpi/image_failed.png b/app/src/main/res/drawable-xxhdpi/image_failed.png deleted file mode 100644 index 4caa2805e9fdb4de9a78371a168fa332b4e77c7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^6F``S8Ays|{O<-*Dgizru0Wb$S_ghq*j60{RK`;h zcuEzWyFQMdvI|DBg$f7F|(T&nckyT!@P|iu3XLMHd$E8rYeq zvQ;XuL}?hE5LPs3RcdAuU|J(0Ii*1$VeyFtOf3x7u57srra7{1G4J@-*em(>i~od{ z%^ZJ?bsr|BJm5BS3G|+RXujW7!A^z?^JJwA1r8VpglMi*{VOiILj1-|cSk#o2f7E! zIqoW!w!ga|yUV%!MQ!tEIO3CE_21adqEr4$BFS3j3^P6 + + + + + + + diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml index bfc200063..80daad068 100644 --- a/app/src/main/res/values/pathdata.xml +++ b/app/src/main/res/values/pathdata.xml @@ -62,6 +62,7 @@ M9,13A3,3 0 0,0 12,16A3,3 0 0,0 15,13A3,3 0 0,0 12,10A3,3 0 0,0 9,13M20,19.59V8L14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18C18.45,22 18.85,21.85 19.19,21.6L14.76,17.17C13.96,17.69 13,18 12,18A5,5 0 0,1 7,13A5,5 0 0,1 12,8A5,5 0 0,1 17,13C17,14 16.69,14.96 16.17,15.75L20,19.59Z M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z M3,15H21V13H3V15M3,19H21V17H3V19M3,11H21V9H3V11M3,5V7H21V5H3Z + M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M6,20H15L18,20V12L14,16L12,14L6,20M8,9A2,2 0 0,0 6,11A2,2 0 0,0 8,13A2,2 0 0,0 10,11A2,2 0 0,0 8,9Z M12.88,2H4V11L14.97,22.14L24,13.1L12.88,2ZM7.26,5.26C7.96,4.58,9.06,4.58,9.74,5.26C10.42,5.96,10.42,7.06,9.74,7.74S7.94,8.42,7.26,7.74S6.58,5.94,7.26,5.26ZM14.98,19.3L8.76,12.95L14.88,6.83L21.18,13.11L14.98,19.31ZM11.6,21.56L10.23,23L0,12.74V5H2V11.9L11.6,21.56Z M20.46,14.65C21.86,16.15,20.31,18.6,18.32,17.87C19.78,17.57,20.79,16.37,20.46,14.65ZM4.32,17.87C6.32,18.6,7.86,16.17,6.46,14.65C6.79,16.38,5.78,17.55,4.32,17.87ZM16.87,4.3C16.6,3.56,15.87,3,15,3C13.7,3,12.7,4.24,13.1,5.58C14.2,5.18,15.44,4.48,16.87,4.31ZM24,16C24,18.76,21.76,21,19,21C14.96,21,14.84,16.88,12,16.88S9.04,21,5,21C2.24,21,0,18.76,0,16C0,13.87,1.53,11.43,3.94,7.18C5.84,3.81,8.69,5.92,10.76,6.58C11.54,6.85,12.41,6.88,13.24,6.58C15.3,5.92,18.14,3.81,20.06,7.18C22.46,11.43,24,13.88,24,16ZM8,16C8,14.35,6.65,13,5,13S2,14.35,2,16S3.35,19,5,19S8,17.65,8,16ZM13,14C13,13.45,12.55,13,12,13S11,13.45,11,14S11.45,15,12,15S13,14.55,13,14ZM22,16C22,14.35,20.65,13,19,13S16,14.35,16,16S17.35,19,19,19S22,17.65,22,16ZM9,3C8.14,3,7.4,3.55,7.13,4.3C8.56,4.48,9.79,5.2,10.9,5.58C11.3,4.24,10.3,3,9,3Z