moparisthebest
/
Yaaic
mirror of https://github.com/moparisthebest/Yaaic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into integration

This commit is contained in:
Sebastian Kaspari 2010-04-06 20:44:38 +02:00
parent cae886fd99 94920feff2
commit 370a25c447
11 changed files with 83 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@ -63,6 +63,11 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
android:label="@string/join_label"
android:theme="@android:style/Theme.Dialog">
</activity>
<activity
android:name=".activity.UsersActivity"
android:label="@string/users"
android:theme="@android:style/Theme.Dialog">
</activity>
<service android:name=".irc.IRCService"></service>
</application>

19
res/anim/slide_left_in.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="150" />
</set>

19
res/anim/slide_left_out.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="150" />
</set>

19
res/anim/slide_right_in.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
<translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="150" />
</set>

19
res/anim/slide_right_out.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
<translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="150" />
</set>

BIN
res/drawable/menu_users.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

4
res/menu/conversations.xml
View File

@ -24,6 +24,10 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/join"
android:title="@string/join_channel"
android:icon="@android:drawable/ic_menu_add" />
<item
android:id="@+id/users"
android:title="@string/users"
android:icon="@drawable/menu_users" />
<item
android:id="@+id/close"
android:title="@string/close"

13
res/values/application.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Yaaic</string>
<string name="app_full_name">Yet Another Android IRC Client</string>
<string name="app_version">0.2</string>
<string name="app_homepage">http://www.yaaic.org</string>
<string name="app_copyright">(C) 2009-2010 Sebastian Kaspari</string>
<string name="licence_info">
Yaaic is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Yaaic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
</string>
</resources>

16
res/values/strings.xml
View File

@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Yaaic</string>
<string name="app_full_name">Yet Another Android IRC Client</string>
<string name="app_version">0.2</string>
<string name="app_homepage">http://www.yaaic.org</string>
<string name="app_copyright">(C) 2009-2010 Sebastian Kaspari</string>
<string name="add_server_menu">Add server</string>
<string name="settings_menu">Settings</string>
<string name="about_menu">About</string>
@ -27,19 +21,17 @@
<string name="join">Join</string>
<string name="join_channel">Join Channel</string>
<string name="close">Close</string>
<string name="users">Users</string>
<string name="connect">Connect</string>
<string name="disconnect">Disconnect</string>
<string name="edit">Edit</string>
<string name="delete">Delete</string>
<string name="about_label">About</string>
<string name="copyright"></string>
<string name="licence_info">
Yaaic is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Yaaic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
</string>
<string name="settings_label">Settings</string>
<string name="join_label">Join channel</string>
<string name="users_label">Users</string>
</resources>

28
src/org/yaaic/activity/ConversationActivity.java
View File

@ -169,7 +169,9 @@ public class ConversationActivity extends Activity implements ServiceConnection,
{
super.onPause();
binder.getService().checkServiceStatus();
if (binder != null && binder.getService() != null) {
binder.getService().checkServiceStatus();
}
/*if (!binder.getService().hasConnections()) {
Log.d("Yaaic", "Stopping service");
@ -235,9 +237,9 @@ public class ConversationActivity extends Activity implements ServiceConnection,
finish();
break;
case R.id.close:
Conversation conversation = deckAdapter.getItem(deck.getSelectedItemPosition());
if (conversation.getType() != Conversation.TYPE_SERVER) {
onRemoveConversation(conversation.getName());
Conversation conversationToClose = deckAdapter.getItem(deck.getSelectedItemPosition());
if (conversationToClose.getType() != Conversation.TYPE_SERVER) {
onRemoveConversation(conversationToClose.getName());
} else {
Toast.makeText(this, "You can not close the server info window", Toast.LENGTH_SHORT).show();
}
@ -245,6 +247,14 @@ public class ConversationActivity extends Activity implements ServiceConnection,
case R.id.join:
startActivityForResult(new Intent(this, JoinActivity.class), 0);
break;
case R.id.users:
Conversation conversationForUserList = deckAdapter.getItem(deck.getSelectedItemPosition());
if (conversationForUserList.getType() == Conversation.TYPE_CHANNEL) {
startActivity(new Intent(this, UsersActivity.class));
} else {
Toast.makeText(this, "Only usable from within a channel", Toast.LENGTH_SHORT).show();
}
break;
}
return true;
@ -362,6 +372,16 @@ public class ConversationActivity extends Activity implements ServiceConnection,
*/
public boolean onKey(View view, int keyCode, KeyEvent event)
{
if (keyCode == KeyEvent.KEYCODE_DPAD_UP && event.getAction() == KeyEvent.ACTION_UP) {
// XXX: History up (Implement me..)
return true;
}
if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.getAction() == KeyEvent.ACTION_UP) {
// XXX: History down (Implement me..)
return true;
}
if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
if (!server.isConnected()) {
Message message = new Message("Not connected");

33
src/org/yaaic/activity/UsersActivity.java Normal file
View File

@ -0,0 +1,33 @@
/*
Yaaic - Yet Another Android IRC Client
Copyright 2009-2010 Sebastian Kaspari
This file is part of Yaaic.
Yaaic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Yaaic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
*/
package org.yaaic.activity;
import android.app.Activity;
/**
* User Activity - Shows a list of users in the current channel
*
* @author Sebastian Kaspari <sebastian@yaaic.org>
*/
public class UsersActivity extends Activity
{
}