From e76805160c0405658b4ffd4339f846ae1e8e0a40 Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 21 May 2020 02:11:18 -0400 Subject: [PATCH] Removing some icons and refactoring a few Will refactor the rest 2 commits later --- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +- .../manga/process/MigrationProcessHolder.kt | 2 +- .../drawable-hdpi/ic_refresh_white_24dp_img.png | Bin 476 -> 0 bytes .../drawable-mdpi/ic_refresh_white_24dp_img.png | Bin 323 -> 0 bytes .../drawable-xhdpi/ic_refresh_white_24dp_img.png | Bin 632 -> 0 bytes .../ic_refresh_white_24dp_img.png | Bin 930 -> 0 bytes .../ic_refresh_white_24dp_img.png | Bin 1264 -> 0 bytes ...ic_close_white_24dp.xml => ic_close_24dp.xml} | 0 ...efresh_white_24dp.xml => ic_refresh_24dp.xml} | 0 .../res/layout/chapter_sort_bottom_sheet.xml | 2 +- app/src/main/res/layout/display_bottom_sheet.xml | 2 +- app/src/main/res/layout/download_item.xml | 4 ++-- app/src/main/res/layout/filter_bottom_sheet.xml | 2 +- .../res/layout/library_category_header_item.xml | 2 +- .../main/res/layout/migration_process_item.xml | 2 +- .../main/res/layout/reader_settings_sheet.xml | 2 +- app/src/main/res/layout/source_item.xml | 4 ++-- app/src/main/res/layout/webview_activity.xml | 2 +- app/src/main/res/menu/manga_details.xml | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_refresh_white_24dp_img.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp_img.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png rename app/src/main/res/drawable/{ic_close_white_24dp.xml => ic_close_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_refresh_white_24dp.xml => ic_refresh_24dp.xml} (100%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 1177cffbc5..15e9ee60d4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -148,7 +148,7 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { this, R.drawable.ic_search_white_24dp ) dismissDrawable = ContextCompat.getDrawable( - this, R.drawable.ic_close_white_24dp + this, R.drawable.ic_close_24dp ) var continueSwitchingTabs = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt index cbfead37c0..ee6efbe866 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt @@ -55,7 +55,7 @@ class MigrationProcessHolder( R.drawable.ic_more_vert_black_24dp, view.context.getResourceColor(android.R.attr.textColorPrimary) ) skip_manga.setVectorCompat( - R.drawable.ic_close_white_24dp, view.context.getResourceColor( + R.drawable.ic_close_24dp, view.context.getResourceColor( android.R.attr.textColorPrimary ) ) diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png deleted file mode 100644 index c68c9fe45d45556ccf9079ee3426886e44ae2a80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmV<20VDp2P)94LI#dKF1=04dpFu?QJ2*J$S#fl5RK!l!ehnuVQ3t1@wIcW(L@0Et)=dO; zuxQU;@Eu;lQIlMh3<*3#bIqIQ^6%aRNsZA|qAf{2vfgw<&x<-oF zmGs+Ks4NA#1G5V47D0Q!$QcQR(lm($o7b4;aqwVM=u{e+yyhmT*&LyW?WVrsG^On( zYeE&)xUMNvRoH#nLQU2<){xm(JPx#lx~y^N!l$FhgmSJ44Z9%p$b=#ng!rOfv(VWF zi+64!w8sKmSP-Usy`6IOUxIZ|0wZ)*m8hcHL?8w!xU(;w4PM6jRRkTd&gCtm$N~YMX$eH|9VgsC2s~hdHW-3A zcO=@eB-IiWD?b5SvP*G9*Oy%>1#W5Owjw{{H^-(FL>w3@f(IY+q7=j&=t+Y6lEf0|mpn1S<-r6#^|dXQCr;ctaD=(+KYHSRbIPd(nzd^$hxw;NsndV`o*0 zov1BaPE0s?#1dk$Kj%BqHlS6tnp)gRrYLp`)~Bz_wK(G?*mK1x`%9f1HNVXN3!ZgH V8leheE!Y46002ovPDHLkV1gvlhPMC! diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png deleted file mode 100644 index c11b6b948139a266d9035b7ede079bce2568c884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)~<5Qf)#y)koDMAj9I#E0-m40Ta4@J+mL1Hr&M5e)<*A3{-3L}Tw;6az)^fbnlA zLCPMPo$hH}=!P%Zo%y@|>DlV)+K}Top=2gx4Oj!#fHhzZ{1*fHpbgA{EpP|kzz4Vo z+h75-g94A5-6jlFQDD!G_aUyG2eDstd+6H03}l0G@b35@VueOQm}&QZyCx6=;>qnh z`o6xaN`ol0T=*vAObQ$8Yl+!U<91G+$%I^C7)|G5OWFs5Hy2S4;ty9 z6I^**9c>1(X{q^G1UWudvIwl1G%z9&A6Cp@V#Rh%7>H5E;7?vP1^1a+fmz8rpJO0+ zEe7(y6BBJw48Avk6sv3?E=iTC3c>dzxJM`(m|}th27}jPV4Vrp`3%0>=Ps>m;F<|W zlC7NPRc59&VAue!SxS=4fUY0$pBdn3bTHWrG&2K7iW}K)W%fCnt4W7}TuCVr55Pbt zo8v)p)bw4<%`ov}GNvo|LU6(6n9$i)5$DxcHo=mn;8VaV(|!SEy8A*yl5KuWL-3Ol z-L4=STVa>e(=wIZei~sb5PUl? zbm)IdAn->jQ7ZmZdp(bK=xMM)9lTdsp{pxUN=K$|R$zAV)0_CLI{ctkVzdf(icd2$ARtM~5AxxaVs%-nO&O9erY64ZzU z5hQ{{kO&e%B1i;@AVCC)pm`*y610FmFa*ZHB$xre!8h<44D)yPgOvux?ebYr26TX@ zLHtI?o&;qv#_#4nyc1N#SHX|KT$=*Dpkj`4yb_cKoqRG$HM$kgfQ6bkdj2`a3qf_@ zMPRRufSL$$yb#pPzpU-{8SKc5)^|bakk#rvXh?7?(FDHuET}U?PK||)=yhKORcSVXQwd)=VN1Ceg8DQ;w0bJX znxKs4*=o>&oF3m-u@22Xr`lsV)&!|i76S>(={E34lDMEs&ESom%dsM;MKSPbf^xbH zKGY^INVR(P7l9lrf`$|WXC-N$V@x5aUIgWsR0t{)K{;j=g3=;L1j#KXle8@J?gjNK z1YPmy#I7k~wDN8~s~G&1CvqrX{Z0|%b{m2!G~4)%9thg1h;15_+DdnfD1x}*fuK8z z*zVe_4?3YqnAJLzvrhAV?to1}%QOl5dk*KGVMR<6V6p8AvrC$}=#T?J?V5Pbx+uY0 z0lq5&qJ;i>i*h#cB>cZdJO3pv1f{rmN!7;rwX}_SXF?OlVcQ$Ud=`P{n&3Ww4GGGj z9Qa4g_z!q)a$4nD8&bUR6C6oEP8;{F`*8}cj5QVPt_bBX_rYodW3ADwR{5L4CRfj5 zDvm}hpt=b*$LODqxfS7upwIWZd{_;W6tx783dOI2eZ1mjc(0P?eO3d1Mi0SnBlbCK zQceljH1Ig(YJzgG2VCTWt5Mz&PxEV~Pv9lz zaOmpW4VD*6PFns@Cx{>sB!Wbc2ogaeNCXKYK?D`XUpPeP7j*L)Z~y=R07*qoM6N<$ Eg6}e|H2?qr diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png deleted file mode 100644 index 4a4c70f687a8ddccd7dfe23c833a58a431065636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1264 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VA<~J;uunK>+KwGk12s74OdTH zNL%BhrJ=OxxK=lh@{-WhEgXxlpVG*VYKUV**c>VK3+b2Gp|9O7?p7+&{TLcPw$_s=d7`PK~ z;sf?+46_@&9!Oo_+Qa^l9V{iTA8WrJ$mo3{t>~ckGL6Oa zM@w?!8I5DYHyw08*fzbdU-r}T5>tx*^Hqn%-yevtx@2(7kWqupZg)WHM6rT12fM#K z7IE6t{n3ZXkFnmZso^YN+#=Z%9f|D;tlPA&am{#~kW$V1q4I+4Jgz(20~^+Sf1k-# z&t(7pYD2&_W8ZC@H`Yo1@Kl=IAZo@rVQ+8V*(~)&hfmDgLLC{;vRzO2{N%~$aqy=| zXt?p=MNcLR1uPKEVQqXe{kD}r_H~JeYSGhbjF_fnu+9q&Tj@lW_hf&k10uZ&#=5?CoQylAx;5ie_M5nAXUyZ)2xPgDQ25D{W5)^(gZq!3 zOcq!$>(W_8qnBxKpWQL%VthF#qnvd`*|w!ci|&dpxRo;XL}yv}0duhjYa7aASSz&` z%#}{eXT1~35pfhG5&7uyg=^e5RtsDJtCMPN;0GCSVyy-<7iYKS&3AeyY=Sse7#dhE z7kz)l$zXu2z#3$b>o9@WeWqMD2?j(kj$*u>Aj@X=Qc=9@D zea^ybY)2C7<3m^R2rMX`V9>v)A>~e;QOHkL9fdi6a(d-rj~DnER0Wow`Ylz%GFkuq zstY@pC$S&R%Xq>=PEJ1_c|QBt z9Pd&EF~7~soN@ouPaM8cI%}g@pd4qrvi`mcwv)B}FZ{NZ%DH=?XCrqxgH&ni%_#Qj z>^KJQ4;NXfP1;?^L{+%`vpC6b1DH8~v$T_*t*|gxf%sZ3G z)t=n#mG3;ts<~S}bK9JoVI;jO>%}_v4Nv|3*k#x^wfyT1d-!Sd2g!+dPKC;M^Ev5M zON%eMQLkCQbGqvXEvZQP^K6$k_}j5bU)g!U>(BelD>D5&VXq2u60YuD_%Y&tkp6Gq zm#+ibQ?IrpYL zQp>zyeY3rJal2B5mixMWUmuIO>8}epdAs82%&iQ060>cBzOfqWG_V@r#(MRP-UnA^ V&RWU74Oo&fc)I$ztaD0e0ss(}GHL(- diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_close_white_24dp.xml rename to app/src/main/res/drawable/ic_close_24dp.xml diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_refresh_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_refresh_white_24dp.xml rename to app/src/main/res/drawable/ic_refresh_24dp.xml diff --git a/app/src/main/res/layout/chapter_sort_bottom_sheet.xml b/app/src/main/res/layout/chapter_sort_bottom_sheet.xml index ebccb642c0..aa945667d0 100644 --- a/app/src/main/res/layout/chapter_sort_bottom_sheet.xml +++ b/app/src/main/res/layout/chapter_sort_bottom_sheet.xml @@ -178,6 +178,6 @@ android:clickable="true" android:contentDescription="@string/close" android:focusable="true" - android:src="@drawable/ic_close_white_24dp" + android:src="@drawable/ic_close_24dp" android:tint="@color/gray_button" /> \ No newline at end of file diff --git a/app/src/main/res/layout/display_bottom_sheet.xml b/app/src/main/res/layout/display_bottom_sheet.xml index 872824b7d3..a2af30b306 100644 --- a/app/src/main/res/layout/display_bottom_sheet.xml +++ b/app/src/main/res/layout/display_bottom_sheet.xml @@ -233,6 +233,6 @@ android:clickable="true" android:contentDescription="@string/close" android:focusable="true" - android:src="@drawable/ic_close_white_24dp" + android:src="@drawable/ic_close_24dp" android:tint="@color/gray_button" /> \ No newline at end of file diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml index a8fb0577f7..b88d1d07fa 100644 --- a/app/src/main/res/layout/download_item.xml +++ b/app/src/main/res/layout/download_item.xml @@ -20,7 +20,7 @@ android:layout_gravity="end|center" android:contentDescription="@string/cancel" android:layout_marginEnd="21dp" - android:src="@drawable/ic_close_white_24dp" /> + android:src="@drawable/ic_close_24dp" /> + android:src="@drawable/ic_close_24dp" /> diff --git a/app/src/main/res/layout/library_category_header_item.xml b/app/src/main/res/layout/library_category_header_item.xml index cdfccb5160..5d9b5f9bc2 100644 --- a/app/src/main/res/layout/library_category_header_item.xml +++ b/app/src/main/res/layout/library_category_header_item.xml @@ -127,7 +127,7 @@ android:clickable="true" android:focusable="true" android:padding="4dp" - android:src="@drawable/ic_refresh_white_24dp" + android:src="@drawable/ic_refresh_24dp" android:tint="@color/gray_button" android:tooltipText="@string/update" app:layout_constraintBottom_toBottomOf="@id/category_title" diff --git a/app/src/main/res/layout/migration_process_item.xml b/app/src/main/res/layout/migration_process_item.xml index 7916f00964..1d9dc1ae73 100644 --- a/app/src/main/res/layout/migration_process_item.xml +++ b/app/src/main/res/layout/migration_process_item.xml @@ -69,5 +69,5 @@ app:layout_constraintEnd_toEndOf="@+id/migration_menu" app:layout_constraintStart_toStartOf="@+id/migration_menu" app:layout_constraintTop_toTopOf="@+id/migration_menu" - app:srcCompat="@drawable/ic_close_white_24dp" /> + app:srcCompat="@drawable/ic_close_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml index 2dc1dedbb0..e887365353 100644 --- a/app/src/main/res/layout/reader_settings_sheet.xml +++ b/app/src/main/res/layout/reader_settings_sheet.xml @@ -323,6 +323,6 @@ android:clickable="true" android:contentDescription="@string/close" android:focusable="true" - android:src="@drawable/ic_close_white_24dp" + android:src="@drawable/ic_close_24dp" android:tint="@color/gray_button" /> \ No newline at end of file diff --git a/app/src/main/res/layout/source_item.xml b/app/src/main/res/layout/source_item.xml index ccb56edeb9..22cfb57564 100644 --- a/app/src/main/res/layout/source_item.xml +++ b/app/src/main/res/layout/source_item.xml @@ -21,7 +21,7 @@ android:gravity="center" android:layout_marginEnd="21dp" android:contentDescription="@string/cancel" - android:src="@drawable/ic_close_white_24dp" + android:src="@drawable/ic_close_24dp" android:text="@string/hide" android:textColor="@color/md_white_1000" /> @@ -40,7 +40,7 @@ android:layout_gravity="start|center" android:layout_marginStart="21dp" android:gravity="center" - android:src="@drawable/ic_close_white_24dp" + android:src="@drawable/ic_close_24dp" android:text="@string/hide" android:textColor="@color/md_white_1000" /> diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml index c1861c0a5c..19bb58ddc9 100644 --- a/app/src/main/res/layout/webview_activity.xml +++ b/app/src/main/res/layout/webview_activity.xml @@ -21,7 +21,7 @@ android:layout_height="?attr/actionBarSize" android:background="?attr/colorSecondary" android:theme="?attr/actionBarTheme" - app:navigationIcon="@drawable/ic_close_white_24dp" + app:navigationIcon="@drawable/ic_close_24dp" app:layout_scrollFlags="scroll|enterAlways|snap" /> diff --git a/app/src/main/res/menu/manga_details.xml b/app/src/main/res/menu/manga_details.xml index 3cb320d585..52512631e6 100644 --- a/app/src/main/res/menu/manga_details.xml +++ b/app/src/main/res/menu/manga_details.xml @@ -46,7 +46,7 @@