Changement du menu de l'activité ContactList ainsi que de son titre.
--- a/AndroidManifest.xml Tue May 26 19:56:38 2009 +0200
+++ b/AndroidManifest.xml Thu May 28 14:26:06 2009 +0200
@@ -23,7 +23,7 @@
</activity>
<activity android:name=".ui.CreateAccount" android:label="@string/create_account_name">
</activity>
- <activity android:name=".ui.ContactList" android:label="@string/app_name">
+ <activity android:name=".ui.ContactList" android:label="@string/contact_list_name">
</activity>
<service android:name="BeemService" android:enabled="true"
android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
--- a/res/values/strings.xml Tue May 26 19:56:38 2009 +0200
+++ b/res/values/strings.xml Thu May 28 14:26:06 2009 +0200
@@ -124,6 +124,9 @@
<string name="create_account_name">BEEM - Create an account</string>
<string name="create_account_tag">BEEM - CreateAccount Activity</string>
+
+ <string name="contact_list_name">BEEM - Contacts</string>
+ <string name="contact_list_tag">BEEM - ContactList Activity</string>
<!--
@@ -221,5 +224,11 @@
<string name="create_account_username">Username</string>
<string name="create_account_password">Password</string>
<string name="create_account_confirm_password">Confirm password</string>
+
+ <!--
+ ContactList Activity
+ -->
+ <string name="contact_list_menu_add_contact">Add a contact</string>
+ <string name="contact_list_menu_settings">Settings</string>
</resources>
--- a/src/com/beem/project/beem/ui/AddContact.java Tue May 26 19:56:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/AddContact.java Thu May 28 14:26:06 2009 +0200
@@ -27,10 +27,10 @@
protected static final String TAG = "AddContact";
private String mLogin;
private String mAlias;
- private List<String> mGroup = new ArrayList<String>();
+ private final List<String> mGroup = new ArrayList<String>();
private IXmppFacade mService;
- private OnClickListener mOkListener = new OnClickListener() {
+ private final OnClickListener mOkListener = new OnClickListener() {
@Override
public void onClick(View v) {
--- a/src/com/beem/project/beem/ui/ContactList.java Tue May 26 19:56:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Thu May 28 14:26:06 2009 +0200
@@ -12,7 +12,6 @@
import android.content.SharedPreferences;
import android.database.DataSetObserver;
import android.graphics.drawable.Drawable;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
@@ -146,7 +145,7 @@
class MyOnClickListener implements OnClickListener {
- private Contact mContact;
+ private final Contact mContact;
public MyOnClickListener(Contact contact) {
mContact = contact;
@@ -163,7 +162,7 @@
class MyOnLongClickListener implements OnLongClickListener {
- private Contact mContact;
+ private final Contact mContact;
public MyOnLongClickListener(Contact contact) {
mContact = contact;
@@ -176,7 +175,7 @@
}
}
- private List<DataSetObserver> observers;
+ private final List<DataSetObserver> observers;
public MyExpandableListAdapter() {
observers = new ArrayList<DataSetObserver>();
@@ -443,6 +442,7 @@
@Override
protected void onCreate(Bundle saveBundle) {
+ Log.d(getString(R.string.contact_list_tag), "onCreate() started");
super.onCreate(saveBundle);
mHandler = new Handler();
mRosterListener = new BeemRosterListener();
@@ -470,6 +470,7 @@
callbackShowContactList();
}
});
+ Log.d(getString(R.string.contact_list_tag), "onCreate() ended");
}
/**
@@ -483,7 +484,7 @@
public final boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.contactlistmenu, menu);
+ inflater.inflate(R.menu.contact_list, menu);
return true;
}
@@ -503,17 +504,10 @@
@Override
public final boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case R.id.account_edit:
- startActivityForResult(new Intent(ContactList.this, ContactListSettings.class), PREFERENCECHANGED);
+ case R.id.contact_list_menu_settings:
+ startActivity(new Intent(this, EditSettings.class));
return true;
- case R.id.account_about:
- Intent t = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.beem-project.com"));
- startActivity(t);
- return true;
- case R.id.account_create:
- startActivity(new Intent(ContactList.this, AccountCreation.class));
- return true;
- case R.id.add_contact:
+ case R.id.contact_list_menu_add_contact:
startActivity(new Intent(ContactList.this, AddContact.class));
return true;
default:
--- a/src/com/beem/project/beem/ui/Login.java Tue May 26 19:56:38 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java Thu May 28 14:26:06 2009 +0200
@@ -61,7 +61,6 @@
@Override
public void connectionFailed(String errorMsg) throws RemoteException {
- Log.d(getString(R.string.login_tag), "connectionFailed");
connectionHandler.post(new ErrorRunnable(errorMsg));
beemApp.stopBeemService();
dismissProgressDialog();
@@ -79,9 +78,9 @@
@Override
public void onConnect() throws RemoteException {
- Log.d(getString(R.string.login_tag), "onConnect");
mIsConnected = true;
dismissProgressDialog();
+ Log.i(getString(R.string.login_tag), "Connected.");
startActivity(new Intent(Login.this, ContactList.class));
}
@@ -125,7 +124,8 @@
xmppConnection
.addConnectionListener(new BeemConnectionListener());
} catch (RemoteException e) {
- e.printStackTrace();
+ Log.e(getString(R.string.login_tag),
+ "REMOTE EXCEPTION $" + e.getMessage());
}
}
@@ -157,6 +157,7 @@
*/
@Override
public void onCreate(Bundle savedInstanceState) {
+ Log.d(getString(R.string.login_tag), "onCreate() started");
super.onCreate(savedInstanceState);
setContentView(R.layout.login);
progressDialog = new ProgressDialog(this);
@@ -166,6 +167,7 @@
if (!mIsConnected)
progressDialog.show();
beemApp.startBeemService();
+ Log.d(getString(R.string.login_tag), "onCreate() ended");
}
/**