commit b69510e97210c2f34846f7f4e10b64767b01316b Author: inorichi Date: Thu Sep 24 17:27:43 2015 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..af291a578a --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.gradle +/local.properties +/.idea/workspace.xml +.DS_Store +/build +.idea/ +*iml +*.iml +*/build \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..75aac8ad3d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: android +android: + components: + - platform-tools + - tools + + # The BuildTools version used by your project + - build-tools-23.0.1 + - android-23 + - extra-android-m2repository + - extra-google-m2repository + - extra-android-support + - extra-google-google_play_services + +before_script: + - chmod +x gradlew +#Build, and run tests +script: "./gradlew build testDebug" +sudo: false diff --git a/README.md b/README.md new file mode 100644 index 0000000000..9cec6fe187 --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +Mangafeed is a Manga reader for Android that tries to have the same features as Manga Watcher, but being Open Source. + +## License + +Copyright 2015 Javier Tomás + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +## Disclaimer + +The developer of this application does not have any affiliation with the content providers available. \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000000..8bd2d8bd6c --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,4 @@ +/build +*iml +*.iml +.idea \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000000..b732e80f6c --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,85 @@ +apply plugin: 'com.android.application' +apply plugin: 'com.neenbedankt.android-apt' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.1" + publishNonDefault true + + defaultConfig { + applicationId "eu.kanade.mangafeed" + minSdkVersion 16 + targetSdkVersion 23 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'LICENSE.txt' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE' + } + + lintOptions { + abortOnError false + } + +} + +dependencies { + final SUPPORT_LIBRARY_VERSION = '23.0.1' + final DAGGER_VERSION = '2.0.1' + final HAMCREST_VERSION = '1.3' + final MOCKITO_VERSION = '1.10.19' + + compile fileTree(dir: 'libs', include: ['*.jar']) + + compile "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:cardview-v7:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION" + compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION" + compile 'com.squareup.retrofit:adapter-rxjava:2.0.0-beta1' + compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0' + compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.pushtorefresh.storio:sqlite:1.4.0' + compile 'com.pushtorefresh.storio:sqlite-annotations:1.4.0' + compile 'de.greenrobot:eventbus:2.4.0' + compile 'com.github.bumptech.glide:glide:3.6.1' + compile 'de.hdodenhof:circleimageview:1.3.0' + compile 'io.reactivex:rxandroid:1.0.1' + compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.jakewharton.timber:timber:3.1.0' + compile 'uk.co.ribot:easyadapter:1.5.0@aar' + + compile "com.google.dagger:dagger:$DAGGER_VERSION" + apt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" + provided 'org.glassfish:javax.annotation:10.0-b28' + + compile('com.mikepenz:materialdrawer:4.3.0@aar') { + transitive = true + } + + testCompile 'junit:junit:4.12' + testCompile "org.hamcrest:hamcrest-core:$HAMCREST_VERSION" + testCompile "org.hamcrest:hamcrest-library:$HAMCREST_VERSION" + testCompile "org.hamcrest:hamcrest-integration:$HAMCREST_VERSION" + testCompile "org.mockito:mockito-core:$MOCKITO_VERSION" + testCompile('org.robolectric:robolectric:3.0') { + exclude group: 'commons-logging', module: 'commons-logging' + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + + androidTestApt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000000..8e5eebc2b9 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/hitherejoe/Android Studio.app/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..445d7a99be --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/eu/kanade/mangafeed/App.java b/app/src/main/java/eu/kanade/mangafeed/App.java new file mode 100644 index 0000000000..3e0039dcc9 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/App.java @@ -0,0 +1,34 @@ +package eu.kanade.mangafeed; + +import android.app.Application; +import android.content.Context; + +import timber.log.Timber; + +public class App extends Application { + + AppComponent mApplicationComponent; + + @Override + public void onCreate() { + super.onCreate(); + if (BuildConfig.DEBUG) Timber.plant(new Timber.DebugTree()); + + mApplicationComponent = DaggerAppComponent.builder() + .appModule(new AppModule(this)) + .build(); + } + + public static App get(Context context) { + return (App) context.getApplicationContext(); + } + + public AppComponent getComponent() { + return mApplicationComponent; + } + + // Needed to replace the component with a test specific one + public void setComponent(AppComponent applicationComponent) { + mApplicationComponent = applicationComponent; + } +} diff --git a/app/src/main/java/eu/kanade/mangafeed/AppComponent.java b/app/src/main/java/eu/kanade/mangafeed/AppComponent.java new file mode 100644 index 0000000000..765f1bf948 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/AppComponent.java @@ -0,0 +1,23 @@ +package eu.kanade.mangafeed; + +import android.app.Application; + +import javax.inject.Singleton; + +import dagger.Component; +import eu.kanade.mangafeed.data.DataModule; +import eu.kanade.mangafeed.ui.activity.MainActivity; + +@Singleton +@Component( + modules = { + AppModule.class, + DataModule.class + } +) +public interface AppComponent { + + void inject(MainActivity mainActivity); + + Application application(); +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/AppModule.java b/app/src/main/java/eu/kanade/mangafeed/AppModule.java new file mode 100644 index 0000000000..a9b8c37848 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/AppModule.java @@ -0,0 +1,28 @@ +package eu.kanade.mangafeed; + +import android.app.Application; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +/** + * Provide application-level dependencies. Mainly singleton object that can be injected from + * anywhere in the app. + */ +@Module +public class AppModule { + protected final Application mApplication; + + public AppModule(Application application) { + mApplication = application; + } + + @Provides + @Singleton + Application provideApplication() { + return mApplication; + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/data/DataModule.java b/app/src/main/java/eu/kanade/mangafeed/data/DataModule.java new file mode 100644 index 0000000000..713ba7d0cc --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/DataModule.java @@ -0,0 +1,38 @@ +package eu.kanade.mangafeed.data; + +import android.app.Application; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; +import eu.kanade.mangafeed.data.helpers.PreferencesHelper; +import eu.kanade.mangafeed.data.helpers.DatabaseHelper; +import rx.Scheduler; +import rx.schedulers.Schedulers; + +/** + * Provide dependencies to the DataManager, mainly Helper classes and Retrofit services. + */ +@Module +public class DataModule { + + @Provides + @Singleton + PreferencesHelper providePreferencesHelper(Application app) { + return new PreferencesHelper(app); + } + + @Provides + @Singleton + DatabaseHelper provideDatabaseHelper(Application app) { + return new DatabaseHelper(app); + } + + @Provides + @Singleton + Scheduler provideSubscribeScheduler() { + return Schedulers.io(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/data/entities/Manga.java b/app/src/main/java/eu/kanade/mangafeed/data/entities/Manga.java new file mode 100644 index 0000000000..a52873c2bc --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/entities/Manga.java @@ -0,0 +1,198 @@ +package eu.kanade.mangafeed.data.entities; + +/** + * Created by len on 23/09/2015. + */ + +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; +import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; + +import eu.kanade.mangafeed.data.tables.MangasTable; + +@StorIOSQLiteType(table = MangasTable.TABLE) +public class Manga { + + @Nullable + @StorIOSQLiteColumn(name = MangasTable.COLUMN_ID, key = true) + Long id; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_SOURCE) + int source; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_URL) + String url; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_ARTIST) + String artist; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_AUTHOR) + String author; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_DESCRIPTION) + String description; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_GENRE) + String genre; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_TITLE) + String title; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_STATUS) + String status; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_THUMBNAIL_URL) + String thumbnail_url; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_RANK) + int rank; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_LAST_UPDATE) + long last_update; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_INITIALIZED) + boolean initialized; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_VIEWER) + int viewer; + + @NonNull + @StorIOSQLiteColumn(name = MangasTable.COLUMN_CHAPTER_ORDER) + int chapter_order; + + Manga() {} + + @Nullable + public Long id() { + return id; + } + + @NonNull + public int source() { + return source; + } + + @NonNull + public String url() { + return url; + } + + @NonNull + public String artist() { + return artist; + } + + @NonNull + public String author() { + return author; + } + + @NonNull + public String description() { + return description; + } + + @NonNull + public String genre() { + return genre; + } + + @NonNull + public String title() { + return title; + } + + @NonNull + public String status() { + return status; + } + + @NonNull + public String thumbnail_url() { + return thumbnail_url; + } + + @NonNull + public int rank() { + return rank; + } + + @NonNull + public long last_update() { + return last_update; + } + + @NonNull + public boolean nitialized() { + return initialized; + } + + @NonNull + public int viewer() { + return viewer; + } + + @NonNull + public int chapter_order() { + return chapter_order; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Manga manga = (Manga) o; + + if (source != manga.source) return false; + if (rank != manga.rank) return false; + if (last_update != manga.last_update) return false; + if (initialized != manga.initialized) return false; + if (viewer != manga.viewer) return false; + if (chapter_order != manga.chapter_order) return false; + if (id != null ? !id.equals(manga.id) : manga.id != null) return false; + if (!url.equals(manga.url)) return false; + if (!artist.equals(manga.artist)) return false; + if (!author.equals(manga.author)) return false; + if (!description.equals(manga.description)) return false; + if (!genre.equals(manga.genre)) return false; + if (!title.equals(manga.title)) return false; + if (!status.equals(manga.status)) return false; + return thumbnail_url.equals(manga.thumbnail_url); + + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + source; + result = 31 * result + url.hashCode(); + result = 31 * result + artist.hashCode(); + result = 31 * result + author.hashCode(); + result = 31 * result + description.hashCode(); + result = 31 * result + genre.hashCode(); + result = 31 * result + title.hashCode(); + result = 31 * result + status.hashCode(); + result = 31 * result + thumbnail_url.hashCode(); + result = 31 * result + rank; + result = 31 * result + (int) (last_update ^ (last_update >>> 32)); + result = 31 * result + (initialized ? 1 : 0); + result = 31 * result + viewer; + result = 31 * result + chapter_order; + return result; + } +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/helpers/DatabaseHelper.java b/app/src/main/java/eu/kanade/mangafeed/data/helpers/DatabaseHelper.java new file mode 100644 index 0000000000..2b767e0f56 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/helpers/DatabaseHelper.java @@ -0,0 +1,43 @@ +package eu.kanade.mangafeed.data.helpers; + +import android.content.Context; + +import com.pushtorefresh.storio.sqlite.StorIOSQLite; +import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite; +import com.pushtorefresh.storio.sqlite.queries.Query; + +import java.util.List; + +import eu.kanade.mangafeed.data.entities.Manga; +import eu.kanade.mangafeed.data.tables.MangasTable; +import rx.Observable; + +/** + * Created by len on 23/09/2015. + */ +public class DatabaseHelper { + + private StorIOSQLite db; + + public DatabaseHelper(Context context) { + db = DefaultStorIOSQLite.builder() + .sqliteOpenHelper(new DbOpenHelper(context)) + .build(); + } + + public StorIOSQLite getStorIODb() { + return db; + } + + public Observable> getMangas() { + return db.get() + .listOfObjects(Manga.class) + .withQuery(Query.builder() + .table(MangasTable.TABLE) + .build()) + .prepare() + .createObservable(); + + } + +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/helpers/DbOpenHelper.java b/app/src/main/java/eu/kanade/mangafeed/data/helpers/DbOpenHelper.java new file mode 100644 index 0000000000..d3e0fcd4d6 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/helpers/DbOpenHelper.java @@ -0,0 +1,31 @@ +package eu.kanade.mangafeed.data.helpers; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import android.support.annotation.NonNull; + +import eu.kanade.mangafeed.data.tables.MangasTable; + +/** + * Created by len on 23/09/2015. + */ +public class DbOpenHelper extends SQLiteOpenHelper { + + public static final String DATABASE_NAME = "mangafeed.db"; + public static final int DATABASE_VERSION = 1; + + public DbOpenHelper(@NonNull Context context) { + super(context, DATABASE_NAME, null, DATABASE_VERSION); + } + + @Override + public void onCreate(@NonNull SQLiteDatabase db) { + db.execSQL(MangasTable.getCreateTableQuery()); + } + + @Override + public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) { + // no impl + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/data/helpers/PreferencesHelper.java b/app/src/main/java/eu/kanade/mangafeed/data/helpers/PreferencesHelper.java new file mode 100644 index 0000000000..cab0d887c5 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/helpers/PreferencesHelper.java @@ -0,0 +1,21 @@ +package eu.kanade.mangafeed.data.helpers; + +import android.content.Context; +import android.content.SharedPreferences; + +public class PreferencesHelper { + + private static SharedPreferences mPref; + + public static final String PREF_FILE_NAME = "android_boilerplate_pref_file"; + + + public PreferencesHelper(Context context) { + mPref = context.getSharedPreferences(PREF_FILE_NAME, Context.MODE_PRIVATE); + } + + public void clear() { + mPref.edit().clear().apply(); + } + +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/tables/CategoriesTable.java b/app/src/main/java/eu/kanade/mangafeed/data/tables/CategoriesTable.java new file mode 100644 index 0000000000..5e5c56642d --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/tables/CategoriesTable.java @@ -0,0 +1,18 @@ +package eu.kanade.mangafeed.data.tables; + +import android.support.annotation.NonNull; + +/** + * Created by len on 23/09/2015. + */ +public class CategoriesTable { + + @NonNull + public static final String TABLE = "categories"; + + @NonNull + public static final String COLUMN_ID = "_id"; + + @NonNull + public static final String COLUMN_NAME = "name"; +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/tables/ChaptersTable.java b/app/src/main/java/eu/kanade/mangafeed/data/tables/ChaptersTable.java new file mode 100644 index 0000000000..121afb00bf --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/tables/ChaptersTable.java @@ -0,0 +1,30 @@ +package eu.kanade.mangafeed.data.tables; + +import android.support.annotation.NonNull; + +/** + * Created by len on 23/09/2015. + */ +public class ChaptersTable { + + @NonNull + public static final String TABLE = "chapters"; + + @NonNull + public static final String COLUMN_ID = "_id"; + + @NonNull + public static final String COLUMN_MANGA_ID = "manga_id"; + + @NonNull + public static final String COLUMN_URL = "url"; + + @NonNull + public static final String COLUMN_NAME = "name"; + + @NonNull + public static final String COLUMN_READ = "read"; + + @NonNull + public static final String COLUMN_DATE_FETCH = "date_fetch"; +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasCategoriesTable.java b/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasCategoriesTable.java new file mode 100644 index 0000000000..9b641139cc --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasCategoriesTable.java @@ -0,0 +1,18 @@ +package eu.kanade.mangafeed.data.tables; + +import android.support.annotation.NonNull; + +/** + * Created by len on 23/09/2015. + */ +public class MangasCategoriesTable { + + @NonNull + public static final String TABLE = "mangas_categories"; + + @NonNull + public static final String COLUMN_MANGA_ID = "_manga_id"; + + @NonNull + public static final String COLUMN_CATEGORY_ID = "_category_id"; +} diff --git a/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasTable.java b/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasTable.java new file mode 100644 index 0000000000..e166cbcba0 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/data/tables/MangasTable.java @@ -0,0 +1,85 @@ +package eu.kanade.mangafeed.data.tables; + +import android.support.annotation.NonNull; + +/** + * Created by len on 23/09/2015. + */ +public class MangasTable { + + @NonNull + public static final String TABLE = "mangas"; + + @NonNull + public static final String COLUMN_ID = "_id"; + + @NonNull + public static final String COLUMN_SOURCE = "source"; + + @NonNull + public static final String COLUMN_URL = "url"; + + @NonNull + public static final String COLUMN_ARTIST = "artist"; + + @NonNull + public static final String COLUMN_AUTHOR = "author" ; + + @NonNull + public static final String COLUMN_DESCRIPTION = "description"; + + @NonNull + public static final String COLUMN_GENRE = "genre"; + + @NonNull + public static final String COLUMN_TITLE = "title"; + + @NonNull + public static final String COLUMN_STATUS = "status"; + + @NonNull + public static final String COLUMN_THUMBNAIL_URL = "thumbnail_url"; + + @NonNull + public static final String COLUMN_RANK = "rank"; + + @NonNull + public static final String COLUMN_LAST_UPDATE = "last_update"; + + @NonNull + public static final String COLUMN_INITIALIZED = "initialized"; + + @NonNull + public static final String COLUMN_VIEWER = "viewer"; + + @NonNull + public static final String COLUMN_CHAPTER_ORDER = "chapter_order"; + + // This is just class with Meta Data, we don't need instances + private MangasTable() { + throw new IllegalStateException("No instances please"); + } + + // Better than static final field -> allows VM to unload useless String + // Because you need this string only once per application life on the device + @NonNull + public static String getCreateTableQuery() { + return "CREATE TABLE " + TABLE + "(" + + COLUMN_ID + " INTEGER NOT NULL PRIMARY KEY, " + + COLUMN_SOURCE + " INTEGER NOT NULL, " + + COLUMN_URL + " TEXT NOT NULL, " + + COLUMN_ARTIST + " TEXT NOT NULL, " + + COLUMN_AUTHOR + " TEXT NOT NULL, " + + COLUMN_DESCRIPTION + " TEXT NOT NULL, " + + COLUMN_GENRE + " TEXT NOT NULL, " + + COLUMN_TITLE + " TEXT NOT NULL, " + + COLUMN_STATUS + " TEXT NOT NULL, " + + COLUMN_THUMBNAIL_URL + " TEXT NOT NULL, " + + COLUMN_RANK + " INTEGER NOT NULL, " + + COLUMN_LAST_UPDATE + " LONG NOT NULL, " + + COLUMN_INITIALIZED + " BOOLEAN NOT NULL, " + + COLUMN_VIEWER + " INTEGER NOT NULL, " + + COLUMN_CHAPTER_ORDER + " INTEGER NOT NULL" + + ");"; + } +} diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/activity/BaseActivity.java b/app/src/main/java/eu/kanade/mangafeed/ui/activity/BaseActivity.java new file mode 100644 index 0000000000..6f96cdea91 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/ui/activity/BaseActivity.java @@ -0,0 +1,32 @@ +package eu.kanade.mangafeed.ui.activity; + +import android.app.FragmentManager; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; + +import eu.kanade.mangafeed.App; +import eu.kanade.mangafeed.AppComponent; + +public class BaseActivity extends AppCompatActivity { + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + FragmentManager fm = getFragmentManager(); + if (fm.getBackStackEntryCount() > 0) { + fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); + } else { + finish(); + } + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + protected AppComponent applicationComponent() { + return App.get(this).getComponent(); + } + +} diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/activity/MainActivity.java b/app/src/main/java/eu/kanade/mangafeed/ui/activity/MainActivity.java new file mode 100644 index 0000000000..3ddeb57722 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/ui/activity/MainActivity.java @@ -0,0 +1,85 @@ +package eu.kanade.mangafeed.ui.activity; + +import android.os.Bundle; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.ProgressBar; + +import javax.inject.Inject; + +import eu.kanade.mangafeed.R; + +import butterknife.Bind; +import butterknife.ButterKnife; +import eu.kanade.mangafeed.data.helpers.DatabaseHelper; +import rx.subscriptions.CompositeSubscription; +import timber.log.Timber; +import uk.co.ribot.easyadapter.EasyRecyclerAdapter; + +public class MainActivity extends BaseActivity { + + @Bind(R.id.recycler_characters) + RecyclerView mCharactersRecycler; + + @Bind(R.id.toolbar) + Toolbar mToolbar; + + @Bind(R.id.progress_indicator) + ProgressBar mProgressBar; + + @Bind(R.id.swipe_container) + SwipeRefreshLayout mSwipeRefresh; + + @Inject DatabaseHelper mDb; + private CompositeSubscription mSubscriptions; + private EasyRecyclerAdapter mEasyRecycleAdapter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + applicationComponent().inject(this); + setContentView(R.layout.activity_main); + ButterKnife.bind(this); + mSubscriptions = new CompositeSubscription(); + //mDataManager = App.get(this).getComponent().dataManager(); + setupToolbar(); + setupRecyclerView(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mSubscriptions.unsubscribe(); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_github: + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + private void setupToolbar() { + setSupportActionBar(mToolbar); + } + + private void setupRecyclerView() { + mCharactersRecycler.setLayoutManager(new LinearLayoutManager(this)); + mCharactersRecycler.setAdapter(mEasyRecycleAdapter); + + mSwipeRefresh.setColorSchemeResources(R.color.primary); + } +} diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/adapter/DetailHolder.java b/app/src/main/java/eu/kanade/mangafeed/ui/adapter/DetailHolder.java new file mode 100644 index 0000000000..45a7630c35 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/ui/adapter/DetailHolder.java @@ -0,0 +1,37 @@ +package eu.kanade.mangafeed.ui.adapter; + +import android.content.Intent; +import android.net.Uri; +import android.view.View; +import android.widget.TextView; + +import uk.co.ribot.easyadapter.ItemViewHolder; +import uk.co.ribot.easyadapter.PositionInfo; +import uk.co.ribot.easyadapter.annotations.LayoutId; +import uk.co.ribot.easyadapter.annotations.ViewId; + +@LayoutId(eu.kanade.mangafeed.R.layout.item_detail) +public class DetailHolder extends ItemViewHolder { + + @ViewId(eu.kanade.mangafeed.R.id.text_detail) + TextView mDetailText; + + public DetailHolder(View view) { + super(view); + } + + @Override + public void onSetValues(String item, PositionInfo positionInfo) { + mDetailText.setText(item); + } + + @Override + public void onSetListeners() { + mDetailText.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getContext().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getItem()))); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java b/app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java new file mode 100644 index 0000000000..3789160fec --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/AndroidComponentUtil.java @@ -0,0 +1,33 @@ +package eu.kanade.mangafeed.util; + +import android.app.ActivityManager; +import android.app.ActivityManager.RunningServiceInfo; +import android.content.ComponentName; +import android.content.Context; +import android.content.pm.PackageManager; + +import timber.log.Timber; + +public class AndroidComponentUtil { + + public static void toggleComponent(Context context, Class componentClass, boolean enable) { + Timber.i((enable ? "Enabling " : "Disabling ") + componentClass.getSimpleName()); + ComponentName componentName = new ComponentName(context, componentClass); + PackageManager pm = context.getPackageManager(); + pm.setComponentEnabledSetting(componentName, + enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, + PackageManager.DONT_KILL_APP); + } + + public static boolean isServiceRunning(Context context, Class serviceClass) { + ActivityManager manager = + (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (serviceClass.getName().equals(service.service.getClassName())) { + return true; + } + } + return false; + } +} diff --git a/app/src/main/java/eu/kanade/mangafeed/util/DataUtils.java b/app/src/main/java/eu/kanade/mangafeed/util/DataUtils.java new file mode 100644 index 0000000000..2e8a091200 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/DataUtils.java @@ -0,0 +1,13 @@ +package eu.kanade.mangafeed.util; + +import android.content.Context; +import android.net.ConnectivityManager; + +public class DataUtils { + + public static boolean isNetworkAvailable(Context context) { + ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + return connectivityManager.getActiveNetworkInfo() != null; + } + +} diff --git a/app/src/main/java/eu/kanade/mangafeed/util/DialogFactory.java b/app/src/main/java/eu/kanade/mangafeed/util/DialogFactory.java new file mode 100644 index 0000000000..c9b9ba171b --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/DialogFactory.java @@ -0,0 +1,39 @@ +package eu.kanade.mangafeed.util; + +import android.app.Dialog; +import android.app.ProgressDialog; +import android.content.Context; +import android.support.annotation.StringRes; +import android.support.v7.app.AlertDialog; + +import eu.kanade.mangafeed.R; + +public class DialogFactory { + + public static Dialog createSimpleOkErrorDialog(Context context, String title, String message) { + AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) + .setTitle(title) + .setMessage(message) + .setNeutralButton(R.string.dialog_action_ok, null); + return alertDialog.create(); + } + + public static Dialog createSimpleErrorDialog(Context context) { + AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) + .setTitle(context.getString(R.string.dialog_error_title)) + .setMessage(context.getString(R.string.dialog_general_error_Message)) + .setNeutralButton(R.string.dialog_action_ok, null); + return alertDialog.create(); + } + + public static ProgressDialog createProgressDialog(Context context, String message) { + ProgressDialog progressDialog = new ProgressDialog(context); + progressDialog.setMessage(message); + return progressDialog; + } + + public static ProgressDialog createProgressDialog(Context context, @StringRes int messageResoruce) { + return createProgressDialog(context, context.getString(messageResoruce)); + } + +} diff --git a/app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java b/app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java new file mode 100644 index 0000000000..c5fdcf15e0 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/NetworkUtil.java @@ -0,0 +1,27 @@ +package eu.kanade.mangafeed.util; + +import android.content.Context; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; + +import retrofit.HttpException; + +public class NetworkUtil { + + /** + * Returns true if the Throwable is an instance of RetrofitError with an + * http status code equals to the given one. + */ + public static boolean isHttpStatusCode(Throwable throwable, int statusCode) { + return throwable instanceof HttpException + && ((HttpException) throwable).code() == statusCode; + } + + public static boolean isNetworkConnected(Context context) { + ConnectivityManager cm = + (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo activeNetwork = cm.getActiveNetworkInfo(); + return activeNetwork != null && activeNetwork.isConnectedOrConnecting(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/util/SnackbarFactory.java b/app/src/main/java/eu/kanade/mangafeed/util/SnackbarFactory.java new file mode 100644 index 0000000000..2087983728 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/SnackbarFactory.java @@ -0,0 +1,18 @@ +package eu.kanade.mangafeed.util; + +import android.content.Context; +import android.support.design.widget.Snackbar; +import android.view.View; +import android.view.ViewGroup; + +import eu.kanade.mangafeed.R; + +public class SnackbarFactory { + + public static Snackbar createSnackbar(Context context, View view, String message) { + Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_SHORT); + ViewGroup group = (ViewGroup) snackbar.getView(); + group.setBackgroundColor(context.getResources().getColor(R.color.primary)); + return snackbar; + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/mangafeed/util/ViewUtils.java b/app/src/main/java/eu/kanade/mangafeed/util/ViewUtils.java new file mode 100644 index 0000000000..18ba0d5338 --- /dev/null +++ b/app/src/main/java/eu/kanade/mangafeed/util/ViewUtils.java @@ -0,0 +1,13 @@ +package eu.kanade.mangafeed.util; + +import android.content.Context; +import android.util.DisplayMetrics; + +public class ViewUtils { + + public static float convertPixelsToDp(float px, Context context){ + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + return px / (metrics.densityDpi / 160f); + } + +} diff --git a/app/src/main/res/drawable-v21/touchable_background_white.xml b/app/src/main/res/drawable-v21/touchable_background_white.xml new file mode 100644 index 0000000000..322353b5ff --- /dev/null +++ b/app/src/main/res/drawable-v21/touchable_background_white.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/touchable_background_white.xml b/app/src/main/res/drawable/touchable_background_white.xml new file mode 100644 index 0000000000..26044d48fb --- /dev/null +++ b/app/src/main/res/drawable/touchable_background_white.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_character.xml b/app/src/main/res/layout/activity_character.xml new file mode 100644 index 0000000000..f5308b852a --- /dev/null +++ b/app/src/main/res/layout/activity_character.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml new file mode 100644 index 0000000000..142aed3624 --- /dev/null +++ b/app/src/main/res/layout/activity_detail.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000000..8442153a0b --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml new file mode 100644 index 0000000000..3f8036eb5b --- /dev/null +++ b/app/src/main/res/layout/fragment_detail.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/layout/item_character.xml b/app/src/main/res/layout/item_character.xml new file mode 100644 index 0000000000..97fc49264d --- /dev/null +++ b/app/src/main/res/layout/item_character.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml new file mode 100644 index 0000000000..e803d438e7 --- /dev/null +++ b/app/src/main/res/layout/item_detail.xml @@ -0,0 +1,11 @@ + + diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml new file mode 100644 index 0000000000..537e37cfa5 --- /dev/null +++ b/app/src/main/res/menu/main.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..e9a0778879 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..03e8228d80 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..2ec8eb35f7 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..9abdc53d9e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..becef89077 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000000..63fc816444 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000..9af6059c6d --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,17 @@ + + + #607D8B + #455A64 + #CFD8DC + #009688 + #212121 + #727272 + #FFFFFF + #B6B6B6 + #FFFFFF + #FAFAFA + #D7D7D7 + #D4D4D4 + #E9E9E9 + #DD000000 + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..5fd4e58157 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,13 @@ + + + 16dp + 16dp + + 24sp + 22sp + 20sp + 18sp + 16sp + 14sp + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..b871922867 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,57 @@ + + AndroidBoilerPlate + + + Boilerplate + + + + View on GitHub + View + Collections + No description available + %d films + + + + + Don\'t underestimate the Force. The Force is strong with this one. I have you now. He is here. \n \n + I suggest you try it again, Luke. This time, let go your conscious self and act on instinct. The more you tighten your grip, Tarkin, the more star systems will slip through your fingers. I\'m trying not to, kid. Red Five standing by.\n \n + I care. So, what do you think of her, Han? Obi-Wan is here. The Force is with him. I\'m surprised you had the courage to take the responsibility yourself. Red Five standing by. I need your help, Luke. She needs your help. I\'m getting too old for this sort of thing.\n \n + What!? All right. Well, take care of yourself, Han. I guess that\'s what you\'re best at, ain\'t it? I don\'t know what you\'re talking about. I am a member of the Imperial Senate on a diplomatic mission to Alderaan, Red Five standing by.\n \n + I suggest you try it again, Luke. This time, let go your conscious self and act on instinct. I want to come with you to Alderaan. There\'s nothing for me here now. I want to learn the ways of the Force and be a Jedi, like my father before me. She must have hidden the plans in the escape pod. Send a detachment down to retrieve them, and see to it personally, Commander. There\'ll be no one to stop us this time! Obi-Wan is here. The Force is with him.\n \n + Hey, Luke! May the Force be with you. Alderaan? I\'m not going to Alderaan. I\'ve got to go home. It\'s late, I\'m in for it as it is. Obi-Wan is here. The Force is with him. Don\'t be too proud of this technological terror you\'ve constructed. The ability to destroy a planet is insignificant next to the power of the Force. She must have hidden the plans in the escape pod. Send a detachment down to retrieve them, and see to it personally, Commander. There\'ll be no one to stop us this time!\n \n + + + + + Films + Vehicles + Species + Starships + + + No data to display + + + + OK + Delete + Cancel + + Oops + There was an error making the request + Sorry, you need a connection to do that! + + + + + 1 + 2 + 3 + 4 + 5 + 6 + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000..9f848adfab --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/test/java/eu/kanade/mangafeed/DataManagerTest.java b/app/src/test/java/eu/kanade/mangafeed/DataManagerTest.java new file mode 100644 index 0000000000..c4a096ac9b --- /dev/null +++ b/app/src/test/java/eu/kanade/mangafeed/DataManagerTest.java @@ -0,0 +1,70 @@ +package eu.kanade.mangafeed; + + +import android.database.Cursor; + +import eu.kanade.mangafeed.data.local.DatabaseHelper; +import eu.kanade.mangafeed.data.local.Db; +import eu.kanade.mangafeed.data.local.PreferencesHelper; +import eu.kanade.mangafeed.data.model.Character; +import eu.kanade.mangafeed.data.remote.AndroidBoilerplateService; +import eu.kanade.mangafeed.util.DefaultConfig; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import java.util.List; + +import rx.Observable; +import rx.observers.TestSubscriber; +import rx.schedulers.Schedulers; + +import static junit.framework.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = DefaultConfig.EMULATE_SDK, manifest = DefaultConfig.MANIFEST) +public class DataManagerTest { + + private DataManager mDataManager; + private AndroidBoilerplateService mMockAndroidBoilerplateService; + private DatabaseHelper mDatabaseHelper; + + @Before + public void setUp() { + mMockAndroidBoilerplateService = mock(AndroidBoilerplateService.class); + mDatabaseHelper = new DatabaseHelper(RuntimeEnvironment.application); + mDatabaseHelper.clearTables().subscribe(); + mDataManager = new DataManager(mMockAndroidBoilerplateService, + mDatabaseHelper, + mock(Bus.class), + new PreferencesHelper(RuntimeEnvironment.application), + Schedulers.immediate()); + } + + @Test + public void shouldSyncCharacters() throws Exception { + int[] ids = new int[]{ 10034, 14050, 10435, 35093 }; + List characters = MockModelsUtil.createListOfMockCharacters(4); + for (int i = 0; i < ids.length; i++) { + when(mMockAndroidBoilerplateService.getCharacter(ids[i])) + .thenReturn(Observable.just(characters.get(i))); + } + + TestSubscriber result = new TestSubscriber<>(); + mDataManager.syncCharacters(ids).subscribe(result); + result.assertNoErrors(); + result.assertReceivedOnNext(characters); + + Cursor cursor = mDatabaseHelper.getBriteDb() + .query("SELECT * FROM " + Db.CharacterTable.TABLE_NAME); + assertEquals(4, cursor.getCount()); + cursor.close(); + } + +} diff --git a/app/src/test/java/eu/kanade/mangafeed/DatabaseHelperTest.java b/app/src/test/java/eu/kanade/mangafeed/DatabaseHelperTest.java new file mode 100644 index 0000000000..e47b6cf996 --- /dev/null +++ b/app/src/test/java/eu/kanade/mangafeed/DatabaseHelperTest.java @@ -0,0 +1,65 @@ +package eu.kanade.mangafeed; + +import android.database.Cursor; + +import eu.kanade.mangafeed.data.local.DatabaseHelper; +import eu.kanade.mangafeed.data.local.Db; +import eu.kanade.mangafeed.data.model.Character; +import eu.kanade.mangafeed.util.DefaultConfig; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import java.util.Collections; +import java.util.List; + +import rx.observers.TestSubscriber; + +import static junit.framework.Assert.assertEquals; + +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = DefaultConfig.EMULATE_SDK, manifest = DefaultConfig.MANIFEST) +public class DatabaseHelperTest { + + private DatabaseHelper mDatabaseHelper; + + @Before + public void setUp() { + mDatabaseHelper = new DatabaseHelper(RuntimeEnvironment.application); + mDatabaseHelper.clearTables().subscribe(); + } + + @Test + public void shouldSetCharacters() throws Exception { + List characters = MockModelsUtil.createListOfMockCharacters(5); + + TestSubscriber result = new TestSubscriber<>(); + mDatabaseHelper.setCharacters(characters).subscribe(result); + result.assertNoErrors(); + result.assertReceivedOnNext(characters); + + Cursor cursor = mDatabaseHelper.getBriteDb() + .query("SELECT * FROM " + Db.CharacterTable.TABLE_NAME); + assertEquals(5, cursor.getCount()); + for (Character character : characters) { + cursor.moveToNext(); + assertEquals(character, Db.CharacterTable.parseCursor(cursor)); + } + } + + @Test + public void shouldGetCharacters() throws Exception { + List characters = MockModelsUtil.createListOfMockCharacters(5); + + mDatabaseHelper.setCharacters(characters).subscribe(); + + TestSubscriber> result = new TestSubscriber<>(); + mDatabaseHelper.getCharacters().subscribe(result); + result.assertNoErrors(); + result.assertReceivedOnNext(Collections.singletonList(characters)); + } +} \ No newline at end of file diff --git a/app/src/test/java/eu/kanade/mangafeed/util/DefaultConfig.java b/app/src/test/java/eu/kanade/mangafeed/util/DefaultConfig.java new file mode 100644 index 0000000000..14b8dccda5 --- /dev/null +++ b/app/src/test/java/eu/kanade/mangafeed/util/DefaultConfig.java @@ -0,0 +1,7 @@ +package eu.kanade.mangafeed.util; + +public class DefaultConfig { + //The api level that Roboelectric will use to run the unit tests + public static final int EMULATE_SDK = 21; + public static final String MANIFEST = "./src/main/AndroidManifest.xml"; +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..3a66608453 --- /dev/null +++ b/build.gradle @@ -0,0 +1,20 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7' + classpath 'me.tatarka:gradle-retrolambda:3.2.3' + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..1d3591c8a4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..8c0fb64a86 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..0c71e760dc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000000..91a7e269e1 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..8a0b282aa6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..e7b4def49c --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'