add seekbar instead of ye olde progressbar thing

4 files changed, 63 insertions, 21 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
index db6a57c..bbb35f5 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
@@ -26,7 +26,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 	

 	private SharedPreferences m_prefs;

 	private int m_page;

-	private CommonActivity m_activity;

+	private ViewComicActivity m_activity;

 	private GestureDetector m_detector;

 	private boolean m_thumbnail = false;

 	

@@ -231,7 +231,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 		super.onAttach(activity);

 		

 		m_prefs = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext());

-		m_activity = (CommonActivity) activity;

+		m_activity = (ViewComicActivity) activity;

 		

 		m_detector = new GestureDetector(m_activity, new GestureDetector.OnGestureListener() {

 			

@@ -312,8 +312,10 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 			

 			if (bar.isShowing()) {

 				bar.hide();

-				m_activity.hideSystemUiIfNecessary();				

+                m_activity.hideSeekBar(true);

+				m_activity.hideSystemUiIfNecessary();

 			} else {

+                m_activity.hideSeekBar(false);

 				m_activity.showSystemUiIfNecessary();

 				bar.show();

 			}

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java
index c533bad..6905416 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java
@@ -1,8 +1,5 @@
 package org.fox.ttcomics;

 

-import java.io.IOException;

-import java.util.HashMap;

-

 import android.annotation.SuppressLint;

 import android.app.Activity;

 import android.content.SharedPreferences;

@@ -11,10 +8,12 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;

 import android.support.v4.app.FragmentManager;

 import android.support.v4.app.FragmentStatePagerAdapter;

-import android.util.Log;

 import android.view.LayoutInflater;

 import android.view.View;

 import android.view.ViewGroup;

+import android.widget.SeekBar;

+

+import java.io.IOException;

 

 public class ComicPager extends Fragment {

 	private String m_fileName;

@@ -22,8 +21,13 @@ public class ComicPager extends Fragment {
 	private final String TAG = this.getClass().getSimpleName();

 	private ComicArchive m_archive;

 	private CommonActivity m_activity;

-	

-	private class PagerAdapter extends FragmentStatePagerAdapter {

+    private SeekBar m_seekBar;

+

+    public void hideSeekBar(boolean hide) {

+        m_seekBar.setVisibility(hide ? View.GONE : View.VISIBLE);

+    }

+

+    private class PagerAdapter extends FragmentStatePagerAdapter {

 		public PagerAdapter(FragmentManager fm) {

 			super(fm);

 		}

@@ -104,15 +108,41 @@ public class ComicPager extends Fragment {
 			if (m_fileName.toLowerCase().matches(".*\\.(cbz|zip)")) {									

 				m_archive = new CbzComicArchive(m_fileName);

 			}

-			

-			int position = m_activity.getLastPosition(m_fileName);

-			

+

+			final int position = m_activity.getLastPosition(m_fileName);

+

+            m_seekBar = (SeekBar) view.findViewById(R.id.comics_seek_bar);

+            m_seekBar.setMax(m_archive.getCount()-1);

+            m_seekBar.setProgress(position);

+            m_seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

+                @Override

+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {

+                    if (fromUser) {

+                        setCurrentItem(progress);

+                    }

+                }

+

+                @Override

+                public void onStartTrackingTouch(SeekBar seekBar) {

+

+                }

+

+                @Override

+                public void onStopTrackingTouch(SeekBar seekBar) {

+

+                }

+            });

+

 			pager.setAdapter(m_adapter);

 			pager.setCurrentItem(position);

-			

-			m_activity.onComicSelected(m_fileName, position);

-			m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000));

+

+            m_activity.onComicSelected(m_fileName, position);

+			//m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000));

 			m_activity.hideSystemUiIfNecessary();

+

+            if (m_prefs.getBoolean("use_full_screen", false)) {

+                hideSeekBar(true);

+            }

 			

 		} catch (IOException e) {

 			m_activity.toast(R.string.error_could_not_open_comic_archive);

@@ -123,7 +153,8 @@ public class ComicPager extends Fragment {
 			public void onPageSelected(int position) {

 

 				m_activity.onComicSelected(m_fileName, position);

-				m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000));

+				//m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000));

+                m_seekBar.setProgress(position);

 				

 				m_activity.hideSystemUiIfNecessary();

 			}

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
index 6f03192..02ac32d 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
@@ -559,7 +559,7 @@ public class CommonActivity extends ActionBarActivity {
 	}

 

 	public void showSystemUiIfNecessary() {

-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {

+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {

 			if (m_prefs.getBoolean("use_full_screen", false)) {

 			    getWindow().getDecorView().setSystemUiVisibility(

 			            View.SYSTEM_UI_FLAG_LAYOUT_STABLE

@@ -573,7 +573,7 @@ public class CommonActivity extends ActionBarActivity {
 	}

 

 	public void hideSystemUiIfNecessary() {

-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {

+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {

 			if (m_prefs.getBoolean("use_full_screen", false)) {

 

 		        getWindow().getDecorView().setSystemUiVisibility(

@@ -587,8 +587,8 @@ public class CommonActivity extends ActionBarActivity {
 			} else if (m_prefs.getBoolean("dim_status_bar", false)) {				

 				getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);

 			}

-			

-		} else { 

+

+		} else {

 			

             if (m_prefs.getBoolean("dim_status_bar", false)) {

                 getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);

@@ -604,4 +604,5 @@ public class CommonActivity extends ActionBarActivity {
 		

 		

 	}

+

 }

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
index dd9ac17..09fc155 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
@@ -320,5 +320,13 @@ public class ViewComicActivity extends CommonActivity {
 			return super.onOptionsItemSelected(item);

 		}

 	}

-	

+

+    public void hideSeekBar(boolean hide) {

+        ComicPager pager = (ComicPager) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_PAGER);

+

+        if (pager != null) {

+            pager.hideSeekBar(hide);

+        }

+    }

+

 }