Commit 1708cd62 authored by 0xd9a's avatar 0xd9a
Browse files

Merge branch 'uRDAlaqjNb-quote-policy--replace-no-one' into develop

parents 328759d5 491159eb

app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class EditProfileActivity extends BaseBarActivity { 
        String quotePolicy = Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.quote_policy;

        if (quotePolicy != null) {

            switch (quotePolicy) {

                case "nobody" -> binding.quoteApprovalPolicyNoOne.setChecked(true);

                case "nobody" -> binding.quoteApprovalPolicyJustMe.setChecked(true);

                case "followers" -> binding.quoteApprovalPolicyFollowersOnly.setChecked(true);

                case "public" -> binding.quoteApprovalPolicyAnyone.setChecked(true);

            }
@@ -397,7 +397,7 @@ public class EditProfileActivity extends BaseBarActivity { 
    }



    private String getQuotePolicy() {

        if (binding.quoteApprovalPolicyNoOne.isChecked()) {

        if (binding.quoteApprovalPolicyJustMe.isChecked()) {

            return "nobody";

        } else if (binding.quoteApprovalPolicyFollowersOnly.isChecked()) {

            return "followers";

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

+1 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                applyColor(context, holder, statusDraft.visibility);

                unlisted_changed = true;

            });

            holder.binding.buttonQuoteApprovalPolicyNoOne.setOnClickListener(v -> {

            holder.binding.buttonQuoteApprovalPolicyJustMe.setOnClickListener(v -> {

                holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);

                holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_nobody);

                statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.NOBODY.name();

app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml

+2 −2
Original line number Diff line number Diff line
@@ -389,11 +389,11 @@ 
                app:singleSelection="true">



                <com.google.android.material.button.MaterialButton

                    android:id="@+id/quote_approval_policy_no_one"

                    android:id="@+id/quote_approval_policy_just_me"

                    style="@style/Fedilab.OutlinedButton"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/no_one"

                    android:text="@string/just_me"

                    android:textAlignment="textStart"

                    app:icon="@drawable/ic_quote_policy_nobody" />

app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml

+2 −2
Original line number Diff line number Diff line
@@ -466,14 +466,14 @@ 
                app:singleSelection="true">



                <com.google.android.material.button.MaterialButton

                    android:id="@+id/button_quote_approval_policy_no_one"

                    android:id="@+id/button_quote_approval_policy_just_me"

                    style="@style/Widget.Material3.Button.OutlinedButton"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:insetTop="0dp"

                    android:insetBottom="0dp"

                    android:minHeight="36dp"

                    android:text="@string/no_one"

                    android:text="@string/just_me"

                    android:textAlignment="textStart"

                    app:icon="@drawable/ic_quote_policy_nobody" />

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

+0 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,6 @@ 
    <string name="set_tracking_parameters">Suprimir paràmetres de rastreig</string>

    <string name="set_tracking_parameters_indication">L\'app suprimirà automàticament els paràmetres de rastreig d\'URLs abans de visitar un enllaç.</string>

    <string name="who_can_quote">Qui pot citar</string>

    <string name="no_one">Ningú</string>

    <string name="anyone">Tothom</string>

    <string name="set_translate_button">Botó de traducció</string>

    <string name="action_unreblog">Desdifondre</string>