Skip to content

Commit

Permalink
sovle bug & update ui
Browse files Browse the repository at this point in the history
  • Loading branch information
xuebin committed Jul 23, 2015
1 parent 5be46fa commit f4a0b18
Show file tree
Hide file tree
Showing 50 changed files with 3,440 additions and 3,166 deletions.
130 changes: 68 additions & 62 deletions app/build.gradle
View file
@@ -1,62 +1,68 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"

defaultConfig {
applicationId "io.bxbxbai.zhuanlan"
minSdkVersion 16
targetSdkVersion 21
versionCode 2
versionName "1.1"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}
lintOptions {
abortOnError false
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:21.0.3'
compile 'com.android.support:gridlayout-v7:21.0.3'
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:palette-v7:21.0.3'
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.android.support:cardview-v7:21.0.3'
compile 'de.greenrobot:eventbus:2.2.1'
compile 'com.google.code.gson:gson:2.3'

compile 'com.facebook.stetho:stetho:1.1.0'
compile 'com.facebook.stetho:stetho-urlconnection:1.1.0'
compile 'com.facebook.rebound:rebound:0.3.7'
compile 'com.jakewharton.timber:timber:3.1.0'

debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'

compile 'se.emilsjolander:stickylistheaders:2.1.0'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.squareup:android-times-square:1.5.0@aar'
compile 'com.jakewharton:butterknife:5.1.2'
compile 'com.mikepenz.iconics:library:0.7.9@aar'
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
// stock actionBar
compile 'com.balysv.materialmenu:material-menu:1.5.1'
compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.0'
compile 'com.jakewharton:disklrucache:2.0.2'
compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
// exclusion is not necessary, but generally a good idea.
exclude group: 'com.google.android', module: 'support-v4'
}
}
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"

defaultConfig {
applicationId "io.bxbxbai.zhuanlan"
minSdkVersion 16
targetSdkVersion 21
versionCode 2
versionName "1.1"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}
lintOptions {
abortOnError false
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:gridlayout-v7:21.0.3'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:palette-v7:21.0.3'
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.android.support:cardview-v7:21.0.3'
compile 'com.android.support:design:22.2.0'

compile 'de.greenrobot:eventbus:2.2.1'
compile 'com.google.code.gson:gson:2.3'

compile 'com.facebook.stetho:stetho:1.1.0'
compile 'com.facebook.stetho:stetho-urlconnection:1.1.0'
compile 'com.facebook.rebound:rebound:0.3.7'

compile 'com.jakewharton.timber:timber:3.1.0'
compile 'com.jakewharton:butterknife:5.1.2'
compile 'com.jakewharton:disklrucache:2.0.2'

debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
compile 'com.squareup:android-times-square:1.5.0@aar'

compile 'se.emilsjolander:stickylistheaders:2.1.0'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.mikepenz.iconics:library:0.7.9@aar'

compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
// stock actionBar
compile 'com.balysv.materialmenu:material-menu:1.5.1'
compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.0'

compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
// exclusion is not necessary, but generally a good idea.
exclude group: 'com.google.android', module: 'support-v4'
}
compile 'org.apache.httpcomponents:httpmime:4.3.6'
}
Binary file removed app/libs/jcc-bate-0.7.3.jar
View file
Binary file not shown.
140 changes: 70 additions & 70 deletions app/src/main/AndroidManifest.xml
View file
@@ -1,70 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.bxbxbai.zhuanlan">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:name="io.bxbxbai.zhuanlan.App"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:allowBackup="true"
android:theme="@style/AppTheme.Toolbar">
<activity
android:name=".ui.activity.EntryActivity"
android:alwaysRetainTaskState="true"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

<activity
android:name=".ui.activity.MainActivity"
android:alwaysRetainTaskState="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden|screenSize">
</activity>

<activity
android:name="io.bxbxbai.zhuanlan.ui.activity.PrefsActivity"
android:label="@string/action_settings">
</activity>
<activity
android:name="io.bxbxbai.zhuanlan.ui.activity.SearchActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|keyboardHidden|screenSize">
</activity>
<activity
android:name=".ui.activity.WebActivity"
android:label="@string/title_activity_about">
<intent-filter>
<action android:name="com.bxbxbai.zhuanlan.ui.activity.AboutActivity"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>

<activity android:name=".ui.activity.NewsDetailActivity"
android:screenOrientation="portrait"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.PostListActivity"
android:screenOrientation="portrait"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.AllPeopleActivity"
android:launchMode="singleTask"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.RecentPostListActivity"
android:screenOrientation="portrait"/>

</application>

</manifest>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.bxbxbai.zhuanlan">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:name="io.bxbxbai.zhuanlan.App"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:allowBackup="true"
android:theme="@style/AppTheme.Toolbar">
<activity
android:name=".ui.activity.EntryActivity"
android:alwaysRetainTaskState="true"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

<activity
android:name=".ui.activity.MainActivity"
android:alwaysRetainTaskState="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden|screenSize">
</activity>

<activity
android:name="io.bxbxbai.zhuanlan.ui.activity.PrefsActivity"
android:label="@string/action_settings">
</activity>
<activity
android:name="io.bxbxbai.zhuanlan.ui.activity.SearchActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|keyboardHidden|screenSize">
</activity>
<activity
android:name=".ui.activity.WebActivity"
android:label="@string/title_activity_about">
<intent-filter>
<action android:name="com.bxbxbai.zhuanlan.ui.activity.AboutActivity"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>

<activity android:name=".ui.activity.NewsDetailActivity"
android:screenOrientation="portrait"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.PostListActivity"
android:screenOrientation="portrait"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.AllPeopleActivity"
android:launchMode="singleTask"
android:parentActivityName=".ui.activity.MainActivity"/>

<activity android:name=".ui.activity.RecentPostListActivity"
android:screenOrientation="portrait"/>
<activity android:name=".transitions.TransitionDemoActivity" android:screenOrientation="portrait"/>

</application>
</manifest>

0 comments on commit f4a0b18

Please sign in to comment.