Merge pull request #23 from Arachnid-27/dev-1.4.x

Dev 1.4.x

README.md

@@ -20,11 +20,9 @@ Online manga reader based on Android
 - [Webtoon](http://m.webtoons.com)
 - [汗汗漫画](http://hhssee.com)
 - [57漫画](http://m.57mh.com)
-- ~~各种奇怪的网站~~
 
 # 可添加图源
 - IKanman、DMZJ、HHAAZZ、CCTuku、U17、DM5、Webtoon、HHSSEE、57MH
-- EHentai、ExHentai、NHentai、Wnacg
 
 # 感谢以下的开源项目及作者
 - [Android Open Source Project](http://source.android.com/)
@@ -42,11 +40,11 @@ Online manga reader based on Android
 
 # ToDo
 - ~~综合搜索~~
-- 漫画标签分类
+- ~~漫画标签分类~~
 - 多线程下载
-- 更改下载路径
+- ~~更改下载路径~~
 - 扫描已下载漫画
-- 阅读状态自定义点击事件
+- ~~阅读状态自定义点击事件~~
 
 # 应用截图
 <img src="./screenshot/01.png" width="30%" height="30%">

app/build.gradle

@@ -4,14 +4,14 @@ apply plugin: 'android-apt'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.hiroshi.cimoc"
         minSdkVersion 15
         targetSdkVersion 24
         versionCode 1
-        versionName "1.4.2"
+        versionName "1.4.3"
         resConfigs "en", "zh"
     }
     buildTypes {
@@ -24,22 +24,22 @@ android {
 }
 
 greendao {
-    schemaVersion 6
+    schemaVersion 7
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:24.1.1'
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:recyclerview-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
+    compile "com.android.support:support-v13:${SUPPORT_LIB_VERSION}"
+    compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
+    compile "com.android.support:recyclerview-v7:${SUPPORT_LIB_VERSION}"
+    compile "com.android.support:design:${SUPPORT_LIB_VERSION}"
     compile 'com.jakewharton:butterknife:8.4.0'
     apt 'com.jakewharton:butterknife-compiler:8.4.0'
     compile 'org.greenrobot:greendao:3.1.1'
     compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.facebook.fresco:fresco:0.13.0'
+    compile 'com.facebook.fresco:fresco:0.14.1'
     compile 'org.jsoup:jsoup:1.9.2'
     compile 'org.adw.library:discrete-seekbar:1.0.1'
-    compile 'io.reactivex:rxjava:1.2.0'
+    compile 'io.reactivex:rxjava:1.2.1'
     compile 'io.reactivex:rxandroid:1.2.1'
 }

app/proguard-rules.pro

@@ -64,6 +64,7 @@
 -keepclassmembers class * {
     native <methods>;
 }
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
 -keep @com.facebook.common.internal.DoNotStrip class *
 -keepclassmembers class * {
     @com.facebook.common.internal.DoNotStrip *;

app/src/main/AndroidManifest.xml

@@ -39,28 +39,32 @@
             android:name=".ui.activity.SettingsActivity"
             android:screenOrientation="portrait"/>
 
+        <activity
+            android:name=".ui.activity.settings.ReaderConfigActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".ui.activity.BackupActivity"
+            android:screenOrientation="portrait"/>
+
         <activity
             android:name=".ui.activity.AboutActivity"
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".ui.activity.PageReaderActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize"/>
+            android:name=".ui.activity.TagComicActivity"
+            android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".ui.activity.StreamReaderActivity"
-            android:screenOrientation="portrait"
+            android:name=".ui.activity.settings.EventSettingsActivity"
             android:configChanges="orientation|screenSize"/>
 
         <activity
-            android:name=".ui.activity.LandscapeStreamReaderActivity"
-            android:screenOrientation="landscape"
+            android:name=".ui.activity.PageReaderActivity"
             android:configChanges="orientation|screenSize"/>
 
         <activity
-            android:name=".ui.activity.LandscapePageReaderActivity"
-            android:screenOrientation="landscape"
+            android:name=".ui.activity.StreamReaderActivity"
             android:configChanges="orientation|screenSize"/>
 
         <service

app/src/main/java/com/hiroshi/cimoc/CimocApplication.java

@@ -1,12 +1,18 @@
 package com.hiroshi.cimoc;
 
 import android.app.Application;
+import android.os.Environment;
+import android.support.v7.widget.RecyclerView;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.hiroshi.cimoc.core.DBOpenHelper;
+import com.hiroshi.cimoc.core.Storage;
 import com.hiroshi.cimoc.core.manager.PreferenceManager;
+import com.hiroshi.cimoc.fresco.ControllerBuilderProvider;
 import com.hiroshi.cimoc.model.DaoMaster;
 import com.hiroshi.cimoc.model.DaoSession;
+import com.hiroshi.cimoc.ui.adapter.GridAdapter;
+import com.hiroshi.cimoc.utils.FileUtils;
 
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
@@ -19,30 +25,48 @@ public class CimocApplication extends Application {
 
     private static DaoSession daoSession;
     private static OkHttpClient httpClient;
-    private static PreferenceManager preferences;
+
+    private PreferenceManager mPreferenceManager;
+    private ControllerBuilderProvider mBuilderProvider;
+    private RecyclerView.RecycledViewPool mRecycledPool;
 
     @Override
     public void onCreate() {
         super.onCreate();
         DBOpenHelper helper = new DBOpenHelper(this, "cimoc.db");
+        httpClient = new OkHttpClient();
         daoSession = new DaoMaster(helper.getWritableDatabase()).newSession(IdentityScopeType.None);
-        preferences = new PreferenceManager(getApplicationContext());
+        mPreferenceManager = new PreferenceManager(getApplicationContext());
+        Storage.STORAGE_DIR = FileUtils.getPath(mPreferenceManager.getString(PreferenceManager.PREF_OTHER_STORAGE,
+                Environment.getExternalStorageDirectory().getAbsolutePath()), "Cimoc");
         Fresco.initialize(this);
     }
 
     public static DaoSession getDaoSession() {
         return daoSession;
     }
 
-    public static PreferenceManager getPreferences() {
-        return preferences;
+    public static OkHttpClient getHttpClient() {
+        return httpClient;
     }
 
-    public static OkHttpClient getHttpClient() {
-        if (httpClient == null) {
-            httpClient = new OkHttpClient();
+    public PreferenceManager getPreferenceManager() {
+        return mPreferenceManager;
+    }
+
+    public RecyclerView.RecycledViewPool getGridRecycledPool() {
+        if (mRecycledPool == null) {
+            mRecycledPool = new RecyclerView.RecycledViewPool();
+            mRecycledPool.setMaxRecycledViews(GridAdapter.GRID_ITEM_TYPE, 20);
         }
-        return httpClient;
+        return mRecycledPool;
+    }
+
+    public ControllerBuilderProvider getBuilderProvider() {
+        if (mBuilderProvider == null) {
+            mBuilderProvider = new ControllerBuilderProvider(getApplicationContext());
+        }
+        return mBuilderProvider;
     }
 
 }