Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

feat: add option to mute notifications to muting dialog #968

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add option to mute notifications to muting dialog #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28a811a
feat: add mute notification toggle to mute dialog
FineFindus Jan 14, 2024
68ace0e
feat: only add body for muting requests
FineFindus Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
import org.joinmastodon.android.model.Relationship;

public class SetAccountMuted extends MastodonAPIRequest<Relationship>{
public SetAccountMuted(String id, boolean muted, long duration){
public SetAccountMuted(String id, boolean muted, long duration, boolean muteNotifications){
super(HttpMethod.POST, "/accounts/"+id+"/"+(muted ? "mute" : "unmute"), Relationship.class);
setRequestBody(new Request(duration));
if(muted)
setRequestBody(new Request(duration, muteNotifications));
}

private static class Request{
public long duration;
public Request(long duration){
public boolean muteNotifications;
public Request(long duration, boolean muteNotifications){
this.duration=duration;
this.muteNotifications=muteNotifications;
}
}
}
5 changes: 4 additions & 1 deletion mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupMenu;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;

Expand Down Expand Up @@ -567,6 +568,8 @@ public static void confirmToggleMuteUser(Context context, String accountID, Acco
durationView.setLayoutParams(params);
Button button=durationView.findViewById(R.id.button);
((TextView) durationView.findViewById(R.id.message)).setText(context.getString(R.string.confirm_mute, account.getDisplayName()));
Switch muteNotificationsSwitch=durationView.findViewById(R.id.mute_notifications_switch);
durationView.findViewById(R.id.mute_notifications).setOnClickListener(l->muteNotificationsSwitch.setChecked(!muteNotificationsSwitch.isChecked()));

AtomicReference<Duration> muteDuration=new AtomicReference<>(Duration.ZERO);

Expand Down Expand Up @@ -603,7 +606,7 @@ else if(id==R.id.duration_minutes_5){
.setMessage(currentlyMuted ? context.getString(R.string.confirm_unmute, account.getDisplayName()) : null)
.setView(currentlyMuted ? null : durationView)
.setPositiveButton(context.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), (dlg, i)->{
new SetAccountMuted(account.id, !currentlyMuted, muteDuration.get().getSeconds())
new SetAccountMuted(account.id, !currentlyMuted, muteDuration.get().getSeconds(), muteNotificationsSwitch.isChecked())
.setCallback(new Callback<>(){
@Override
public void onSuccess(Relationship result){
Expand Down
31 changes: 30 additions & 1 deletion mastodon/src/main/res/layout/mute_user_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,35 @@
android:text="@string/confirm_mute"
android:textSize="16sp"/>

<LinearLayout
android:id="@+id/mute_notifications"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:gravity="center_vertical"
android:layoutDirection="locale">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingVertical="8dp"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:text="@string/sk_mute_notifications_label" />

<org.joinmastodon.android.ui.views.M3Switch
android:id="@+id/mute_notifications_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:checked="true"
android:focusable="false"
android:clickable="false"/>

</LinearLayout>

<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -28,7 +57,7 @@
android:paddingVertical="8dp"
android:gravity="center_vertical"
android:textColor="?android:textColorPrimary"
android:text="@string/sk_mute_label"
android:text="@string/sk_mute_duration_label"
android:textSize="16sp"/>

<Button
Expand Down
3 changes: 2 additions & 1 deletion mastodon/src/main/res/values/strings_sk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@
<string name="sk_button_react">React with emoji</string>
<string name="sk_enter_emoji_toast">Please type an emoji</string>
<string name="sk_enter_emoji_hint">Type an emoji or search</string>
<string name="sk_mute_label">Duration</string>
<string name="sk_mute_duration_label">Duration</string>
<string name="sk_mute_notifications_label">Mute Notifications?</string>
<string name="sk_duration_indefinite">Indefinite</string>
<string name="sk_duration_minutes_5">5 minutes</string>
<string name="sk_duration_minutes_30">30 minutes</string>
Expand Down