Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow to fetch when starting with @ or #

This commit is contained in:
tom79 2019-09-29 17:55:10 +02:00
parent fe2d1081fd
commit 6a36822233
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
View File

@ -40,6 +40,7 @@ import android.text.Editable;
import android.text.Html;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.Log;
import android.util.Patterns;
import android.view.LayoutInflater;
import android.view.Menu;
@ -529,8 +530,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
TextWatcher textWatcher = initializeTextWatcher(getApplicationContext(), social, toot_content, toot_space_left, pp_actionBar, pp_progress, PixelfedComposeActivity.this, PixelfedComposeActivity.this, PixelfedComposeActivity.this);
if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA)
toot_content.addTextChangedListener(textWatcher);
toot_content.addTextChangedListener(textWatcher);
if (scheduledstatus != null)
@ -574,6 +574,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
final int[] searchLength = {searchDeep};
TextWatcher textw = null;
TextWatcher finalTextw = textw;
Log.v(Helper.TAG,"finalTextw: " + finalTextw);
textw = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -586,6 +587,8 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
@Override
public void afterTextChanged(Editable s) {
Log.v(Helper.TAG,"s: " + s);
if (autocomplete) {
toot_content.removeTextChangedListener(finalTextw);
Thread thread = new Thread() {
@ -601,8 +604,6 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
if (toFill <= 0) {
return;
}
StringBuilder hugs = new StringBuilder();
for (int i = 0; i < toFill; i++) {
hugs.append(new String(Character.toChars(0x1F917)));
@ -691,6 +692,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
int totalChar = countLength(social, toot_content);
toot_space_left.setText(String.valueOf(totalChar));
Log.v(Helper.TAG,"totalChar: " + totalChar);
if (currentCursorPosition[0] - (searchLength[0] - 1) < 0 || currentCursorPosition[0] == 0 || currentCursorPosition[0] > s.toString().length())
return;
@ -714,6 +716,8 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
if( searchInArray.length < 1){
return;
}
Log.v(Helper.TAG,"last " + searchInArray.length);
String searchIn = searchInArray[searchInArray.length-1];
Matcher m, mt;
m = sPattern.matcher(searchIn);

5
app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
View File

@ -65,6 +65,7 @@ import java.util.ArrayList;
import java.util.List;
import app.fedilab.android.activities.MediaActivity;
import app.fedilab.android.activities.PixelfedComposeActivity;
import app.fedilab.android.activities.TootActivity;
import app.fedilab.android.asynctasks.PostStatusAsyncTask;
import app.fedilab.android.asynctasks.RetrieveContextAsyncTask;
@ -466,7 +467,8 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
EditText content_cw = new EditText(context);
content_cw.setText(status.getReblog() != null ? status.getReblog().getSpoiler_text() : status.getSpoiler_text());
String content = TootActivity.manageMentions(context, userId,status.getReblog() != null ? status.getReblog() : status);
TextWatcher textWatcher = TootActivity.initializeTextWatcher(context, social, holder.quick_reply_text, content_cw, holder.toot_space_left, null, null, PixelfedListAdapter.this, PixelfedListAdapter.this, PixelfedListAdapter.this);
TextWatcher textWatcher = PixelfedComposeActivity.initializeTextWatcher(context, social, holder.quick_reply_text, holder.toot_space_left, null, null, PixelfedListAdapter.this, PixelfedListAdapter.this, PixelfedListAdapter.this);
holder.quick_reply_text.addTextChangedListener(textWatcher);
holder.quick_reply_text.setText(content);
comment_content = holder.quick_reply_text;
holder.quick_reply_text.setFocusable(true);
@ -566,7 +568,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
holder.quick_reply_privacy.setImageResource(R.drawable.ic_mail_outline_toot);
break;
}
holder.quick_reply_text.addTextChangedListener(textWatcher);
} else {
holder.quick_reply_container.setVisibility(View.GONE);