Skip to content

Commit 35bc875

Browse files
committed
Merge branch 'release/1.4.0'
2 parents 5057f85 + 84e4269 commit 35bc875

File tree

127 files changed

+2085
-1970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2085
-1970
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
[![Build Status](https://travis-ci.org/TakWolf/CNode-Material-Design.svg?branch=master)](https://travis-ci.org/TakWolf/CNode-Material-Design)
66
[![Release](https://img.shields.io/github/release/TakWolf/CNode-Material-Design.svg?style=flat)](https://github.com/TakWolf/CNode-Material-Design/releases/latest)
77
[![Platform](https://img.shields.io/badge/platform-Android-green.svg?style=flat)](https://www.android.com)
8-
[![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
8+
[![API](https://img.shields.io/badge/API-14%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=14)
99
[![License](https://img.shields.io/github/license/TakWolf/CNode-Material-Design.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
1010

1111
![Logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
1212

13-
[CNode社区](https://cnodejs.org)第三方Android客户端,原生App,Material Design风格,支持夜间模式
13+
[CNode 社区](https://cnodejs.org)第三方 Android 客户端,原生 App,Material Design 风格,支持夜间模式
1414

1515
## Downloads ##
1616

@@ -54,14 +54,14 @@
5454

5555
- [Glide](https://github.com/bumptech/glide)
5656

57+
- [Android-HeaderAndFooterRecyclerView](https://github.com/TakWolf/Android-HeaderAndFooterRecyclerView)
58+
5759
- [CircleImageView](https://github.com/hdodenhof/CircleImageView)
5860

5961
- [MaterialEditText](https://github.com/rengwuxian/MaterialEditText)
6062

6163
- [materialish-progress](https://github.com/pnikosis/materialish-progress)
6264

63-
- [FloatingActionButton](https://github.com/makovkastar/FloatingActionButton)
64-
6565
- [QRCodeReaderView](https://github.com/dlazaro66/QRCodeReaderView)
6666

6767
- [PhotoView](https://github.com/chrisbanes/PhotoView)

app/build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ android {
1515

1616
defaultConfig {
1717
applicationId 'org.cnodejs.android.md'
18-
minSdkVersion 9
18+
minSdkVersion 14
1919
targetSdkVersion 25
2020
versionCode Integer.parseInt(new Date().format('yyyyMMdd'))
21-
versionName '1.3.0'
21+
versionName '1.4.0'
2222

2323
manifestPlaceholders = [
2424
UMENG_APPKEY: umengAppKey,
@@ -51,28 +51,28 @@ dependencies {
5151
compile 'com.android.support:design:25.3.1'
5252
compile 'com.android.support:cardview-v7:25.3.1'
5353

54-
compile 'com.jakewharton:butterknife:8.5.1'
55-
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
54+
compile 'com.jakewharton:butterknife:8.8.1'
55+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
5656

57-
compile 'com.google.code.gson:gson:2.8.0'
57+
compile 'com.google.code.gson:gson:2.8.1'
5858
compile 'net.danlew:android.joda:2.9.9'
59-
compile 'com.squareup.okhttp3:okhttp:3.6.0'
60-
compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
61-
compile 'com.squareup.retrofit2:retrofit:2.2.0'
62-
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
63-
compile 'com.github.bumptech.glide:glide:3.7.0'
59+
compile 'com.squareup.okhttp3:okhttp:3.8.1'
60+
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
61+
compile 'com.squareup.retrofit2:retrofit:2.3.0'
62+
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
63+
compile 'com.github.bumptech.glide:glide:3.8.0'
6464

65+
compile 'com.takwolf.android:hf-recyclerview:0.1.1'
6566
compile 'de.hdodenhof:circleimageview:2.1.0'
6667
compile 'com.rengwuxian.materialedittext:library:2.1.4'
6768
compile 'com.pnikosis:materialish-progress:1.7'
68-
compile 'com.melnykov:floatingactionbutton:1.3.0'
69-
compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0'
70-
compile 'com.github.chrisbanes:PhotoView:1.3.1'
69+
compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.2'
70+
compile 'com.github.chrisbanes:PhotoView:2.1.3'
7171

7272
compile 'org.tautua.markdownpapers:markdownpapers-core:1.4.4'
73-
compile 'org.jsoup:jsoup:1.10.2'
73+
compile 'org.jsoup:jsoup:1.10.3'
7474

7575
compile 'org.cnodejs.android:oauth-login:0.0.1'
7676

77-
compile 'com.umeng.analytics:analytics:6.1.0'
77+
compile 'com.umeng.analytics:analytics:6.1.2'
7878
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@
3232

3333
<activity
3434
android:name="org.cnodejs.android.md.ui.activity.MainActivity"
35+
android:launchMode="singleTask"
3536
android:label="@string/app_name"
36-
android:theme="@style/AppThemeLight.FitsStatusBar"
3737
android:screenOrientation="portrait"
3838
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
3939

4040
<activity
4141
android:name="org.cnodejs.android.md.ui.activity.LoginActivity"
4242
android:label="@string/login"
43-
android:theme="@style/AppThemeLight.FitsStatusBar"
4443
android:screenOrientation="portrait"
4544
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
4645

@@ -109,12 +108,12 @@
109108
android:name="org.cnodejs.android.md.ui.activity.ModifyTopicSignActivity"
110109
android:label="@string/modify_topic_sign"
111110
android:screenOrientation="portrait"
112-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
111+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
112+
android:windowSoftInputMode="stateHidden|adjustResize" />
113113

114114
<activity
115115
android:name="org.cnodejs.android.md.ui.activity.AboutActivity"
116116
android:label="@string/about"
117-
android:theme="@style/AppThemeLight.FitsStatusBar"
118117
android:screenOrientation="portrait"
119118
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
120119

0 commit comments

Comments
 (0)