narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

set focusable=false instead of enabled=false for rooms w/o voice

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-03 19:55:21 +02:00
parent 5cac4397dd
commit f2409ed95e
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -904,9 +904,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
} }
this.conversation = conversation; this.conversation = conversation;
boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating();
this.mEditMessage.setEnabled(canWrite);
this.mSendButton.setEnabled(canWrite);
this.mEditMessage.setKeyboardListener(null); this.mEditMessage.setKeyboardListener(null);
this.mEditMessage.setText(""); this.mEditMessage.setText("");
this.mEditMessage.append(this.conversation.getNextMessage()); this.mEditMessage.append(this.conversation.getNextMessage());
@ -1112,7 +1109,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
if (!activity.isConversationsOverviewVisable() || !activity.isConversationsOverviewHideable()) { if (!activity.isConversationsOverviewVisable() || !activity.isConversationsOverviewHideable()) {
activity.sendReadMarkerIfNecessary(conversation); activity.sendReadMarkerIfNecessary(conversation);
} }
this.updateSendButton(); updateSendButton();
updateEditablity();
} }
} }
} }
@ -1229,6 +1227,14 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline); return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
} }
private void updateEditablity() {
boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating();
this.mEditMessage.setFocusable(canWrite);
this.mEditMessage.setFocusableInTouchMode(canWrite);
this.mSendButton.setEnabled(canWrite);
this.mEditMessage.setCursorVisible(canWrite);
}
public void updateSendButton() { public void updateSendButton() {
final Conversation c = this.conversation; final Conversation c = this.conversation;
final SendButtonAction action; final SendButtonAction action;