diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 15cf7f55b..528faada2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,7 +53,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index a2cc257b9..41a7d5de4 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -53,7 +53,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/src/org/geometerplus/android/fbreader/BookStatusActivity.java b/src/org/geometerplus/android/fbreader/BookInfoActivity.java similarity index 96% rename from src/org/geometerplus/android/fbreader/BookStatusActivity.java rename to src/org/geometerplus/android/fbreader/BookInfoActivity.java index e136254db..0a78b0d69 100644 --- a/src/org/geometerplus/android/fbreader/BookStatusActivity.java +++ b/src/org/geometerplus/android/fbreader/BookInfoActivity.java @@ -50,9 +50,9 @@ import org.geometerplus.fbreader.formats.FormatPlugin; import org.geometerplus.fbreader.formats.PluginCollection; import org.geometerplus.fbreader.library.*; -import org.geometerplus.android.fbreader.preferences.BookInfoActivity; +import org.geometerplus.android.fbreader.preferences.EditBookInfoActivity; -public class BookStatusActivity extends Activity { +public class BookInfoActivity extends Activity { public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath"; private final ZLResource myResource = ZLResource.resource("bookInfo"); @@ -131,8 +131,8 @@ public class BookStatusActivity extends Activity { } private void startEditDialog() { - final Intent intent = new Intent(getApplicationContext(), BookInfoActivity.class); - intent.putExtra(BookInfoActivity.CURRENT_BOOK_PATH_KEY, myBook.File.getPath()); + final Intent intent = new Intent(getApplicationContext(), EditBookInfoActivity.class); + intent.putExtra(CURRENT_BOOK_PATH_KEY, myBook.File.getPath()); startActivity(intent); } diff --git a/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java b/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java index d5005bc1b..42ba7bade 100644 --- a/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java +++ b/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java @@ -39,9 +39,9 @@ class ShowBookInfoAction extends FBAction { public void run() { myBaseActivity.startActivityForResult( - new Intent(myBaseActivity.getApplicationContext(), BookStatusActivity.class) + new Intent(myBaseActivity.getApplicationContext(), BookInfoActivity.class) .putExtra( - BookStatusActivity.CURRENT_BOOK_PATH_KEY, + BookInfoActivity.CURRENT_BOOK_PATH_KEY, Reader.Model.Book.File.getPath() ), FBReader.REPAINT_CODE diff --git a/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java similarity index 88% rename from src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java rename to src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java index 7ab9a4191..e560f6b10 100644 --- a/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java @@ -32,6 +32,7 @@ import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.fbreader.library.Book; +import org.geometerplus.android.fbreader.BookInfoActivity; import org.geometerplus.android.fbreader.SQLiteBooksDatabase; class BookTitlePreference extends ZLStringPreference { @@ -83,12 +84,10 @@ class LanguagePreference extends ZLStringListPreference { } } -public class BookInfoActivity extends ZLPreferenceActivity { - public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath"; - +public class EditBookInfoActivity extends ZLPreferenceActivity { private Book myBook; - public BookInfoActivity() { + public EditBookInfoActivity() { super("BookInfo"); } @@ -98,17 +97,10 @@ public class BookInfoActivity extends ZLPreferenceActivity { new SQLiteBooksDatabase(this, "LIBRARY"); } - final String path = intent.getStringExtra(CURRENT_BOOK_PATH_KEY); + final String path = intent.getStringExtra(BookInfoActivity.CURRENT_BOOK_PATH_KEY); final ZLFile file = ZLFile.createFileByPath(path); myBook = Book.getByFile(file); - if (myBook.File.getPhysicalFile() != null) { - addPreference(new InfoPreference( - this, - Resource.getResource("fileName").getValue(), - myBook.File.getPath()) - ); - } addPreference(new BookTitlePreference(this, Resource, "title", myBook)); addPreference(new LanguagePreference(this, Resource, "language", myBook)); }