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

Fix issue #252 - long press quick reply button

This commit is contained in:
tom79 2019-07-26 18:46:57 +02:00
parent 1752849938
commit c1abc34fa7
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -3979,7 +3979,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
return false;
}
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
return sharedpreferences.getBoolean(Helper.SET_WYSIWYG, true);
return sharedpreferences.getBoolean(Helper.SET_WYSIWYG, false);
}
private void renderEditor(){

41
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -2376,13 +2376,47 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.quick_reply_button.setOnClickListener(view -> {
sendToot();
sendToot(null);
status.setShortReply(false);
holder.quick_reply_container.setVisibility(View.GONE);
InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(holder.quick_reply_button.getWindowToken(), 0);
});
holder.quick_reply_button.setOnLongClickListener(v -> {
android.widget.PopupMenu popup = new android.widget.PopupMenu(context, holder.quick_reply_button);
popup.getMenuInflater()
.inflate(R.menu.main_content_type, popup.getMenu());
popup.setOnMenuItemClickListener(new android.widget.PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
String contentType = null;
switch (item.getItemId()) {
case R.id.action_plain_text:
contentType = "text/plain";
break;
case R.id.action_html:
contentType = "text/html";
break;
case R.id.action_markdown:
contentType = "text/markdown";
break;
case R.id.action_bbcode:
contentType = "text/bbcode";
break;
}
popup.dismiss();
sendToot(contentType);
status.setShortReply(false);
holder.quick_reply_container.setVisibility(View.GONE);
InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(holder.quick_reply_button.getWindowToken(), 0);
return false;
}
});
popup.show();
return false;
});
holder.quick_reply_privacy.setOnClickListener(view -> {
int style;
@ -3951,7 +3985,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
context.startActivity(intent);
}
private void sendToot(){
private void sendToot(String content_type){
if(toot_content == null || toot_content.getText() == null){
Toasty.error(context, context.getString(R.string.toast_error),Toast.LENGTH_LONG).show();
@ -3978,7 +4012,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
stepSpliToot = 1;
}
Status toot = new Status();
if(content_type != null)
toot.setContentType(content_type);
toot.setSensitive(false);
final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);

2
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -1060,7 +1060,7 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
set_wysiwyg_container.setVisibility(View.VISIBLE);
}
boolean wysiwyg = sharedpreferences.getBoolean(Helper.SET_WYSIWYG, true);
boolean wysiwyg = sharedpreferences.getBoolean(Helper.SET_WYSIWYG, false);
final CheckBox set_wysiwyg = rootView.findViewById(R.id.set_wysiwyg);
set_wysiwyg.setChecked(wysiwyg);