Skip to content
Open

test #62

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ local.properties
# Proguard folder generated by Eclipse
proguard/
/PullToZoomView/.idea
*.iml
19 changes: 0 additions & 19 deletions PullToZoomView/PullToZoomView.iml

This file was deleted.

89 changes: 0 additions & 89 deletions PullToZoomView/app/app.iml

This file was deleted.

12 changes: 7 additions & 5 deletions PullToZoomView/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 20
compileSdkVersion 23
buildToolsVersion "20.0.0"

defaultConfig {
applicationId "com.ecloud.pulltozoomview.demo"
minSdkVersion 11
targetSdkVersion 20
minSdkVersion 14
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
buildTypes {
release {
runProguard false
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:20.0.0'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
compile project(':library')
// compile 'com.github.frank-zhu:pullzoomview:1.0.0'
}
3 changes: 3 additions & 0 deletions PullToZoomView/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<activity
android:name=".PullToZoomScrollActivity"
android:label="@string/title_pull_to_zoom_scroll_view" />
<activity
android:name=".recyclerview.PullToZoomRecyclerActivity"
android:label="@string/title_pull_to_zoom_scroll_view" />
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import android.view.MenuItem;
import android.view.View;

import com.ecloud.pulltozoomview.demo.recyclerview.PullToZoomRecyclerActivity;


public class MainActivity extends ActionBarActivity {

Expand All @@ -28,6 +30,13 @@ public void onClick(View v) {
startActivity(new Intent(MainActivity.this, PullToZoomScrollActivity.class));
}
});

findViewById(R.id.btn_recycler_view).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(MainActivity.this, PullToZoomRecyclerActivity.class));
}
});
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.LinearLayout;

import com.ecloud.pulltozoomview.PullToZoomListViewEx;

Expand Down Expand Up @@ -44,12 +42,12 @@ protected void onCreate(Bundle savedInstanceState) {
"BroadcastReceiver", "ADT", "Sqlite3", "HttpClient"};

listView.setAdapter(new ArrayAdapter<String>(PullToZoomListActivity.this, android.R.layout.simple_list_item_1, adapterData));
// listView.getRootView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
// @Override
// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// Log.e("zhuwenwu", "position = " + position);
// }
// });
listView.getPullRootView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Log.e("zhuwenwu", "position = " + position);
}
});

listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
Expand Down
Loading