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 7821875d3..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_copy.png and /dev/null differ 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 f1f39724e..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_done.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_done_all.png b/app/src/main/res/drawable-hdpi/ic_done_all.png deleted file mode 100644 index 3d0e27aa9..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_done_all.png and /dev/null differ 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 912309132..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_copy.png and /dev/null differ 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 4d1d9bdfd..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_done.png and /dev/null differ 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 c0e88e9fe..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_done_all.png and /dev/null differ 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 a15eb3da5..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_copy.png and /dev/null differ 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 f193eba59..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_done.png and /dev/null differ 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 d6036992c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_done_all.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_copy.png b/app/src/main/res/drawable-xxhdpi/ic_copy.png deleted file mode 100644 index bfc0c2588..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_copy.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done.png b/app/src/main/res/drawable-xxhdpi/ic_done.png deleted file mode 100644 index 612c0a3fd..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_done.png and /dev/null differ 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 da71795bd..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_done_all.png and /dev/null differ diff --git a/app/src/main/res/drawable-anydpi/ic_copy.xml b/app/src/main/res/drawable/ic_copy_24dp.xml similarity index 76% rename from app/src/main/res/drawable-anydpi/ic_copy.xml rename to app/src/main/res/drawable/ic_copy_24dp.xml index b11c7d4ef..4741ca618 100644 --- a/app/src/main/res/drawable-anydpi/ic_copy.xml +++ b/app/src/main/res/drawable/ic_copy_24dp.xml @@ -1,10 +1,8 @@ + 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