Merge branch 'release/1.3.0'

.travis.yml

@@ -0,0 +1,21 @@
+language: android
+
+android:
+  components:
+    - platform-tools
+    - tools
+    - build-tools-25.0.3
+    - android-25
+    - extra-android-m2repository
+
+jdk:
+  - oraclejdk8
+
+cache:
+  directories:
+    - $HOME/.gradle
+
+script:
+  - chmod u+x gradlew
+  - ./gradlew clean
+  - ./gradlew build

README.md

@@ -1,19 +1,20 @@
-![Banner](/art/banner-1024-500.png)
+![Banner](art/banner-1024-500.png)
 
 # CNode Material Design #
 
+[![Build Status](https://travis-ci.org/TakWolf/CNode-Material-Design.svg?branch=master)](https://travis-ci.org/TakWolf/CNode-Material-Design)
 [![Release](https://img.shields.io/github/release/TakWolf/CNode-Material-Design.svg?style=flat)](https://github.com/TakWolf/CNode-Material-Design/releases/latest)
-[![Platform](https://img.shields.io/badge/platform-Android-green.svg?style=flat)](http://developer.android.com/index.html)
+[![Platform](https://img.shields.io/badge/platform-Android-green.svg?style=flat)](https://www.android.com)
 [![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
 [![License](https://img.shields.io/github/license/TakWolf/CNode-Material-Design.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 
-![Logo](/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
+![Logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
 
-[CNode社区](https://cnodejs.org) 第三方Android客户端，原生App，Material Design风格，支持夜间模式
+[CNode社区](https://cnodejs.org)第三方Android客户端，原生App，Material Design风格，支持夜间模式
 
-## Download ##
+## Downloads ##
 
-[![Google Play Store](/art/git_it_on_google_play.png)](https://play.google.com/store/apps/details?id=org.cnodejs.android.md)
+[![Google Play](art/get_it_on_google_play.png)](https://play.google.com/store/apps/details?id=org.cnodejs.android.md)
 
 - [Google Play](https://play.google.com/store/apps/details?id=org.cnodejs.android.md)
 
@@ -29,25 +30,27 @@
 
 - [豌豆荚](http://www.wandoujia.com/apps/org.cnodejs.android.md)
 
+- [酷安网](http://www.coolapk.com/apk/org.cnodejs.android.md)
+
 ## Screenshots ##
 
-![image](/art/screenshot_s01.png) ![image](/art/screenshot_s02.png)
+![Image](art/screenshot_s01.png) ![Image](art/screenshot_s02.png)
 
-![image](/art/screenshot_s03.png) ![image](/art/screenshot_s04.png)
+![Image](art/screenshot_s03.png) ![Image](art/screenshot_s04.png)
 
-## Credits ##
+## Dependencies ##
 
-- [Butter Knife](http://jakewharton.github.io/butterknife)
+- [Butter Knife](https://github.com/JakeWharton/butterknife)
 
 - [Gson](https://github.com/google/gson)
 
 - [Joda-Time](http://www.joda.org/joda-time)
 
 - [Joda-Time-Android](https://github.com/dlew/joda-time-android)
 
-- [OkHttp](http://square.github.io/okhttp)
+- [OkHttp](https://github.com/square/okhttp)
 
-- [Retrofit](http://square.github.io/retrofit)
+- [Retrofit](https://github.com/square/retrofit)
 
 - [Glide](https://github.com/bumptech/glide)
 
@@ -67,12 +70,12 @@
 
 - [jsoup](https://jsoup.org)
 
-- [Google I/O Android App - ScrimInsetsViews](https://github.com/google/iosched/blob/master/android/src/main/java/com/google/samples/apps/iosched/ui/widget/ScrimInsetsScrollView.java)
-
-- [Material design icons](https://github.com/google/material-design-icons)
+- [CNode-OAuth-Login-Android](https://github.com/TakWolf/CNode-OAuth-Login-Android)
 
 - [CNodeMD Page Render Compat](https://github.com/TakWolf/CNodeMD-Page-Render-Compat)
 
+- [Material design icons](https://github.com/google/material-design-icons)
+
 - [Vue.js](http://cn.vuejs.org)
 
 - [github-markdown-css](https://github.com/sindresorhus/github-markdown-css)
@@ -87,16 +90,18 @@ TakWolf
 
 ## License ##
 
-    Copyright 2015-2016 TakWolf
-
-    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
+```
+Copyright 2015 TakWolf
+
+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
+    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.
+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.
+```

app/build.gradle

@@ -1,29 +1,28 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
 
-// 根据日期自动生成build号
-def calendar = Calendar.getInstance();
-def time = String.format("%d%02d%02d", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DAY_OF_MONTH));
-
-// 读取local.properties文件
-def Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+String umengAppKey = System.getenv('CNODEMD_UMENG_APP_KEY')
+File localPropertiesFile = project.rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    Properties properties = new Properties()
+    properties.load(localPropertiesFile.newDataInputStream())
+    umengAppKey = properties.getProperty('umeng.appkey', umengAppKey)
+}
 
 android {
 
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
-        applicationId "org.cnodejs.android.md"
+        applicationId 'org.cnodejs.android.md'
         minSdkVersion 9
-        targetSdkVersion 23
-        versionCode Integer.parseInt(time)
-        versionName "1.2.0"
+        targetSdkVersion 25
+        versionCode Integer.parseInt(new Date().format('yyyyMMdd'))
+        versionName '1.3.0'
 
         manifestPlaceholders = [
-                UMENG_CHANNEL: "CNodeJS",
-                UMENG_APPKEY: properties.getProperty("umeng.appkey")
+                UMENG_APPKEY: umengAppKey,
+                UMENG_CHANNEL: 'CNodeJS'
         ]
     }
 
@@ -41,33 +40,39 @@ android {
         exclude 'META-INF/NOTICE.txt'
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-
-    compile 'com.jakewharton:butterknife:8.0.1'
-    apt 'com.jakewharton:butterknife-compiler:8.0.1'
-
-    compile 'com.google.code.gson:gson:2.6.2'
-    compile 'net.danlew:android.joda:2.9.3.1'
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
-    compile 'com.squareup.retrofit2:retrofit:2.0.2'
-    compile 'com.squareup.retrofit2:converter-gson:2.0.2'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+
+    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'net.danlew:android.joda:2.9.9'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    compile 'com.squareup.retrofit2:retrofit:2.2.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
 
-    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.rengwuxian.materialedittext:library:2.1.4'
     compile 'com.pnikosis:materialish-progress:1.7'
     compile 'com.melnykov:floatingactionbutton:1.3.0'
     compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0'
-    compile 'com.github.chrisbanes:PhotoView:1.2.6'
+    compile 'com.github.chrisbanes:PhotoView:1.3.1'
 
     compile 'org.tautua.markdownpapers:markdownpapers-core:1.4.4'
-    compile 'org.jsoup:jsoup:1.9.2'
+    compile 'org.jsoup:jsoup:1.10.2'
+
+    compile 'org.cnodejs.android:oauth-login:0.0.1'
 
-    compile 'com.umeng.analytics:analytics:6.0.1'
+    compile 'com.umeng.analytics:analytics:6.1.0'
 }

app/proguard-rules.pro

@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile