diff -r 4feced261c68 -r de822cd3df3a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/ChatFragment.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/ChatFragment.java Tue Jan 21 22:38:13 2014 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/ChatFragment.java Tue Jan 21 22:43:06 2014 +0100 @@ -39,61 +39,61 @@ * the lobby or a room. */ public class ChatFragment extends Fragment { - private ChatlogAdapter adapter; - private Netplay netplay; - private MessageLog messageLog; - private boolean inRoom; - - public void setInRoom(boolean inRoom) { - this.inRoom = inRoom; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - netplay = Netplay.getAppInstance(getActivity().getApplicationContext()); - adapter = new ChatlogAdapter(getActivity()); - } - - @Override - public void onStart() { - super.onStart(); - messageLog = inRoom ? netplay.roomChatlog : netplay.lobbyChatlog; - adapter.setLog(messageLog.getLog()); - messageLog.addListener(adapter); - } - - @Override - public void onStop() { - super.onStop(); - messageLog.removeListener(adapter); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_chat, container, false); - - ListView listView = (ListView) view.findViewById(R.id.chatConsole); - listView.setAdapter(adapter); - listView.setDivider(null); - listView.setDividerHeight(0); - listView.setVerticalFadingEdgeEnabled(true); - - EditText editText = (EditText) view.findViewById(R.id.chatInput); + private ChatlogAdapter adapter; + private Netplay netplay; + private MessageLog messageLog; + private boolean inRoom; + + public void setInRoom(boolean inRoom) { + this.inRoom = inRoom; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + netplay = Netplay.getAppInstance(getActivity().getApplicationContext()); + adapter = new ChatlogAdapter(getActivity()); + } + + @Override + public void onStart() { + super.onStart(); + messageLog = inRoom ? netplay.roomChatlog : netplay.lobbyChatlog; + adapter.setLog(messageLog.getLog()); + messageLog.addListener(adapter); + } + + @Override + public void onStop() { + super.onStop(); + messageLog.removeListener(adapter); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_chat, container, false); + + ListView listView = (ListView) view.findViewById(R.id.chatConsole); + listView.setAdapter(adapter); + listView.setDivider(null); + listView.setDividerHeight(0); + listView.setVerticalFadingEdgeEnabled(true); + + EditText editText = (EditText) view.findViewById(R.id.chatInput); editText.setOnEditorActionListener(new ChatSendListener()); - - return view; - } - - private final class ChatSendListener implements OnEditorActionListener { - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - String text = v.getText().toString(); - if(text.length()>0) { - v.setText(""); - netplay.sendChat(text); - } - return true; - } - } + + return view; + } + + private final class ChatSendListener implements OnEditorActionListener { + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + String text = v.getText().toString(); + if(text.length()>0) { + v.setText(""); + netplay.sendChat(text); + } + return true; + } + } }