owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace mute icon

Browse Source
This commit is contained in:
sk
2022-12-28 01:58:44 +01:00
parent d9ed6f600b
commit f3a9b19104
16 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -562,7 +562,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
MenuItem mute = menu.findItem(R.id.mute);
mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_mute_24_regular);
mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
UiUtils.insetPopupMenuIcon(getContext(), mute);
menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));

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

@@ -377,7 +377,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
report.setVisible(true);
follow.setVisible(relationship==null || relationship.following || (!relationship.blocking && !relationship.blockedBy && !relationship.domainBlocking && !relationship.muting));
mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_mute_24_regular);
mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), mute);
block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
report.setTitle(item.parentFragment.getString(R.string.report_user, account.getShortUsername()));

2
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -416,7 +416,7 @@ public class UiUtils{
showConfirmationAlert(activity, activity.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title),
activity.getString(currentlyMuted ? R.string.confirm_unmute : R.string.confirm_mute, account.displayName),
activity.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute),
currentlyMuted ? R.drawable.ic_fluent_speaker_2_28_regular : R.drawable.ic_fluent_speaker_mute_28_regular,
currentlyMuted ? R.drawable.ic_fluent_speaker_0_28_regular : R.drawable.ic_fluent_speaker_off_28_regular,
()->{
new SetAccountMuted(account.id, !currentlyMuted)
.setCallback(new Callback<>(){

3
mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M12 9.005c2.209 0 4 1.79 4 4 0 2.209-1.791 4-4 4-2.21 0-4-1.791-4-4 0-2.21 1.79-4 4-4zm0 1.5c-1.38 0-2.5 1.119-2.5 2.5 0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5c0-1.381-1.12-2.5-2.5-2.5zM12 5.5c4.613 0 8.596 3.15 9.701 7.564 0.1 0.402-0.144 0.81-0.545 0.91-0.402 0.1-0.81-0.143-0.91-0.545C19.307 9.678 15.92 7 12 7c-3.923 0-7.31 2.68-8.247 6.433-0.1 0.402-0.508 0.646-0.91 0.546-0.401-0.1-0.646-0.507-0.546-0.91C3.4 8.654 7.384 5.5 12 5.5z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
<path android:pathData="M25.256 16h0.006-0.01 0.005zm-0.704-0.52c0.1 0.318 0.387 0.518 0.704 0.52 0.07 0 0.148-0.02 0.226-0.04 0.39-0.12 0.61-0.55 0.48-0.94C25.932 14.93 22.932 6 14 6S2.067 14.93 2.037 15.02c-0.13 0.39 0.09 0.81 0.48 0.94 0.4 0.13 0.82-0.09 0.95-0.48l0.003-0.005C3.603 15.085 6.207 7.5 14.01 7.5c7.842 0 10.432 7.65 10.542 7.98zM10.5 16c0-1.933 1.567-3.5 3.5-3.5s3.5 1.567 3.5 3.5-1.567 3.5-3.5 3.5-3.5-1.567-3.5-3.5zm3.5-5c-2.761 0-5 2.239-5 5s2.239 5 5 5 5-2.239 5-5-2.239-5-5-5z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M2.22 2.22C1.953 2.486 1.93 2.903 2.147 3.196L2.22 3.28l4.034 4.035c-1.922 1.35-3.358 3.365-3.955 5.75-0.1 0.401 0.143 0.809 0.545 0.91 0.402 0.1 0.81-0.144 0.91-0.546 0.53-2.116 1.837-3.89 3.58-5.034l1.81 1.81C8.436 10.924 8 11.914 8 13.004c0 2.209 1.79 4 4 4 1.09 0 2.079-0.437 2.8-1.144l5.92 5.92c0.293 0.292 0.767 0.292 1.06 0 0.267-0.267 0.29-0.684 0.073-0.977L21.78 20.72l-6.113-6.114 0.001-0.002-1.2-1.198-2.87-2.87H11.6L8.719 7.658 8.72 7.656l-1.133-1.13L3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0zm7.984 9.046L13.74 14.8c-0.45 0.435-1.063 0.704-1.739 0.704-1.38 0-2.5-1.12-2.5-2.5 0-0.676 0.268-1.29 0.704-1.74zM12 5.5c-1 0-1.97 0.148-2.889 0.425l1.237 1.236C10.884 7.055 11.436 7 12 7c3.923 0 7.31 2.68 8.247 6.433 0.1 0.402 0.508 0.646 0.91 0.546 0.401-0.1 0.646-0.507 0.545-0.91C20.6 8.654 16.615 5.5 12 5.5zm0.195 3.51l3.801 3.8c-0.102-2.057-1.749-3.702-3.801-3.8z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M14.704 3.44C14.895 3.667 15 3.953 15 4.248V19.75c0 0.69-0.56 1.25-1.25 1.25-0.296 0-0.582-0.105-0.808-0.296l-4.967-4.206H4.25c-1.243 0-2.25-1.008-2.25-2.25v-4.5c0-1.243 1.007-2.25 2.25-2.25h3.725l4.968-4.204c0.526-0.446 1.315-0.38 1.761 0.147zM13.5 4.787l-4.975 4.21H4.25c-0.414 0-0.75 0.337-0.75 0.75v4.5c0 0.415 0.336 0.75 0.75 0.75h4.275L13.5 19.21V4.787z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
<path android:pathData="M16.5 4.814c0-1.094-1.307-1.66-2.105-0.912l-4.937 4.63C9.134 8.836 8.706 9.005 8.261 9.005H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912V4.814zm-6.016 4.812L15 5.39v17.216l-4.516-4.232c-0.602-0.564-1.397-0.878-2.222-0.878H5.25c-0.966 0-1.75-0.784-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.826 0 1.62-0.314 2.223-0.88z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_2_24_regular.xml
View File

@@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M15 4.25c0-1.08-1.274-1.651-2.08-0.935L8.427 7.31C8.29 7.43 8.113 7.499 7.93 7.499H4.25C3.007 7.498 2 8.504 2 9.748v4.497c0 1.243 1.007 2.25 2.25 2.25h3.68c0.183 0 0.36 0.067 0.498 0.19l4.491 3.993C13.725 21.396 15 20.824 15 19.745V4.25zM9.425 8.43L13.5 4.806v14.382l-4.075-3.623c-0.412-0.367-0.944-0.569-1.495-0.569H4.25c-0.414 0-0.75-0.336-0.75-0.75V9.748c0-0.414 0.336-0.75 0.75-0.75h3.68c0.55 0 1.083-0.202 1.495-0.568zm9.567-2.533c0.332-0.247 0.802-0.177 1.049 0.156C21.27 7.715 22 9.773 22 12s-0.728 4.285-1.96 5.947c-0.246 0.333-0.716 0.403-1.048 0.156-0.333-0.246-0.403-0.716-0.157-1.049C19.881 15.641 20.5 13.893 20.5 12c0-1.893-0.619-3.64-1.665-5.053-0.246-0.333-0.176-0.803 0.157-1.05zm-1.849 2.472c0.364-0.197 0.82-0.062 1.017 0.302C18.696 9.662 19 10.796 19 12c0 1.203-0.304 2.337-0.84 3.328-0.198 0.364-0.653 0.5-1.017 0.302-0.364-0.197-0.5-0.652-0.303-1.016 0.42-0.777 0.66-1.667 0.66-2.615 0-0.947-0.24-1.837-0.66-2.614-0.197-0.364-0.061-0.819 0.303-1.016z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_2_28_regular.xml
View File

@@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
<path android:pathData="M16.5 4.814c0-1.094-1.307-1.66-2.105-0.912l-4.937 4.63C9.134 8.836 8.706 9.005 8.261 9.005H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912V4.814zm-6.016 4.812L15 5.39v17.216l-4.516-4.232c-0.602-0.564-1.397-0.878-2.222-0.878H5.25c-0.966 0-1.75-0.784-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.826 0 1.62-0.314 2.223-0.88zm12.218-4.374c-0.274-0.311-0.747-0.341-1.058-0.068-0.311 0.274-0.342 0.748-0.068 1.059C23.396 8.313 24.5 11.026 24.5 14c0 2.973-1.103 5.687-2.924 7.757-0.274 0.31-0.243 0.785 0.068 1.058 0.31 0.274 0.785 0.243 1.058-0.068C24.754 20.414 26 17.352 26 14c0-3.352-1.245-6.415-3.298-8.748zm-2.35 3.05c-0.248-0.33-0.718-0.398-1.05-0.15-0.33 0.25-0.398 0.72-0.149 1.051C20.156 10.54 20.75 12.199 20.75 14c0 1.8-0.594 3.46-1.597 4.797-0.248 0.33-0.181 0.8 0.15 1.05 0.331 0.248 0.801 0.181 1.05-0.15C21.544 18.11 22.25 16.136 22.25 14c0-2.137-0.706-4.11-1.897-5.697z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_mute_24_regular.xml
View File

@@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M12.92 3.315C13.726 2.6 15 3.171 15 4.25v15.495c0 1.079-1.274 1.651-2.08 0.934l-4.492-3.993c-0.137-0.123-0.315-0.19-0.498-0.19H4.25c-1.243 0-2.25-1.007-2.25-2.25V9.748c0-1.242 1.007-2.25 2.25-2.25h3.68c0.183 0 0.36-0.067 0.498-0.19l4.491-3.993zm0.58 1.491L9.425 8.43C9.013 8.796 8.48 8.998 7.93 8.998H4.25c-0.414 0-0.75 0.336-0.75 0.75v4.498c0 0.414 0.336 0.75 0.75 0.75h3.68c0.55 0 1.083 0.202 1.495 0.569l4.075 3.623V4.806zm2.72 4.413c0.293-0.293 0.767-0.293 1.06 0L19 10.94l1.72-1.72c0.293-0.293 0.767-0.293 1.06 0 0.293 0.293 0.293 0.768 0 1.06L20.06 12l1.72 1.72c0.293 0.293 0.293 0.768 0 1.06-0.293 0.294-0.767 0.294-1.06 0L19 13.06l-1.72 1.72c-0.293 0.293-0.767 0.293-1.06 0-0.293-0.293-0.293-0.768 0-1.06L17.94 12l-1.72-1.72c-0.293-0.293-0.293-0.768 0-1.06z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_mute_28_regular.xml
View File

@@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
<path android:pathData="M14.395 3.902C15.193 3.154 16.5 3.72 16.5 4.814v18.37c0 1.094-1.306 1.66-2.105 0.912L9.458 19.47c-0.324-0.304-0.752-0.473-1.196-0.473H5.25c-1.795 0-3.25-1.455-3.25-3.25v-3.492c0-1.795 1.455-3.25 3.25-3.25h3.011c0.445 0 0.873-0.17 1.197-0.473l4.937-4.63zM15 5.392l-4.516 4.234c-0.602 0.565-1.397 0.879-2.223 0.879H5.25c-0.966 0-1.75 0.784-1.75 1.75v3.492c0 0.966 0.784 1.75 1.75 1.75h3.012c0.825 0 1.62 0.314 2.222 0.878L15 22.607V5.391zm4.782 5.33c-0.291-0.295-0.766-0.296-1.06-0.005-0.294 0.292-0.296 0.767-0.004 1.061l2.218 2.235-2.215 2.205c-0.294 0.293-0.295 0.767-0.002 1.061 0.292 0.294 0.767 0.294 1.06 0.002l2.218-2.208 2.225 2.209c0.294 0.292 0.769 0.29 1.06-0.004 0.292-0.294 0.29-0.769-0.004-1.06l-2.22-2.205 2.224-2.234c0.292-0.293 0.29-0.768-0.003-1.06-0.293-0.293-0.768-0.292-1.06 0.002l-2.223 2.23-2.214-2.23z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06L6.438 7.5H4.25C3.007 7.499 2 8.506 2 9.749v4.497c0 1.243 1.007 2.25 2.25 2.25h3.68c0.183 0 0.36 0.068 0.498 0.19l4.491 3.994C13.725 21.396 15 20.824 15 19.746V16.06l5.72 5.72c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM13.5 14.56v4.629l-4.075-3.624c-0.412-0.366-0.944-0.569-1.495-0.569H4.25c-0.414 0-0.75-0.335-0.75-0.75V9.75C3.5 9.335 3.836 9 4.25 9h3.688l5.562 5.56zm0-9.753v5.511l1.5 1.5V4.25c0-1.079-1.274-1.65-2.08-0.934l-3.4 3.022 1.063 1.063L13.5 4.807zm3.641 9.152l1.138 1.138C18.741 14.163 19 13.111 19 12c0-1.203-0.304-2.338-0.84-3.328-0.198-0.364-0.653-0.5-1.017-0.303-0.364 0.197-0.5 0.653-0.303 1.017 0.42 0.777 0.66 1.666 0.66 2.614 0 0.691-0.127 1.351-0.359 1.96zm2.247 2.247l1.093 1.094C21.445 15.763 22 13.946 22 12c0-2.226-0.728-4.284-1.96-5.946-0.246-0.333-0.716-0.403-1.048-0.157-0.333 0.247-0.403 0.716-0.157 1.05C19.881 8.358 20.5 10.106 20.5 12c0 1.531-0.404 2.966-1.112 4.206z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
<path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l5.724 5.725H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912v-5.623l8.22 8.22c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM15 16.06v6.547l-4.516-4.231c-0.602-0.565-1.397-0.879-2.222-0.879H5.25c-0.966 0-1.75-0.783-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.35 0 0.693-0.056 1.02-0.164L15 16.061zm-4.378-8.62l1.061 1.061L15 5.392v6.427l1.5 1.5V4.814c0-1.094-1.307-1.66-2.105-0.912L10.622 7.44zm9.55 9.55l1.137 1.137C21.912 16.88 22.25 15.478 22.25 14c0-2.136-0.706-4.11-1.897-5.697-0.249-0.332-0.719-0.399-1.05-0.15-0.332 0.249-0.399 0.719-0.15 1.05C20.156 10.54 20.75 12.199 20.75 14c0 1.058-0.205 2.067-0.578 2.99zm2.803 2.803l1.095 1.096c1.224-2.008 1.93-4.366 1.93-6.89 0-3.35-1.245-6.414-3.298-8.747-0.274-0.31-0.747-0.341-1.058-0.068-0.311 0.274-0.342 0.748-0.068 1.059C23.396 8.313 24.5 11.027 24.5 14c0 2.107-0.554 4.084-1.525 5.793z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

2
mastodon/src/main/res/menu/post.xml
View File

@@ -8,7 +8,7 @@
<item android:id="@+id/delete_and_redraft" android:title="@string/sk_delete_and_redraft" android:icon="@drawable/ic_fluent_arrow_clockwise_24_regular" />
<item android:id="@+id/pin" android:title="@string/sk_pin_post" android:icon="@drawable/ic_fluent_pin_24_regular"/>
<item android:id="@+id/unpin" android:title="@string/sk_unpin_post" android:icon="@drawable/ic_fluent_pin_off_24_regular"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_mute_24_regular"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>

2
mastodon/src/main/res/menu/profile.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_mute_24_regular"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>