Add quote-or-boost icon and quote policy icons (3d83d3fa) · Commits · Android-smartphones / Fedilab

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -1673,15 +1673,15 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder

		switch (statusDraft.quote_approval_policy.toLowerCase()) {
		case "public" -> {
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_compose_visibility_public);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_public);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.PUBLIC.name();
		}
		case "followers" -> {
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_people_alt_24);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_followers);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.FOLLOWERS.name();
		}
		case "nobody" -> {
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_block_24);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_nobody);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.NOBODY.name();
		}
		}
		@@ -1730,17 +1730,17 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		});
		holder.binding.buttonQuoteApprovalPolicyNoOne.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_block_24);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_nobody);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.NOBODY.name();
		});
		holder.binding.buttonQuoteApprovalPolicyFollowersOnly.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_baseline_people_alt_24);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_followers);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.FOLLOWERS.name();
		});
		holder.binding.buttonQuoteApprovalPolicyAnyone.setOnClickListener(v -> {
		holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_compose_visibility_public);
		holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_public);
		statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.PUBLIC.name();
		});

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -969,8 +969,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
		holder.binding.actionButtonFavorite.setInactiveImage(R.drawable.ic_round_star_border_24);
		holder.binding.actionButtonBookmark.setActiveImage(R.drawable.ic_round_bookmark_24);
		holder.binding.actionButtonBookmark.setInactiveImage(R.drawable.ic_round_bookmark_border_24);
		if (displayQuote) {
		holder.binding.actionButtonBoost.setActiveImage(R.drawable.ic_quote_or_boost_active);
		holder.binding.actionButtonBoost.setInactiveImage(R.drawable.ic_quote_or_boost);
		} else {
		holder.binding.actionButtonBoost.setActiveImage(R.drawable.ic_round_repeat_active_24);
		holder.binding.actionButtonBoost.setInactiveImage(R.drawable.ic_round_repeat_24);
		}
		holder.binding.actionButtonFavorite.setActiveImageTint(R.color.marked_icon);
		holder.binding.actionButtonBoost.setActiveImageTint(R.color.boost_icon);
		holder.binding.actionButtonBookmark.setActiveImageTint(R.color.marked_icon);

app/src/main/res/drawables/mastodon/drawable/ic_quote_or_boost.xml

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="?attr/colorControlNormal"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#000"
		android:pathData="m17.895,17h-10v-1.79c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.79,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.31,0.31 0.85,0.09 0.85,-0.36v-1.79h11c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z" />
		<path
		android:fillColor="#000"
		android:pathData="m8.067,10.848c0.415,0 0.798,-0.236 0.977,-0.603l1.156,-2.313c0.114,-0.228 0.171,-0.472 0.171,-0.725v-3.689c0,-0.448 -0.366,-0.814 -0.814,-0.814h-3.257c-0.448,0 -0.814,0.366 -0.814,0.814v3.257c0,0.448 0.366,0.814 0.814,0.814h1.628l-0.839,1.677c-0.366,0.725 0.163,1.58 0.977,1.58zM16.21,10.848c0.415,0 0.798,-0.236 0.977,-0.603l1.156,-2.313c0.114,-0.228 0.171,-0.472 0.171,-0.725v-3.689c0,-0.448 -0.366,-0.814 -0.814,-0.814h-3.257c-0.448,0 -0.814,0.366 -0.814,0.814v3.257c0,0.448 0.366,0.814 0.814,0.814h1.628l-0.839,1.677c-0.366,0.725 0.163,1.58 0.977,1.58z" />
		</vector>

app/src/main/res/drawables/mastodon/drawable/ic_quote_or_boost_active.xml

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="@color/boost_icon"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#000"
		android:pathData="m17.895,17h-10v-1.79c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.79,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.31,0.31 0.85,0.09 0.85,-0.36v-1.79h11c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z" />
		<path
		android:fillColor="#000"
		android:pathData="m8.067,10.848c0.415,0 0.798,-0.236 0.977,-0.603l1.156,-2.313c0.114,-0.228 0.171,-0.472 0.171,-0.725v-3.689c0,-0.448 -0.366,-0.814 -0.814,-0.814h-3.257c-0.448,0 -0.814,0.366 -0.814,0.814v3.257c0,0.448 0.366,0.814 0.814,0.814h1.628l-0.839,1.677c-0.366,0.725 0.163,1.58 0.977,1.58zM16.21,10.848c0.415,0 0.798,-0.236 0.977,-0.603l1.156,-2.313c0.114,-0.228 0.171,-0.472 0.171,-0.725v-3.689c0,-0.448 -0.366,-0.814 -0.814,-0.814h-3.257c-0.448,0 -0.814,0.366 -0.814,0.814v3.257c0,0.448 0.366,0.814 0.814,0.814h1.628l-0.839,1.677c-0.366,0.725 0.163,1.58 0.977,1.58z" />
		</vector>

app/src/main/res/drawables/mastodon/drawable/ic_quote_policy_followers.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="?attr/colorControlNormal"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#000"
		android:pathData="m7.33,13.13c-1.37,0.93 -2.33,2.19 -2.33,3.87v3h-4v-3c0,-2.18 3.57,-3.47 6.33,-3.87z" />
		<path
		android:fillColor="#000"
		android:pathData="m7.336,8.033 l-0.869,1.736v0.004h-0.002v0.002l-0.004,0.004 -0.002,0.006c-0.142,0.287 -0.325,0.546 -0.537,0.771 0.734,0.882 1.84,1.443 3.078,1.443 0.47,0 0.91,-0.1 1.33,-0.24 -0.065,-0.081 -0.127,-0.162 -0.188,-0.246 -1.597,-0.311 -2.686,-1.772 -2.607,-3.334 -0.069,-0.046 -0.135,-0.095 -0.199,-0.146z" />
		<path
		android:fillColor="#000"
		android:pathData="m15.096,4.002v2.072c0,0.589 -0.141,1.154 -0.395,1.66l-1.016,2.035c-0.002,0.003 -0.002,0.005 -0.004,0.008l-0.004,0.006c-0.276,0.556 -0.699,1.005 -1.207,1.314a4,4 0,0 0,6.529 -3.098,4 4,0 0,0 -3.904,-3.998z" />
		<path
		android:fillColor="#000"
		android:pathData="m15,13c2.67,0 8,1.34 8,4v3h-16v-3c0,-2.66 5.33,-4 8,-4z" />
		<path
		android:fillColor="#000"
		android:pathData="m1.995,1.811c-0.548,0 -0.995,0.447 -0.995,0.995v2.887c0,0.548 0.447,0.995 0.995,0.995h1.002l-0.546,1.091c-0.417,0.825 0.184,1.796 1.109,1.796 0.47,0 0.906,-0.268 1.109,-0.685l1.025,-2.05c0.12,-0.24 0.182,-0.499 0.182,-0.765v-3.269c0,-0.548 -0.447,-0.995 -0.995,-0.995zM9.213,1.811c-0.548,0 -0.995,0.447 -0.995,0.995v2.887c0,0.548 0.447,0.995 0.995,0.995h1.002l-0.546,1.091c-0.417,0.825 0.184,1.796 1.109,1.796 0.47,0 0.906,-0.268 1.109,-0.685l1.025,-2.05c0.12,-0.24 0.182,-0.499 0.182,-0.765v-3.269c0,-0.548 -0.447,-0.995 -0.995,-0.995z" />
		</vector>