moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2025-01-07 19:58:10 -05:00
Code Issues Releases Wiki Activity

Include channel topic in the displayed conversation title

Browse Source
This commit is contained in:
Steven Luo 2011-05-29 17:49:53 -07:00 committed by Sebastian Kaspari
parent 9a8bf44d63
commit 09fedc6975
7 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/res/layout/conversations.xml
View File

@ -42,6 +42,7 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
android:paddingLeft="3dp"
android:textSize="12sp"
android:text="Server"
android:maxLines="1"
android:layout_weight="1" />
</LinearLayout>
<ViewSwitcher

19
application/src/org/yaaic/activity/ConversationActivity.java
View File

@ -39,6 +39,7 @@ import org.yaaic.listener.ConversationSelectedListener;
import org.yaaic.listener.ServerListener;
import org.yaaic.listener.SpeechClickListener;
import org.yaaic.model.Broadcast;
import org.yaaic.model.Channel;
import org.yaaic.model.Conversation;
import org.yaaic.model.Extra;
import org.yaaic.model.Message;
@ -198,6 +199,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
registerReceiver(channelReceiver, new IntentFilter(Broadcast.CONVERSATION_MESSAGE));
registerReceiver(channelReceiver, new IntentFilter(Broadcast.CONVERSATION_NEW));
registerReceiver(channelReceiver, new IntentFilter(Broadcast.CONVERSATION_REMOVE));
registerReceiver(channelReceiver, new IntentFilter(Broadcast.CONVERSATION_TOPIC));
serverReceiver = new ServerReceiver(this);
registerReceiver(serverReceiver, new IntentFilter(Broadcast.SERVER_UPDATE));
@ -490,6 +492,23 @@ public class ConversationActivity extends Activity implements ServiceConnection,
}
}
/**
* On topic change
*/
public void onTopicChanged(String target)
{
String selected = server.getSelectedConversation();
if (selected.equals(target)) {
// onTopicChanged is only called for channels
Channel channel = (Channel) server.getConversation(selected);
StringBuilder sb = new StringBuilder();
sb.append(server.getTitle() + " - " + channel.getName());
if (!(channel.getTopic()).equals(""))
sb.append(" - " + channel.getTopic());
((TextView) findViewById(R.id.title)).setText(sb.toString());
}
}
/**
* On server status update
*/

8
application/src/org/yaaic/irc/IRCConnection.java
View File

@ -738,6 +738,14 @@ public class IRCConnection extends PircBot
target
);
service.sendBroadcast(intent);
// update the displayed conversation title if necessary
intent = Broadcast.createConversationIntent(
Broadcast.CONVERSATION_TOPIC,
server.getId(),
target
);
service.sendBroadcast(intent);
}
/**

7
application/src/org/yaaic/listener/ConversationListener.java
View File

@ -47,4 +47,11 @@ public interface ConversationListener
* @param target
*/
public void onRemoveConversation(String target);
/**
* On topic changed (for given target)
*
* @param target
*/
public void onTopicChanged(String target);
}

7
application/src/org/yaaic/listener/ConversationSelectedListener.java
View File

@ -20,6 +20,7 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
*/
package org.yaaic.listener;
import org.yaaic.model.Channel;
import org.yaaic.model.Conversation;
import org.yaaic.model.Server;
import org.yaaic.view.ConversationSwitcher;
@ -62,7 +63,11 @@ public class ConversationSelectedListener implements OnItemSelectedListener
Conversation conversation = (Conversation) deck.getItemAtPosition(position);
if (conversation != null && conversation.getType() != Conversation.TYPE_SERVER) {
titleView.setText(server.getTitle() + " - " + conversation.getName());
StringBuilder sb = new StringBuilder();
sb.append(server.getTitle() + " - " + conversation.getName());
if (conversation.getType() == Conversation.TYPE_CHANNEL && !((Channel)conversation).getTopic().equals(""))
sb.append(" - " + ((Channel)conversation).getTopic());
titleView.setText(sb.toString());
} else {
onNothingSelected(deck);
}

1
application/src/org/yaaic/model/Broadcast.java
View File

@ -34,6 +34,7 @@ public abstract class Broadcast
public static final String CONVERSATION_MESSAGE = "org.yaaic.conversation.message";
public static final String CONVERSATION_NEW = "org.yaaic.conversation.new";
public static final String CONVERSATION_REMOVE = "org.yaaic.conversation.remove";
public static final String CONVERSATION_TOPIC = "org.yaaic.conversation.topic";
/**
* Create an Intent for conversation broadcasting

2
application/src/org/yaaic/receiver/ConversationReceiver.java
View File

@ -72,6 +72,8 @@ public class ConversationReceiver extends BroadcastReceiver
listener.onNewConversation(intent.getExtras().getString(Extra.CONVERSATION));
} else if (action.equals(Broadcast.CONVERSATION_REMOVE)) {
listener.onRemoveConversation(intent.getExtras().getString(Extra.CONVERSATION));
} else if (action.equals(Broadcast.CONVERSATION_TOPIC)) {
listener.onTopicChanged(intent.getExtras().getString(Extra.CONVERSATION));
}
}