diff --git a/app/build.gradle b/app/build.gradle index b2e0ad2..f70d1ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ dependencies { compile 'com.fasterxml.jackson.core:jackson-databind:2.6.1' compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE' compile 'com.squareup.okhttp:okhttp:2.7.5' - compile 'com.github.chrisbanes:PhotoView:1.3.1' + compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.android.support:appcompat-v7:25.0.0' diff --git a/app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java b/app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java index 2ec082b..2a596f1 100644 --- a/app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java +++ b/app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java @@ -1,19 +1,15 @@ package com.dougkeen.bart.activities; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.graphics.drawable.VectorDrawableCompat; -import android.support.v4.content.res.ResourcesCompat; import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.widget.ImageView; +import com.davemorrissey.labs.subscaleview.ImageSource; +import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; import com.dougkeen.bart.R; -import uk.co.senab.photoview.PhotoView; -import uk.co.senab.photoview.PhotoViewAttacher; public class ViewMapActivity extends AppCompatActivity { @@ -21,18 +17,14 @@ public class ViewMapActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - PhotoView photoView = new PhotoView(this); + SubsamplingScaleImageView photoView = new SubsamplingScaleImageView(this); setContentView(photoView); - Drawable map = ResourcesCompat.getDrawable(getResources(), R.drawable.map, null); - photoView.setImageDrawable(map); - - PhotoViewAttacher attacher = new PhotoViewAttacher(photoView); - attacher.setScaleType(ImageView.ScaleType.FIT_CENTER); - - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + photoView.setImage(ImageSource.resource(R.drawable.map).dimensions(2279, 2075), + ImageSource.resource(R.drawable.map_preview)); + photoView.setMinimumDpi(320); + photoView.setDoubleTapZoomDpi(480); } @Override diff --git a/app/src/main/res/drawable/map.png b/app/src/main/res/drawable/map.png index 416be07..f61486c 100755 Binary files a/app/src/main/res/drawable/map.png and b/app/src/main/res/drawable/map.png differ diff --git a/app/src/main/res/drawable/map_preview.png b/app/src/main/res/drawable/map_preview.png new file mode 100755 index 0000000..416be07 Binary files /dev/null and b/app/src/main/res/drawable/map_preview.png differ