Skip to content

Commit

Permalink
'删除build文件夹'
Browse files Browse the repository at this point in the history
  • Loading branch information
liuling07 committed Dec 21, 2015
1 parent 004e3d5 commit b244821
Show file tree
Hide file tree
Showing 1,304 changed files with 39 additions and 41,101 deletions.
3 changes: 0 additions & 3 deletions .idea/dictionaries/zhangxinxin.xml

This file was deleted.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':swipeback')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.os.Bundle;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.ImageView;
Expand All @@ -13,23 +12,28 @@
import com.lauren.simplenews.news.presenter.NewsDetailPresenter;
import com.lauren.simplenews.news.presenter.NewsDetailPresenterImpl;
import com.lauren.simplenews.news.view.NewsDetailView;
import com.lauren.simplenews.utils.DensityUtil;
import com.lauren.simplenews.utils.ImageLoaderUtils;

import org.sufficientlysecure.htmltextview.HtmlTextView;

import me.imid.swipebacklayout.lib.SwipeBackLayout;
import me.imid.swipebacklayout.lib.app.SwipeBackActivity;

/**
* Description : 新闻详情界面
* Author : lauren
* Email : [email protected]
* Blog : http://www.liuling123.com
* Date : 15/12/19
*/
public class NewsDetailActivity extends AppCompatActivity implements NewsDetailView {
public class NewsDetailActivity extends SwipeBackActivity implements NewsDetailView {

private NewsBean mNews;
private HtmlTextView mTVNewsContent;
private NewsDetailPresenter mNewsDetailPresenter;
private ProgressBar mProgressBar;
private SwipeBackLayout mSwipeBackLayout;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -48,6 +52,10 @@ public void onClick(View view) {
}
});

mSwipeBackLayout = getSwipeBackLayout();
mSwipeBackLayout.setEdgeSize(DensityUtil.getWidthInPx(this));
mSwipeBackLayout.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT);

mNews = (NewsBean) getIntent().getSerializableExtra("news");

CollapsingToolbarLayout collapsingToolbar = (CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/lauren/simplenews/utils/DensityUtil.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.lauren.simplenews.utils;

import java.util.concurrent.Executors;

import android.content.Context;

/**
* Description :
* Author : lauren
* Email : [email protected]
* Blog : http://www.liuling123.com
* Date : 15/12/21
*/
public class DensityUtil {



public static final int getHeightInPx(Context context) {
final int height = context.getResources().getDisplayMetrics().heightPixels;
return height;
Expand Down
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:1.3.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -17,7 +17,3 @@ allprojects {
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 21 11:34:03 PDT 2015
#Mon Dec 14 16:34:39 CST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
10 changes: 7 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ case "`uname`" in
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
Expand All @@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

Expand Down Expand Up @@ -109,7 +114,6 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app'
include ':app',':swipeback'

This file was deleted.

This file was deleted.

Loading

0 comments on commit b244821

Please sign in to comment.