Put SSIV onimageready callbacks into a subclass

captchafix
Florens Douwes 11 years ago
parent 302a1cfa93
commit 18f2c36e5c
  1. 15
      Clover/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
  2. 50
      Clover/app/src/main/java/org/floens/chan/ui/view/CustomScaleImageView.java
  3. 4
      Clover/app/src/main/java/org/floens/chan/ui/view/ThumbnailImageView.java

@ -183,8 +183,6 @@ public class SubsamplingScaleImageView extends View {
private Paint bitmapPaint;
private Paint debugPaint;
private InitedCallback initCallback;
public SubsamplingScaleImageView(Context context, AttributeSet attr) {
super(context, attr);
setMinimumDpi(160);
@ -223,10 +221,6 @@ public class SubsamplingScaleImageView extends View {
this(context, null);
}
public void setInitCallback(InitedCallback initCallback) {
this.initCallback = initCallback;
}
/**
* Sets the image orientation. It's best to call this before setting the image file or asset, because it may waste
* loading of tiles. However, this can be freely called at any time.
@ -1535,9 +1529,7 @@ public class SubsamplingScaleImageView extends View {
* skip their own rendering until the base layer (and its scale and translate) are known.
*/
protected void onImageReady() {
if (initCallback != null) {
initCallback.onInit();
}
}
/**
@ -1828,10 +1820,5 @@ public class SubsamplingScaleImageView extends View {
invalidate();
}
}
public interface InitedCallback {
public void onInit();
}
}

@ -0,0 +1,50 @@
/**
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.floens.chan.ui.view;
import android.content.Context;
import android.util.AttributeSet;
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
public class CustomScaleImageView extends SubsamplingScaleImageView {
private InitedCallback initCallback;
public CustomScaleImageView(Context context, AttributeSet attr) {
super(context, attr);
}
public CustomScaleImageView(Context context) {
super(context);
}
public void setInitCallback(InitedCallback initCallback) {
this.initCallback = initCallback;
}
@Override
protected void onImageReady() {
super.onImageReady();
if (initCallback != null) {
initCallback.onInit();
}
}
public interface InitedCallback {
public void onInit();
}
}

@ -134,13 +134,13 @@ public class ThumbnailImageView extends LoadView implements View.OnClickListener
@Override
public void onSuccess(File file) {
final SubsamplingScaleImageView image = new SubsamplingScaleImageView(getContext());
final CustomScaleImageView image = new CustomScaleImageView(getContext());
image.setImageFile(file.getAbsolutePath());
image.setOnClickListener(ThumbnailImageView.this);
addView(image);
image.setInitCallback(new SubsamplingScaleImageView.InitedCallback() {
image.setInitCallback(new CustomScaleImageView.InitedCallback() {
@Override
public void onInit() {
Utils.runOnUiThread(new Runnable() {

Loading…
Cancel
Save