Fixed fullscreen bug.

aerovulpe · Jun 11, 2015 · 773532d · 773532d
1 parent 69f1d70
commit 773532d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 32 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/src/main/java/me/aerovulpe/crawler/PhotoManager.java b/app/src/main/java/me/aerovulpe/crawler/PhotoManager.java
@@ -13,7 +13,7 @@ void createPhotoListInstance(int accountType, String albumTitle, String albumID,
 
     PhotoViewerFragment createPhotoViewerInstance(String albumTitle, boolean isSlideShow);
 
-    void setFullScreen(boolean fullScreen, boolean restoreActionBar);
+    void setFullScreen(boolean fullScreen);
 
     void toggleFullScreen();
 

diff --git a/app/src/main/java/me/aerovulpe/crawler/activities/MainActivity.java b/app/src/main/java/me/aerovulpe/crawler/activities/MainActivity.java
@@ -263,7 +263,7 @@ public PhotoViewerFragment createPhotoViewerInstance(String albumTitle, boolean
     }
 
     @Override
-    public void setFullScreen(boolean fullScreen, boolean restoreActionBar) {
+    public void setFullScreen(boolean fullScreen) {
         ActionBar actionBar = getSupportActionBar();
         if (fullScreen) {
             if (Build.VERSION.SDK_INT < 16) { //ye olde method
@@ -291,7 +291,7 @@ public void setFullScreen(boolean fullScreen, boolean restoreActionBar) {
                 decorView.setSystemUiVisibility(uiOptions);
                 // Remember that you should never show the action bar if the
                 // status bar is hidden, so !hide that too if necessary.
-                if (restoreActionBar && actionBar != null)
+                if (actionBar != null)
                     actionBar.show();
             }
         }
@@ -300,7 +300,7 @@ public void setFullScreen(boolean fullScreen, boolean restoreActionBar) {
 
     @Override
     public void toggleFullScreen() {
-        setFullScreen(!mIsFullScreen, true);
+        setFullScreen(!mIsFullScreen);
     }
 
     @Override

diff --git a/app/src/main/java/me/aerovulpe/crawler/adapters/PhotoViewerAdapter.java b/app/src/main/java/me/aerovulpe/crawler/adapters/PhotoViewerAdapter.java
@@ -117,7 +117,7 @@ public void onLoadingCancelled(String imageUri, View view) {
         }
     }
 
-    public void bufferLoad(final int position) {
+    public void bufferLoad(int position) {
         final String[] photoUrls = new String[LOAD_BUFFER_SIZE];
         Cursor cursor = getCursor();
         cursor.moveToPosition(position);

diff --git a/app/src/main/java/me/aerovulpe/crawler/fragments/AlbumListFragment.java b/app/src/main/java/me/aerovulpe/crawler/fragments/AlbumListFragment.java
@@ -1,5 +1,6 @@
 package me.aerovulpe.crawler.fragments;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.LoaderManager;
 import android.content.CursorLoader;
@@ -76,6 +77,13 @@ public void onCreate(Bundle savedInstanceState) {
         setRetainInstance(true);
     }
 
+    @Override
+    public void onAttach(Activity activity) {
+        if (!(activity instanceof PhotoManager))
+            throw new IllegalArgumentException("Must be attached to a PhotoManager instance.");
+        super.onAttach(activity);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {

diff --git a/app/src/main/java/me/aerovulpe/crawler/fragments/PhotoListFragment.java b/app/src/main/java/me/aerovulpe/crawler/fragments/PhotoListFragment.java
@@ -140,6 +140,17 @@ public void onCreate(Bundle savedInstanceState) {
         setRetainInstance(true);
     }
 
+    @Override
+    public void onAttach(Activity activity) {
+        if (!(activity instanceof PhotoManager))
+            throw new IllegalArgumentException("Must be attached to a PhotoManager instance.");
+        super.onAttach(activity);
+        // If is loading, show progress dialog.
+        if (mIsRequesting || mIsLoading) {
+            makeProgressDialog();
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -221,15 +232,6 @@ public void onDestroy() {
         getActivity().sendBroadcast(new Intent(Request.buildShowAction(mAlbumID)));
     }
 
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        // If is loading, show progress dialog.
-        if (mIsRequesting || mIsLoading) {
-            makeProgressDialog();
-        }
-    }
-
     @Override
     public void onDetach() {
         super.onDetach();

diff --git a/app/src/main/java/me/aerovulpe/crawler/fragments/PhotoViewerFragment.java b/app/src/main/java/me/aerovulpe/crawler/fragments/PhotoViewerFragment.java
@@ -87,6 +87,13 @@ public void onCreate(Bundle savedInstanceState) {
         setRetainInstance(true);
     }
 
+    @Override
+    public void onAttach(Activity activity) {
+        if (!(activity instanceof PhotoManager))
+            throw new IllegalArgumentException("Must be attached to a PhotoManager instance.");
+        super.onAttach(activity);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -101,17 +108,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         return rootView;
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-    }
-
     @Override
     public void onResume() {
         super.onResume();
         mViewPager.setCurrentItem(mCurrentPhotoIndex);
-
-        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -130,7 +131,7 @@ public void onPageScrollStateChanged(int state) {
         });
 
         Activity activity = getActivity();
-        ((PhotoManager) activity).setFullScreen(mIsFullscreen, true);
+        ((PhotoManager) activity).setFullScreen(mIsFullscreen);
         mViewPager.setPageTransformer(true, SettingsFragment.getPageTransformer(activity));
         mAnimSlideshowDelay = SettingsFragment.getSlideshowIntervalMS(activity);
         mDescInterval = SettingsFragment.getDescIntervalMS(activity);
@@ -150,8 +151,8 @@ public void onPause() {
             slideShowTimer.cancel();
             slideShowTimer = null;
         }
-        getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        mIsFullscreen = ((PhotoManager) getActivity()).isFullScreen();
+        Activity activity = getActivity();
+        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         final RecyclerView photoList;
         if (mPhotoListRef != null && (photoList = mPhotoListRef.get()) != null) {
             GridLayoutManager layoutManager = (GridLayoutManager) photoList.getLayoutManager();
@@ -166,21 +167,21 @@ public void run() {
                     }
                 });
         }
+        activity.getSharedPreferences(CrawlerApplication.APP_NAME_PATH, Context.MODE_PRIVATE).edit()
+                .putBoolean(CrawlerApplication.PHOTO_DETAIL_KEY, mShowText)
+                .putBoolean(CrawlerApplication.PHOTO_FULLSCREEN_KEY, mIsFullscreen).apply();
     }
 
     @Override
     public void onStop() {
         super.onStop();
-        Activity activity = getActivity();
-        activity.getSharedPreferences(CrawlerApplication.APP_NAME_PATH, Context.MODE_PRIVATE).edit()
-                .putBoolean(CrawlerApplication.PHOTO_DETAIL_KEY, mShowText)
-                .putBoolean(CrawlerApplication.PHOTO_FULLSCREEN_KEY, mIsFullscreen).apply();
+        mViewPager.clearOnPageChangeListeners();
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        ((PhotoManager) getActivity()).setFullScreen(false, true);
+        ((PhotoManager) getActivity()).setFullScreen(false);
     }
 
     @Override
@@ -332,7 +333,7 @@ public void setUpSlideShowTask() {
         if (activity == null)
             return;
 
-        ((PhotoManager) activity).setFullScreen(isSlideShowRunning, true);
+        ((PhotoManager) activity).setFullScreen(isSlideShowRunning || mIsFullscreen);
         if (isSlideShowRunning) {
             activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             //schedule this to
@@ -447,8 +448,11 @@ public void setAsWallpaper(Photo photo) {
     @Override
     public void onClick(View v) {
         PhotoManager photoManager = (PhotoManager) getActivity();
-        if (photoManager != null && !isSlideShowRunning) photoManager.toggleFullScreen();
-        else toggleSlideShow();
+        if (photoManager != null && !isSlideShowRunning) {
+            photoManager.toggleFullScreen();
+            mIsFullscreen = !mIsFullscreen;
+        } else
+            toggleSlideShow();
     }
 
     @Override