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

Last fixes

This commit is contained in:
tom79 2017-09-29 18:53:45 +02:00
parent 6276d90a0b
commit 96f2b31a80
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -35,6 +35,7 @@ import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@ -519,24 +520,26 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
holder.status_more.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PopupMenu popup = new PopupMenu(context, holder.status_more);
PopupMenu popup = new PopupMenu(context, holder.status_more, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0);
final boolean isOwner = status.getAccount().getId().equals(userId);
popup.getMenuInflater()
.inflate(R.menu.option_toot, popup.getMenu());
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
popup.getMenu().findItem(R.id.action_mention).setVisible(false);
}
final String[] stringArrayConf;
if( isOwner) {
popup.getMenu().findItem(R.id.action_block).setVisible(false);
popup.getMenu().findItem(R.id.action_mute).setVisible(false);
popup.getMenu().findItem(R.id.action_report).setVisible(false);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
}else {
popup.getMenu().findItem(R.id.action_remove).setVisible(false);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
}
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
AlertDialog.Builder builderInner;
String[] stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
final API.StatusAction doAction;
switch (item.getItemId()) {
case R.id.action_remove:

7
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -40,6 +40,7 @@ import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.util.Patterns;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
@ -864,24 +865,26 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_more.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PopupMenu popup = new PopupMenu(context, holder.status_more);
PopupMenu popup = new PopupMenu(context, holder.status_more, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0);
final boolean isOwner = status.getAccount().getId().equals(userId);
popup.getMenuInflater()
.inflate(R.menu.option_toot, popup.getMenu());
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
popup.getMenu().findItem(R.id.action_mention).setVisible(false);
}
final String[] stringArrayConf;
if( isOwner) {
popup.getMenu().findItem(R.id.action_block).setVisible(false);
popup.getMenu().findItem(R.id.action_mute).setVisible(false);
popup.getMenu().findItem(R.id.action_report).setVisible(false);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
}else {
popup.getMenu().findItem(R.id.action_remove).setVisible(false);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
}
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
AlertDialog.Builder builderInner;
String[] stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
final API.StatusAction doAction;
switch (item.getItemId()) {
case R.id.action_remove:

20
app/src/main/res/menu/option_toot_owner.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_remove"
android:title="@string/more_action_owner_1"
app:showAsAction="never" />
<item
android:id="@+id/action_copy"
android:title="@string/more_action_owner_2"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/more_action_owner_3"
app:showAsAction="never" />
<item
android:id="@+id/action_mention"
android:title="@string/more_action_owner_4"
app:showAsAction="never" />
</menu>