diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java index d42f435eb..0e888c798 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.view.WindowInsets; import android.widget.Button; import android.widget.EditText; +import android.widget.Switch; import android.widget.TextView; import com.squareup.otto.Subscribe; @@ -28,15 +29,17 @@ import java.util.ArrayList; import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.fragments.ToolbarFragment; import me.grishka.appkit.utils.V; public class ReportCommentFragment extends MastodonToolbarFragment{ private String accountID; private Account reportAccount; private Button btn; - private View buttonBar; + private View buttonBar, forwardReportItem; + private TextView forwardReportText; + private Switch forwardReportSwitch; private EditText commentEdit; + private boolean forwardReport; @Override public void onCreate(Bundle savedInstanceState){ @@ -77,7 +80,17 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ view.findViewById(R.id.btn_back).setOnClickListener(this::onButtonClick); buttonBar=view.findViewById(R.id.button_bar); commentEdit=view.findViewById(R.id.text); - + forwardReportSwitch = view.findViewById(R.id.forward_report_switch); + forwardReportItem = view.findViewById(R.id.forward_report); + forwardReportText = view.findViewById(R.id.forward_report_text); + String domain = reportAccount.getDomain(); + if (domain == null) { + forwardReportItem.setVisibility(View.GONE); + } else { + forwardReportItem.setOnClickListener(this::onForwardReportClick); + forwardReportText.setText(getActivity().getString(R.string.sk_forward_report_to, domain)); + forwardReportSwitch.setChecked(forwardReport = true); + } return view; } @@ -102,7 +115,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ ReportReason reason=ReportReason.valueOf(getArguments().getString("reason")); ArrayList statusIDs=getArguments().getStringArrayList("statusIDs"); ArrayList ruleIDs=getArguments().getStringArrayList("ruleIDs"); - new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), true) + new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), forwardReport) .setCallback(new Callback<>(){ @Override public void onSuccess(Object result){ @@ -123,6 +136,11 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ .exec(accountID); } + private void onForwardReportClick(View v) { + forwardReport = !forwardReport; + forwardReportSwitch.setChecked(forwardReport); + } + @Subscribe public void onFinishReportFragments(FinishReportFragmentsEvent ev){ if(ev.reportAccountID.equals(reportAccount.id)) diff --git a/mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml new file mode 100644 index 000000000..0a3fb4e2e --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/layout/fragment_report_comment.xml b/mastodon/src/main/res/layout/fragment_report_comment.xml index 14ccb4817..0f71e8f89 100644 --- a/mastodon/src/main/res/layout/fragment_report_comment.xml +++ b/mastodon/src/main/res/layout/fragment_report_comment.xml @@ -26,6 +26,49 @@ android:gravity="top|start" android:minHeight="212dp"/> + + + + + + + + + + diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index 0698554e3..47687b898 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -102,4 +102,5 @@ Already reblogged Reply with other account Uniform icon for all notifications + Forward to %s \ No newline at end of file