fix rotate

Author: PowerExplorer

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

@@ -15,17 +15,20 @@
 import android.view.View;
 import android.view.GestureDetector;
 import com.ortiz.touch.TouchImageView;
+import java.util.*;
+import net.gnu.util.*;
 
 public class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {//}implements Runnable {
 
     private static final String TAG = "ScreenSlidePagerAdapter";
 
 	private final List<File> mListOfMedia;
 	private final ViewPager viewPager;
-//	TreeMap<Integer, ImageFragment> fragMap = new TreeMap<>();
+	List<ComparableEntry<Integer, ImageFragment>> fragMap = new ArrayList<>(3);
 	final GestureDetector.OnDoubleTapListener onDoubleTapListener;
 	static int numOfPages = 1;
-
+	private final int sizeMediaFiles;
+	
     public ScreenSlidePagerAdapter(final FragmentManager fm, 
 								   final ViewPager vp,
 								   final List<File> listOfMedia, 
@@ -35,34 +38,39 @@ public ScreenSlidePagerAdapter(final FragmentManager fm,
 		this.viewPager = vp;
         this.mListOfMedia = listOfMedia;
 		this.onDoubleTapListener = onDoubleTapListener;
+		sizeMediaFiles = mListOfMedia.size();
     }
 
 	@Override
     public Fragment getItem(final int pagerPos) {
-		final int size = mListOfMedia.size();
-		int mediaPos = pagerPos;
-		if (mediaPos == 0) {
-			mediaPos = size - 1;
-		} else if (mediaPos == size + 1) {
-			mediaPos = 0;
-		} else {
-			mediaPos--;
+		final int mediaPos = pagerPos == 0 ? (sizeMediaFiles - 1) : pagerPos == (sizeMediaFiles + 1) ? 0 : (pagerPos - 1);
+		final ImageFragment curFrag = loadImageFragment(mListOfMedia.get(mediaPos));
+		if (fragMap.size() >= 3) {
+			fragMap.remove(0);
 		}
-        //if (position < size) {
-		final ImageFragment fragment = loadImageFragment(mListOfMedia.get(mediaPos));
-			//fragMap.put(Integer.valueOf(positionOri), fragment);
-        //}
+        fragMap.add(new ComparableEntry<Integer, ImageFragment>(Integer.valueOf(pagerPos), curFrag));
 		Log.d(TAG, "getItem pagerPos " + pagerPos + ", mediaPos " + mediaPos + ", viewPager.getCurrentItem() " + viewPager.getCurrentItem());
-		return fragment;
+		return curFrag;
     }
 
-    private ImageFragment loadImageFragment(final File mediaInfo) {//, final String mime
+	private ImageFragment loadImageFragment(final File mediaInfo) {
         final ImageFragment fragment = new ImageFragment();
         fragment.setMediaInfo(mediaInfo);
 		fragment.setOnDoubleTapListener(onDoubleTapListener);
 		//fragment.setCallback(this);
         return fragment;
     }
+	
+	public ImageFragment getCurrentItem() {
+		final int pagerPos = viewPager.getCurrentItem();
+		for (ComparableEntry<Integer, ImageFragment> e : fragMap) {
+			//Log.d(TAG, "getCurrentItem pagerPos " + pagerPos + ", key " + e.getKey() + ", viewPager.getCurrentItem() " + viewPager.getCurrentItem());
+			if (e.getKey().intValue() == pagerPos) {
+				return e.getValue();
+			}
+		}
+		return null;
+	}
 
 //	@Override
 //	public void run() {

PowerFileExplorer/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java

@@ -256,7 +256,8 @@ public ScrollGalleryView(final Context context, final AttributeSet attrs, final
 
     @Override
     public Parcelable onSaveInstanceState() {
-        final Bundle bundle = new Bundle();
+        Log.d(TAG, "onSaveInstanceState ");
+		final Bundle bundle = new Bundle();
         bundle.putParcelable("instanceState", super.onSaveInstanceState());
         bundle.putBoolean("SLIDESHOW", SLIDESHOW);
 		removeCallbacks(runSlideshow);
@@ -321,13 +322,13 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
 		}
 
 		@Override 
-		public void onPageSelected(int position) {
+		public void onPageSelected(int pagerPos) {
 			scrolledByViewPager = true;
-			final int mediaPos = position == 0 ? (sizeMediaFiles - 1) : position == (sizeMediaFiles + 1) ? 0 : (position - 1);
+			final int mediaPos = pagerPos == 0 ? (sizeMediaFiles - 1) : pagerPos == (sizeMediaFiles + 1) ? 0 : (pagerPos - 1);
 			final int childCount = thumbnailsRecyclerView.getLayoutManager().getChildCount();
 			final int measuredWidth = getMeasuredWidth();
 			final int mid = (measuredWidth - thumbnailSize) / 2;
-			Log.d(TAG, "onPageSelected position " + position + ", newpos " + mediaPos + ", mid " + mid + ", childCount " + childCount);
+			Log.d(TAG, "onPageSelected pagerPos " + pagerPos + ", mediaPos " + mediaPos + ", mid " + mid + ", childCount " + childCount);
 			if ((mediaPos) <= childCount / 2 || sizeMediaFiles == 1) {
 				thumbnailsRecyclerView.setPadding(Math.max(mid - (mediaPos) * thumbnailSize, 0), 0, 0, 0);
 			} else if ((sizeMediaFiles - 1 - (mediaPos)) <= childCount / 2) {
@@ -337,7 +338,7 @@ public void onPageSelected(int position) {
 			}
 			final ImageView childAt = (ImageView) mLayoutManager.findViewByPosition(mediaPos);
 			scrollRecycler(mediaPos, childAt);
-			pageSelected = position;
+			pageSelected = pagerPos;
 		}
 
 
@@ -674,15 +675,15 @@ public void onClick(final View p1) {
 					break;
 					//}
 				case R.id.clockwiseButton:
-					new RotateTask(((ImageFragment)imageViewPagerAdapter.getItem(pageSelected)).getImage().getDrawable(), true).execute();
+					new RotateTask(imageViewPagerAdapter.getCurrentItem().getImage().getDrawable(), true).execute();
 //					Glide
 //						.with(mContext)
 //						.load(f)
 //						.transform(new RotateTransformation(mContext, 90f))
 //						.into(pagerAdapter.fragMap.get(pageSelected).getBackgroundImage());
 					break;
 				case R.id.counterClockwiseButton:
-					new RotateTask(((ImageFragment)imageViewPagerAdapter.getItem(pageSelected)).getImage().getDrawable(), false).execute();
+					new RotateTask(imageViewPagerAdapter.getCurrentItem().getImage().getDrawable(), false).execute();
 //					Glide
 //						.with(mContext)
 //						.load(f)
@@ -931,7 +932,7 @@ public final void setBitmapToView(Bitmap bmp, String name) {
             //Log.v( TAG, "Bitmap is ready" );
             //hideWait();
             if (bmp != null) {
-                TouchImageView image = ((ImageFragment)imageViewPagerAdapter.getItem(pageSelected)).getImage();
+                TouchImageView image = ((ImageFragment)imageViewPagerAdapter.getCurrentItem()).getImage();
 				image.setVisibility(View.VISIBLE);
                 image.setImageBitmap(bmp);