diff options
-rw-r--r-- | .classpath | 3 | ||||
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | project.properties | 3 | ||||
-rw-r--r-- | res/anim/appear.xml | 9 | ||||
-rw-r--r-- | res/anim/layout_comics.xml | 5 | ||||
-rw-r--r-- | res/layout/fragment_comics_list.xml | 10 | ||||
-rw-r--r-- | src/org/fox/ttcomics/ComicFragment.java | 8 | ||||
-rw-r--r-- | src/org/fox/ttcomics/CommonActivity.java | 10 | ||||
-rw-r--r-- | src/org/fox/ttcomics/MainActivity.java | 31 | ||||
-rw-r--r-- | src/org/fox/ttcomics/ViewComicActivity.java | 16 |
10 files changed, 58 insertions, 39 deletions
@@ -3,6 +3,7 @@ <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 58f98d2..690b822 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-sdk
android:minSdkVersion="8"
- android:targetSdkVersion="15" />
+ android:targetSdkVersion="17" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
diff --git a/project.properties b/project.properties index 0840b4a..e166ee0 100644 --- a/project.properties +++ b/project.properties @@ -11,4 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-15 +target=android-17 +android.library.reference.1=../ActionBarSherlock/actionbarsherlock diff --git a/res/anim/appear.xml b/res/anim/appear.xml new file mode 100644 index 0000000..a60e055 --- /dev/null +++ b/res/anim/appear.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
+ <alpha
+ android:fromAlpha="0"
+ android:toAlpha="1"
+ android:duration="150"
+ />
+</set>
+
diff --git a/res/anim/layout_comics.xml b/res/anim/layout_comics.xml new file mode 100644 index 0000000..93a58f1 --- /dev/null +++ b/res/anim/layout_comics.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?>
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+ android:delay="20%"
+ android:animation="@anim/appear"
+/>
diff --git a/res/layout/fragment_comics_list.xml b/res/layout/fragment_comics_list.xml index ee744a8..cdef287 100644 --- a/res/layout/fragment_comics_list.xml +++ b/res/layout/fragment_comics_list.xml @@ -6,6 +6,7 @@ <ListView
android:id="@+id/comics_list"
+ android:layoutAnimation="@anim/layout_comics"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
</ListView>
@@ -14,12 +15,9 @@ android:id="@+id/no_comics"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center"
- android:padding="4dp"
- android:orientation="vertical" >
-
-
-
+ android:layout_gravity="center"
+ android:orientation="vertical"
+ android:padding="4dp" >
<TextView
android:id="@+id/textView1"
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());
|