Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes a character limit bug. Closes #102

This commit is contained in:
Vavassor 2017-04-10 13:34:33 -04:00
parent 17c8827b35
commit c9e7401fca
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -116,6 +116,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
private int currentFlags; private int currentFlags;
private ProgressDialog finishingUploadDialog; private ProgressDialog finishingUploadDialog;
private EditText contentWarningEditor; private EditText contentWarningEditor;
private TextView charactersLeft;
private Button floatingBtn; private Button floatingBtn;
private ImageButton pickBtn; private ImageButton pickBtn;
private Button nsfwBtn; private Button nsfwBtn;
@ -436,12 +437,11 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
* without the text editor stealing the events from behind them. */ * without the text editor stealing the events from behind them. */
editArea.addView(textEditor, 0); editArea.addView(textEditor, 0);
contentWarningEditor = (EditText) findViewById(R.id.field_content_warning); contentWarningEditor = (EditText) findViewById(R.id.field_content_warning);
final TextView charactersLeft = (TextView) findViewById(R.id.characters_left); charactersLeft = (TextView) findViewById(R.id.characters_left);
textEditor.addTextChangedListener(new TextWatcher() { textEditor.addTextChangedListener(new TextWatcher() {
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
int left = STATUS_CHARACTER_LIMIT - s.length() - contentWarningEditor.length(); updateVisibleCharactersLeft();
charactersLeft.setText(String.format(Locale.getDefault(), "%d", left));
} }
@Override @Override
@ -475,8 +475,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
int left = STATUS_CHARACTER_LIMIT - s.length() - textEditor.length(); updateVisibleCharactersLeft();
charactersLeft.setText(String.format(Locale.getDefault(), "%d", left));
} }
@Override @Override
@ -593,8 +592,17 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
setStatusVisibility(visibility); setStatusVisibility(visibility);
} }
private void updateVisibleCharactersLeft() {
int left = STATUS_CHARACTER_LIMIT - textEditor.length();
if (statusHideText) {
left -= contentWarningEditor.length();
}
charactersLeft.setText(String.format(Locale.getDefault(), "%d", left));
}
public void onContentWarningChanged(boolean hideText) { public void onContentWarningChanged(boolean hideText) {
showContentWarning(hideText); showContentWarning(hideText);
updateVisibleCharactersLeft();
} }
private void sendStatus() { private void sendStatus() {