Skip to content
This repository has been archived by the owner on Sep 28, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
TakWolf committed Aug 29, 2017
2 parents 5057f85 + 84e4269 commit 35bc875
Show file tree
Hide file tree
Showing 127 changed files with 2,085 additions and 1,970 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
[![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)](https://www.android.com)
[![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
[![API](https://img.shields.io/badge/API-14%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=14)
[![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)

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

## Downloads ##

Expand Down Expand Up @@ -54,14 +54,14 @@

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

- [Android-HeaderAndFooterRecyclerView](https://github.com/TakWolf/Android-HeaderAndFooterRecyclerView)

- [CircleImageView](https://github.com/hdodenhof/CircleImageView)

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

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

- [FloatingActionButton](https://github.com/makovkastar/FloatingActionButton)

- [QRCodeReaderView](https://github.com/dlazaro66/QRCodeReaderView)

- [PhotoView](https://github.com/chrisbanes/PhotoView)
Expand Down
30 changes: 15 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ android {

defaultConfig {
applicationId 'org.cnodejs.android.md'
minSdkVersion 9
minSdkVersion 14
targetSdkVersion 25
versionCode Integer.parseInt(new Date().format('yyyyMMdd'))
versionName '1.3.0'
versionName '1.4.0'

manifestPlaceholders = [
UMENG_APPKEY: umengAppKey,
Expand Down Expand Up @@ -51,28 +51,28 @@ dependencies {
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.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

compile 'com.google.code.gson:gson:2.8.0'
compile 'com.google.code.gson:gson:2.8.1'
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 'com.squareup.okhttp3:okhttp:3.8.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.github.bumptech.glide:glide:3.8.0'

compile 'com.takwolf.android:hf-recyclerview:0.1.1'
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.3.1'
compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.2'
compile 'com.github.chrisbanes:PhotoView:2.1.3'

compile 'org.tautua.markdownpapers:markdownpapers-core:1.4.4'
compile 'org.jsoup:jsoup:1.10.2'
compile 'org.jsoup:jsoup:1.10.3'

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

compile 'com.umeng.analytics:analytics:6.1.0'
compile 'com.umeng.analytics:analytics:6.1.2'
}
7 changes: 3 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@

<activity
android:name="org.cnodejs.android.md.ui.activity.MainActivity"
android:launchMode="singleTask"
android:label="@string/app_name"
android:theme="@style/AppThemeLight.FitsStatusBar"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />

<activity
android:name="org.cnodejs.android.md.ui.activity.LoginActivity"
android:label="@string/login"
android:theme="@style/AppThemeLight.FitsStatusBar"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />

Expand Down Expand Up @@ -109,12 +108,12 @@
android:name="org.cnodejs.android.md.ui.activity.ModifyTopicSignActivity"
android:label="@string/modify_topic_sign"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="org.cnodejs.android.md.ui.activity.AboutActivity"
android:label="@string/about"
android:theme="@style/AppThemeLight.FitsStatusBar"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />

Expand Down
Loading

0 comments on commit 35bc875

Please sign in to comment.