Commit b16f0ca3 authored by Thomas's avatar Thomas
Browse files

Some updates

parent d56ce890

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

+12 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.text.Html; 
import android.text.Spannable;

import android.text.SpannableString;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.MenuItem;
@@ -2600,6 +2601,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        if (statusToDeal.visibility.equals("direct") || (statusToDeal.visibility.equals("private") && !isOwner))

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

        if (isOwner) {

            //TODO: remove when ready

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

            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);
@@ -2608,6 +2611,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            popup.getMenu().findItem(R.id.action_pin).setVisible(!statusToDeal.visibility.equalsIgnoreCase("direct"));

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

        } else {

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

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

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

            popup.getMenu().findItem(R.id.action_edit).setVisible(false);
@@ -2766,6 +2770,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                } else {

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

                }

                return true;

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

                String currentPolicy = "public";

                if(statusToDeal.quote_approval != null && statusToDeal.quote_approval.automatic != null && statusToDeal.quote_approval.automatic.length > 0) {

                    currentPolicy = statusToDeal.quote_approval.automatic[0];

                }



                return true;

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

                if (statusToDeal.bookmarked) {

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

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
        android:id="@+id/action_pin"

        android:title="@string/action_pin"

        app:showAsAction="never" />



    <item

        android:id="@+id/action_quote_policy"

        android:title="@string/action_quote_policy"

        app:showAsAction="never" />

    <item

        android:id="@+id/action_share_action"

        android:title="@string/more_action_6"

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

+1 −0
Original line number Diff line number Diff line
@@ -1906,6 +1906,7 @@ 
    <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_quote_policy">Change who can quote you</string>

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

    <string name="toast_unpin">The message is no longer pinned!</string>

    <string name="toast_pin">The message has been pinned</string>

src/fdroid/fastlane/metadata/android/en/changelogs/539.txt

+5 −5
Original line number Diff line number Diff line 
Added:

- Mastodon quotes support

- Full Mastodon quotes support

- Quote button can be hidden in Settings > Timeline

- Change default quote policy in settings

- Add colors in compose depending of the visibility (can be disabled / colors can be changed)

- Add accessibility actions to move timelines up/down in Manage timelines page



Changed:

- Boost & quote button are merged

- Boost & quote buttons are merged

- Show emoji buttons only in focused status

- Add popup menu for boost, quote actions in status

- Add popup menu for boost/quote actions in status

- Improve UI and accessibility in login page

- Move "Max chars in links" next to "Truncate links"

- Add more translated pronouns for keys support(translations)

- Add more translated pronouns for keys support



Fixed:

- Left margin not removed for bottom information