Update ids of quote related buttons in compose page (2c302901) · Commits · Android-smartphones / Fedilab

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

+25 −25

Original line number	Diff line number	Diff line
		@@ -1643,22 +1643,22 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		switch (statusDraft.visibility.toLowerCase()) {
		case "public" -> {
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_public);
		holder.binding.buttonQuoteVisibility.setVisibility(View.VISIBLE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.VISIBLE);
		statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();
		}
		case "unlisted" -> {
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_unlisted);
		holder.binding.buttonQuoteVisibility.setVisibility(View.VISIBLE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.VISIBLE);
		statusDraft.visibility = MastodonHelper.visibility.UNLISTED.name();
		}
		case "private" -> {
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_private);
		holder.binding.buttonQuoteVisibility.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.GONE);
		statusDraft.visibility = MastodonHelper.visibility.PRIVATE.name();
		}
		case "direct" -> {
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_direct);
		holder.binding.buttonQuoteVisibility.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.GONE);
		statusDraft.visibility = MastodonHelper.visibility.DIRECT.name();
		}
		}
		@@ -1670,53 +1670,53 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		holder.binding.visibilityGroup.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
		holder.binding.buttonVisibility.setChecked(false);
		});
		holder.binding.buttonQuoteVisibility.setOnClickListener(v -> {
		holder.binding.quoteVisibilityPanel.setVisibility(View.VISIBLE);
		holder.binding.quoteVisibilityGroup.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
		holder.binding.buttonQuoteVisibility.setChecked(false);
		holder.binding.buttonQuoteApprovalPolicy.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.VISIBLE);
		holder.binding.quoteApprovalPolicyGroup.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
		holder.binding.buttonQuoteApprovalPolicy.setChecked(false);
		});
		holder.binding.buttonCloseVisibilityPanel.setOnClickListener(v -> holder.binding.visibilityPanel.setVisibility(View.GONE));
		holder.binding.buttonCloseQuoteVisibilityPanel.setOnClickListener(v -> holder.binding.quoteVisibilityPanel.setVisibility(View.GONE));
		holder.binding.buttonCloseQuoteApprovalPolicyPanel.setOnClickListener(v -> holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE));
		holder.binding.buttonVisibilityDirect.setOnClickListener(v -> {
		holder.binding.visibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.GONE);
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_direct);
		statusDraft.visibility = MastodonHelper.visibility.DIRECT.name();

		});
		holder.binding.buttonVisibilityPrivate.setOnClickListener(v -> {
		holder.binding.visibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.GONE);
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_private);
		statusDraft.visibility = MastodonHelper.visibility.PRIVATE.name();
		});
		holder.binding.buttonVisibilityUnlisted.setOnClickListener(v -> {
		holder.binding.visibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setVisibility(View.VISIBLE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.VISIBLE);
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_unlisted);
		statusDraft.visibility = MastodonHelper.visibility.UNLISTED.name();
		});
		holder.binding.buttonVisibilityPublic.setOnClickListener(v -> {
		holder.binding.visibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setVisibility(View.VISIBLE);
		holder.binding.buttonQuoteApprovalPolicy.setVisibility(View.VISIBLE);
		holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_public);
		statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();
		unlisted_changed = true;
		});
		holder.binding.buttonQuoteVisibilityNoOne.setOnClickListener(v -> {
		holder.binding.quoteVisibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setIconResource(R.drawable.ic_baseline_block_24);
		// Todo: "No one" quote visibility clicked
		holder.binding.buttonQuoteApprovalPolicyNoOne.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_block_24);
		// Todo: statusDraft.visibility = nobody
		});
		holder.binding.buttonQuoteVisibilityFollowersOnly.setOnClickListener(v -> {
		holder.binding.quoteVisibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setIconResource(R.drawable.ic_baseline_people_alt_24);
		// Todo: "No one" quote visibility clicked
		holder.binding.buttonQuoteApprovalPolicyFollowersOnly.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_people_alt_24);
		// Todo: statusDraft.visibility = followers
		});
		holder.binding.buttonQuoteVisibilityAnyone.setOnClickListener(v -> {
		holder.binding.quoteVisibilityPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteVisibility.setIconResource(R.drawable.ic_compose_visibility_public);
		// Todo: "No one" quote visibility clicked
		holder.binding.buttonQuoteApprovalPolicyAnyone.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_compose_visibility_public);
		// Todo: statusDraft.visibility = public
		});

		if (statusDraft.spoilerChecked \|\| statusDraft.spoiler_text != null && !statusDraft.spoiler_text.trim().isEmpty()) {

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@
		app:toggleCheckedStateOnClick="true" />

		<com.google.android.material.button.MaterialButtonToggleGroup
		android:id="@+id/visibility_indicators_group"
		android:id="@+id/visibility_and_quote_approval_policy_indicators_group"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginHorizontal="3dp"
		@@ -231,7 +231,7 @@
		app:icon="@drawable/ic_compose_visibility_public" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_quote_visibility"
		android:id="@+id/button_quote_approval_policy"
		style="@style/Widget.Material3.Button.IconButton.Outlined"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -253,7 +253,7 @@
		android:fontFamily="monospace"
		android:minWidth="72dp"
		app:layout_constraintBottom_toBottomOf="@id/action_buttons_barrier"
		app:layout_constraintStart_toEndOf="@id/visibility_indicators_group"
		app:layout_constraintStart_toEndOf="@id/visibility_and_quote_approval_policy_indicators_group"
		app:layout_constraintTop_toBottomOf="@id/text_area_divider"
		tools:text="EN" />

		@@ -438,7 +438,7 @@
		</androidx.appcompat.widget.LinearLayoutCompat>

		<androidx.appcompat.widget.LinearLayoutCompat
		android:id="@+id/quote_visibility_panel"
		android:id="@+id/quote_approval_policy_panel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@drawable/bg_compose_panels"
		@@ -458,7 +458,7 @@
		android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />

		<com.google.android.material.button.MaterialButtonToggleGroup
		android:id="@+id/quote_visibility_group"
		android:id="@+id/quote_approval_policy_group"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_margin="6dp"
		@@ -466,7 +466,7 @@
		app:singleSelection="true">

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_quote_visibility_no_one"
		android:id="@+id/button_quote_approval_policy_no_one"
		style="@style/Widget.Material3.Button.OutlinedButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -478,7 +478,7 @@
		app:icon="@drawable/ic_baseline_block_24" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_quote_visibility_followers_only"
		android:id="@+id/button_quote_approval_policy_followers_only"
		style="@style/Widget.Material3.Button.OutlinedButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -490,7 +490,7 @@
		app:icon="@drawable/ic_baseline_people_alt_24" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_quote_visibility_anyone"
		android:id="@+id/button_quote_approval_policy_anyone"
		style="@style/Widget.Material3.Button.OutlinedButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -504,7 +504,7 @@
		</com.google.android.material.button.MaterialButtonToggleGroup>

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_close_quote_visibility_panel"
		android:id="@+id/button_close_quote_approval_policy_panel"
		style="@style/Widget.Material3.Button.IconButton.Outlined"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -520,7 +520,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:barrierDirection="bottom"
		app:constraint_referenced_ids="button_attach, visibility_indicators_group, button_language, button_post, character_progress, button_sensitive" />
		app:constraint_referenced_ids="button_attach, visibility_and_quote_approval_policy_indicators_group, button_language, button_post, character_progress, button_sensitive" />


		<com.google.android.material.checkbox.MaterialCheckBox