Skip to content

Commit d10a71c

Browse files
PowerExplorerPowerExplorer
committed
fix crash clone photofrag
1 parent 44f31d6 commit d10a71c

15 files changed

Lines changed: 1268 additions & 1757 deletions

‎PowerFileExplorer/build.gradle‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ repositories {
3131
//build-tools_r25.0.2-linux.zip
3232
//build-tools_r25.0.2-windows.zip
3333
//https://maven.google.com/com/android/support/support-annotations/27.1.1/support-annotations-27.1.1-sources.jar
34-
//maven.google.com/ group_path / library / version / library - version . ext
35-
//For example: maven.google.com/android/arch/lifecycle/compiler/1.0.0/compiler-1.0.0.pom .
34+
//maven.google.com/group_path/library/version/library-version.ext
35+
//maven.google.com/android/arch/lifecycle/compiler/1.0.0/compiler-1.0.0.pom .
3636

3737
//url 'https://s3.amazonaws.com/repo.commonsware.com'
3838
//url 'http://repo.commonsware.com' //
@@ -98,7 +98,19 @@ dependencies{
9898
transitive = false
9999
}
100100

101-
//support-v4
101+
102+
//compile 'androidx.core:core:1.2.0'
103+
//compile 'androidx.legacy:legacy-support-core-utils:1.0.0'
104+
//compile 'androidx.legacy:legacy-support-core-ui:1.0.0'
105+
//compile 'androidx.media:media:1.1.0'
106+
//compile 'androidx.fragment:fragment:1.2.2'
107+
//compile 'androidx.recyclerview:recyclerview:1.1.0'
108+
//compile 'androidx.viewpager:viewpager:1.0.0'
109+
//compile 'com.google.android.material:material:1.1.0'
110+
111+
112+
113+
//support-v4
102114
//compile 'com.android.support:support-compat:25.3.1'
103115
//compile 'com.android.support:support-media-compat:25.3.1'
104116
//compile 'com.android.support:support-core-utils:25.3.1'
@@ -132,7 +144,9 @@ dependencies{
132144
//compile 'com.android.support:support-dynamic-animation:27.1.1'
133145

134146

135-
147+
148+
//compile 'com.opencsv:opencsv:4.6'
149+
//compile 'com.github.amlcurran.showcaseview:library:5.4.3'
136150
//compile 'com.newtronlabs.easypermissions:easypermissions:2.2.0'
137151
//compile 'org.apache.james:apache-mime4j-core:+'
138152
//compile 'org.apache.james:apache-mime4j-dom:+'
@@ -575,4 +589,3 @@ android {
575589

576590

577591

578-

‎PowerFileExplorer/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="net.gnu.explorer"
5-
android:versionCode="64"
6-
android:versionName="1.0.15"
5+
android:versionCode="65"
6+
android:versionName="1.0.16"
77
>
88

99
<!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle

‎PowerFileExplorer/src/main/java/com/veinhorn/example/GlideImageLoader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public boolean onResourceReady(
137137
boolean isFromMemoryCache, boolean
138138
isFirstResource ) {
139139

140-
Log.d(TAG, "onResourceReady " + imageView.getMeasuredWidth() + ", " + imageView.getMeasuredHeight() + ", " + model);
140+
//Log.d(TAG, "onResourceReady " + imageView.getMeasuredWidth() + ", " + imageView.getMeasuredHeight() + ", " + model);
141141
return false;
142142
}
143143
};
@@ -280,7 +280,7 @@ public boolean onResourceReady(
280280
boolean isFromMemoryCache, boolean
281281
isFirstResource ) {
282282

283-
Log.d(TAG, "onResourceReady " + imageView.getMeasuredWidth() + ", " + imageView.getMeasuredHeight() + ", " + model);
283+
//Log.d(TAG, "onResourceReady " + imageView.getMeasuredWidth() + ", " + imageView.getMeasuredHeight() + ", " + model);
284284
return false;
285285
}
286286
};

‎PowerFileExplorer/src/main/java/com/veinhorn/scrollgalleryview/HackyViewPager.java‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎PowerFileExplorer/src/main/java/com/veinhorn/scrollgalleryview/ImageFragment.java‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@
4242
import android.view.Window;
4343
import com.bumptech.glide.load.engine.*;
4444
import android.net.*;
45+
import net.gnu.explorer.*;
4546

46-
/**
47-
* Created by veinhorn on 29.8.15.
48-
*/
4947
public class ImageFragment extends Fragment {
5048
private static final String TAG = "ImageFragment";
5149

@@ -57,7 +55,7 @@ public class ImageFragment extends Fragment {
5755
private ImageView videoPlayImage;
5856
private Runnable zoomCallback;
5957

60-
private OnDoubleTapListener onDoubleTapListener;
58+
private PhotoFragment photoFragment;
6159
private GestureDetector mGestureDetector;
6260

6361
//Touch Events
@@ -79,18 +77,16 @@ public class ImageFragment extends Fragment {
7977
private TextView centerInfo;
8078
private boolean mIsFirstBrightnessGesture = true;
8179

82-
private float minZoom;
83-
private float maxZoom;
80+
//private float minZoom;
81+
//private float maxZoom;
8482
static float DEFAULT_ZOOM = 2f;
85-
static float curZoom = DEFAULT_ZOOM;
86-
static int curDelay = 1000;
87-
static int curTransform = 12;
83+
//static float curZoom = DEFAULT_ZOOM;
84+
public static int curDelay = 1000;
85+
public static int curTransform = 12;
8886

8987
private ViewPager viewPager;
9088
private Context context;;
9189

92-
private ScrollGalleryView scrollGalleryView;
93-
9490
@Override
9591
public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
9692
super.onCreateView(inflater, container, savedInstanceState);
@@ -104,19 +100,18 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
104100

105101
image = (TouchImageView) view.findViewById(R.id.image);
106102
videoPlayImage = (ImageView) view.findViewById(R.id.videoPlayImage);
107-
minZoom = TouchImageView.SUPER_MIN_MULTIPLIER * image.getMinZoom();
108-
maxZoom = TouchImageView.SUPER_MAX_MULTIPLIER * image.getMaxZoom();
109-
image.setZoom(curZoom);
103+
// minZoom = TouchImageView.SUPER_MIN_MULTIPLIER * image.getMinZoom();
104+
// maxZoom = TouchImageView.SUPER_MAX_MULTIPLIER * image.getMaxZoom();
105+
// image.setZoom(curZoom);
110106
final FragmentActivity activity = getActivity();
111107
viewPager = (ViewPager) activity.findViewById(R.id.photoViewPager);
112-
scrollGalleryView = (ScrollGalleryView) activity.findViewById(R.id.scroll_gallery_view);
113-
108+
114109
mGestureDetector = new GestureDetector(getContext(), new SimpleOnGestureListener() {
115110
@Override
116111
public boolean onSingleTapConfirmed(MotionEvent e) {
117-
Log.d(TAG, "onSingleTapConfirmed " + e + onDoubleTapListener);
118-
if (onDoubleTapListener != null) {
119-
return onDoubleTapListener.onSingleTapConfirmed(e);
112+
Log.d(TAG, "onSingleTapConfirmed " + e + photoFragment);
113+
if (photoFragment != null) {
114+
return photoFragment.onSingleTapConfirmed(e);
120115
}
121116
return false;//performClick();
122117
}
@@ -136,7 +131,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) {
136131
loadImageToView();
137132
}
138133

139-
public TouchImageView getImage() {
134+
public ImageView getImage() {//TouchImageView
140135
return image;
141136
}
142137

@@ -177,7 +172,7 @@ private boolean dispatchCenterWrapperTouchEvent(final View p1, final MotionEvent
177172
case MotionEvent.ACTION_DOWN:
178173
mTouchAction = TOUCH_NONE;
179174
touchX = event.getX();
180-
curZoom = image.getCurrentZoom();
175+
//curZoom = image.getCurrentZoom();
181176
touchY = mInitTouchY = event.getY();
182177
break;
183178
case MotionEvent.ACTION_MOVE:
@@ -318,7 +313,7 @@ private void doDelayTouch(final float y_changed) {
318313
drawableId = R.drawable.ic_volume_down_white_36dp;
319314
}
320315
//ScrollGalleryView.DELAY = curDelay;
321-
scrollGalleryView.resetDelay();
316+
photoFragment.resetDelay();
322317
//Log.d(TAG, "ScrollGalleryView.DELAY " + ScrollGalleryView.DELAY);
323318
setInfo("Delay " + Util.nf.format(curDelay) + " ms", drawableId);
324319
}
@@ -423,8 +418,8 @@ private int whichBrightnessImageToUse(int brightnessInt) {
423418
}
424419
}
425420

426-
public void setOnDoubleTapListener(final OnDoubleTapListener onDoubleTapListener) {
427-
this.onDoubleTapListener = onDoubleTapListener;
421+
public void setPhotoFragment(final PhotoFragment photoFragment) {
422+
this.photoFragment = photoFragment;
428423
}
429424

430425
public void setCallback(final Runnable callback) {

‎PowerFileExplorer/src/main/java/com/veinhorn/scrollgalleryview/ScreenSlidePagerAdapter.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,48 @@
1717
import com.ortiz.touch.TouchImageView;
1818
import java.util.*;
1919
import net.gnu.util.*;
20+
import net.gnu.explorer.*;
2021

2122
public class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {//}implements Runnable {
2223

2324
private static final String TAG = "ScreenSlidePagerAdapter";
2425

2526
private final ArrayList<File> mListOfMedia;
2627
private final ViewPager viewPager;
27-
List<ComparableEntry<Integer, ImageFragment>> fragMap = new ArrayList<>(3);
28-
final GestureDetector.OnDoubleTapListener onDoubleTapListener;
29-
static int numOfPages = 1;
28+
private final List<ComparableEntry<Integer, ImageFragment>> fragMap = new ArrayList<>(3);
29+
private final PhotoFragment onDoubleTapListener;
30+
private int numOfPages = 1;
3031
private final int sizeMediaFiles;
3132

3233
public ScreenSlidePagerAdapter(final FragmentManager fm,
3334
final ViewPager vp,
3435
final ArrayList<File> listOfMedia,
35-
final GestureDetector.OnDoubleTapListener onDoubleTapListener
36+
final PhotoFragment onDoubleTapListener
3637
) {
3738
super(fm);
3839
this.viewPager = vp;
3940
this.mListOfMedia = listOfMedia;
4041
this.onDoubleTapListener = onDoubleTapListener;
4142
sizeMediaFiles = mListOfMedia.size();
43+
Log.i(TAG, "sizeMediaFiles " + sizeMediaFiles + ", this " + this + ", photoFrag " + onDoubleTapListener);
4244
}
4345

4446
@Override
4547
public Fragment getItem(final int pagerPos) {
4648
final int mediaPos = pagerPos == 0 ? (sizeMediaFiles - 1) : pagerPos == (sizeMediaFiles + 1) ? 0 : (pagerPos - 1);
49+
Log.d(TAG, "getItem pagerPos " + pagerPos + ", mediaPos " + mediaPos + ", sizeMediaFiles " + sizeMediaFiles + ", this " + this + ", viewPager.getCurrentItem() " + viewPager.getCurrentItem() + ", photoFrag " + onDoubleTapListener);
4750
final ImageFragment curFrag = loadImageFragment(mListOfMedia.get(mediaPos));
4851
if (fragMap.size() >= 3) {
4952
fragMap.remove(0);
5053
}
5154
fragMap.add(new ComparableEntry<Integer, ImageFragment>(Integer.valueOf(pagerPos), curFrag));
52-
Log.d(TAG, "getItem pagerPos " + pagerPos + ", mediaPos " + mediaPos + ", viewPager.getCurrentItem() " + viewPager.getCurrentItem());
5355
return curFrag;
5456
}
5557

5658
private ImageFragment loadImageFragment(final File mediaInfo) {
5759
final ImageFragment fragment = new ImageFragment();
5860
fragment.setMediaInfo(mediaInfo);
59-
fragment.setOnDoubleTapListener(onDoubleTapListener);
61+
fragment.setPhotoFragment(onDoubleTapListener);
6062
//fragment.setCallback(this);
6163
return fragment;
6264
}

0 commit comments

Comments
 (0)