Merge branch 'release/1.2.0'

TakWolf-Deprecated · Jun 4, 2016 · 1c871bd · 1c871bd
2 parents f5d00f4 + 679d588
commit 1c871bd
Show file tree

Hide file tree

Showing 149 changed files with 4,914 additions and 2,614 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@
 
 ## Credits ##
 
-- [Butter Knife](https://github.com/JakeWharton/butterknife)
+- [Butter Knife](http://jakewharton.github.io/butterknife)
 
 - [Gson](https://github.com/google/gson)
 
@@ -65,10 +65,16 @@
 
 - [MarkdownPapers](http://markdown.tautua.org)
 
+- [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)
 
+- [CNodeMD Page Render Compat](https://github.com/TakWolf/CNodeMD-Page-Render-Compat)
+
+- [Vue.js](http://cn.vuejs.org)
+
 - [github-markdown-css](https://github.com/sindresorhus/github-markdown-css)
 
 ## Author ##

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.neenbedankt.android-apt'
 
 // 根据日期自动生成build号
 def calendar = Calendar.getInstance();
@@ -18,7 +19,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 23
         versionCode Integer.parseInt(time)
-        versionName "1.1.2"
+        versionName "1.2.0"
 
         manifestPlaceholders = [
                 UMENG_CHANNEL: "CNodeJS",
@@ -44,14 +45,16 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:23.3.0'
-    compile 'com.android.support:cardview-v7:23.3.0'
+    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.jakewharton:butterknife:7.0.1'
     compile 'com.google.code.gson:gson:2.6.2'
-    compile 'net.danlew:android.joda:2.9.3'
-    compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
+    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.github.bumptech.glide:glide:3.7.0'
@@ -62,7 +65,9 @@ dependencies {
     compile 'com.melnykov:floatingactionbutton:1.3.0'
     compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0'
     compile 'com.github.chrisbanes:PhotoView:1.2.6'
-    compile 'org.tautua.markdownpapers:markdownpapers-core:1.4.3'
 
-    compile 'com.umeng.analytics:analytics:5.6.7'
+    compile 'org.tautua.markdownpapers:markdownpapers-core:1.4.4'
+    compile 'org.jsoup:jsoup:1.9.2'
+
+    compile 'com.umeng.analytics:analytics:6.0.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <activity
             android:name="org.cnodejs.android.md.display.activity.LoginActivity"
             android:label="@string/login"
+            android:theme="@style/AppThemeLight.FitsStatusBar"
             android:screenOrientation="portrait"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
@@ -52,17 +53,13 @@
             android:name="org.cnodejs.android.md.display.activity.TopicActivity"
             android:label="@string/topic"
             android:screenOrientation="portrait"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-            <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:scheme="https"
-                    android:host="cnodejs.org"
-                    android:pathPrefix="/topic/" />
-            </intent-filter>
-        </activity>
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
+
+        <activity
+            android:name="org.cnodejs.android.md.display.activity.TopicCompatActivity"
+            android:label="@string/topic"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.CreateTopicActivity"
@@ -87,24 +84,20 @@
             android:name="org.cnodejs.android.md.display.activity.UserDetailActivity"
             android:label="@string/user_detail"
             android:screenOrientation="portrait"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-            <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:scheme="https"
-                    android:host="cnodejs.org"
-                    android:pathPrefix="/user/" />
-            </intent-filter>
-        </activity>
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.NotificationActivity"
             android:label="@string/notification"
             android:screenOrientation="portrait"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
+        <activity
+            android:name="org.cnodejs.android.md.display.activity.NotificationCompatActivity"
+            android:label="@string/notification"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
+
         <activity
             android:name="org.cnodejs.android.md.display.activity.SettingActivity"
             android:label="@string/setting"
@@ -136,6 +129,31 @@
             android:screenOrientation="portrait"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
+        <activity
+            android:name="org.cnodejs.android.md.display.activity.StandardLinkRouterActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="https"
+                    android:host="cnodejs.org"
+                    android:pathPrefix="/topic/" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="https"
+                    android:host="cnodejs.org"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+        </activity>
+
         <!-- 友盟参数 -->
         <meta-data
             android:name="UMENG_APPKEY"