E-Hentai Reader 1.0

DaoGenerator/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'application'
 mainClassName = 'tw.skyarrow.daogenerator.Generator'
 
 dependencies {
-    compile 'de.greenrobot:greendao-generator:1.3.0'
+    compile 'de.greenrobot:greendao-generator:1.3.1'
 }
 
 sourceSets {

DaoGenerator/src/main/java/tw/skyarrow/daogenerator/Generator.java → DaoGenerator/src/tw/skyarrow/daogenerator/Generator.java

@@ -2,19 +2,14 @@
 
 import java.io.File;
 
-import de.greenrobot.daogenerator.DaoGenerator;
 import de.greenrobot.daogenerator.Entity;
 import de.greenrobot.daogenerator.Property;
 import de.greenrobot.daogenerator.Schema;
 import de.greenrobot.daogenerator.ToMany;
-import de.greenrobot.daogenerator.ToOne;
 
-/**
- * Created by SkyArrow on 2014/1/26.
- */
 public class Generator {
-    private static final int dbVersion = 1;
-    private static final String dbPackage = "tw.skyarrow.ehreader.db";
+    private static final int dbVersion = 2;
+    private static final String dbPackage = "tw.skyarrow.ehreader.model";
     private static final String dbPath = "../ehreader/src-gen";
 
     public static void main(String[] args) throws Exception {
@@ -34,12 +29,7 @@ public static void main(String[] args) throws Exception {
         photo.addStringProperty("src");
         photo.addBooleanProperty("downloaded");
         photo.addBooleanProperty("invalid");
-
-        // Recent Image Search
-        Entity imageSearch = schema.addEntity("ImageSearch");
-
-        imageSearch.addIdProperty().autoincrement();
-        imageSearch.addStringProperty("path");
+        photo.addStringProperty("retryId");
 
         // Gallery
         Entity gallery = schema.addEntity("Gallery");
@@ -61,6 +51,7 @@ public static void main(String[] args) throws Exception {
         gallery.addIntProperty("progress");
         gallery.addStringProperty("showkey");
         gallery.addLongProperty("size");
+        gallery.addIntProperty("photoPerPage");
 
         Property photoProperty = photo.addLongProperty("galleryId").notNull().getProperty();
         ToMany galleryToPhotos = gallery.addToMany(photo, photoProperty);
@@ -82,6 +73,6 @@ public static void main(String[] args) throws Exception {
         File file = new File(dbPath);
         if (!file.exists()) file.mkdirs();
 
-        new DaoGenerator().generateAll(schema, dbPath);
+        new de.greenrobot.daogenerator.DaoGenerator().generateAll(schema, dbPath);
     }
 }

README.md

@@ -14,9 +14,9 @@ The best E-Hentai Reader for Android ever!
 
 ## Screenshots
 
-<a href="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-main.png"><img src="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-main.png" width="360" height="640"></a>
-<a href="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-gallery.png"><img src="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-gallery.png" width="360" height="640"></a>
-<a href="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-photo.png"><img src="https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-photo.png" width="360" height="640"></a>
+![](https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-main.png)
+![](https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-gallery.png)
+![](https://raw.github.com/tommy351/ehreader-android/master/images/screenshot-photo.png)
 
 ## Development
 
@@ -31,17 +31,13 @@ The best E-Hentai Reader for Android ever!
 Run the following commands and open the project in Android Studio.
 
 ``` bash
-$ git clone https://github.com/tommy351/ehreader-android.git
+$ https://github.com/tommy351/ehreader-android.git
 $ cd ehreader-android
 $ git submodule update --init
 $ cd android-stackblur/StackBlur
 $ ndk-build
 ```
 
-### Generating DAO
-
-This app uses [GreenDAO](http://greendao-orm.com/) as ORM. Before you get started or after the DAO is updated, you have to run the gradle task `DaoGenerator:run`.
-
 ## License
 
 Apache License 2.0

build.gradle

@@ -1,15 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 }

ehreader/.gitignore

@@ -1,2 +1 @@
 /build
-signing.gradle

ehreader/build.gradle

@@ -1,45 +1,43 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1'
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
+        applicationId "tw.skyarrow.ehreader"
         minSdkVersion 14
-        targetSdkVersion 19
-        versionCode 8
-        versionName '0.4.0'
-    }
-
-    signingConfigs {
-        release
+        targetSdkVersion 22
+        versionCode 10
+        versionName "1.0.0"
+        renderscriptTargetApi 22
+        renderscriptSupportModeEnabled true
     }
 
     buildTypes {
-        staging {
+        release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            signingConfig signingConfigs.release
-            debuggable true
+
+            // Library specific proguard files
+            proguardFile 'proguard-butterknife.pro'
+            proguardFile 'proguard-eventbus.pro'
+            proguardFile 'proguard-greendao.pro'
+            proguardFile 'proguard-support-v7-appcompat.pro'
+
+            // Default proguard files
+            proguardFile 'proguard-project.pro'
+            proguardFile getDefaultProguardFile('proguard-android.txt')
         }
 
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            signingConfig signingConfigs.release
-            debuggable false
+        debug {
+            applicationIdSuffix '.dev'
+            versionNameSuffix '-dev'
         }
     }
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src', 'src-gen']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
+            java.srcDirs += 'src-gen'
         }
 
         instrumentTest {
@@ -48,27 +46,21 @@ android {
         }
     }
 
-    packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
+    lintOptions {
+        disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:19.0.+'
-    compile files('libs/libGoogleAnalyticsServices.jar')
-    compile 'com.github.chrisbanes.photoview:library:1.2.3'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:cardview-v7:22.0.0'
+    compile 'com.android.support:recyclerview-v7:22.0.0'
     compile 'de.greenrobot:greendao:1.3.7'
     compile 'de.greenrobot:eventbus:2.4.0'
-    compile 'org.apache.httpcomponents:httpcore:4.4'
-    compile 'org.apache.httpcomponents:httpmime:4.3.6'
-    compile 'com.jakewharton:butterknife:6.0.0'
-    compile 'org.apache.commons:commons-io:1.3.2'
-    compile 'com.edmodo:cropper:1.0.1'
-    compile project(':android-stackblur:StackBlur')
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.1'
-    compile 'com.github.zafarkhaja:java-semver:0.8.0'
-    compile files('libs/GoogleAdMobAdsSdk-6.4.1.jar')
+    compile 'com.mcxiaoke.volley:library:1.0.15@aar'
+    compile 'com.github.zafarkhaja:java-semver:0.9.0'
+    compile 'com.jakewharton:disklrucache:2.0.2'
+    compile 'com.jakewharton:butterknife:6.1.0'
+    compile 'de.hdodenhof:circleimageview:1.2.2'
 }

ehreader/proguard-butterknife.pro

@@ -0,0 +1,11 @@
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewInjector { *; }
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <fields>;
+}
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <methods>;
+}

ehreader/proguard-eventbus.pro

@@ -0,0 +1,11 @@
+## GreenRobot EventBus specific rules ##
+# https://github.com/greenrobot/EventBus/blob/master/HOWTO.md#proguard-configuration
+
+-keepclassmembers class ** {
+    public void onEvent*(**);
+}
+
+# Only required if you use AsyncExecutor
+#-keepclassmembers class * extends de.greenrobot.event.util.ThrowableFailureEvent {
+#    public <init>(java.lang.Throwable);
+#}

ehreader/proguard-greendao.pro

@@ -0,0 +1,7 @@
+# GreenDao rules
+# Source: http://greendao-orm.com/documentation/technical-faq
+#
+-keepclassmembers class * extends de.greenrobot.dao.AbstractDao {
+    public static java.lang.String TABLENAME;
+}
+-keep class **$Properties

ehreader/proguard-project.pro

@@ -0,0 +1,2 @@
+# Keep the BuildConfig
+-keep class tw.skyarrow.ehreader.BuildConfig { *; }

ehreader/proguard-support-v7-appcompat.pro

@@ -0,0 +1,7 @@
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+-keep public class android.support.v7.internal.view.menu.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}