yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

renaming

Browse source
This commit is contained in:
Nikolay Pultsin 2010-12-18 15:50:13 +00:00
parent 0f844d797e
commit 46ca7e191e
5 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -53,7 +53,7 @@
</intent-filter> </intent-filter>
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.TextSearchActivity" /> <meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.TextSearchActivity" />
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.BookStatusActivity" android:configChanges="orientation|keyboardHidden" android:process=":library"/> <activity android:name="org.geometerplus.android.fbreader.BookInfoActivity" android:configChanges="orientation|keyboardHidden" android:process=":library"/>
<activity android:name="org.geometerplus.android.fbreader.TextSearchActivity"> <activity android:name="org.geometerplus.android.fbreader.TextSearchActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEARCH" /> <action android:name="android.intent.action.SEARCH" />
@ -89,7 +89,7 @@
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.preferences.BookInfoActivity" android:process=":library" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.preferences.EditBookInfoActivity" android:process=":library" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.network.BookDownloader" android:process=":bookDownloader" android:theme="@android:style/Theme.NoDisplay"> <activity android:name="org.geometerplus.android.fbreader.network.BookDownloader" android:process=":bookDownloader" android:theme="@android:style/Theme.NoDisplay">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />

4
AndroidManifest.xml.pattern
View file

@ -53,7 +53,7 @@
</intent-filter> </intent-filter>
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.TextSearchActivity" /> <meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.TextSearchActivity" />
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.BookStatusActivity" android:configChanges="orientation|keyboardHidden" android:process=":library"/> <activity android:name="org.geometerplus.android.fbreader.BookInfoActivity" android:configChanges="orientation|keyboardHidden" android:process=":library"/>
<activity android:name="org.geometerplus.android.fbreader.TextSearchActivity"> <activity android:name="org.geometerplus.android.fbreader.TextSearchActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEARCH" /> <action android:name="android.intent.action.SEARCH" />
@ -89,7 +89,7 @@
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.preferences.BookInfoActivity" android:process=":library" android:configChanges="orientation|keyboardHidden" /> <activity android:name="org.geometerplus.android.fbreader.preferences.EditBookInfoActivity" android:process=":library" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.network.BookDownloader" android:process=":bookDownloader" android:theme="@android:style/Theme.NoDisplay"> <activity android:name="org.geometerplus.android.fbreader.network.BookDownloader" android:process=":bookDownloader" android:theme="@android:style/Theme.NoDisplay">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />

8
src/org/geometerplus/android/fbreader/BookStatusActivity.java → src/org/geometerplus/android/fbreader/BookInfoActivity.java
View file

@ -50,9 +50,9 @@ import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.formats.PluginCollection; import org.geometerplus.fbreader.formats.PluginCollection;
import org.geometerplus.fbreader.library.*; 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"; public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath";
private final ZLResource myResource = ZLResource.resource("bookInfo"); private final ZLResource myResource = ZLResource.resource("bookInfo");
@ -131,8 +131,8 @@ public class BookStatusActivity extends Activity {
} }
private void startEditDialog() { private void startEditDialog() {
final Intent intent = new Intent(getApplicationContext(), BookInfoActivity.class); final Intent intent = new Intent(getApplicationContext(), EditBookInfoActivity.class);
intent.putExtra(BookInfoActivity.CURRENT_BOOK_PATH_KEY, myBook.File.getPath()); intent.putExtra(CURRENT_BOOK_PATH_KEY, myBook.File.getPath());
startActivity(intent); startActivity(intent);
} }

4
src/org/geometerplus/android/fbreader/ShowBookInfoAction.java
View file

@ -39,9 +39,9 @@ class ShowBookInfoAction extends FBAction {
public void run() { public void run() {
myBaseActivity.startActivityForResult( myBaseActivity.startActivityForResult(
new Intent(myBaseActivity.getApplicationContext(), BookStatusActivity.class) new Intent(myBaseActivity.getApplicationContext(), BookInfoActivity.class)
.putExtra( .putExtra(
BookStatusActivity.CURRENT_BOOK_PATH_KEY, BookInfoActivity.CURRENT_BOOK_PATH_KEY,
Reader.Model.Book.File.getPath() Reader.Model.Book.File.getPath()
), ),
FBReader.REPAINT_CODE FBReader.REPAINT_CODE

16
src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java → src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
View file

@ -32,6 +32,7 @@ import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.library.Book;
import org.geometerplus.android.fbreader.BookInfoActivity;
import org.geometerplus.android.fbreader.SQLiteBooksDatabase; import org.geometerplus.android.fbreader.SQLiteBooksDatabase;
class BookTitlePreference extends ZLStringPreference { class BookTitlePreference extends ZLStringPreference {
@ -83,12 +84,10 @@ class LanguagePreference extends ZLStringListPreference {
} }
} }
public class BookInfoActivity extends ZLPreferenceActivity { public class EditBookInfoActivity extends ZLPreferenceActivity {
public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath";
private Book myBook; private Book myBook;
public BookInfoActivity() { public EditBookInfoActivity() {
super("BookInfo"); super("BookInfo");
} }
@ -98,17 +97,10 @@ public class BookInfoActivity extends ZLPreferenceActivity {
new SQLiteBooksDatabase(this, "LIBRARY"); 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); final ZLFile file = ZLFile.createFileByPath(path);
myBook = Book.getByFile(file); 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 BookTitlePreference(this, Resource, "title", myBook));
addPreference(new LanguagePreference(this, Resource, "language", myBook)); addPreference(new LanguagePreference(this, Resource, "language", myBook));
} }