From a04a224b4aa1a2be75ae2f3c88756373b613a11e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 22 Jun 2011 21:48:21 +0000
Subject: [PATCH] - Add addressbook to menu - Addressbook header not selectable
---
res/drawable/ic_menu_friendslist.png | Bin 0 -> 1561 bytes
res/menu/menu1.xml | 4 ++++
.../router/activity/AddressbookActivity.java | 4 ++--
.../android/router/activity/I2PActivityBase.java | 10 ++++++++++
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 res/drawable/ic_menu_friendslist.png
diff --git a/res/drawable/ic_menu_friendslist.png b/res/drawable/ic_menu_friendslist.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ec6b1aae8df6a7e0c5a0438a6fefcb9765b14af
GIT binary patch
literal 1561
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
literal 0
HcmV?d00001
diff --git a/res/menu/menu1.xml b/res/menu/menu1.xml
index b7857aa38..565b16497 100755
--- a/res/menu/menu1.xml
+++ b/res/menu/menu1.xml
@@ -7,6 +7,10 @@
android:id="@+id/menu_stop"
android:icon="@android:drawable/ic_menu_close_clear_cancel" >
</item>
+ <item android:title="Address Book"
+ android:id="@+id/menu_addressbook"
+ android:icon="@drawable/ic_menu_friendslist" >
+ </item>
<item android:title="I2P Home"
android:id="@+id/menu_home"
android:icon="@drawable/ic_menu_home" >
diff --git a/src/net/i2p/android/router/activity/AddressbookActivity.java b/src/net/i2p/android/router/activity/AddressbookActivity.java
index 6eee259bd..2923869d4 100644
--- a/src/net/i2p/android/router/activity/AddressbookActivity.java
+++ b/src/net/i2p/android/router/activity/AddressbookActivity.java
@@ -35,9 +35,9 @@ public class AddressbookActivity extends ListActivity {
// set the header
TextView tv = (TextView) getLayoutInflater().inflate(R.layout.addressbook_header, null);
- tv.setText(names.size() + " hosts in address book. Start typing to filter");
+ tv.setText(names.size() + " hosts in address book. Start typing to filter.");
ListView lv = getListView();
- lv.addHeaderView(tv);
+ lv.addHeaderView(tv, "", false);
lv.setTextFilterEnabled(true);
// set the list
diff --git a/src/net/i2p/android/router/activity/I2PActivityBase.java b/src/net/i2p/android/router/activity/I2PActivityBase.java
index d1e86ca4c..e9443da89 100644
--- a/src/net/i2p/android/router/activity/I2PActivityBase.java
+++ b/src/net/i2p/android/router/activity/I2PActivityBase.java
@@ -146,6 +146,11 @@ public abstract class I2PActivityBase extends Activity {
home.setVisible(showHome);
home.setEnabled(showHome);
+ boolean showAddressbook = (this instanceof WebActivity);
+ MenuItem addressbook = menu.findItem(R.id.menu_addressbook);
+ addressbook.setVisible(showAddressbook);
+ addressbook.setEnabled(showAddressbook);
+
return super.onPrepareOptionsMenu(menu);
}
@@ -162,6 +167,11 @@ public abstract class I2PActivityBase extends Activity {
startActivity(i2);
return true;
+ case R.id.menu_addressbook:
+ Intent i3 = new Intent(I2PActivityBase.this, AddressbookActivity.class);
+ startActivity(i3);
+ return true;
+
case R.id.menu_start:
case R.id.menu_stop:
default:
--
GitLab