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

chore(merge-upstream): more conflict solving tomfoolery

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-16 20:21:38 -03:00
parent 0af8dbf09b
commit 76867a971b
19 changed files with 110 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,6 @@ public class OldPostPreReplySheet extends PreReplySheet{
String monthsStr=months>24 ? context.getString(R.string.more_than_two_years) : context.getResources().getQuantityString(R.plurals.x_months, months, months);
title.setText(context.getString(R.string.old_post_sheet_title, monthsStr));
text.setText(R.string.old_post_sheet_text);
icon.setImageResource(R.drawable.ic_history_24px);
icon.setImageResource(R.drawable.ic_fluent_clock_24_regular);
}
}

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

@@ -780,8 +780,9 @@ public class UiUtils {
activity.getString(R.string.delete),
R.drawable.ic_fluent_delete_28_regular,
() -> new DeleteList(listID).setCallback(new Callback<>() {
@Override
public void onSuccess(Object o) {
public void onSuccess(Void result){
callback.run();
}

18
mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
View File

@@ -15,10 +15,10 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.joinmastodon.android.R;
import org.joinmastodon.android.model.ListTimeline;
import org.joinmastodon.android.model.FollowList;
public class ListEditor extends LinearLayout {
private ListTimeline.RepliesPolicy policy = null;
private FollowList.RepliesPolicy policy = null;
private final TextInputFrameLayout input;
private final Button button;
private final Switch exclusiveSwitch;
@@ -42,10 +42,10 @@ public class ListEditor extends LinearLayout {
findViewById(R.id.exclusive)
.setOnClickListener(v -> exclusiveSwitch.setChecked(!exclusiveSwitch.isChecked()));
setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
setRepliesPolicy(FollowList.RepliesPolicy.LIST);
}
public void applyList(String title, boolean exclusive, @Nullable ListTimeline.RepliesPolicy policy) {
public void applyList(String title, boolean exclusive, @Nullable FollowList.RepliesPolicy policy) {
input.getEditText().setText(title);
exclusiveSwitch.setChecked(exclusive);
if (policy != null) setRepliesPolicy(policy);
@@ -55,7 +55,7 @@ public class ListEditor extends LinearLayout {
return input.getEditText().getText().toString();
}
public ListTimeline.RepliesPolicy getRepliesPolicy() {
public FollowList.RepliesPolicy getRepliesPolicy() {
return policy;
}
@@ -63,7 +63,7 @@ public class ListEditor extends LinearLayout {
return exclusiveSwitch.isChecked();
}
public void setRepliesPolicy(@NonNull ListTimeline.RepliesPolicy policy) {
public void setRepliesPolicy(@NonNull FollowList.RepliesPolicy policy) {
this.policy = policy;
switch (policy) {
case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed);
@@ -74,11 +74,11 @@ public class ListEditor extends LinearLayout {
private boolean onMenuItemClick(MenuItem i) {
if (i.getItemId() == R.id.reply_policy_none) {
setRepliesPolicy(ListTimeline.RepliesPolicy.NONE);
setRepliesPolicy(FollowList.RepliesPolicy.NONE);
} else if (i.getItemId() == R.id.reply_policy_followed) {
setRepliesPolicy(ListTimeline.RepliesPolicy.FOLLOWED);
setRepliesPolicy(FollowList.RepliesPolicy.FOLLOWED);
} else if (i.getItemId() == R.id.reply_policy_list) {
setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
setRepliesPolicy(FollowList.RepliesPolicy.LIST);
}
return true;
}