From 675bb209e6521d39eba55c96153a605205377daa Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 28 May 2020 22:53:39 -0400 Subject: [PATCH] Cleanup and bugfixes for migration Fix migration list actions Remove uneeded icons Rename some actions in library --- .../sources/MigrationSourcesPresenter.kt | 11 ++--------- app/src/main/res/drawable-anydpi/ic_done.xml | 11 ----------- app/src/main/res/drawable-hdpi/ic_copy.png | Bin 220 -> 0 bytes app/src/main/res/drawable-hdpi/ic_done.png | Bin 197 -> 0 bytes app/src/main/res/drawable-hdpi/ic_done_all.png | Bin 289 -> 0 bytes app/src/main/res/drawable-mdpi/ic_copy.png | Bin 146 -> 0 bytes app/src/main/res/drawable-mdpi/ic_done.png | Bin 151 -> 0 bytes app/src/main/res/drawable-mdpi/ic_done_all.png | Bin 213 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_copy.png | Bin 209 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_done.png | Bin 219 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_done_all.png | Bin 323 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_copy.png | Bin 303 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_done.png | Bin 279 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_done_all.png | Bin 416 -> 0 bytes .../ic_copy.xml => drawable/ic_copy_24dp.xml} | 6 ++---- .../ic_done_all_24dp.xml} | 6 ++---- app/src/main/res/menu/library.xml | 2 +- app/src/main/res/menu/library_selection.xml | 2 +- app/src/main/res/menu/migration_list.xml | 6 ++++-- 19 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 app/src/main/res/drawable-anydpi/ic_done.xml delete mode 100644 app/src/main/res/drawable-hdpi/ic_copy.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_done_all.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_copy.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_done_all.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_copy.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_done_all.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_copy.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_done_all.png rename app/src/main/res/{drawable-anydpi/ic_copy.xml => drawable/ic_copy_24dp.xml} (76%) rename app/src/main/res/{drawable-anydpi/ic_done_all.xml => drawable/ic_done_all_24dp.xml} (76%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt index 568f9d516..aaee99ba9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt @@ -3,21 +3,18 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources import android.os.Bundle import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga -import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter -import eu.kanade.tachiyomi.ui.browse.migration.manga.MangaItem import exh.MERGED_SOURCE_ID +import java.util.Locale import rx.android.schedulers.AndroidSchedulers import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.util.Locale class MigrationSourcesPresenter( private val sourceManager: SourceManager = Injekt.get(), - private val db: DatabaseHelper = Injekt.get(), - private val preferences: PreferencesHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get() ) : BasePresenter() { override fun onCreate(savedState: Bundle?) { @@ -43,8 +40,4 @@ class MigrationSourcesPresenter( ) } } - - private fun libraryToMigrationItem(library: List, sourceId: Long): List { - return library.filter { it.source == sourceId }.map(::MangaItem) - } } diff --git a/app/src/main/res/drawable-anydpi/ic_done.xml b/app/src/main/res/drawable-anydpi/ic_done.xml deleted file mode 100644 index 28bf05369..000000000 --- a/app/src/main/res/drawable-anydpi/ic_done.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-hdpi/ic_copy.png b/app/src/main/res/drawable-hdpi/ic_copy.png deleted file mode 100644 index 7821875d32b34ce5f4bb34eb60b036ae3b44a861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7JIrlhE&{2PLO!>;Q#;sH4blB zjyPU9FvZG^vm>41V^UV4mu!f;@9}`cj-My+NQ(rz$<7ZnbmW(14>bJ#lW`-TE8im5 zcg&A?ykuOy-eEs#^~9=U*3R`@Cw1(LWL>r%;VTunQ@of@s`SE&W;a=rR|^8!d#yUo z@g2HlA#cEbaq(JPkPxpJJFk!O{CUj+E~U*cEPb3q+$Z`mN7kjZpK)MdaJU=tK=#-* RH=uJFJYD@<);T3K0RW;zPy7G? diff --git a/app/src/main/res/drawable-hdpi/ic_done.png b/app/src/main/res/drawable-hdpi/ic_done.png deleted file mode 100644 index f1f39724ec85d401f124ce4410ef7fd0e5a8e1d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBdOTemLn>~)o#x2ZpdjG7)U~|u z{-WfT=N$Q$?LI8H%)zRdoOep{h5e7)@0n#KpEEE#NEf(xV5aU#7r#d=-bUejRA(|s zo^Uueg-6_Xj;VZ-Ynr`xviGac*^f3Y)mZOUT5Y^@i|Wa}&F7GhKrTWE_Kk+dz+53DVi?R^ z1VcL>(4}Y03f-gq%DM@fw~ZO17uuoVP=tBXm?ML_wRW2@a7<@cx=>i&S_iM8KA3^i zZ=Z#jK`pE?yAZ0?2l!W%$lK&VB>~h49f`f#4N(u#d8Q#seA2T~ceEEk$zT{%=K2h+ npky%?Dh_=&>)(S$qiL8IPcVbh2Jy{y00000NkvXXu0mjf5`BE> diff --git a/app/src/main/res/drawable-mdpi/ic_copy.png b/app/src/main/res/drawable-mdpi/ic_copy.png deleted file mode 100644 index 912309132c66b3380284512bff939c9db7e83d98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk)AG&Ar-fh6Bda7`2T;uoPa;m zqoYd_f^=qhta`X4%3&6pQB%i0u?dpu3SX;^L^*`bY4{?T&3MwWE&Tin*2Q8yQ4Z|f uD*}J?MmdynuZWHbUMbkH`_MvB1_t&GIm<)$F_r=?VeoYIb6Mw<&;$TUYBH4o diff --git a/app/src/main/res/drawable-mdpi/ic_done.png b/app/src/main/res/drawable-mdpi/ic_done.png deleted file mode 100644 index 4d1d9bdfd398fb95fc284df160a073a40ad4b8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjah@)YAr-fh6C_v{H;8=r|G!={ zN-B@(2zP@;$Fw&6WxH4xw*_A>SdgTqaE?*ZL3lc|X@rBR-hnjE&?eR;g0odac#BKC yGlUjqOuL}7^?**K&txTrlamzM0u8td7#X+{o~rcw>FWV)V(@hJb6Mw<&;$VIN-miI diff --git a/app/src/main/res/drawable-mdpi/ic_done_all.png b/app/src/main/res/drawable-mdpi/ic_done_all.png deleted file mode 100644 index c0e88e9fe7c408dc131dbd726952e236853172d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjb39!fLn>}1CrGd^ZV>qK|Nnjy zF+(+lX-nE3ra9~p=xDycbDr%{q{A8?-oxUDbsUUp3|+-~r2JwJFYGdEyusuf!_%?4 zA%f#nIP0UED!XM~Z8{ooJyN0bx#Q8_4G|JrYA#_L8e&>gIxRzbggahujBtvZA)MJM z;VRgb)+s6G{VY&bP0l+XkKkXBAt diff --git a/app/src/main/res/drawable-xhdpi/ic_copy.png b/app/src/main/res/drawable-xhdpi/ic_copy.png deleted file mode 100644 index a15eb3da563cd823f60fd39e48f65aa42606040f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt8J;eVAr-gY-aN>AK!Kw*F}=X& z_(f;-7YnX5Gv8=)&-^uck8usVbJNlQ&eLaJ`OKCyUT(DNA^+D0UJl(-ajY-m*)ybB zY!Vn4t~4yLH4N*2#no|7cy;(!mX>#&Q=f6Z&}Z1CuJB}{{X1r$Wyql87ns*@pSeiB s+?-+O`Pb47cjRTv1uXZ^Sn*&N!)c4fi%sUu>j$awboFyt=akR{0J#%L&j0`b diff --git a/app/src/main/res/drawable-xhdpi/ic_done.png b/app/src/main/res/drawable-xhdpi/ic_done.png deleted file mode 100644 index f193eba596c01079e295605f9d2ea8d8356a8fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtMV>B>Ar-gYPCw1rU?9L+{3(sw z?8(`@oC89a9JqR=KPV*qaXDf$v(ffFPsXBij6fZK`X!RnFKeH!o}FN{c?tNv`!`K&4!f683@XMoVhpT_gW-sS3Eq45VN-1@R*du@Xv`qV><`gUkv`x-{*~3*?Yl&)G Q4v@#->FVdQ&MBb@04O6=B>(^b diff --git a/app/src/main/res/drawable-xhdpi/ic_done_all.png b/app/src/main/res/drawable-xhdpi/ic_done_all.png deleted file mode 100644 index d6036992c4f1cbba832ffb0fd03120511502fe51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmV-J0lfZ+P)d)WI^tc{J=uu_cPzz((KpfDs$LuO<(yUc3dOI~Bf<@<=jLXsc| zf*=Tj{BEkMN~tTy*(vov9mfP;P)n+DfWO$;6Lk_3eECkI1K;+nCLzGH0s?%~Ttxuz zfCoI_0sr^#a}{{{!i;*PE*$6g+$PMfbJKvo+6A6{5*EHaV4p;A_z`o)L<#zQ#~fIa zSPt@=Z_X04U?Y(-vl;cp%y^I`t5g2dxPiH!<;Xo*2Dm7XNFs@Hj65~?>TPZD?4 zJFF)O-R*%OQG6khYd(Y<*Gr}#k;m{F#Pq%X5G3^BI}*lmHnW?~)y}gmQ*+76bfJ-bv z;~E$1%|oeds(mg|T$3Ld*Tw((`|{+Zw~yK!U9!?{Z!;`ESNmkyo$w{sj?FBZe=)#` z;jMalZ%?pvMqeM0U@YO8!XV3hbhl|!?E3}=MkbaQc@B>M^D^f@H@+UhyP|dfZM*v= zmI2!J+xNbHIXQ&E#JuVA+Zxjgmn1F}nFeI>XvFf0e2e@r{U%5+hk$|u*bp3yRZOOq zEGSC8vR}Eb<-`~ee_Dstp?0maD8tvS0pT52&U-yOIl1Kj(m27NuJ`;|maTZWDEApK P1Q~)y|tIO*+8J-V#v!) zPGVli%_18FH!(B|DF?D0|D$>8?r)Xv$F&b^+YzJUISGiCH1s~MSh}I7SbMep>cty- zjL&cfv9bp-^DSYUv&W&}!GT6*c0L&kC}U3R!S|`Q%h?+~OFlQ{zcIg2gf-oQSySrV zLXY~tPI}F@`*`+oYaY3tCG~-4Nx=M1izhn0EADgR+RJ&TdrDIK9#PG!9}{(hPHhg= z4tmv`t{n6(xRQC2c6YDG&UeLON=x^?dG+9p^QYmdKI;Vst0QSmoO#lD@ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_all.png b/app/src/main/res/drawable-xxhdpi/ic_done_all.png deleted file mode 100644 index da71795bd68d69dafecafc31e586de922e231daf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U`+RPaSW-r_4d|zufq-k4IkyY z#Z4DIQeJuV@S&#jkCbQp`Y-rvK_Sy@Z-aMf+kMlfy>H$*)$^z5t(+HW&Mr`pvS!`u zZBk_!M>A8RB*Qm6j(X<&Y+=|OXNm9z<2My+MAOYK$y*$LlXcY7?H7CcjO9^$p@sqX}0Y z)%5Baac8y^pKuB4EY|*PTewkW3Fn-h9#;D&q`s_uvdA___~yp$H!mjYao>BqYk%0^ z<>EVkL^Dn5f0I!>;mV&W*)Bol^A~e^zV&_3iX&5= zZ=D(cJZ`0%wo}y=wz@lP`g167=5225GCd54Ci&y0ngn)_b>KLavoL>5;@K+Hq + android:viewportWidth="24.0" + android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable-anydpi/ic_done_all.xml b/app/src/main/res/drawable/ic_done_all_24dp.xml similarity index 76% rename from app/src/main/res/drawable-anydpi/ic_done_all.xml rename to app/src/main/res/drawable/ic_done_all_24dp.xml index 85d9ffd19..17b5d715b 100644 --- a/app/src/main/res/drawable-anydpi/ic_done_all.xml +++ b/app/src/main/res/drawable/ic_done_all_24dp.xml @@ -1,10 +1,8 @@ + android:viewportWidth="24.0" + android:viewportHeight="24.0"> diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml index 62c7ef416..555022b73 100755 --- a/app/src/main/res/menu/library.xml +++ b/app/src/main/res/menu/library.xml @@ -34,7 +34,7 @@ diff --git a/app/src/main/res/menu/migration_list.xml b/app/src/main/res/menu/migration_list.xml index 9257ff4ed..8febdbe52 100644 --- a/app/src/main/res/menu/migration_list.xml +++ b/app/src/main/res/menu/migration_list.xml @@ -4,12 +4,14 @@ \ No newline at end of file