Make quote settings explanation match settings structure

Author: grishka

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -1058,7 +1058,7 @@ private void toggleSpoiler(){
 	private void onVisibilityClick(View v){
 		if(instance.supportsQuotePostAuthoring()){
 			ComposerVisibilitySheet sheet=new ComposerVisibilitySheet(getActivity(), statusVisibility, statusQuotePolicy,
-					true, quotedStatus==null ? StatusPrivacy.PUBLIC : quotedStatus.visibility, (s, visibility, policy)->{
+					true, quotedStatus==null ? StatusPrivacy.PUBLIC : quotedStatus.visibility, accountID, (s, visibility, policy)->{
 				if(statusVisibility!=visibility || statusQuotePolicy!=policy){
 					statusVisibility=visibility;
 					statusQuotePolicy=policy;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -249,7 +249,7 @@ public void onError(ErrorResponse error){
 							.exec(item.accountID);
 				}else if(id==R.id.change_quote_policy){
 					ComposerVisibilitySheet sheet=new ComposerVisibilitySheet(activity, item.status.visibility, item.status.quoteApproval.toQuotePolicy(),
-							false, StatusPrivacy.PUBLIC, (s, visibility, policy)->{
+							false, StatusPrivacy.PUBLIC, item.accountID, (s, visibility, policy)->{
 						new SetStatusInteractionPolicies(item.status.id, policy)
 								.setCallback(new Callback<>(){
 									@Override

mastodon/src/main/java/org/joinmastodon/android/ui/sheets/ComposerVisibilitySheet.java

@@ -12,8 +12,10 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.StatusQuotePolicy;
 import org.joinmastodon.android.model.viewmodel.ListItem;
@@ -38,13 +40,16 @@ public class ComposerVisibilitySheet extends BottomSheet{
 	private StatusQuotePolicy userSelectedPolicy;
 	private final Listener listener;
 
-	public ComposerVisibilitySheet(@NonNull Context context, StatusPrivacy defaultVisibility, StatusQuotePolicy defaultPolicy, boolean canChangeVisibility, StatusPrivacy maxVisibility, Listener listener){
+	public ComposerVisibilitySheet(@NonNull Context context, StatusPrivacy defaultVisibility, StatusQuotePolicy defaultPolicy, boolean canChangeVisibility, StatusPrivacy maxVisibility, String accountID, Listener listener){
 		super(context);
 		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_compose_visibility, null);
 		setContentView(content);
 		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
 				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
 
+		TextView subtitle=findViewById(R.id.subtitle);
+		subtitle.setText(context.getString(R.string.compose_visibility_explanation, AccountSessionManager.get(accountID).getFullUsername()));
+
 		Button cancelBtn=findViewById(R.id.cancel);
 		Button saveBtn=findViewById(R.id.save);
 		cancelBtn.setOnClickListener(v->dismiss());

mastodon/src/main/res/layout/sheet_compose_visibility.xml

@@ -27,11 +27,12 @@
 			android:text="@string/compose_visibility_title"/>
 
 		<TextView
+			android:id="@+id/subtitle"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
 			android:textAppearance="@style/m3_body_medium"
-			android:text="@string/compose_visibility_explanation"/>
+			tools:text="@string/compose_visibility_explanation"/>
 
 		<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
 			android:id="@+id/visibility_spinner_wrap"

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

@@ -887,7 +887,8 @@
 	<string name="compose_visibility_unlisted_limited">Quiet public, quotes limited</string>
 	<string name="compose_visibility_unlisted_disabled">Quiet public, quotes disabled</string>
 	<string name="compose_visibility_title">Visibility and interaction</string>
-	<string name="compose_visibility_explanation"><![CDATA[Control who can interact with this post. Global settings can be found under Preferences > Other.]]></string>
+	<!-- %s is current user's full username, e.g. @example@mastodon.social -->
+	<string name="compose_visibility_explanation"><![CDATA[Control who can interact with this post. Global settings can be found under Settings > %s > Posting defaults.]]></string>
 	<string name="compose_visibility">Visibility</string>
 	<string name="compose_quote_policy">Who can quote</string>
 	<string name="quote_policy_public">Anyone</string>