Merge branch 'release/1.1.1'

TakWolf-Deprecated · May 3, 2016 · ac548e9 · ac548e9
2 parents 4656446 + e686760
commit ac548e9
Show file tree

Hide file tree

Showing 100 changed files with 2,432 additions and 1,256 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015-2016 TakWolf (takwolf.com)
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,3 @@ Apache License
    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.
-
diff --git a/README.md b/README.md
@@ -2,9 +2,10 @@
 
 # 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)
 [![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/badge/license-Apache--2.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
+[![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)
 
@@ -74,124 +75,6 @@
 
 - [github-markdown-css](https://github.com/sindresorhus/github-markdown-css)
 
-## Other Clients ##
-
-**带有 ![image](/art/ic_good_project.png) 标志的是笔者推荐的项目**
-
-### [CNodejs Ionic app](https://github.com/lanceli/cnodejs-ionic) ![image](/art/ic_good_project.png) ###
-
-> [https://cnodejs.org](http://cnodejs.org) hybird mobile application powered by [Ionic Framework](http://ionicframework.com) using AngularJS and Cordova. The development stage powered by [Ionic Framework generator](https://github.com/diegonetto/generator-ionic).
-
-> [https://cnodejs.org/topic/545aee5a3e1f39344c5b3b3e](https://cnodejs.org/topic/545aee5a3e1f39344c5b3b3e)
-
-> PS：官方客户端
-
-### [CNode Swift for iOS](https://github.com/klesh/cnodejs-swift) ![image](/art/ic_good_project.png) ###
-
-> CNode.js app written in Swift for iOS
-
-> [https://cnodejs.org/topic/5698c285e5c79df62a37a13b](https://cnodejs.org/topic/5698c285e5c79df62a37a13b)
-
-> PS：基于Swift的原生iOS客户端，体验良好
-
-### [Noder](https://github.com/soliury/noder-react-native) ![image](/art/ic_good_project.png) ###
-
-> A new [cnodejs.org](http://cnodejs.org) mobile app powered by [React-Native](http://facebook.github.io/react-native/) and [Redux](https://github.com/gaearon/redux). 
-
-> [https://cnodejs.org/topic/559bd1b91e5c761761468884](https://cnodejs.org/topic/559bd1b91e5c761761468884)
-
-> PS：基于React Native实现，包含iOS和Android两个平台
-
-### [Vue-cnodejs](https://github.com/shinygang/Vue-cnodejs) ![image](/art/ic_good_project.png) ###
-
-> 基于vue.js重写Cnodejs.org社区的webapp，[线上访问地址](http://shinygang.github.io/cnodevue)
-
-> [https://cnodejs.org/topic/565c4473d0bc14ae279399fe](https://cnodejs.org/topic/565c4473d0bc14ae279399fe)
-
-### [swift-cnode](https://github.com/nswbmw/swift-cnode) ###
-
-> [CNode社区](https://cnodejs.org/) 的又一 swift 客户端，未完成...不定期更新，欢迎 fork 与 PR。
-
-> [https://cnodejs.org/topic/570a7adcbc564eaf3c6a4901](https://cnodejs.org/topic/570a7adcbc564eaf3c6a4901)
-
-### [cnode-angular-material](https://github.com/XGHeaven/cnode-angular-material) ###
-
-> CNode.JS 社区的 Angular-Material 的实现，暂时处于开发状态中 [http://cnode.xgheaven.cn](http://cnode.xgheaven.cn)
-
-> [https://cnodejs.org/topic/566bb3a35af0e6ab3bf1a280](https://cnodejs.org/topic/566bb3a35af0e6ab3bf1a280)
-
-### [Ioniclub](https://github.com/XueRainey/Ioniclub) ###
-
-> Ioniclub is hybird mobile app of [https://cnodejs.org](https://cnodejs.org), web demo [http://rainey.coding.io/ioniclub/](http://rainey.coding.io/ioniclub/)
-
-> [https://cnodejs.org/topic/57111863434cfcfa52684a8e](https://cnodejs.org/topic/57111863434cfcfa52684a8e)
-
-### [CNode-android](https://github.com/iwhys/CNode-android) ###
-
-> 这是为CNodejs社区(https://cnodejs.org) 开发的原生Android版客户端。适用于Android4.0及以上。
-
-> [https://cnodejs.org/topic/552dbeede10460475e7f7554](https://cnodejs.org/topic/552dbeede10460475e7f7554)
-
-### [CNode Android](https://github.com/xingrz/cnode-android) ###
-
-> A [CNode](https://cnodejs.org) client for Android.
-
-> [https://cnodejs.org/topic/544a8301b379fed26548a480](https://cnodejs.org/topic/544a8301b379fed26548a480)
-
-> PS：CNode社区早期的客户端实践项目，完成度不高，只能浏览帖子，不能登录和发表话题。作者已经很长时间没有更新了。
-
-### [CNodeJS-iOS](https://github.com/callmewhy/CNodeJS-iOS) ###
-
-> An iOS app for [cnodejs.org](https://cnodejs.org/) .
-
-> [https://cnodejs.org/topic/544b563ab379fed26548a4ed](https://cnodejs.org/topic/544b563ab379fed26548a4ed)
-
-> PS：CNode社区早期的客户端实践项目。作者已经很长时间没有更新了。
-
-### [ionic-cnodejs](https://github.com/saionjisekai/ionic-cnodejs) ###
-
-> Application for Android or IOS with ionic framework
-
-> [https://cnodejs.org/topic/545289e1d0c2f0fe2f533ae0](https://cnodejs.org/topic/545289e1d0c2f0fe2f533ae0)
-
-> PS：CNode社区早期的客户端实践项目，基于Ionic 和 PhoneGap。作者已经很长时间没有更新了。
-
-### [cnodejs-reader](https://github.com/cnodejs/cnodejs-reader) ![image](/art/ic_good_project.png) ###
-
-> CNode.js client in React. Demo: [http://r.nodejs-china.org](http://r.nodejs-china.org)
-
-> [https://cnodejs.org/topic/545b97cc3e1f39344c5b3c1a](https://cnodejs.org/topic/545b97cc3e1f39344c5b3c1a)
-
-> PS：开发基于cirru，一种定制过语法的JavaScript，详情地址在 [http://script.cirru.org](http://script.cirru.org)
-
-### [CNode4WP](https://github.com/heimeil/CNode4WP) ###
-
-> cnodejs.org的windowsphone客户端，使用winjs进行开发。
-
-> [https://cnodejs.org/topic/545ef7d4a68535a174fe5251](https://cnodejs.org/topic/545ef7d4a68535a174fe5251)
-
-> PS：难得一见的WP实现，只不过是基于WinJs而不是原生。如今来看Windows Phone，慢慢的都是眼泪...
-
-### [CNode for cordova](https://coding.net/u/por/p/CNode/git) ###
-
-> CNode 中文社区，hybrid app 应用
-
-> [https://cnodejs.org/topic/5460959c789ab1f8158e1beb](https://cnodejs.org/topic/5460959c789ab1f8158e1beb)
-
-### CNode的HTML版本 ###
-
-> 不（tou）想（lan）工作的下午做了一个 CNode 的HTML版本。
-
-> [https://cnodejs.org/topic/5458a50a6537f4d52c414edb](https://cnodejs.org/topic/5458a50a6537f4d52c414edb)
-
-> PS：没有找到项目源码主页，在线演示地址是 [http://cnode.herokuapp.com](http://cnode.herokuapp.com)
-
-### 其他参考信息 ###
-
-目前还在维护中的CNode客户端，请参考 [CNode客户端专题](https://cnodejs.org/topic/55c5f41139273b92193362fb)
-
-CNode之前做过的一个客户端实现有奖评选，请参考 [【有奖评选】CNode 第三方客户端之客户端技术哪家强？](https://cnodejs.org/topic/545c395becbcb78265856eb2)
-
 ## Author ##
 
 TakWolf

diff --git a/app/build.gradle b/app/build.gradle
@@ -16,9 +16,9 @@ android {
     defaultConfig {
         applicationId "org.cnodejs.android.md"
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode Integer.parseInt(time)
-        versionName "1.1.0"
+        versionName "1.1.1"
 
         manifestPlaceholders = [
                 UMENG_CHANNEL: "CNodeJS",

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="org.cnodejs.android.md">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -21,7 +22,7 @@
             android:label="@string/app_name"
             android:theme="@style/AppThemeLaunch"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize">
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -33,87 +34,107 @@
             android:label="@string/app_name"
             android:theme="@style/AppThemeLight.FitsStatusBar"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.LoginActivity"
             android:label="@string/login"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.QRCodeActivity"
             android:label="@string/open_qrcode"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.TopicActivity"
             android:label="@string/topic"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            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>
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.CreateTopicActivity"
             android:label="@string/new_topic"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden|adjustResize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.MarkdownPreviewActivity"
             android:label="@string/markdown_preview"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.ImagePreviewActivity"
             android:label="@string/image_preview"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.UserDetailActivity"
             android:label="@string/user_detail"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            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>
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.NotificationActivity"
             android:label="@string/notification"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.SettingActivity"
             android:label="@string/setting"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.ModifyTopicSignActivity"
             android:label="@string/modify_topic_sign"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.AboutActivity"
             android:label="@string/about"
             android:theme="@style/AppThemeLight.FitsStatusBar"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.LicenseActivity"
             android:label="@string/open_source_license"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <activity
             android:name="org.cnodejs.android.md.display.activity.CrashLogActivity"
             android:label="@string/app_crash"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
         <!-- 友盟参数 -->
         <meta-data

diff --git a/app/src/main/assets/cnode_dark.css b/app/src/main/assets/cnode_dark.css
@@ -4,6 +4,8 @@
 }
 
 body {
+  margin: 0;
+  padding: 0;
   background: #3c3c3c;
 }
 

diff --git a/app/src/main/assets/cnode_light.css b/app/src/main/assets/cnode_light.css
@@ -3,6 +3,11 @@
   src: url(data:font/woff;charset=utf-8;base64,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) format('woff');
 }
 
+body {
+  margin: 0;
+  padding: 0;
+}
+
 .markdown-text {
   -webkit-text-size-adjust: 100%;
   text-size-adjust: 100%;

diff --git a/app/src/main/java/org/cnodejs/android/md/display/activity/AboutActivity.java b/app/src/main/java/org/cnodejs/android/md/display/activity/AboutActivity.java
@@ -70,7 +70,8 @@ protected void onBtnAdviceFeedbackClick() {
                 this,
                 "[email protected]",
                 "来自 CNodeMD-" + VERSION_TEXT + " 的客户端反馈",
-                "设备信息：Android " + Build.VERSION.RELEASE + " - " + Build.MANUFACTURER + " - " + Build.MODEL + "\n（如果涉及隐私请手动删除这个内容）\n\n");
+                "设备信息：Android " + Build.VERSION.RELEASE + " - " + Build.MANUFACTURER + " - " + Build.MODEL + "\n（如果涉及隐私请手动删除这个内容）\n\n"
+        );
     }
 
     @OnClick(R.id.about_btn_open_source_license)

diff --git a/app/src/main/java/org/cnodejs/android/md/display/activity/CrashLogActivity.java b/app/src/main/java/org/cnodejs/android/md/display/activity/CrashLogActivity.java
@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 
         toolbar.setNavigationOnClickListener(new NavigationFinishClickListener(this));
-        toolbar.inflateMenu(R.menu.new_topic);
+        toolbar.inflateMenu(R.menu.crash_log);
         toolbar.setOnMenuItemClickListener(this);
 
         //接收异常对象
@@ -84,7 +84,8 @@ public boolean onMenuItemClick(MenuItem item) {
                         this,
                         "[email protected]",
                         "来自 CNodeMD-" + AboutActivity.VERSION_TEXT + " 的客户端崩溃日志",
-                        crashLog);
+                        crashLog
+                );
                 return true;
             default:
                 return false;