TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 23:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix landscape softkey sizing

Browse Source 
Closes #3540
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-06 17:24:40 -07:00 committed by Moxie Marlinspike
parent 9a18be0a61
commit 00a85c4438
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/styles.xml
View File

@ -185,7 +185,7 @@
<item name="android:capitalize">sentences</item> <item name="android:capitalize">sentences</item>
<item name="android:autoText">true</item> <item name="android:autoText">true</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:imeOptions">actionSend|flagNoEnterAction|flagNoExtractUi</item> <item name="android:imeOptions">flagNoEnterAction</item>
<item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item> <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
<item name="android:contentDescription">@string/conversation_activity__compose_description</item> <item name="android:contentDescription">@string/conversation_activity__compose_description</item>
</style> </style>

12
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -52,6 +52,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast; import android.widget.Toast;
import com.afollestad.materialdialogs.AlertDialogWrapper; import com.afollestad.materialdialogs.AlertDialogWrapper;
@ -734,6 +735,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
composeText.setInputType (composeText.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE); composeText.setInputType (composeText.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
composeText.setImeOptions(composeText.getImeOptions() | EditorInfo.IME_FLAG_NO_ENTER_ACTION); composeText.setImeOptions(composeText.getImeOptions() | EditorInfo.IME_FLAG_NO_ENTER_ACTION);
} }
composeText.setOnEditorActionListener(new OnEditorActionListener() {
@Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_SEND) {
sendMessage();
return true;
}
return false;
}
});
} }
private void initializeViews() { private void initializeViews() {
@ -771,6 +781,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
public void onChange(TransportOption newTransport) { public void onChange(TransportOption newTransport) {
calculateCharactersRemaining(); calculateCharactersRemaining();
composeText.setHint(newTransport.getComposeHint()); composeText.setHint(newTransport.getComposeHint());
composeText.setImeActionLabel(newTransport.getComposeHint(), EditorInfo.IME_ACTION_SEND);
buttonToggle.getBackground().setColorFilter(newTransport.getBackgroundColor(), Mode.MULTIPLY); buttonToggle.getBackground().setColorFilter(newTransport.getBackgroundColor(), Mode.MULTIPLY);
} }
}); });
@ -825,7 +836,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void showEmojiPopup() { private void showEmojiPopup() {
Log.w(TAG, "showEmojiPopup()");
int height = Math.max(getResources().getDimensionPixelSize(R.dimen.min_emoji_drawer_height), int height = Math.max(getResources().getDimensionPixelSize(R.dimen.min_emoji_drawer_height),
container.getKeyboardHeight()); container.getKeyboardHeight());
container.padForCustomKeyboard(height); container.padForCustomKeyboard(height);