split java classes to packages

18 files changed, 52 insertions, 19 deletions

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index a0f698d..293eec8 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -63,7 +63,7 @@
             android:finishOnTaskLaunch="true" />
 
         <service
-            android:name=".SyncFolderService"
+            android:name=".sync.SyncFolderService"
             android:exported="false"/>
 
     </application>
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
index 976e624..4e07bd4 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
@@ -16,6 +16,8 @@ import android.view.ViewGroup;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import org.fox.ttcomics2.archive.ComicArchive;
+
 import java.io.IOException;
 
 import it.sephiroth.android.library.imagezoom.ImageViewTouch;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
index 11f0d33..4529384 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
@@ -18,6 +18,10 @@ import android.widget.TextView;
 
 import com.ToxicBakery.viewpager.transforms.DepthPageTransformer;
 
+import org.fox.ttcomics2.archive.CbzComicArchive;
+import org.fox.ttcomics2.archive.ComicArchive;
+import org.fox.ttcomics2.utils.IVTViewPager;
+
 import java.io.IOException;
 
 public class ComicPager extends Fragment {
@@ -77,7 +81,7 @@ public class ComicPager extends Fragment {
 	}
 	
 	public int getPosition() {
-		ViewPager pager = (ViewPager) getView().findViewById(R.id.comics_pager);
+		IVTViewPager pager = (IVTViewPager) getView().findViewById(R.id.comics_pager);
 		
 		if (pager != null) {
 			return pager.getCurrentItem();
@@ -91,7 +95,7 @@ public class ComicPager extends Fragment {
 	}
 	
 	public void setCurrentItem(int item) {
-		ViewPager pager = (ViewPager) getView().findViewById(R.id.comics_pager);
+		IVTViewPager pager = (IVTViewPager) getView().findViewById(R.id.comics_pager);
 		
 		if (pager != null) {
 			try {
@@ -117,7 +121,7 @@ public class ComicPager extends Fragment {
 	
 		m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager());
 		
-		final ViewPager pager = (ViewPager) view.findViewById(R.id.comics_pager);
+		final IVTViewPager pager = (IVTViewPager) view.findViewById(R.id.comics_pager);
 		
 		if (savedInstanceState != null) {
 			m_fileName = savedInstanceState.getString("fileName");
@@ -183,7 +187,7 @@ public class ComicPager extends Fragment {
 			e.printStackTrace();
 		}
 		
-		pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+		pager.setOnPageChangeListener(new IVTViewPager.OnPageChangeListener() {
 			public void onPageSelected(int position) {
 
 				m_activity.onComicSelected(m_fileName, position);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index cc63307..db9f4cc 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -19,6 +19,9 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 
+import org.fox.ttcomics2.sync.SyncClient;
+import org.fox.ttcomics2.utils.ByteArrayImageDownloader;
+
 import java.io.File;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -139,7 +142,7 @@ public class CommonActivity extends AppCompatActivity {
 		return null;
 	}
 
-	protected static String sha1(String s) {
+	public static String sha1(String s) {
 		if (s != null) {
 			try {
 				MessageDigest digest = java.security.MessageDigest.getInstance("SHA1");
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
index e1976e3..749a82a 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
@@ -9,6 +9,9 @@ import android.database.sqlite.SQLiteStatement;
 import android.os.AsyncTask;
 import android.provider.BaseColumns;
 
+import org.fox.ttcomics2.archive.CbzComicArchive;
+import org.fox.ttcomics2.archive.ComicArchive;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
index 77551f2..2a602bd 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
@@ -13,6 +13,8 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import org.fox.ttcomics2.utils.CompatListActivity;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index 37eb53b..5eb833b 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -18,6 +18,9 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import org.fox.ttcomics2.sync.SyncClient;
+import org.fox.ttcomics2.sync.SyncFolderService;
+
 import java.io.File;
 
 import it.neokree.materialtabs.MaterialTab;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
index ffbadc9..593a73f 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
@@ -17,6 +17,8 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
+import org.fox.ttcomics2.sync.SyncClient;
+
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index 61a6f41..8b3e13e 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -25,6 +25,8 @@ import android.widget.NumberPicker;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import org.fox.ttcomics2.sync.SyncClient;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CbzComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbzComicArchive.java
index e533ff3..f6612fe 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CbzComicArchive.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbzComicArchive.java
@@ -1,8 +1,10 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.archive;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import org.fox.ttcomics2.utils.NaturalOrderComparator;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/ComicArchive.java
index f85263c..7e8d79d 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicArchive.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/ComicArchive.java
@@ -1,4 +1,4 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.archive;
 
 import android.os.Parcelable;
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncClient.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncClient.java
index 267205a..861eb31 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncClient.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncClient.java
@@ -1,8 +1,10 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.sync;
 
 import android.os.AsyncTask;
 import android.util.Log;
 
+import org.fox.ttcomics2.CommonActivity;
+
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncFolderService.java
index 8efb1e3..66ac766 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncFolderService.java
@@ -1,4 +1,4 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.sync;
 
 import android.app.Service;
 import android.content.Intent;
@@ -7,6 +7,10 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.util.Log;
 
+import org.fox.ttcomics2.BuildConfig;
+import org.fox.ttcomics2.CommonActivity;
+import org.fox.ttcomics2.DatabaseHelper;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/ByteArrayImageDownloader.java
index 9b7f920..0a36ccf 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/ByteArrayImageDownloader.java
@@ -1,4 +1,4 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.utils;
 
 import android.content.Context;
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CompatListActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CompatListActivity.java
index 24e89fe..53ca9fd 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CompatListActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CompatListActivity.java
@@ -1,4 +1,4 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.utils;
 
 import android.support.v7.app.AppCompatActivity;
 import android.widget.HeaderViewListAdapter;
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/IVTViewPager.java
index 91feea1..8360afe 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/IVTViewPager.java
@@ -1,13 +1,14 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.utils;
 
-import it.sephiroth.android.library.imagezoom.ImageViewTouch;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-public class ViewPager extends android.support.v4.view.ViewPager {
-    public ViewPager(Context context, AttributeSet attrs) {
+import it.sephiroth.android.library.imagezoom.ImageViewTouch;
+
+public class IVTViewPager extends android.support.v4.view.ViewPager {
+    public IVTViewPager(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/NaturalOrderComparator.java
index d7522f9..8994f51 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/NaturalOrderComparator.java
@@ -1,4 +1,4 @@
-package org.fox.ttcomics2;
+package org.fox.ttcomics2.utils;
 
 /*
  NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.
@@ -24,7 +24,10 @@ package org.fox.ttcomics2;
  3. This notice may not be removed or altered from any source distribution.
  */
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 public class NaturalOrderComparator implements Comparator
 {
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
index 41e79c5..021fa41 100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
@@ -6,7 +6,7 @@
     android:animateLayoutChanges="true"
     android:layout_height="fill_parent" >
 
-    <org.fox.ttcomics2.ViewPager
+    <org.fox.ttcomics2.utils.IVTViewPager
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"