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

Dev 1.4.x

.gitignore

@@ -8,8 +8,7 @@ build/
 
 # Intellij
 *.iml
-.idea/workspace.xml
-.idea/libraries
+.idea/
 
 # Local configuration file (sdk path, etc)
 local.properties

README.md

@@ -20,9 +20,7 @@ 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
+- [吹妖漫画](http://m.chuiyao.com/)
 
 # 感谢以下的开源项目及作者
 - [Android Open Source Project](http://source.android.com/)
@@ -41,7 +39,7 @@ Online manga reader based on Android
 # ToDo
 - ~~综合搜索~~
 - ~~漫画标签分类~~
-- 多线程下载
+- ~~多任务下载~~
 - ~~更改下载路径~~
 - 扫描已下载漫画
 - ~~阅读状态自定义点击事件~~
@@ -52,4 +50,7 @@ Online manga reader based on Android
 <img src="./screenshot/03.png" width="30%" height="30%">
 <img src="./screenshot/04.png" width="30%" height="30%">
 <img src="./screenshot/05.png" width="30%" height="30%">
-<img src="./screenshot/06.png" width="30%" height="30%">
+<img src="./screenshot/06.png" width="30%" height="30%">
+<img src="./screenshot/07.png" width="30%" height="30%">
+<img src="./screenshot/08.png" width="30%" height="30%">
+<img src="./screenshot/09.png" width="30%" height="30%">

app/build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.hiroshi.cimoc"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
-        versionName "1.4.3"
+        versionName "1.4.4.0"
         resConfigs "en", "zh"
     }
     buildTypes {
@@ -35,11 +35,11 @@ dependencies {
     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.14.1'
-    compile 'org.jsoup:jsoup:1.9.2'
+    compile 'org.greenrobot:greendao:3.2.0'
+    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    compile 'com.facebook.fresco:fresco:1.0'
+    compile 'org.jsoup:jsoup:1.10.1'
     compile 'org.adw.library:discrete-seekbar:1.0.1'
-    compile 'io.reactivex:rxjava:1.2.1'
+    compile 'io.reactivex:rxjava:1.2.3'
     compile 'io.reactivex:rxandroid:1.2.1'
 }

app/src/main/AndroidManifest.xml

@@ -31,6 +31,14 @@
             android:name=".ui.activity.DetailActivity"
             android:screenOrientation="portrait"/>
 
+        <activity
+            android:name=".ui.activity.ChapterActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".ui.activity.TagEditorActivity"
+            android:screenOrientation="portrait"/>
+
         <activity
             android:name=".ui.activity.TaskActivity"
             android:screenOrientation="portrait"/>
@@ -52,7 +60,18 @@
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".ui.activity.TagComicActivity"
+            android:name=".ui.activity.CategoryActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".ui.activity.SearchActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".ui.activity.PartFavoriteActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".ui.activity.DirPickerActivity"
             android:screenOrientation="portrait"/>
 
         <activity