Commit f94b568d authored by Thomas's avatar Thomas
Browse files

Fix issue #378 - Allow to pin & unpin messages

parent 5458d93b

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+12 −2
Original line number Diff line number Diff line
@@ -1649,7 +1649,10 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                popup.getMenu().findItem(R.id.action_mute_conversation).setTitle(R.string.unmute_conversation);

            else

                popup.getMenu().findItem(R.id.action_mute_conversation).setTitle(R.string.mute_conversation);



            if (statusToDeal.pinned)

                popup.getMenu().findItem(R.id.action_pin).setTitle(R.string.action_unpin);

            else

                popup.getMenu().findItem(R.id.action_pin).setTitle(R.string.action_pin);

            final String[] stringArrayConf;

            if (statusToDeal.visibility.equals("direct") || (statusToDeal.visibility.equals("private") && !isOwner))

                popup.getMenu().findItem(R.id.action_schedule_boost).setVisible(false);
@@ -1661,6 +1664,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                popup.getMenu().findItem(R.id.action_block_domain).setVisible(false);

                stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);

            } else {

                popup.getMenu().findItem(R.id.action_pin).setVisible(false);

                popup.getMenu().findItem(R.id.action_redraft).setVisible(false);

                popup.getMenu().findItem(R.id.action_remove).setVisible(false);

                if (statusToDeal.account.acct.split("@").length < 2)
@@ -1761,7 +1765,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    } else {

                        statusesVM.mute(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id).observe((LifecycleOwner) context, status1 -> Toasty.info(context, context.getString(R.string.toast_mute_conversation)).show());

                    }



                    return true;

                } else if (itemId == R.id.action_pin) {

                    if (statusToDeal.pinned) {

                        statusesVM.unPin(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id).observe((LifecycleOwner) context, status1 -> Toasty.info(context, context.getString(R.string.toast_unmute_conversation)).show());

                    } else {

                        statusesVM.pin(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id).observe((LifecycleOwner) context, status1 -> Toasty.info(context, context.getString(R.string.toast_mute_conversation)).show());

                    }

                    return true;

                } else if (itemId == R.id.action_bookmark) {

                    if (statusToDeal.bookmarked) {

app/src/main/res/menu/option_toot.xml

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
        android:id="@+id/action_open_browser"

        android:title="@string/action_open_in_web"

        app:showAsAction="never" />

    <item

        android:id="@+id/action_pin"

        android:title="@string/action_pin"

        app:showAsAction="never" />

    <item

        android:id="@+id/action_share"

        android:title="@string/more_action_6"

app/src/main/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1513,4 +1513,6 @@ 
    <string name="pickup_logo">Pickup a logo</string>

    <string name="change_logo">Change logo</string>

    <string name="change_logo_description">Change the logo of the app on your device</string>

    <string name="action_pin">Pin message</string>

    <string name="action_unpin">Unpin message</string>

</resources>