summaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/fox/ttcomics/ComicFragment.java8
-rw-r--r--src/org/fox/ttcomics/CommonActivity.java10
-rw-r--r--src/org/fox/ttcomics/MainActivity.java31
-rw-r--r--src/org/fox/ttcomics/ViewComicActivity.java16
4 files changed, 35 insertions, 30 deletions
diff --git a/src/org/fox/ttcomics/ComicFragment.java b/src/org/fox/ttcomics/ComicFragment.java
index 6769626..43bf77f 100644
--- a/src/org/fox/ttcomics/ComicFragment.java
+++ b/src/org/fox/ttcomics/ComicFragment.java
@@ -1,10 +1,12 @@
package org.fox.ttcomics;
+
import it.sephiroth.android.library.imagezoom.ImageViewTouch;
import java.io.IOException;
-import android.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar;
+
import android.app.Activity;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
@@ -312,8 +314,8 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
onLeftSideTapped();
} else if (x >= width-(width/10)) {
onRightSideTapped();
- } else if (!CommonActivity.isCompatMode()) {
- ActionBar bar = m_activity.getActionBar();
+ } else {
+ ActionBar bar = m_activity.getSupportActionBar();
if (bar.isShowing()) {
bar.hide();
diff --git a/src/org/fox/ttcomics/CommonActivity.java b/src/org/fox/ttcomics/CommonActivity.java
index 91bca92..9069949 100644
--- a/src/org/fox/ttcomics/CommonActivity.java
+++ b/src/org/fox/ttcomics/CommonActivity.java
@@ -1,10 +1,10 @@
package org.fox.ttcomics;
+
import java.io.File;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
-import java.util.HashMap;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -19,14 +19,14 @@ import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.provider.BaseColumns;
-import android.support.v4.app.FragmentActivity;
import android.util.Log;
import android.view.Display;
-import android.view.MenuItem;
-import android.view.WindowManager;
import android.widget.Toast;
-public class CommonActivity extends FragmentActivity {
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
+
+public class CommonActivity extends SherlockFragmentActivity {
private final String TAG = this.getClass().getSimpleName();
protected static final String FRAG_COMICS_PAGER = "comic_pager";
diff --git a/src/org/fox/ttcomics/MainActivity.java b/src/org/fox/ttcomics/MainActivity.java
index 8b82dd4..47e23bc 100644
--- a/src/org/fox/ttcomics/MainActivity.java
+++ b/src/org/fox/ttcomics/MainActivity.java
@@ -1,19 +1,21 @@
package org.fox.ttcomics;
+
import java.io.File;
+import com.actionbarsherlock.app.ActionBar.Tab;
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
import android.animation.LayoutTransition;
import android.annotation.SuppressLint;
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ShareActionProvider;
@@ -29,11 +31,13 @@ public class MainActivity extends CommonActivity {
@SuppressLint("NewApi")
private class TabListener implements ActionBar.TabListener {
- public void onTabReselected(Tab tab, android.app.FragmentTransaction ft) {
+ @Override
+ public void onTabReselected(Tab tab, FragmentTransaction ft) {
// TODO Auto-generated method stub
}
- public void onTabSelected(Tab tab, android.app.FragmentTransaction ft) {
+ @Override
+ public void onTabSelected(Tab tab, FragmentTransaction ft) {
FragmentTransaction sft = getSupportFragmentManager().beginTransaction();
if (m_selectedTab != tab.getPosition() && m_selectedTab != -1) {
@@ -50,7 +54,8 @@ public class MainActivity extends CommonActivity {
sft.commit();
}
- public void onTabUnselected(Tab tab, android.app.FragmentTransaction ft) {
+ @Override
+ public void onTabUnselected(Tab tab, FragmentTransaction ft) {
// TODO Auto-generated method stub
}
@@ -96,23 +101,23 @@ public class MainActivity extends CommonActivity {
if (!isCompatMode()) {
m_tabListener = new TabListener();
- ActionBar actionBar = getActionBar();
+ ActionBar actionBar = getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
- actionBar.addTab(getActionBar().newTab()
+ actionBar.addTab(getSupportActionBar().newTab()
.setText(R.string.tab_all_comics)
.setTabListener(m_tabListener));
- actionBar.addTab(getActionBar().newTab()
+ actionBar.addTab(getSupportActionBar().newTab()
.setText(R.string.tab_unread)
.setTabListener(m_tabListener));
- actionBar.addTab(getActionBar().newTab()
+ actionBar.addTab(getSupportActionBar().newTab()
.setText(R.string.tab_unfinished)
.setTabListener(m_tabListener));
- actionBar.addTab(getActionBar().newTab()
+ actionBar.addTab(getSupportActionBar().newTab()
.setText(R.string.tab_read)
.setTabListener(m_tabListener));
@@ -156,7 +161,7 @@ public class MainActivity extends CommonActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.activity_main, menu);
+ getSupportMenuInflater().inflate(R.menu.activity_main, menu);
return true;
}
diff --git a/src/org/fox/ttcomics/ViewComicActivity.java b/src/org/fox/ttcomics/ViewComicActivity.java
index 83a8896..88774ed 100644
--- a/src/org/fox/ttcomics/ViewComicActivity.java
+++ b/src/org/fox/ttcomics/ViewComicActivity.java
@@ -1,10 +1,14 @@
package org.fox.ttcomics;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -21,8 +25,6 @@ import android.os.Environment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
@@ -60,9 +62,7 @@ public class ViewComicActivity extends CommonActivity {
setOrientationLock(isOrientationLocked(), true);
- if (!isCompatMode()) {
- getActionBar().setDisplayHomeAsUpEnabled(true);
- }
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(new File(m_fileName).getName());
@@ -70,16 +70,14 @@ public class ViewComicActivity extends CommonActivity {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
- if (!isCompatMode()) {
- getActionBar().hide();
- }
+ getSupportActionBar().hide();
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.activity_view_comic, menu);
+ getSupportMenuInflater().inflate(R.menu.activity_view_comic, menu);
menu.findItem(R.id.menu_sync_location).setVisible(m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner());
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 16:10:30 +0000