diff --git a/app/build.gradle b/app/build.gradle index 0373208c8..3ea7183ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { publishNonDefault true defaultConfig { - applicationId "eu.kanade.mangafeed" + applicationId "eu.kanade.tachiyomi" minSdkVersion 16 targetSdkVersion 23 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2a062750c..873e9f402 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="eu.kanade.tachiyomi" > @@ -77,7 +77,7 @@ diff --git a/app/src/main/java/eu/kanade/mangafeed/App.java b/app/src/main/java/eu/kanade/tachiyomi/App.java similarity index 84% rename from app/src/main/java/eu/kanade/mangafeed/App.java rename to app/src/main/java/eu/kanade/tachiyomi/App.java index 4c76c466b..1024edb8e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/App.java +++ b/app/src/main/java/eu/kanade/tachiyomi/App.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed; +package eu.kanade.tachiyomi; import android.app.Application; import android.content.Context; @@ -6,10 +6,10 @@ import android.content.Context; import org.acra.ACRA; import org.acra.annotation.ReportsCrashes; -import eu.kanade.mangafeed.injection.ComponentReflectionInjector; -import eu.kanade.mangafeed.injection.component.AppComponent; -import eu.kanade.mangafeed.injection.component.DaggerAppComponent; -import eu.kanade.mangafeed.injection.module.AppModule; +import eu.kanade.tachiyomi.injection.ComponentReflectionInjector; +import eu.kanade.tachiyomi.injection.component.AppComponent; +import eu.kanade.tachiyomi.injection.component.DaggerAppComponent; +import eu.kanade.tachiyomi.injection.module.AppModule; import timber.log.Timber; @ReportsCrashes( diff --git a/app/src/main/java/eu/kanade/mangafeed/data/cache/ChapterCache.java b/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/data/cache/ChapterCache.java rename to app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.java index 428368f67..9571c6020 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/cache/ChapterCache.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.cache; +package eu.kanade.tachiyomi.data.cache; import android.content.Context; import android.text.format.Formatter; @@ -15,8 +15,8 @@ import java.io.OutputStream; import java.lang.reflect.Type; import java.util.List; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.util.DiskUtils; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.util.DiskUtils; import okio.BufferedSink; import okio.Okio; import rx.Observable; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/cache/CoverCache.java b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/data/cache/CoverCache.java rename to app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.java index 93ffd081a..7f2697a37 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/cache/CoverCache.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.cache; +package eu.kanade.tachiyomi.data.cache; import android.content.Context; import android.text.TextUtils; @@ -18,7 +18,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import eu.kanade.mangafeed.util.DiskUtils; +import eu.kanade.tachiyomi.util.DiskUtils; public class CoverCache { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/cache/CoverGlideModule.java b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverGlideModule.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/data/cache/CoverGlideModule.java rename to app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverGlideModule.java index 1fc485993..c94397bcd 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/cache/CoverGlideModule.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverGlideModule.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.cache; +package eu.kanade.tachiyomi.data.cache; import android.content.Context; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java index a9aa09ee7..35402e35b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database; +package eu.kanade.tachiyomi.data.database; import android.content.Context; import android.util.Pair; @@ -20,24 +20,24 @@ import com.pushtorefresh.storio.sqlite.queries.RawQuery; import java.util.Date; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.data.database.models.CategorySQLiteTypeMapping; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.ChapterSQLiteTypeMapping; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaCategory; -import eu.kanade.mangafeed.data.database.models.MangaCategorySQLiteTypeMapping; -import eu.kanade.mangafeed.data.database.models.MangaSQLiteTypeMapping; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.data.database.models.MangaSyncSQLiteTypeMapping; -import eu.kanade.mangafeed.data.database.resolvers.LibraryMangaGetResolver; -import eu.kanade.mangafeed.data.database.tables.CategoryTable; -import eu.kanade.mangafeed.data.database.tables.ChapterTable; -import eu.kanade.mangafeed.data.database.tables.MangaCategoryTable; -import eu.kanade.mangafeed.data.database.tables.MangaSyncTable; -import eu.kanade.mangafeed.data.database.tables.MangaTable; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.util.ChapterRecognition; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.data.database.models.CategorySQLiteTypeMapping; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.ChapterSQLiteTypeMapping; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaCategory; +import eu.kanade.tachiyomi.data.database.models.MangaCategorySQLiteTypeMapping; +import eu.kanade.tachiyomi.data.database.models.MangaSQLiteTypeMapping; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.database.models.MangaSyncSQLiteTypeMapping; +import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver; +import eu.kanade.tachiyomi.data.database.tables.CategoryTable; +import eu.kanade.tachiyomi.data.database.tables.ChapterTable; +import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable; +import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable; +import eu.kanade.tachiyomi.data.database.tables.MangaTable; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.util.ChapterRecognition; import rx.Observable; public class DatabaseHelper { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/DbOpenHelper.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.java similarity index 60% rename from app/src/main/java/eu/kanade/mangafeed/data/database/DbOpenHelper.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.java index 8fdfca705..ba073c71a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/DbOpenHelper.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.java @@ -1,20 +1,20 @@ -package eu.kanade.mangafeed.data.database; +package eu.kanade.tachiyomi.data.database; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.support.annotation.NonNull; -import eu.kanade.mangafeed.data.database.tables.CategoryTable; -import eu.kanade.mangafeed.data.database.tables.MangaCategoryTable; -import eu.kanade.mangafeed.data.database.tables.MangaSyncTable; -import eu.kanade.mangafeed.data.database.tables.ChapterTable; -import eu.kanade.mangafeed.data.database.tables.MangaTable; +import eu.kanade.tachiyomi.data.database.tables.CategoryTable; +import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable; +import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable; +import eu.kanade.tachiyomi.data.database.tables.ChapterTable; +import eu.kanade.tachiyomi.data.database.tables.MangaTable; public class DbOpenHelper extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "mangafeed.db"; - public static final int DATABASE_VERSION = 2; + public static final String DATABASE_NAME = "tachiyomi.db"; + public static final int DATABASE_VERSION = 1; public DbOpenHelper(@NonNull Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); @@ -36,12 +36,7 @@ public class DbOpenHelper extends SQLiteOpenHelper { @Override public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) { - if (oldVersion == 1) { - db.execSQL("ALTER TABLE manga_sync RENAME TO tmp;"); - db.execSQL(MangaSyncTable.getCreateTableQuery()); - db.execSQL("INSERT INTO " + MangaSyncTable.TABLE + " SELECT * FROM tmp;"); - db.execSQL("DROP TABLE tmp;"); - } + } @Override diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Category.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.java similarity index 88% rename from app/src/main/java/eu/kanade/mangafeed/data/database/models/Category.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.java index 44dcd4177..e4b142e3f 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Category.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.java @@ -1,11 +1,11 @@ -package eu.kanade.mangafeed.data.database.models; +package eu.kanade.tachiyomi.data.database.models; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; import java.io.Serializable; -import eu.kanade.mangafeed.data.database.tables.CategoryTable; +import eu.kanade.tachiyomi.data.database.tables.CategoryTable; @StorIOSQLiteType(table = CategoryTable.TABLE) public class Category implements Serializable { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Chapter.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/data/database/models/Chapter.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.java index 90073d929..86657e2ec 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Chapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.data.database.models; +package eu.kanade.tachiyomi.data.database.models; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; import java.io.Serializable; -import eu.kanade.mangafeed.data.database.tables.ChapterTable; -import eu.kanade.mangafeed.util.UrlUtil; +import eu.kanade.tachiyomi.data.database.tables.ChapterTable; +import eu.kanade.tachiyomi.util.UrlUtil; @StorIOSQLiteType(table = ChapterTable.TABLE) public class Chapter implements Serializable { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Manga.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/data/database/models/Manga.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.java index f5260a7fb..5548f69ff 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/models/Manga.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.models; +package eu.kanade.tachiyomi.data.database.models; import android.content.Context; @@ -7,9 +7,9 @@ import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; import java.io.Serializable; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.tables.MangaTable; -import eu.kanade.mangafeed.util.UrlUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.tables.MangaTable; +import eu.kanade.tachiyomi.util.UrlUtil; @StorIOSQLiteType(table = MangaTable.TABLE) public class Manga implements Serializable { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaCategory.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.java similarity index 87% rename from app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaCategory.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.java index 802e0dac3..062039b29 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaCategory.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.java @@ -1,9 +1,9 @@ -package eu.kanade.mangafeed.data.database.models; +package eu.kanade.tachiyomi.data.database.models; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; -import eu.kanade.mangafeed.data.database.tables.MangaCategoryTable; +import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable; @StorIOSQLiteType(table = MangaCategoryTable.TABLE) public class MangaCategory { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaSync.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.java similarity index 89% rename from app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaSync.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.java index ef63321ab..0dfdaa896 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaSync.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.data.database.models; +package eu.kanade.tachiyomi.data.database.models; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; import java.io.Serializable; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.database.tables.MangaSyncTable; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable; @StorIOSQLiteType(table = MangaSyncTable.TABLE) public class MangaSync implements Serializable { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/LibraryMangaGetResolver.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.java similarity index 83% rename from app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/LibraryMangaGetResolver.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.java index 004464492..af815de1c 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/LibraryMangaGetResolver.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.java @@ -1,13 +1,13 @@ -package eu.kanade.mangafeed.data.database.resolvers; +package eu.kanade.tachiyomi.data.database.resolvers; import android.database.Cursor; import android.support.annotation.NonNull; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaStorIOSQLiteGetResolver; -import eu.kanade.mangafeed.data.database.tables.ChapterTable; -import eu.kanade.mangafeed.data.database.tables.MangaCategoryTable; -import eu.kanade.mangafeed.data.database.tables.MangaTable; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver; +import eu.kanade.tachiyomi.data.database.tables.ChapterTable; +import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable; +import eu.kanade.tachiyomi.data.database.tables.MangaTable; public class LibraryMangaGetResolver extends MangaStorIOSQLiteGetResolver { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/MangaWithUnreadGetResolver.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaWithUnreadGetResolver.java similarity index 70% rename from app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/MangaWithUnreadGetResolver.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaWithUnreadGetResolver.java index dbe2855a4..75a8d353d 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/MangaWithUnreadGetResolver.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaWithUnreadGetResolver.java @@ -1,11 +1,11 @@ -package eu.kanade.mangafeed.data.database.resolvers; +package eu.kanade.tachiyomi.data.database.resolvers; import android.database.Cursor; import android.support.annotation.NonNull; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaStorIOSQLiteGetResolver; -import eu.kanade.mangafeed.data.database.tables.MangaTable; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver; +import eu.kanade.tachiyomi.data.database.tables.MangaTable; public class MangaWithUnreadGetResolver extends MangaStorIOSQLiteGetResolver { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/CategoryTable.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/data/database/tables/CategoryTable.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.java index b440e57c8..a84db5066 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/CategoryTable.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.tables; +package eu.kanade.tachiyomi.data.database.tables; import android.support.annotation.NonNull; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/ChapterTable.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/database/tables/ChapterTable.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.java index f6454fe70..1aea2574d 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/ChapterTable.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.tables; +package eu.kanade.tachiyomi.data.database.tables; import android.support.annotation.NonNull; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaCategoryTable.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaCategoryTable.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.java index 9a86231db..e31086603 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaCategoryTable.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.tables; +package eu.kanade.tachiyomi.data.database.tables; import android.support.annotation.NonNull; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaSyncTable.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaSyncTable.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaSyncTable.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaSyncTable.java index 09779b332..c8dadeb60 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaSyncTable.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaSyncTable.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.tables; +package eu.kanade.tachiyomi.data.database.tables; import android.support.annotation.NonNull; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaTable.java b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaTable.java rename to app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.java index 12bbb4626..7b99bcd39 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/tables/MangaTable.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.database.tables; +package eu.kanade.tachiyomi.data.database.tables; import android.support.annotation.NonNull; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java rename to app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java index 7fd03c985..4e40951d1 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadManager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.download; +package eu.kanade.tachiyomi.data.download; import android.content.Context; @@ -14,17 +14,17 @@ import java.io.IOException; import java.lang.reflect.Type; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.data.download.model.DownloadQueue; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.event.DownloadChaptersEvent; -import eu.kanade.mangafeed.util.DiskUtils; -import eu.kanade.mangafeed.util.DynamicConcurrentMergeOperator; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.data.download.model.DownloadQueue; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.event.DownloadChaptersEvent; +import eu.kanade.tachiyomi.util.DiskUtils; +import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator; import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadService.java b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/data/download/DownloadService.java rename to app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.java index 2b9032b41..43aa82f4d 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/download/DownloadService.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.download; +package eu.kanade.tachiyomi.data.download; import android.app.Service; import android.content.Context; @@ -11,12 +11,12 @@ import com.github.pwittchen.reactivenetwork.library.ReactiveNetwork; import javax.inject.Inject; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.event.DownloadChaptersEvent; -import eu.kanade.mangafeed.util.EventBusHook; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.event.DownloadChaptersEvent; +import eu.kanade.tachiyomi.util.EventBusHook; +import eu.kanade.tachiyomi.util.ToastUtil; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/download/model/Download.java b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.java similarity index 82% rename from app/src/main/java/eu/kanade/mangafeed/data/download/model/Download.java rename to app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.java index b555a6c75..b0891edee 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/download/model/Download.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.data.download.model; +package eu.kanade.tachiyomi.data.download.model; import java.io.File; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.Page; import rx.subjects.PublishSubject; public class Download { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/download/model/DownloadQueue.java b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/data/download/model/DownloadQueue.java rename to app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.java index 06b0df460..00e291475 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/download/model/DownloadQueue.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.java @@ -1,10 +1,10 @@ -package eu.kanade.mangafeed.data.download.model; +package eu.kanade.tachiyomi.data.download.model; import java.util.ArrayList; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.source.model.Page; import rx.Observable; import rx.subjects.PublishSubject; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/MangaSyncManager.java b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncManager.java similarity index 81% rename from app/src/main/java/eu/kanade/mangafeed/data/mangasync/MangaSyncManager.java rename to app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncManager.java index 63176e2ac..3411b852b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/MangaSyncManager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncManager.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.data.mangasync; +package eu.kanade.tachiyomi.data.mangasync; import android.content.Context; import java.util.ArrayList; import java.util.List; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.mangasync.services.MyAnimeList; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.mangasync.services.MyAnimeList; public class MangaSyncManager { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/base/MangaSyncService.java b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/base/MangaSyncService.java similarity index 86% rename from app/src/main/java/eu/kanade/mangafeed/data/mangasync/base/MangaSyncService.java rename to app/src/main/java/eu/kanade/tachiyomi/data/mangasync/base/MangaSyncService.java index e94dc43f5..097abbf5a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/base/MangaSyncService.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/base/MangaSyncService.java @@ -1,8 +1,8 @@ -package eu.kanade.mangafeed.data.mangasync.base; +package eu.kanade.tachiyomi.data.mangasync.base; import com.squareup.okhttp.Response; -import eu.kanade.mangafeed.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.database.models.MangaSync; import rx.Observable; public abstract class MangaSyncService { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/services/MyAnimeList.java b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/services/MyAnimeList.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/data/mangasync/services/MyAnimeList.java rename to app/src/main/java/eu/kanade/tachiyomi/data/mangasync/services/MyAnimeList.java index fc0b9e2d3..f7eda7559 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/mangasync/services/MyAnimeList.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/services/MyAnimeList.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.mangasync.services; +package eu.kanade.tachiyomi.data.mangasync.services; import android.content.Context; import android.net.Uri; @@ -19,13 +19,13 @@ import java.util.List; import javax.inject.Inject; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.network.NetworkHelper; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.network.NetworkHelper; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; import rx.Observable; public class MyAnimeList extends MangaSyncService { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/network/NetworkHelper.java b/app/src/main/java/eu/kanade/tachiyomi/data/network/NetworkHelper.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/data/network/NetworkHelper.java rename to app/src/main/java/eu/kanade/tachiyomi/data/network/NetworkHelper.java index 2ea70d691..60bbe68d5 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/network/NetworkHelper.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/network/NetworkHelper.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.network; +package eu.kanade.tachiyomi.data.network; import com.squareup.okhttp.CacheControl; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/network/ProgressListener.java b/app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressListener.java similarity index 71% rename from app/src/main/java/eu/kanade/mangafeed/data/network/ProgressListener.java rename to app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressListener.java index cdab93dcd..ae43b27f7 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/network/ProgressListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.network; +package eu.kanade.tachiyomi.data.network; public interface ProgressListener { void update(long bytesRead, long contentLength, boolean done); diff --git a/app/src/main/java/eu/kanade/mangafeed/data/network/ProgressResponseBody.java b/app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressResponseBody.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/data/network/ProgressResponseBody.java rename to app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressResponseBody.java index 58a9654bc..472b14b7d 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/network/ProgressResponseBody.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressResponseBody.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.network; +package eu.kanade.tachiyomi.data.network; import com.squareup.okhttp.MediaType; import com.squareup.okhttp.ResponseBody; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/preference/PreferencesHelper.java b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/preference/PreferencesHelper.java rename to app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.java index 5f31a399a..d79b1c7f3 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/preference/PreferencesHelper.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.preference; +package eu.kanade.tachiyomi.data.preference; import android.content.Context; import android.content.SharedPreferences; @@ -11,9 +11,9 @@ import com.f2prateek.rx.preferences.RxSharedPreferences; import java.io.File; import java.io.IOException; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.source.base.Source; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.source.base.Source; public class PreferencesHelper { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/SourceManager.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.java similarity index 81% rename from app/src/main/java/eu/kanade/mangafeed/data/source/SourceManager.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.java index 58cba352f..c4ef6969c 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/SourceManager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source; +package eu.kanade.tachiyomi.data.source; import android.content.Context; @@ -6,11 +6,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.online.english.Batoto; -import eu.kanade.mangafeed.data.source.online.english.Kissmanga; -import eu.kanade.mangafeed.data.source.online.english.Mangafox; -import eu.kanade.mangafeed.data.source.online.english.Mangahere; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.online.english.Batoto; +import eu.kanade.tachiyomi.data.source.online.english.Kissmanga; +import eu.kanade.tachiyomi.data.source.online.english.Mangafox; +import eu.kanade.tachiyomi.data.source.online.english.Mangahere; public class SourceManager { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/BaseSource.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/base/BaseSource.java index ddd55b4a6..8e247d51a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/BaseSource.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.base; +package eu.kanade.tachiyomi.data.source.base; import com.squareup.okhttp.Headers; import com.squareup.okhttp.Response; @@ -7,9 +7,9 @@ import org.jsoup.nodes.Document; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.model.MangasPage; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.model.MangasPage; import rx.Observable; public abstract class BaseSource { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/LoginSource.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/LoginSource.java similarity index 85% rename from app/src/main/java/eu/kanade/mangafeed/data/source/base/LoginSource.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/base/LoginSource.java index b4bd7474c..f6b90ffc5 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/LoginSource.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/LoginSource.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.base; +package eu.kanade.tachiyomi.data.source.base; import android.content.Context; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/Source.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/base/Source.java index 08475b646..681438e2e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/Source.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/base/Source.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.base; +package eu.kanade.tachiyomi.data.source.base; import android.content.Context; @@ -15,14 +15,14 @@ import java.util.Map; import javax.inject.Inject; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.data.cache.ChapterCache; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.network.NetworkHelper; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.data.cache.ChapterCache; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.network.NetworkHelper; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.data.source.model.Page; import rx.Observable; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/model/MangasPage.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/model/MangasPage.java similarity index 69% rename from app/src/main/java/eu/kanade/mangafeed/data/source/model/MangasPage.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/model/MangasPage.java index b63dc719e..7ca1cd831 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/model/MangasPage.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/model/MangasPage.java @@ -1,8 +1,8 @@ -package eu.kanade.mangafeed.data.source.model; +package eu.kanade.tachiyomi.data.source.model; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.Manga; public class MangasPage { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/model/Page.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/model/Page.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/data/source/model/Page.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/model/Page.java index cbcbcc2d8..9763881a6 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/model/Page.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/model/Page.java @@ -1,6 +1,6 @@ -package eu.kanade.mangafeed.data.source.model; +package eu.kanade.tachiyomi.data.source.model; -import eu.kanade.mangafeed.data.network.ProgressListener; +import eu.kanade.tachiyomi.data.network.ProgressListener; import rx.subjects.PublishSubject; public class Page implements ProgressListener { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Batoto.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Batoto.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.java index b222264d6..cdec10aea 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Batoto.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.online.english; +package eu.kanade.tachiyomi.data.source.online.english; import android.content.Context; import android.net.Uri; @@ -28,13 +28,13 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.LoginSource; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.util.Parser; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.LoginSource; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.util.Parser; import rx.Observable; public class Batoto extends LoginSource { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.java index 2cf4a982b..c542eb705 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Kissmanga.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.online.english; +package eu.kanade.tachiyomi.data.source.online.english; import android.content.Context; import android.net.Uri; @@ -19,13 +19,13 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.util.Parser; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.util.Parser; import rx.Observable; public class Kissmanga extends Source { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangafox.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangafox.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangafox.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangafox.java index 364f5b388..8b5c5dd08 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangafox.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangafox.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.online.english; +package eu.kanade.tachiyomi.data.source.online.english; import android.content.Context; import android.net.Uri; @@ -16,12 +16,12 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.util.Parser; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.util.Parser; public class Mangafox extends Source { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangahere.java b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangahere.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangahere.java rename to app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangahere.java index 76bcaa26c..40b951574 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/source/online/english/Mangahere.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangahere.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.source.online.english; +package eu.kanade.tachiyomi.data.source.online.english; import android.content.Context; import android.net.Uri; @@ -16,12 +16,12 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.util.Parser; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.util.Parser; public class Mangahere extends Source { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateAlarm.java b/app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateAlarm.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateAlarm.java rename to app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateAlarm.java index 49ac67bbd..6c8df38fb 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateAlarm.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateAlarm.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.sync; +package eu.kanade.tachiyomi.data.sync; import android.app.AlarmManager; import android.app.PendingIntent; @@ -7,7 +7,7 @@ import android.content.Context; import android.content.Intent; import android.os.SystemClock; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; import timber.log.Timber; public class LibraryUpdateAlarm extends BroadcastReceiver { diff --git a/app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateService.java b/app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateService.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateService.java rename to app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateService.java index 46605c1ed..f0b62b13f 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateService.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/LibraryUpdateService.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.sync; +package eu.kanade.tachiyomi.data.sync; import android.app.NotificationManager; import android.app.PendingIntent; @@ -17,16 +17,16 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.BuildConfig; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.ui.main.MainActivity; -import eu.kanade.mangafeed.util.AndroidComponentUtil; -import eu.kanade.mangafeed.util.NetworkUtil; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.BuildConfig; +import eu.kanade.tachiyomi.R; +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.data.source.SourceManager; +import eu.kanade.tachiyomi.ui.main.MainActivity; +import eu.kanade.tachiyomi.util.AndroidComponentUtil; +import eu.kanade.tachiyomi.util.NetworkUtil; import rx.Observable; import rx.Subscription; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/data/sync/UpdateMangaSyncService.java b/app/src/main/java/eu/kanade/tachiyomi/data/sync/UpdateMangaSyncService.java similarity index 87% rename from app/src/main/java/eu/kanade/mangafeed/data/sync/UpdateMangaSyncService.java rename to app/src/main/java/eu/kanade/tachiyomi/data/sync/UpdateMangaSyncService.java index 0f2ce8ee2..c8ae78143 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/sync/UpdateMangaSyncService.java +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/UpdateMangaSyncService.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.data.sync; +package eu.kanade.tachiyomi.data.sync; import android.app.Service; import android.content.Context; @@ -7,11 +7,11 @@ import android.os.IBinder; import javax.inject.Inject; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/event/ChapterCountEvent.java b/app/src/main/java/eu/kanade/tachiyomi/event/ChapterCountEvent.java similarity index 84% rename from app/src/main/java/eu/kanade/mangafeed/event/ChapterCountEvent.java rename to app/src/main/java/eu/kanade/tachiyomi/event/ChapterCountEvent.java index 4bed4ad88..6e336925c 100644 --- a/app/src/main/java/eu/kanade/mangafeed/event/ChapterCountEvent.java +++ b/app/src/main/java/eu/kanade/tachiyomi/event/ChapterCountEvent.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.event; +package eu.kanade.tachiyomi.event; public class ChapterCountEvent { private int count; diff --git a/app/src/main/java/eu/kanade/mangafeed/event/DownloadChaptersEvent.java b/app/src/main/java/eu/kanade/tachiyomi/event/DownloadChaptersEvent.java similarity index 73% rename from app/src/main/java/eu/kanade/mangafeed/event/DownloadChaptersEvent.java rename to app/src/main/java/eu/kanade/tachiyomi/event/DownloadChaptersEvent.java index 855ec2433..1b9a5d08b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/event/DownloadChaptersEvent.java +++ b/app/src/main/java/eu/kanade/tachiyomi/event/DownloadChaptersEvent.java @@ -1,9 +1,9 @@ -package eu.kanade.mangafeed.event; +package eu.kanade.tachiyomi.event; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; public class DownloadChaptersEvent { private Manga manga; diff --git a/app/src/main/java/eu/kanade/mangafeed/event/LibraryMangasEvent.java b/app/src/main/java/eu/kanade/tachiyomi/event/LibraryMangasEvent.java similarity index 76% rename from app/src/main/java/eu/kanade/mangafeed/event/LibraryMangasEvent.java rename to app/src/main/java/eu/kanade/tachiyomi/event/LibraryMangasEvent.java index 29dc63a0d..1250a0d4b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/event/LibraryMangasEvent.java +++ b/app/src/main/java/eu/kanade/tachiyomi/event/LibraryMangasEvent.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.event; +package eu.kanade.tachiyomi.event; import android.support.annotation.Nullable; import java.util.List; import java.util.Map; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.data.database.models.Manga; public class LibraryMangasEvent { diff --git a/app/src/main/java/eu/kanade/mangafeed/event/ReaderEvent.java b/app/src/main/java/eu/kanade/tachiyomi/event/ReaderEvent.java similarity index 70% rename from app/src/main/java/eu/kanade/mangafeed/event/ReaderEvent.java rename to app/src/main/java/eu/kanade/tachiyomi/event/ReaderEvent.java index 66553e5de..6126d0a7e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/event/ReaderEvent.java +++ b/app/src/main/java/eu/kanade/tachiyomi/event/ReaderEvent.java @@ -1,8 +1,8 @@ -package eu.kanade.mangafeed.event; +package eu.kanade.tachiyomi.event; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.base.Source; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.base.Source; public class ReaderEvent { diff --git a/app/src/main/java/eu/kanade/mangafeed/injection/ComponentReflectionInjector.java b/app/src/main/java/eu/kanade/tachiyomi/injection/ComponentReflectionInjector.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/injection/ComponentReflectionInjector.java rename to app/src/main/java/eu/kanade/tachiyomi/injection/ComponentReflectionInjector.java index 0cb4bd87c..5f2c8ed14 100644 --- a/app/src/main/java/eu/kanade/mangafeed/injection/ComponentReflectionInjector.java +++ b/app/src/main/java/eu/kanade/tachiyomi/injection/ComponentReflectionInjector.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.injection; +package eu.kanade.tachiyomi.injection; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/app/src/main/java/eu/kanade/mangafeed/injection/component/AppComponent.java b/app/src/main/java/eu/kanade/tachiyomi/injection/component/AppComponent.java similarity index 50% rename from app/src/main/java/eu/kanade/mangafeed/injection/component/AppComponent.java rename to app/src/main/java/eu/kanade/tachiyomi/injection/component/AppComponent.java index 7f1f15333..e9e0554af 100644 --- a/app/src/main/java/eu/kanade/mangafeed/injection/component/AppComponent.java +++ b/app/src/main/java/eu/kanade/tachiyomi/injection/component/AppComponent.java @@ -1,30 +1,30 @@ -package eu.kanade.mangafeed.injection.component; +package eu.kanade.tachiyomi.injection.component; import android.app.Application; import javax.inject.Singleton; import dagger.Component; -import eu.kanade.mangafeed.data.download.DownloadService; -import eu.kanade.mangafeed.data.mangasync.services.MyAnimeList; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.sync.LibraryUpdateService; -import eu.kanade.mangafeed.data.sync.UpdateMangaSyncService; -import eu.kanade.mangafeed.injection.module.AppModule; -import eu.kanade.mangafeed.injection.module.DataModule; -import eu.kanade.mangafeed.ui.catalogue.CataloguePresenter; -import eu.kanade.mangafeed.ui.download.DownloadPresenter; -import eu.kanade.mangafeed.ui.library.category.CategoryPresenter; -import eu.kanade.mangafeed.ui.library.LibraryPresenter; -import eu.kanade.mangafeed.ui.manga.MangaActivity; -import eu.kanade.mangafeed.ui.manga.MangaPresenter; -import eu.kanade.mangafeed.ui.manga.chapter.ChaptersPresenter; -import eu.kanade.mangafeed.ui.manga.info.MangaInfoPresenter; -import eu.kanade.mangafeed.ui.manga.myanimelist.MyAnimeListPresenter; -import eu.kanade.mangafeed.ui.reader.ReaderActivity; -import eu.kanade.mangafeed.ui.reader.ReaderPresenter; -import eu.kanade.mangafeed.ui.setting.SettingsAccountsFragment; -import eu.kanade.mangafeed.ui.setting.SettingsActivity; +import eu.kanade.tachiyomi.data.download.DownloadService; +import eu.kanade.tachiyomi.data.mangasync.services.MyAnimeList; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.sync.LibraryUpdateService; +import eu.kanade.tachiyomi.data.sync.UpdateMangaSyncService; +import eu.kanade.tachiyomi.injection.module.AppModule; +import eu.kanade.tachiyomi.injection.module.DataModule; +import eu.kanade.tachiyomi.ui.catalogue.CataloguePresenter; +import eu.kanade.tachiyomi.ui.download.DownloadPresenter; +import eu.kanade.tachiyomi.ui.library.category.CategoryPresenter; +import eu.kanade.tachiyomi.ui.library.LibraryPresenter; +import eu.kanade.tachiyomi.ui.manga.MangaActivity; +import eu.kanade.tachiyomi.ui.manga.MangaPresenter; +import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersPresenter; +import eu.kanade.tachiyomi.ui.manga.info.MangaInfoPresenter; +import eu.kanade.tachiyomi.ui.manga.myanimelist.MyAnimeListPresenter; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; +import eu.kanade.tachiyomi.ui.reader.ReaderPresenter; +import eu.kanade.tachiyomi.ui.setting.SettingsAccountsFragment; +import eu.kanade.tachiyomi.ui.setting.SettingsActivity; @Singleton @Component( diff --git a/app/src/main/java/eu/kanade/mangafeed/injection/module/AppModule.java b/app/src/main/java/eu/kanade/tachiyomi/injection/module/AppModule.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/injection/module/AppModule.java rename to app/src/main/java/eu/kanade/tachiyomi/injection/module/AppModule.java index e512d06cd..c855cf8e5 100644 --- a/app/src/main/java/eu/kanade/mangafeed/injection/module/AppModule.java +++ b/app/src/main/java/eu/kanade/tachiyomi/injection/module/AppModule.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.injection.module; +package eu.kanade.tachiyomi.injection.module; import android.app.Application; diff --git a/app/src/main/java/eu/kanade/mangafeed/injection/module/DataModule.java b/app/src/main/java/eu/kanade/tachiyomi/injection/module/DataModule.java similarity index 74% rename from app/src/main/java/eu/kanade/mangafeed/injection/module/DataModule.java rename to app/src/main/java/eu/kanade/tachiyomi/injection/module/DataModule.java index 24022f750..7be95dba9 100644 --- a/app/src/main/java/eu/kanade/mangafeed/injection/module/DataModule.java +++ b/app/src/main/java/eu/kanade/tachiyomi/injection/module/DataModule.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.injection.module; +package eu.kanade.tachiyomi.injection.module; import android.app.Application; @@ -6,14 +6,14 @@ import javax.inject.Singleton; import dagger.Module; import dagger.Provides; -import eu.kanade.mangafeed.data.cache.ChapterCache; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.download.DownloadManager; -import eu.kanade.mangafeed.data.network.NetworkHelper; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; +import eu.kanade.tachiyomi.data.cache.ChapterCache; +import eu.kanade.tachiyomi.data.cache.CoverCache; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.download.DownloadManager; +import eu.kanade.tachiyomi.data.network.NetworkHelper; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.SourceManager; /** * Provide dependencies to the DataManager, mainly Helper classes and Retrofit services. diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.java index 37dced98c..90d92ba74 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.activity; +package eu.kanade.tachiyomi.ui.base.activity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseRxActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseRxActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.java index cfab9a313..8b3117e9a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/activity/BaseRxActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.java @@ -1,10 +1,10 @@ -package eu.kanade.mangafeed.ui.base.activity; +package eu.kanade.tachiyomi.ui.base.activity; import android.os.Bundle; import android.support.annotation.NonNull; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import nucleus.factory.PresenterFactory; import nucleus.factory.ReflectionPresenterFactory; import nucleus.presenter.Presenter; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/FlexibleViewHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/FlexibleViewHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.java index 762bc3226..8ca4d3b13 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/FlexibleViewHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.adapter; +package eu.kanade.tachiyomi.ui.base.adapter; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/ItemTouchHelperAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/ItemTouchHelperAdapter.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/ItemTouchHelperAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/ItemTouchHelperAdapter.java index 9cf8266d2..7f335bd86 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/ItemTouchHelperAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/ItemTouchHelperAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.kanade.mangafeed.ui.base.adapter; +package eu.kanade.tachiyomi.ui.base.adapter; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/OnStartDragListener.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/OnStartDragListener.java similarity index 86% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/OnStartDragListener.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/OnStartDragListener.java index 692e0fd4f..26bfcb4ce 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/OnStartDragListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/OnStartDragListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.adapter; +package eu.kanade.tachiyomi.ui.base.adapter; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SimpleItemTouchHelperCallback.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SimpleItemTouchHelperCallback.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SimpleItemTouchHelperCallback.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SimpleItemTouchHelperCallback.java index 525e9c2d5..d4e05c55a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SimpleItemTouchHelperCallback.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SimpleItemTouchHelperCallback.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.adapter; +package eu.kanade.tachiyomi.ui.base.adapter; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SmartFragmentStatePagerAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SmartFragmentStatePagerAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.java index 22bb6717d..d90cdff9a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/adapter/SmartFragmentStatePagerAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.adapter; +package eu.kanade.tachiyomi.ui.base.adapter; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/fab/ScrollAwareFABBehavior.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fab/ScrollAwareFABBehavior.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/fab/ScrollAwareFABBehavior.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/fab/ScrollAwareFABBehavior.java index bb1e0d872..707299b80 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/fab/ScrollAwareFABBehavior.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fab/ScrollAwareFABBehavior.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.kanade.mangafeed.ui.base.fab; +package eu.kanade.tachiyomi.ui.base.fab; import android.content.Context; import android.support.design.widget.CoordinatorLayout; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.java index 352682dcf..9b20f5cdb 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.java @@ -1,10 +1,10 @@ -package eu.kanade.mangafeed.ui.base.fragment; +package eu.kanade.tachiyomi.ui.base.fragment; import android.os.Bundle; import android.support.v4.app.Fragment; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.ui.base.activity.BaseActivity; +import eu.kanade.tachiyomi.ui.base.activity.BaseActivity; import icepick.Icepick; public class BaseFragment extends Fragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseRxFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseRxFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.java index f8e811198..6e977a18b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/fragment/BaseRxFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.java @@ -1,9 +1,9 @@ -package eu.kanade.mangafeed.ui.base.fragment; +package eu.kanade.tachiyomi.ui.base.fragment; import android.os.Bundle; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import nucleus.factory.PresenterFactory; import nucleus.factory.ReflectionPresenterFactory; import nucleus.presenter.Presenter; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/BasePresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/BasePresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.java index cace48cdc..fe3c72069 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/BasePresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.presenter; +package eu.kanade.tachiyomi.ui.base.presenter; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/RxPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/RxPresenter.java similarity index 99% rename from app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/RxPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/RxPresenter.java index 4d1ddde0c..57ba302de 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/base/presenter/RxPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/RxPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.base.presenter; +package eu.kanade.tachiyomi.ui.base.presenter; import android.os.Bundle; import android.support.annotation.CallSuper; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.java index 1ec457b61..69871e28f 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.catalogue; +package eu.kanade.tachiyomi.ui.catalogue; import android.view.LayoutInflater; import android.view.View; @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Manga; public class CatalogueAdapter extends FlexibleAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.java index a3e891990..911a6ed37 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.catalogue; +package eu.kanade.tachiyomi.ui.catalogue; import android.content.Context; import android.content.Intent; @@ -23,16 +23,16 @@ import java.util.concurrent.TimeUnit; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; -import eu.kanade.mangafeed.ui.main.MainActivity; -import eu.kanade.mangafeed.ui.manga.MangaActivity; -import eu.kanade.mangafeed.util.ToastUtil; -import eu.kanade.mangafeed.widget.AutofitRecyclerView; -import eu.kanade.mangafeed.widget.EndlessRecyclerScrollListener; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.ui.main.MainActivity; +import eu.kanade.tachiyomi.ui.manga.MangaActivity; +import eu.kanade.tachiyomi.util.ToastUtil; +import eu.kanade.tachiyomi.widget.AutofitRecyclerView; +import eu.kanade.tachiyomi.widget.EndlessRecyclerScrollListener; import icepick.State; import nucleus.factory.RequiresPresenter; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.java similarity index 85% rename from app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.java index 620771b08..243b6d804 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.catalogue; +package eu.kanade.tachiyomi.ui.catalogue; import android.view.View; import android.widget.ImageView; @@ -6,9 +6,9 @@ import android.widget.TextView; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; public class CatalogueHolder extends FlexibleViewHolder { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CataloguePresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CataloguePresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.java index f559dc8e0..c2cb4bd82 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CataloguePresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.catalogue; +package eu.kanade.tachiyomi.ui.catalogue; import android.os.Bundle; import android.text.TextUtils; @@ -10,15 +10,15 @@ import java.util.List; import javax.inject.Inject; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.MangasPage; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; -import eu.kanade.mangafeed.util.RxPager; +import eu.kanade.tachiyomi.data.cache.CoverCache; +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.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.MangasPage; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.util.RxPager; import icepick.State; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueSpinnerAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueSpinnerAdapter.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueSpinnerAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueSpinnerAdapter.java index 08e5001f9..b2da1f2d0 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueSpinnerAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueSpinnerAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.catalogue; +package eu.kanade.tachiyomi.ui.catalogue; import android.content.Context; import android.view.View; @@ -10,11 +10,11 @@ import org.jsoup.nodes.Document; import java.util.List; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.MangasPage; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.MangasPage; public class CatalogueSpinnerAdapter extends ArrayAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/decoration/DividerItemDecoration.java b/app/src/main/java/eu/kanade/tachiyomi/ui/decoration/DividerItemDecoration.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/ui/decoration/DividerItemDecoration.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/decoration/DividerItemDecoration.java index 86cb799d6..591cc17b7 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/decoration/DividerItemDecoration.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/decoration/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.decoration; +package eu.kanade.tachiyomi.ui.decoration; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.java index 0f6695d8b..f10ba392a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.download; +package eu.kanade.tachiyomi.ui.download; import android.content.Context; import android.view.LayoutInflater; @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.List; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.download.model.Download; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.download.model.Download; public class DownloadAdapter extends FlexibleAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java index b78cfa780..30e85441a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.download; +package eu.kanade.tachiyomi.ui.download; import android.os.Bundle; import android.support.annotation.Nullable; @@ -15,10 +15,10 @@ import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.download.DownloadService; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.download.DownloadService; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; import nucleus.factory.RequiresPresenter; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.java index aef912ce6..c7fa0b324 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.download; +package eu.kanade.tachiyomi.ui.download; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -7,8 +7,8 @@ import android.widget.TextView; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.download.model.Download; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.download.model.Download; public class DownloadHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadPresenter.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadPresenter.java index 2b48da411..429180f75 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/download/DownloadPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.download; +package eu.kanade.tachiyomi.ui.download; import android.os.Bundle; @@ -7,11 +7,11 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; -import eu.kanade.mangafeed.data.download.DownloadManager; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.data.download.model.DownloadQueue; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.data.download.DownloadManager; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.data.download.model.DownloadQueue; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.java similarity index 85% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.java index 688b3c0ea..c25964d6b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import java.util.List; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.ui.base.adapter.SmartFragmentStatePagerAdapter; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.ui.base.adapter.SmartFragmentStatePagerAdapter; public class LibraryAdapter extends SmartFragmentStatePagerAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java index 2a443f721..9319e9db9 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.view.LayoutInflater; import android.view.View; @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.List; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Manga; import rx.Observable; public class LibraryCategoryAdapter extends FlexibleAdapter diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.java index 60ec5dbad..37d69409a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.content.Intent; import android.content.res.Configuration; @@ -15,15 +15,15 @@ import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.event.LibraryMangasEvent; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; -import eu.kanade.mangafeed.ui.base.fragment.BaseFragment; -import eu.kanade.mangafeed.ui.manga.MangaActivity; -import eu.kanade.mangafeed.util.EventBusHook; -import eu.kanade.mangafeed.widget.AutofitRecyclerView; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.event.LibraryMangasEvent; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.ui.base.fragment.BaseFragment; +import eu.kanade.tachiyomi.ui.manga.MangaActivity; +import eu.kanade.tachiyomi.util.EventBusHook; +import eu.kanade.tachiyomi.widget.AutofitRecyclerView; import icepick.State; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.java index 196b02abb..4a71137f4 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.content.Intent; import android.os.Bundle; @@ -24,14 +24,14 @@ import butterknife.Bind; import butterknife.ButterKnife; import de.greenrobot.event.EventBus; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.sync.LibraryUpdateService; -import eu.kanade.mangafeed.event.LibraryMangasEvent; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; -import eu.kanade.mangafeed.ui.library.category.CategoryActivity; -import eu.kanade.mangafeed.ui.main.MainActivity; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.sync.LibraryUpdateService; +import eu.kanade.tachiyomi.event.LibraryMangasEvent; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.ui.library.category.CategoryActivity; +import eu.kanade.tachiyomi.ui.main.MainActivity; import icepick.State; import nucleus.factory.RequiresPresenter; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.java similarity index 83% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.java index ce95bb5a9..4dfac4b52 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.view.View; import android.widget.ImageView; @@ -6,11 +6,11 @@ import android.widget.TextView; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.cache.CoverCache; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.widget.RelativeLayout.LayoutParams; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.java similarity index 87% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.java index 8e14e0077..7953b28fe 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library; +package eu.kanade.tachiyomi.ui.library; import android.os.Bundle; import android.util.Pair; @@ -10,15 +10,15 @@ import java.util.Map; import javax.inject.Inject; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaCategory; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.event.LibraryMangasEvent; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.data.cache.CoverCache; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaCategory; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.event.LibraryMangasEvent; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryActivity.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryActivity.java index 92146d524..b5409cde5 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library.category; +package eu.kanade.tachiyomi.ui.library.category; import android.content.Context; import android.content.Intent; @@ -19,13 +19,13 @@ import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.ui.base.activity.BaseRxActivity; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; -import eu.kanade.mangafeed.ui.base.adapter.OnStartDragListener; -import eu.kanade.mangafeed.ui.decoration.DividerItemDecoration; -import eu.kanade.mangafeed.ui.library.LibraryCategoryAdapter; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.ui.base.adapter.OnStartDragListener; +import eu.kanade.tachiyomi.ui.decoration.DividerItemDecoration; +import eu.kanade.tachiyomi.ui.library.LibraryCategoryAdapter; import nucleus.factory.RequiresPresenter; import rx.Observable; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryAdapter.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryAdapter.java index 04c43136c..e1a845385 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library.category; +package eu.kanade.tachiyomi.ui.library.category; import android.view.LayoutInflater; import android.view.View; @@ -11,9 +11,9 @@ import java.util.Collections; import java.util.List; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.ui.base.adapter.ItemTouchHelperAdapter; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.ui.base.adapter.ItemTouchHelperAdapter; public class CategoryAdapter extends FlexibleAdapter implements ItemTouchHelperAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryHolder.java similarity index 86% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryHolder.java index 4d273c694..feec63a71 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library.category; +package eu.kanade.tachiyomi.ui.library.category; import android.support.v4.view.MotionEventCompat; import android.view.MotionEvent; @@ -12,10 +12,10 @@ import com.amulyakhare.textdrawable.util.ColorGenerator; import butterknife.Bind; import butterknife.ButterKnife; import butterknife.OnClick; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; -import eu.kanade.mangafeed.ui.base.adapter.OnStartDragListener; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.ui.base.adapter.OnStartDragListener; public class CategoryHolder extends FlexibleViewHolder { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryItemTouchHelper.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryItemTouchHelper.java similarity index 61% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryItemTouchHelper.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryItemTouchHelper.java index dd37e7a1d..7e38a25de 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryItemTouchHelper.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryItemTouchHelper.java @@ -1,7 +1,7 @@ -package eu.kanade.mangafeed.ui.library.category; +package eu.kanade.tachiyomi.ui.library.category; -import eu.kanade.mangafeed.ui.base.adapter.ItemTouchHelperAdapter; -import eu.kanade.mangafeed.ui.base.adapter.SimpleItemTouchHelperCallback; +import eu.kanade.tachiyomi.ui.base.adapter.ItemTouchHelperAdapter; +import eu.kanade.tachiyomi.ui.base.adapter.SimpleItemTouchHelperCallback; public class CategoryItemTouchHelper extends SimpleItemTouchHelperCallback { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryPresenter.java similarity index 88% rename from app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryPresenter.java index 5e4b1add6..26e6b53af 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.library.category; +package eu.kanade.tachiyomi.ui.library.category; import android.os.Bundle; @@ -6,9 +6,9 @@ import java.util.List; import javax.inject.Inject; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Category; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Category; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import rx.android.schedulers.AndroidSchedulers; public class CategoryPresenter extends BasePresenter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/main/FragmentStack.java b/app/src/main/java/eu/kanade/tachiyomi/ui/main/FragmentStack.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/ui/main/FragmentStack.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/main/FragmentStack.java index 1963da68c..31ea76f5e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/main/FragmentStack.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/FragmentStack.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.main; +package eu.kanade.tachiyomi.ui.main; import android.app.Activity; import android.support.annotation.Nullable; @@ -8,7 +8,7 @@ import android.support.v4.app.FragmentManager; import java.util.ArrayList; import java.util.List; -import eu.kanade.mangafeed.R; +import eu.kanade.tachiyomi.R; /** * Why this class is needed. diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java index 4c2401960..c2f45021e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.main; +package eu.kanade.tachiyomi.ui.main; import android.content.Intent; import android.os.Bundle; @@ -14,12 +14,12 @@ import com.mikepenz.materialdrawer.model.PrimaryDrawerItem; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.ui.base.activity.BaseActivity; -import eu.kanade.mangafeed.ui.catalogue.CatalogueFragment; -import eu.kanade.mangafeed.ui.download.DownloadFragment; -import eu.kanade.mangafeed.ui.library.LibraryFragment; -import eu.kanade.mangafeed.ui.setting.SettingsActivity; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.ui.base.activity.BaseActivity; +import eu.kanade.tachiyomi.ui.catalogue.CatalogueFragment; +import eu.kanade.tachiyomi.ui.download.DownloadFragment; +import eu.kanade.tachiyomi.ui.library.LibraryFragment; +import eu.kanade.tachiyomi.ui.setting.SettingsActivity; import icepick.State; import nucleus.view.ViewWithPresenter; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java similarity index 87% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java index bf3dbdafd..8899cf04f 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga; +package eu.kanade.tachiyomi.ui.manga; import android.content.Context; import android.content.Intent; @@ -14,15 +14,15 @@ import javax.inject.Inject; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.ui.base.activity.BaseRxActivity; -import eu.kanade.mangafeed.ui.manga.chapter.ChaptersFragment; -import eu.kanade.mangafeed.ui.manga.info.MangaInfoFragment; -import eu.kanade.mangafeed.ui.manga.myanimelist.MyAnimeListFragment; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity; +import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersFragment; +import eu.kanade.tachiyomi.ui.manga.info.MangaInfoFragment; +import eu.kanade.tachiyomi.ui.manga.myanimelist.MyAnimeListFragment; import nucleus.factory.RequiresPresenter; @RequiresPresenter(MangaPresenter.class) diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.java similarity index 85% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.java index d7548743a..874047f8f 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.java @@ -1,13 +1,13 @@ -package eu.kanade.mangafeed.ui.manga; +package eu.kanade.tachiyomi.ui.manga; import android.os.Bundle; import javax.inject.Inject; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; import icepick.State; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.java index c1298844e..0e0e64392 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.chapter; +package eu.kanade.tachiyomi.ui.manga.chapter; import android.view.LayoutInflater; import android.view.View; @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; import eu.davidea.flexibleadapter.FlexibleAdapter; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; public class ChaptersAdapter extends FlexibleAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.java index adbbaec5e..557655da0 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.chapter; +package eu.kanade.tachiyomi.ui.manga.chapter; import android.content.Intent; import android.os.Bundle; @@ -22,16 +22,16 @@ import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.download.DownloadService; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; -import eu.kanade.mangafeed.ui.decoration.DividerItemDecoration; -import eu.kanade.mangafeed.ui.manga.MangaActivity; -import eu.kanade.mangafeed.ui.reader.ReaderActivity; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.download.DownloadService; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.ui.decoration.DividerItemDecoration; +import eu.kanade.tachiyomi.ui.manga.MangaActivity; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; +import eu.kanade.tachiyomi.util.ToastUtil; import nucleus.factory.RequiresPresenter; import rx.Observable; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersHolder.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersHolder.java index 93bc5f35f..b7ffe2259 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.chapter; +package eu.kanade.tachiyomi.ui.manga.chapter; import android.content.Context; import android.support.v4.content.ContextCompat; @@ -12,10 +12,10 @@ import java.util.Date; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder; import rx.Observable; public class ChaptersHolder extends FlexibleViewHolder { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.java index 362b4e99f..554d79db2 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.chapter; +package eu.kanade.tachiyomi.ui.manga.chapter; import android.os.Bundle; import android.util.Pair; @@ -8,19 +8,19 @@ import java.util.List; import javax.inject.Inject; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.download.DownloadManager; -import eu.kanade.mangafeed.data.download.model.Download; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.event.ChapterCountEvent; -import eu.kanade.mangafeed.event.DownloadChaptersEvent; -import eu.kanade.mangafeed.event.ReaderEvent; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; -import eu.kanade.mangafeed.util.EventBusHook; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.download.DownloadManager; +import eu.kanade.tachiyomi.data.download.model.Download; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.event.ChapterCountEvent; +import eu.kanade.tachiyomi.event.DownloadChaptersEvent; +import eu.kanade.tachiyomi.event.ReaderEvent; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.util.EventBusHook; import icepick.State; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java index 3f00868f3..16aaeee9e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.info; +package eu.kanade.tachiyomi.ui.manga.info; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; @@ -13,10 +13,10 @@ import com.bumptech.glide.load.model.LazyHeaders; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.cache.CoverCache; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; import nucleus.factory.RequiresPresenter; @RequiresPresenter(MangaInfoPresenter.class) diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.java similarity index 86% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.java index b26989500..896541905 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.java @@ -1,17 +1,17 @@ -package eu.kanade.mangafeed.ui.manga.info; +package eu.kanade.tachiyomi.ui.manga.info; import android.os.Bundle; import javax.inject.Inject; -import eu.kanade.mangafeed.data.cache.CoverCache; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.event.ChapterCountEvent; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; -import eu.kanade.mangafeed.util.EventBusHook; +import eu.kanade.tachiyomi.data.cache.CoverCache; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.event.ChapterCountEvent; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.util.EventBusHook; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListDialogFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListDialogFragment.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListDialogFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListDialogFragment.java index 441d2cd48..fd2527f89 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListDialogFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListDialogFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.myanimelist; +package eu.kanade.tachiyomi.ui.manga.myanimelist; import android.app.Dialog; import android.os.Bundle; @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.MangaSync; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.MangaSync; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.subjects.PublishSubject; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListFragment.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListFragment.java index 4226efc4c..e532c1c19 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.myanimelist; +package eu.kanade.tachiyomi.ui.manga.myanimelist; import android.content.Context; import android.os.Bundle; @@ -17,9 +17,9 @@ import java.util.List; import butterknife.Bind; import butterknife.ButterKnife; import butterknife.OnClick; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment; import nucleus.factory.RequiresPresenter; @RequiresPresenter(MyAnimeListPresenter.class) diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListPresenter.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListPresenter.java index fbb9874ae..325835af0 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.manga.myanimelist; +package eu.kanade.tachiyomi.ui.manga.myanimelist; import android.content.Context; import android.os.Bundle; @@ -6,15 +6,15 @@ import android.text.TextUtils; import javax.inject.Inject; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.mangasync.services.MyAnimeList; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; -import eu.kanade.mangafeed.util.EventBusHook; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.mangasync.services.MyAnimeList; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.util.EventBusHook; +import eu.kanade.tachiyomi.util.ToastUtil; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.java index bb7a31057..cbe7eabde 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader; +package eu.kanade.tachiyomi.ui.reader; import android.content.Context; import android.content.Intent; @@ -24,20 +24,20 @@ import javax.inject.Inject; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.base.activity.BaseRxActivity; -import eu.kanade.mangafeed.ui.reader.viewer.base.BaseReader; -import eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal.LeftToRightReader; -import eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal.RightToLeftReader; -import eu.kanade.mangafeed.ui.reader.viewer.pager.vertical.VerticalReader; -import eu.kanade.mangafeed.ui.reader.viewer.webtoon.WebtoonReader; -import eu.kanade.mangafeed.util.GLUtil; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity; +import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal.LeftToRightReader; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal.RightToLeftReader; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical.VerticalReader; +import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonReader; +import eu.kanade.tachiyomi.util.GLUtil; +import eu.kanade.tachiyomi.util.ToastUtil; import icepick.Icepick; import nucleus.factory.RequiresPresenter; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderMenu.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderMenu.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java index cd3016119..8f8a840a0 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderMenu.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader; +package eu.kanade.tachiyomi.ui.reader; import android.app.Dialog; import android.content.Context; @@ -25,11 +25,11 @@ import java.text.DecimalFormat; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.ui.reader.viewer.base.BaseReader; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader; import icepick.State; import rx.Subscription; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderPresenter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderPresenter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.java index 4be3576d4..2abee1582 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderPresenter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader; +package eu.kanade.tachiyomi.ui.reader; import android.os.Bundle; import android.support.annotation.NonNull; @@ -10,21 +10,21 @@ import java.util.List; import javax.inject.Inject; import de.greenrobot.event.EventBus; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; -import eu.kanade.mangafeed.data.database.models.MangaSync; -import eu.kanade.mangafeed.data.download.DownloadManager; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.data.sync.UpdateMangaSyncService; -import eu.kanade.mangafeed.event.ReaderEvent; -import eu.kanade.mangafeed.ui.base.presenter.BasePresenter; -import eu.kanade.mangafeed.util.EventBusHook; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.MangaSync; +import eu.kanade.tachiyomi.data.download.DownloadManager; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.data.sync.UpdateMangaSyncService; +import eu.kanade.tachiyomi.event.ReaderEvent; +import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter; +import eu.kanade.tachiyomi.util.EventBusHook; import icepick.State; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.java similarity index 89% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.java index a0eee82bf..c3e89a178 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.base; +package eu.kanade.tachiyomi.ui.reader.viewer.base; import android.view.MotionEvent; @@ -8,9 +8,9 @@ import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder; import java.util.List; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.base.fragment.BaseFragment; -import eu.kanade.mangafeed.ui.reader.ReaderActivity; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.base.fragment.BaseFragment; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; public abstract class BaseReader extends BaseFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterBoundariesOutListener.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterBoundariesOutListener.java similarity index 69% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterBoundariesOutListener.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterBoundariesOutListener.java index 0e1989ad1..2870fdfe7 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterBoundariesOutListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterBoundariesOutListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.base; +package eu.kanade.tachiyomi.ui.reader.viewer.base; public interface OnChapterBoundariesOutListener { void onFirstPageOutEvent(); diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterSingleTapListener.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterSingleTapListener.java similarity index 71% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterSingleTapListener.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterSingleTapListener.java index 8c1286585..2f8e0cc60 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/OnChapterSingleTapListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/OnChapterSingleTapListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.base; +package eu.kanade.tachiyomi.ui.reader.viewer.base; public interface OnChapterSingleTapListener { void onCenterTap(); diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/Pager.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.java similarity index 84% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/Pager.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.java index 685e15151..a9282a15e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/Pager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.java @@ -1,11 +1,11 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager; +package eu.kanade.tachiyomi.ui.reader.viewer.pager; import android.support.v4.view.PagerAdapter; import android.view.MotionEvent; import android.view.ViewGroup; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterBoundariesOutListener; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterSingleTapListener; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterBoundariesOutListener; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterSingleTapListener; import rx.functions.Action1; public interface Pager { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerGestureListener.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerGestureListener.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerGestureListener.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerGestureListener.java index c304c8479..bee01c590 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerGestureListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerGestureListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager; +package eu.kanade.tachiyomi.ui.reader.viewer.pager; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.java index 6c7052882..f3d5a4c26 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.java @@ -1,15 +1,15 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager; +package eu.kanade.tachiyomi.ui.reader.viewer.pager; import android.view.MotionEvent; import android.view.ViewGroup; import java.util.List; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.reader.viewer.base.BaseReader; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterBoundariesOutListener; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterSingleTapListener; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterBoundariesOutListener; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterSingleTapListener; import rx.subscriptions.CompositeSubscription; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderAdapter.java similarity index 89% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderAdapter.java index f67ba6c1e..120d55048 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager; +package eu.kanade.tachiyomi.ui.reader.viewer.pager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -6,7 +6,7 @@ import android.support.v4.app.FragmentStatePagerAdapter; import java.util.List; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.data.source.model.Page; public class PagerReaderAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.java index cc070922e..d92ecd653 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/PagerReaderFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager; +package eu.kanade.tachiyomi.ui.reader.viewer.pager; import android.os.Bundle; import android.support.annotation.Nullable; @@ -21,11 +21,11 @@ import java.util.concurrent.atomic.AtomicInteger; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.base.fragment.BaseFragment; -import eu.kanade.mangafeed.ui.reader.ReaderActivity; -import eu.kanade.mangafeed.ui.reader.viewer.base.BaseReader; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.base.fragment.BaseFragment; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; +import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader; import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalPager.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalPager.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java index 29144d5ab..9c89b4cd4 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalPager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal; import android.content.Context; import android.support.v4.view.ViewPager; @@ -6,10 +6,10 @@ import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterBoundariesOutListener; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterSingleTapListener; -import eu.kanade.mangafeed.ui.reader.viewer.pager.PagerGestureListener; -import eu.kanade.mangafeed.ui.reader.viewer.pager.Pager; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterBoundariesOutListener; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterSingleTapListener; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerGestureListener; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.Pager; import rx.functions.Action1; public class HorizontalPager extends ViewPager implements Pager { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalReader.java similarity index 77% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalReader.java index c1b71da71..109a989ed 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/HorizontalReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalReader.java @@ -1,11 +1,11 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import eu.kanade.mangafeed.ui.reader.viewer.pager.PagerReader; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerReader; public abstract class HorizontalReader extends PagerReader { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/LeftToRightReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/LeftToRightReader.java similarity index 81% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/LeftToRightReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/LeftToRightReader.java index 5378c1dd8..ac0a3312a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/LeftToRightReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/LeftToRightReader.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal; public class LeftToRightReader extends HorizontalReader { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/RightToLeftReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/RightToLeftReader.java similarity index 81% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/RightToLeftReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/RightToLeftReader.java index c26cf6ff6..75b25c933 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/horizontal/RightToLeftReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/RightToLeftReader.java @@ -1,11 +1,10 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.reader.viewer.pager.horizontal.HorizontalReader; +import eu.kanade.tachiyomi.data.source.model.Page; public class RightToLeftReader extends HorizontalReader { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalPager.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalPager.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java index 10c384886..61e9dc624 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalPager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java @@ -1,14 +1,14 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.vertical; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical; import android.content.Context; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterBoundariesOutListener; -import eu.kanade.mangafeed.ui.reader.viewer.base.OnChapterSingleTapListener; -import eu.kanade.mangafeed.ui.reader.viewer.pager.PagerGestureListener; -import eu.kanade.mangafeed.ui.reader.viewer.pager.Pager; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterBoundariesOutListener; +import eu.kanade.tachiyomi.ui.reader.viewer.base.OnChapterSingleTapListener; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerGestureListener; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.Pager; import rx.functions.Action1; public class VerticalPager extends VerticalViewPagerImpl implements Pager { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalReader.java similarity index 75% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalReader.java index ffe2ef465..55d917f3c 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalReader.java @@ -1,12 +1,11 @@ -package eu.kanade.mangafeed.ui.reader.viewer.pager.vertical; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import eu.kanade.mangafeed.ui.reader.viewer.pager.PagerReader; -import eu.kanade.mangafeed.ui.reader.viewer.pager.vertical.VerticalPager; +import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerReader; public class VerticalReader extends PagerReader { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java similarity index 99% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java index 231ce0bcd..baded3360 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.kanade.mangafeed.ui.reader.viewer.pager.vertical; +package eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonAdapter.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.java similarity index 92% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonAdapter.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.java index 7a738e7f1..5b696b35d 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonAdapter.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.webtoon; +package eu.kanade.tachiyomi.ui.reader.viewer.webtoon; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -8,8 +8,8 @@ import android.view.ViewGroup; import java.util.ArrayList; import java.util.List; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.source.model.Page; public class WebtoonAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonHolder.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonHolder.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonHolder.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonHolder.java index 090e1d6de..e49986f5b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonHolder.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonHolder.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.webtoon; +package eu.kanade.tachiyomi.ui.reader.viewer.webtoon; import android.support.v7.widget.RecyclerView; import android.view.MotionEvent; @@ -14,8 +14,8 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.source.model.Page; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.source.model.Page; public class WebtoonHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonReader.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonReader.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.java index 9457da5d5..a688d6b42 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/webtoon/WebtoonReader.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.reader.viewer.webtoon; +package eu.kanade.tachiyomi.ui.reader.viewer.webtoon; import android.os.Bundle; import android.support.annotation.Nullable; @@ -11,9 +11,9 @@ import android.view.ViewGroup; import java.util.List; -import eu.kanade.mangafeed.data.source.model.Page; -import eu.kanade.mangafeed.ui.reader.viewer.base.BaseReader; -import eu.kanade.mangafeed.widget.PreCachingLayoutManager; +import eu.kanade.tachiyomi.data.source.model.Page; +import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader; +import eu.kanade.tachiyomi.widget.PreCachingLayoutManager; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.subjects.PublishSubject; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAboutFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAboutFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.java index 0bb2f6369..b25c64496 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAboutFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.preference.Preference; @@ -13,8 +13,8 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import eu.kanade.mangafeed.BuildConfig; -import eu.kanade.mangafeed.R; +import eu.kanade.tachiyomi.BuildConfig; +import eu.kanade.tachiyomi.R; public class SettingsAboutFragment extends SettingsNestedFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAccountsFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAccountsFragment.java similarity index 84% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAccountsFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAccountsFragment.java index bb6392e7c..8f3ce6988 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAccountsFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAccountsFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.preference.PreferenceCategory; @@ -11,13 +11,13 @@ import java.util.List; import javax.inject.Inject; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.mangasync.MangaSyncManager; -import eu.kanade.mangafeed.data.source.SourceManager; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.widget.preference.MangaSyncLoginDialog; -import eu.kanade.mangafeed.widget.preference.SourceLoginDialog; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager; +import eu.kanade.tachiyomi.data.source.SourceManager; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.widget.preference.MangaSyncLoginDialog; +import eu.kanade.tachiyomi.widget.preference.SourceLoginDialog; import rx.Observable; public class SettingsAccountsFragment extends SettingsNestedFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsActivity.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.java index b126c7f8a..904f36ab9 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsActivity.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.preference.PreferenceFragment; @@ -8,12 +8,12 @@ import javax.inject.Inject; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.App; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.cache.ChapterCache; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.ui.base.activity.BaseActivity; +import eu.kanade.tachiyomi.App; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.cache.ChapterCache; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.ui.base.activity.BaseActivity; public class SettingsActivity extends BaseActivity { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAdvancedFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAdvancedFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.java index bd65cb2af..eb9318820 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsAdvancedFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.preference.Preference; @@ -11,10 +11,10 @@ import com.afollestad.materialdialogs.MaterialDialog; import java.io.File; import java.util.concurrent.atomic.AtomicInteger; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.cache.ChapterCache; -import eu.kanade.mangafeed.data.database.DatabaseHelper; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.cache.ChapterCache; +import eu.kanade.tachiyomi.data.database.DatabaseHelper; +import eu.kanade.tachiyomi.util.ToastUtil; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsDownloadsFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsDownloadsFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.java index b0efd7a8d..a7852bfb2 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsDownloadsFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.app.Activity; import android.content.Intent; @@ -17,7 +17,7 @@ import com.nononsenseapps.filepicker.LogicHandler; import java.io.File; -import eu.kanade.mangafeed.R; +import eu.kanade.tachiyomi.R; public class SettingsDownloadsFragment extends SettingsNestedFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsGeneralFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.java similarity index 80% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsGeneralFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.java index ac40f9066..f5089e699 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsGeneralFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.java @@ -1,15 +1,15 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.sync.LibraryUpdateAlarm; -import eu.kanade.mangafeed.widget.preference.IntListPreference; -import eu.kanade.mangafeed.widget.preference.LibraryColumnsDialog; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.sync.LibraryUpdateAlarm; +import eu.kanade.tachiyomi.widget.preference.IntListPreference; +import eu.kanade.tachiyomi.widget.preference.LibraryColumnsDialog; public class SettingsGeneralFragment extends SettingsNestedFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsNestedFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNestedFragment.java similarity index 91% rename from app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsNestedFragment.java rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNestedFragment.java index 84a49c265..7081aa4af 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/setting/SettingsNestedFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNestedFragment.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.ui.setting; +package eu.kanade.tachiyomi.ui.setting; import android.os.Bundle; import android.preference.PreferenceFragment; @@ -6,8 +6,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.ui.base.activity.BaseActivity; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.ui.base.activity.BaseActivity; public class SettingsNestedFragment extends PreferenceFragment { diff --git a/app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java rename to app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java index 3789160fe..cc261b93a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/ChapterRecognition.java b/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/util/ChapterRecognition.java rename to app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.java index 1564eeaad..287c288ed 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/ChapterRecognition.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.java @@ -1,12 +1,12 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.kanade.mangafeed.data.database.models.Chapter; -import eu.kanade.mangafeed.data.database.models.Manga; +import eu.kanade.tachiyomi.data.database.models.Chapter; +import eu.kanade.tachiyomi.data.database.models.Manga; public class ChapterRecognition { diff --git a/app/src/main/java/eu/kanade/mangafeed/util/DiskUtils.java b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtils.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/util/DiskUtils.java rename to app/src/main/java/eu/kanade/tachiyomi/util/DiskUtils.java index 94fd6027c..ea2d83ddd 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/DiskUtils.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtils.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/DynamicConcurrentMergeOperator.java b/app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java similarity index 99% rename from app/src/main/java/eu/kanade/mangafeed/util/DynamicConcurrentMergeOperator.java rename to app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java index 821c0c6c6..843e6e42b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/DynamicConcurrentMergeOperator.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/EventBusHook.java b/app/src/main/java/eu/kanade/tachiyomi/util/EventBusHook.java similarity index 80% rename from app/src/main/java/eu/kanade/mangafeed/util/EventBusHook.java rename to app/src/main/java/eu/kanade/tachiyomi/util/EventBusHook.java index 025da748e..013de2854 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/EventBusHook.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/EventBusHook.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/GLUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/GLUtil.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/util/GLUtil.java rename to app/src/main/java/eu/kanade/tachiyomi/util/GLUtil.java index a88a310aa..53f69b847 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/GLUtil.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/GLUtil.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java rename to app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java index b421b412f..3ecac2f72 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import android.content.Context; import android.net.ConnectivityManager; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/Parser.java b/app/src/main/java/eu/kanade/tachiyomi/util/Parser.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/util/Parser.java rename to app/src/main/java/eu/kanade/tachiyomi/util/Parser.java index f32c686ec..bad9854a2 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/Parser.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/Parser.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import android.support.annotation.Nullable; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/RxPager.java b/app/src/main/java/eu/kanade/tachiyomi/util/RxPager.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/util/RxPager.java rename to app/src/main/java/eu/kanade/tachiyomi/util/RxPager.java index 1de155868..2fe26e3e9 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/RxPager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/RxPager.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import rx.Observable; import rx.subjects.PublishSubject; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/ToastUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/ToastUtil.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/util/ToastUtil.java rename to app/src/main/java/eu/kanade/tachiyomi/util/ToastUtil.java index 54b15b68f..231734b34 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/ToastUtil.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/ToastUtil.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/java/eu/kanade/mangafeed/util/UrlUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/UrlUtil.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/util/UrlUtil.java rename to app/src/main/java/eu/kanade/tachiyomi/util/UrlUtil.java index 2c4ea9997..65e0ea618 100644 --- a/app/src/main/java/eu/kanade/mangafeed/util/UrlUtil.java +++ b/app/src/main/java/eu/kanade/tachiyomi/util/UrlUtil.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.util; +package eu.kanade.tachiyomi.util; import java.net.URI; import java.net.URISyntaxException; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/AutofitRecyclerView.java b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/widget/AutofitRecyclerView.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.java index e90256b82..fe0248bbb 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/AutofitRecyclerView.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/EndlessRecyclerScrollListener.java b/app/src/main/java/eu/kanade/tachiyomi/widget/EndlessRecyclerScrollListener.java similarity index 97% rename from app/src/main/java/eu/kanade/mangafeed/widget/EndlessRecyclerScrollListener.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/EndlessRecyclerScrollListener.java index 05f5435b4..d55b2a583 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/EndlessRecyclerScrollListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EndlessRecyclerScrollListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/EndlessScrollListener.java b/app/src/main/java/eu/kanade/tachiyomi/widget/EndlessScrollListener.java similarity index 98% rename from app/src/main/java/eu/kanade/mangafeed/widget/EndlessScrollListener.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/EndlessScrollListener.java index 8aff6d9b9..eea94da12 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/EndlessScrollListener.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EndlessScrollListener.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.widget.AbsListView; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/MinMaxNumberPicker.java b/app/src/main/java/eu/kanade/tachiyomi/widget/MinMaxNumberPicker.java similarity index 93% rename from app/src/main/java/eu/kanade/mangafeed/widget/MinMaxNumberPicker.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/MinMaxNumberPicker.java index 2536ad4df..fcaebf464 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/MinMaxNumberPicker.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MinMaxNumberPicker.java @@ -1,11 +1,11 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.NumberPicker; -import eu.kanade.mangafeed.R; +import eu.kanade.tachiyomi.R; public class MinMaxNumberPicker extends NumberPicker{ diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/PTSansTextView.java b/app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.java similarity index 96% rename from app/src/main/java/eu/kanade/mangafeed/widget/PTSansTextView.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.java index b74ae96bd..497ba634b 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/PTSansTextView.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import android.graphics.Typeface; import android.util.AttributeSet; import android.widget.TextView; -import eu.kanade.mangafeed.R; +import eu.kanade.tachiyomi.R; public class PTSansTextView extends TextView { diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/PreCachingLayoutManager.java b/app/src/main/java/eu/kanade/tachiyomi/widget/PreCachingLayoutManager.java similarity index 95% rename from app/src/main/java/eu/kanade/mangafeed/widget/PreCachingLayoutManager.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/PreCachingLayoutManager.java index 7ae40b8aa..909f3ecf1 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/PreCachingLayoutManager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/PreCachingLayoutManager.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget; +package eu.kanade.tachiyomi.widget; import android.content.Context; import android.support.v7.widget.LinearLayoutManager; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/preference/IntListPreference.java b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/widget/preference/IntListPreference.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.java index 02dfe7c12..5dc3d90d8 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/preference/IntListPreference.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget.preference; +package eu.kanade.tachiyomi.widget.preference; import android.content.Context; import android.preference.ListPreference; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/preference/LibraryColumnsDialog.java b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/widget/preference/LibraryColumnsDialog.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.java index 5bb1b2e16..79ae1c305 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/preference/LibraryColumnsDialog.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget.preference; +package eu.kanade.tachiyomi.widget.preference; import android.content.Context; import android.preference.DialogPreference; @@ -8,8 +8,8 @@ import android.widget.NumberPicker; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; public class LibraryColumnsDialog extends DialogPreference { diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/preference/LoginDialogPreference.java b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.java similarity index 94% rename from app/src/main/java/eu/kanade/mangafeed/widget/preference/LoginDialogPreference.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.java index 73ba9f804..0ff711695 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/preference/LoginDialogPreference.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.java @@ -1,4 +1,4 @@ -package eu.kanade.mangafeed.widget.preference; +package eu.kanade.tachiyomi.widget.preference; import android.app.AlertDialog; import android.content.Context; @@ -14,8 +14,8 @@ import com.dd.processbutton.iml.ActionProcessButton; import butterknife.Bind; import butterknife.ButterKnife; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; import rx.Subscription; public abstract class LoginDialogPreference extends DialogPreference { diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/preference/MangaSyncLoginDialog.java b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MangaSyncLoginDialog.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/widget/preference/MangaSyncLoginDialog.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/preference/MangaSyncLoginDialog.java index ec2d35d40..440709578 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/preference/MangaSyncLoginDialog.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MangaSyncLoginDialog.java @@ -1,13 +1,13 @@ -package eu.kanade.mangafeed.widget.preference; +package eu.kanade.tachiyomi.widget.preference; import android.content.Context; import android.content.DialogInterface; import android.view.View; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.util.ToastUtil; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/eu/kanade/mangafeed/widget/preference/SourceLoginDialog.java b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SourceLoginDialog.java similarity index 90% rename from app/src/main/java/eu/kanade/mangafeed/widget/preference/SourceLoginDialog.java rename to app/src/main/java/eu/kanade/tachiyomi/widget/preference/SourceLoginDialog.java index 5984ab1ab..1d39315cb 100644 --- a/app/src/main/java/eu/kanade/mangafeed/widget/preference/SourceLoginDialog.java +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SourceLoginDialog.java @@ -1,13 +1,13 @@ -package eu.kanade.mangafeed.widget.preference; +package eu.kanade.tachiyomi.widget.preference; import android.content.Context; import android.content.DialogInterface; import android.view.View; -import eu.kanade.mangafeed.R; -import eu.kanade.mangafeed.data.preference.PreferencesHelper; -import eu.kanade.mangafeed.data.source.base.Source; -import eu.kanade.mangafeed.util.ToastUtil; +import eu.kanade.tachiyomi.R; +import eu.kanade.tachiyomi.data.preference.PreferencesHelper; +import eu.kanade.tachiyomi.data.source.base.Source; +import eu.kanade.tachiyomi.util.ToastUtil; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/res/layout/activity_edit_categories.xml b/app/src/main/res/layout/activity_edit_categories.xml index 126a86e08..564865341 100644 --- a/app/src/main/res/layout/activity_edit_categories.xml +++ b/app/src/main/res/layout/activity_edit_categories.xml @@ -25,6 +25,6 @@ android:src="@drawable/ic_action_add_18dp" app:layout_anchor="@id/categories_list" app:layout_anchorGravity="bottom|right|end" - app:layout_behavior="eu.kanade.mangafeed.ui.base.fab.ScrollAwareFABBehavior"/> + app:layout_behavior="eu.kanade.tachiyomi.ui.base.fab.ScrollAwareFABBehavior"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manga.xml b/app/src/main/res/layout/activity_manga.xml index 68ea2fe7f..f73e0924a 100644 --- a/app/src/main/res/layout/activity_manga.xml +++ b/app/src/main/res/layout/activity_manga.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - tools:context="eu.kanade.mangafeed.ui.manga.MangaActivity"> + tools:context="eu.kanade.tachiyomi.ui.manga.MangaActivity"> - - + tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueFragment"> - - + tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueFragment">