1 files changed, 20 insertions, 88 deletions

diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
index acce3cd..bd5613a 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
@@ -16,110 +16,42 @@ limitations under the License.
 
 package com.davemorrissey.labs.subscaleview.sample.eventhandling;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
+import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.sample.Page;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
 
 import java.util.Arrays;
-import java.util.List;
 
-public class EventHandlingActivity extends Activity implements OnClickListener, OnLongClickListener {
+import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
 
-    private static final String BUNDLE_POSITION = "position";
+public class EventHandlingActivity extends AbstractPagesActivity {
 
-    private int position;
-
-    private List<Note> notes;
+    public EventHandlingActivity() {
+        super(event_title, pages_activity, Arrays.asList(
+                new Page(event_p1_subtitle, event_p1_text),
+                new Page(event_p2_subtitle, event_p2_text),
+                new Page(event_p3_subtitle, event_p3_text)
+        ));
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(layout.notes_activity);
-        getActionBar().setTitle("Event handling");
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        findViewById(id.next).setOnClickListener(this);
-        findViewById(id.previous).setOnClickListener(this);
-        findViewById(id.imageView).setOnClickListener(this);
-        findViewById(id.imageView).setOnLongClickListener(this);
-        if (savedInstanceState != null && savedInstanceState.containsKey(BUNDLE_POSITION)) {
-            position = savedInstanceState.getInt(BUNDLE_POSITION);
-        }
-        notes = Arrays.asList(
-                new Note("Simple events", "Touch handling by the image view doesn't prevent normal events from working."),
-                new Note("OnClickListener", "This view has an OnClickListener. Tap once to activate the click."),
-                new Note("OnLongClickListener", "This view has an OnLongClickListener. Press and hold to activate it.")
-        );
-
-        initialiseImage();
-        updateNotes();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(BUNDLE_POSITION, position);
-    }
-
-    @Override
-    public void onClick(View view) {
-        if (view.getId() == id.next) {
-            position++;
-            updateNotes();
-        } else if (view.getId() == id.previous) {
-            position--;
-            updateNotes();
-        } else if (view.getId() == id.imageView) {
-            Toast.makeText(this, "Clicked", Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        if (view.getId() == id.imageView) {
-            Toast.makeText(this, "Long clicked", Toast.LENGTH_SHORT).show();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        finish();
-        return true;
-    }
-
-    private void initialiseImage() {
-        SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImage(ImageSource.asset("squirrel.jpg"));
-    }
-
-    private void updateNotes() {
-        if (position > notes.size() - 1) {
-            return;
-        }
-        getActionBar().setSubtitle(notes.get(position).subtitle);
-        ((TextView)findViewById(id.note)).setText(notes.get(position).text);
-        findViewById(id.next).setVisibility(position >= notes.size() - 1 ? View.INVISIBLE : View.VISIBLE);
-        findViewById(id.previous).setVisibility(position <= 0 ? View.INVISIBLE : View.VISIBLE);
-    }
-
-    private static final class Note {
-        private final String text;
-        private final String subtitle;
-        private Note(String subtitle, String text) {
-            this.subtitle = subtitle;
-            this.text = text;
-        }
+        SubsamplingScaleImageView imageView = findViewById(id.imageView);
+        imageView.setImage(ImageSource.asset("pony.jpg"));
+        imageView.setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) { Toast.makeText(v.getContext(), "Clicked", Toast.LENGTH_SHORT).show(); }
+        });
+        imageView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override public boolean onLongClick(View v) { Toast.makeText(v.getContext(), "Long clicked", Toast.LENGTH_SHORT).show(); return true; }
+        });
     }
 
 }