From 8c821f34b8d812964c744565a93351c57c1ed70c Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 27 Feb 2011 23:46:04 +0300 Subject: [PATCH] custom catalog activity (in progress) --- AndroidManifest.xml | 2 +- AndroidManifest.xml.pattern | 2 +- icons/fbreader.png | Bin 23890 -> 6584 bytes .../network/AddCustomCatalogActivity.java | 40 +++++++++++++++--- .../network/AddCustomCatalogItemActions.java | 3 +- .../fbreader/network/NetworkBookActions.java | 2 +- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b12bf99a1..fa7cd9c54 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -134,7 +134,7 @@ - + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index 6d509e71d..63239e669 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -134,7 +134,7 @@ - + diff --git a/icons/fbreader.png b/icons/fbreader.png index 149e037e3d19e358344f68d522469f4ea182d3d9..c1815b8db791fd596bc46dd0cc665ebb1094f6ea 100644 GIT binary patch literal 6584 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 Y0BZli3n2XXbN~PV07*qoM6N<$f?~D&J^%m! diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java index 3112f38e3..9515fda62 100644 --- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java @@ -20,8 +20,11 @@ package org.geometerplus.android.fbreader.network; import android.app.Activity; +import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import android.widget.TextView; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -43,8 +46,7 @@ public class AddCustomCatalogActivity extends Activity { Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this)); setContentView(R.layout.add_custom_catalog); - final ZLResource dialogResource = ZLResource.resource("dialog"); - myResource = dialogResource.getResource("CustomCatalogDialog"); + myResource = ZLResource.resource("dialog").getResource("CustomCatalogDialog"); setTitle(myResource.getResource("title").getValue()); @@ -55,20 +57,46 @@ public class AddCustomCatalogActivity extends Activity { setTextFromResource(R.id.add_custom_catalog_url_example, "catalogUrlExample"); setTextFromResource(R.id.add_custom_catalog_summary_example, "catalogSummaryExample"); - final ZLResource buttonResource = dialogResource.getResource("button"); - setText(R.id.add_custom_catalog_ok_button, buttonResource.getResource("ok").getValue()); - setText(R.id.add_custom_catalog_cancel_button, buttonResource.getResource("cancel").getValue()); + setupButton( + R.id.add_custom_catalog_ok_button, "ok", new View.OnClickListener() { + public void onClick(View view) { + startActivity( + new Intent(AddCustomCatalogActivity.this, NetworkLibraryActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP) + ); + finish(); + } + } + ); + setupButton( + R.id.add_custom_catalog_cancel_button, "cancel", new View.OnClickListener() { + public void onClick(View view) { + finish(); + } + } + ); final Uri uri = getIntent().getData(); if (uri != null) { loadInfoByUri(uri); - } + } else { + findViewById(R.id.add_custom_catalog_title_group).setVisibility(View.GONE); + findViewById(R.id.add_custom_catalog_summary_group).setVisibility(View.GONE); + } } private void setText(int id, String text) { ((TextView)findViewById(id)).setText(text); } + private void setupButton(int id, String resourceKey, View.OnClickListener listener) { + final Button button = (Button)findViewById(id); + button.setText( + ZLResource.resource("dialog").getResource("button").getResource(resourceKey).getValue() + ); + button.setOnClickListener(listener); + } + private void setTextFromResource(int id, String resourceKey) { setText(id, myResource.getResource(resourceKey).getValue()); } diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java index d8ef4aedf..63f804209 100644 --- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java +++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java @@ -20,6 +20,7 @@ package org.geometerplus.android.fbreader.network; import android.app.Activity; +import android.content.Intent; import android.view.Menu; import android.view.ContextMenu; @@ -70,6 +71,6 @@ class AddCustomCatalogItemActions extends NetworkTreeActions { } public static void addCustomCatalog(Activity activity) { - NetworkDialog.show(activity, NetworkDialog.DIALOG_CUSTOM_CATALOG, null, null); + activity.startActivity(new Intent(activity, AddCustomCatalogActivity.class)); } } diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java index cff6a0021..7884c8915 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java @@ -308,7 +308,7 @@ class NetworkBookActions extends NetworkTreeActions { Uri.fromFile(new File(local)), activity.getApplicationContext(), FBReader.class - ).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + ).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK) ); } }