diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/java/org')
12 files changed, 73 insertions, 250 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java index 848600f..4095886 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java @@ -1,8 +1,6 @@ package org.fox.ttcomics2; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.livefront.bridge.Bridge; import com.livefront.bridge.SavedStateHandler; @@ -11,6 +9,8 @@ import org.acra.ACRA; import org.acra.ReportingInteractionMode; import org.acra.annotation.ReportsCrashes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import icepick.Icepick; @ReportsCrashes(mode = ReportingInteractionMode.SILENT, 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 a21e749..ded84f2 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java @@ -5,22 +5,22 @@ import android.app.Activity; import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.view.GestureDetector;
import android.view.LayoutInflater;
-import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.github.chrisbanes.photoview.OnViewTapListener;
+import com.github.chrisbanes.photoview.PhotoView;
import org.fox.ttcomics2.archive.ComicArchive;
import java.io.IOException;
+import androidx.appcompat.app.ActionBar;
import icepick.State;
-import it.sephiroth.android.library.imagezoom.ImageViewTouch;
public class ComicFragment extends StateSavedFragment {
private final String TAG = this.getClass().getSimpleName();
@@ -28,9 +28,8 @@ public class ComicFragment extends StateSavedFragment { private SharedPreferences m_prefs;
@State protected int m_page;
private ViewComicActivity m_activity;
- private GestureDetector m_detector;
- @State protected boolean m_thumbnail = false;
@State protected ComicArchive m_archive;
+ private PhotoView m_image;
public ComicFragment() {
super();
@@ -45,147 +44,37 @@ public class ComicFragment extends StateSavedFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_comic, container, false);
-
- final ImageViewTouch image = view.findViewById(R.id.comic_image);
- if (m_prefs.getBoolean("fit_to_width", false)) {
- image.setFitToWidth(true);
- } else {
- image.setFitToScreen(true);
- }
+ m_image = view.findViewById(R.id.comic_image);
try {
- Glide.with(ComicFragment.this)
+ Glide.with(getContext())
.load(m_archive.getByteArray(m_page))
.dontAnimate()
+ .dontTransform()
.diskCacheStrategy(DiskCacheStrategy.NONE)
.skipMemoryCache(true)
- .into(image);
+ .into(m_image);
} catch (IOException e) {
- image.setImageResource(R.drawable.badimage);
+ m_image.setImageResource(R.drawable.badimage);
e.printStackTrace();
}
- image.setOnScaleChangedListener(new ImageViewTouch.OnScaleChangedListener() {
- @Override
- public void onScaleChanged(float scale) {
- // TODO: shared scale change?
- }
- });
-
- image.setOnTouchListener(new View.OnTouchListener() {
- @Override
- public boolean onTouch(View view, MotionEvent event) {
- return m_detector.onTouchEvent(event);
- }
- });
-
- //}
-
- return view;
-
- }
-
- private void onLeftSideTapped() {
- ImageViewTouch image = getView().findViewById(R.id.comic_image);
-
- if (image != null) {
- boolean atLeftEdge = !image.canScroll(1);
-
- if (atLeftEdge) {
- m_activity.selectPreviousComic();
- }
- }
- }
-
- private void onRightSideTapped() {
- ImageViewTouch image = getView().findViewById(R.id.comic_image);
-
- if (image != null) {
- boolean atRightEdge = !image.canScroll(-1);
-
- if (atRightEdge) {
- m_activity.selectNextComic();
- }
+ if (m_prefs.getBoolean("fit_to_width", false)) {
+ m_image.setScaleType(ImageView.ScaleType.CENTER_CROP);
}
- }
- @Override
- public void setUserVisibleHint(boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
-
- //setThumbnail(!isVisibleToUser); disabled
- }
-
- @Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
-
- m_prefs = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext());
- m_activity = (ViewComicActivity) activity;
-
- m_detector = new GestureDetector(m_activity, new GestureDetector.OnGestureListener() {
-
- @Override
- public boolean onSingleTapUp(MotionEvent e) {
- int width = getView().getWidth();
- int x = Math.round(e.getX());
-
- if (x <= width/10) {
- onLeftSideTapped();
-
- return true;
- } else if (x >= width-(width/10)) {
- onRightSideTapped();
-
- return true;
- }
-
- return false;
- }
-
+ m_image.setOnViewTapListener(new OnViewTapListener() {
@Override
- public void onShowPress(MotionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
- float distanceY) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void onLongPress(MotionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
- float velocityY) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean onDown(MotionEvent e) {
- // TODO Auto-generated method stub
- return false;
- }
- });
-
- m_detector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
- @Override
- public boolean onSingleTapConfirmed(MotionEvent e) {
-
- int width = getView().getWidth();
- int x = Math.round(e.getX());
+ public void onViewTap(View view, float x, float y) {
+ int width = view.getWidth();
boolean fullScreenMode = m_prefs.getBoolean("use_full_screen", false);
- if (x > width/10 && x < width-(width/10)) {
+ if (x <= width / 10) {
+ m_activity.selectPreviousComic();
+ } else if (x > width-(width/10)) {
+ m_activity.selectNextComic();
+ } else {
ActionBar bar = m_activity.getSupportActionBar();
if (bar.isShowing()) {
@@ -205,24 +94,25 @@ public class ComicFragment extends StateSavedFragment { bar.show();
}
-
- return true;
}
-
- return false;
- }
-
- @Override
- public boolean onDoubleTap(MotionEvent e) {
- return false;
- }
-
- @Override
- public boolean onDoubleTapEvent(MotionEvent e) {
- return false;
}
});
+ return view;
+
+ }
+
+ @Override
+ public void setUserVisibleHint(boolean isVisibleToUser) {
+ super.setUserVisibleHint(isVisibleToUser);
+ }
+
+ @Override
+ public void onAttach(Activity activity) {
+ super.onAttach(activity);
+
+ m_prefs = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext());
+ m_activity = (ViewComicActivity) activity;
}
}
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java index 96ddf78..f94b14a 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java @@ -4,12 +4,9 @@ import android.app.Activity; import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
-import android.graphics.Bitmap;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.BaseColumns;
-import android.support.v4.widget.SimpleCursorAdapter;
-import android.support.v4.widget.SwipeRefreshLayout;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
@@ -18,7 +15,6 @@ import android.view.MenuInflater; import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
@@ -34,6 +30,8 @@ import com.nhaarman.listviewanimations.appearance.simple.ScaleInAnimationAdapter import java.io.File;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import icepick.State;
import jp.co.recruit_mp.android.widget.HeaderFooterGridView;
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 08c52ce..738d810 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 @@ -6,10 +6,6 @@ import android.content.SharedPreferences; import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v7.app.ActionBar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -21,10 +17,14 @@ import com.ToxicBakery.viewpager.transforms.DepthPageTransformer; import org.fox.ttcomics2.archive.CbrComicArchive;
import org.fox.ttcomics2.archive.CbzComicArchive;
import org.fox.ttcomics2.archive.ComicArchive;
-import org.fox.ttcomics2.utils.IVTViewPager;
import java.io.IOException;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import icepick.State;
public class ComicPager extends StateSavedFragment {
@@ -84,7 +84,7 @@ public class ComicPager extends StateSavedFragment { }
public int getPosition() {
- IVTViewPager pager = getView().findViewById(R.id.comics_pager);
+ ViewPager pager = getView().findViewById(R.id.comics_pager);
if (pager != null) {
return pager.getCurrentItem();
@@ -94,7 +94,7 @@ public class ComicPager extends StateSavedFragment { }
public void setCurrentItem(int item) {
- IVTViewPager pager = getView().findViewById(R.id.comics_pager);
+ ViewPager pager = getView().findViewById(R.id.comics_pager);
if (pager != null) {
try {
@@ -120,7 +120,7 @@ public class ComicPager extends StateSavedFragment { m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager());
- final IVTViewPager pager = view.findViewById(R.id.comics_pager);
+ final ViewPager pager = view.findViewById(R.id.comics_pager);
try {
if (m_fileName.toLowerCase().matches(".*\\.(cbz|zip)")) {
@@ -187,7 +187,8 @@ public class ComicPager extends StateSavedFragment { e.printStackTrace();
}
- pager.setOnPageChangeListener(new IVTViewPager.OnPageChangeListener() {
+ pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+ @Override
public void onPageSelected(int position) {
m_activity.onComicSelected(m_fileName, position);
@@ -200,11 +201,13 @@ public class ComicPager extends StateSavedFragment { hideReadingUI(true);
}
-
+
+ @Override
public void onPageScrolled(int arg0, float arg1, int arg2) {
// TODO Auto-generated method stub
}
-
+
+ @Override
public void onPageScrollStateChanged(int arg0) {
// TODO Auto-generated method stub
}
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 f4bbcd8..ede3cd0 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java @@ -7,13 +7,11 @@ import android.content.Intent; import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.JobIntentService;
-import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
+import com.google.android.material.snackbar.Snackbar;
import com.livefront.bridge.Bridge;
import org.fox.ttcomics2.sync.SyncClient;
@@ -23,6 +21,9 @@ import java.io.File; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.JobIntentService;
+
public class CommonActivity extends AppCompatActivity {
private final String TAG = this.getClass().getSimpleName();
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 6a19b63..6a62406 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java @@ -15,13 +15,6 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -37,6 +30,13 @@ import java.io.File; import java.util.ArrayList;
import java.util.Arrays;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import icepick.State;
public class MainActivity extends CommonActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java index d65ec9a..300e369 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java @@ -5,12 +5,13 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; import net.rdrei.android.dirchooser.DirectoryChooserActivity; import net.rdrei.android.dirchooser.DirectoryChooserConfig; +import androidx.appcompat.widget.Toolbar; + public class PreferencesActivity extends CommonActivity { @Override diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java index 023c3dc..840aaf5 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java @@ -1,10 +1,11 @@ package org.fox.ttcomics2; import android.os.Bundle; -import android.support.v4.app.Fragment; import com.livefront.bridge.Bridge; +import androidx.fragment.app.Fragment; + public class StateSavedFragment extends Fragment { @Override public void onCreate(Bundle savedInstanceState) { 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 058e091..4733b3f 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java @@ -13,9 +13,6 @@ import android.content.res.Configuration; import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.FileProvider;
-import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -31,6 +28,9 @@ import java.io.FileOutputStream; import java.io.IOException;
import java.io.InputStream;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.FragmentTransaction;
import icepick.State;
public class ViewComicActivity extends CommonActivity {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java index d68e039..871b026 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java @@ -2,7 +2,6 @@ package org.fox.ttcomics2.utils; import android.content.Intent; import android.os.Environment; -import android.support.v4.app.JobIntentService; import android.util.Log; import org.fox.ttcomics2.CommonActivity; @@ -12,6 +11,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import androidx.core.app.JobIntentService; + public class CacheCleanupService extends JobIntentService { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CompatListActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CompatListActivity.java deleted file mode 100644 index 2e04b2a..0000000 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CompatListActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.fox.ttcomics2.utils;
-
-import android.support.v7.app.AppCompatActivity;
-import android.widget.HeaderViewListAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-// http://stackoverflow.com/questions/18403647/actionbaractivity-of-android-support-v7-appcompat-and-listactivity-in-same-act
-
-public abstract class CompatListActivity extends AppCompatActivity {
-
- private ListView mListView;
-
- protected ListView getListView() {
- if (mListView == null) {
- mListView = (ListView) findViewById(android.R.id.list);
- }
- return mListView;
- }
-
- protected void setListAdapter(ListAdapter adapter) {
- getListView().setAdapter(adapter);
- }
-
- protected ListAdapter getListAdapter() {
- ListAdapter adapter = getListView().getAdapter();
- if (adapter instanceof HeaderViewListAdapter) {
- return ((HeaderViewListAdapter)adapter).getWrappedAdapter();
- } else {
- return adapter;
- }
- }
-}
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/IVTViewPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/IVTViewPager.java deleted file mode 100644 index 814c4f2..0000000 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/IVTViewPager.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.fox.ttcomics2.utils;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-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);
- }
-
- @Override
- protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
- if (v instanceof ImageViewTouch) {
- ImageViewTouch ivt = (ImageViewTouch) v;
- try {
- return ivt.canScroll(dx);
- } catch (NullPointerException e) {
- // bad image, etc
- return false;
- }
- } else {
- return super.canScroll(v, checkV, dx, x, y);
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- return super.onTouchEvent(event);
- }
-
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event) {
- return super.onInterceptTouchEvent(event);
- }
-}
\ No newline at end of file |