From 0616145b2a8b8044056fc89303d91c93958ec35b Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Fri, 25 Apr 2025 08:05:35 -0300 Subject: [PATCH] refactor(ListEditor.java): add back the working ListEditor version --- .../android/ui/views/ListEditor.java | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java index 1ebe466d2..c6e37d5aa 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java @@ -15,83 +15,83 @@ 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 final TextInputFrameLayout input; - private final Button button; - private final Switch exclusiveSwitch; + private FollowList.RepliesPolicy policy = null; + private final TextInputFrameLayout input; + private final Button button; + private final Switch exclusiveSwitch; - @SuppressLint("ClickableViewAccessibility") - public ListEditor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - LayoutInflater.from(context).inflate(R.layout.list_timeline_editor, this); + @SuppressLint("ClickableViewAccessibility") + public ListEditor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + LayoutInflater.from(context).inflate(R.layout.list_timeline_editor, this); - button = findViewById(R.id.button); - input = findViewById(R.id.input); - exclusiveSwitch = findViewById(R.id.exclusive_checkbox); + button = findViewById(R.id.button); + input = findViewById(R.id.input); + exclusiveSwitch = findViewById(R.id.exclusive_checkbox); - PopupMenu popupMenu = new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL); - popupMenu.inflate(R.menu.list_reply_policies); - popupMenu.setOnMenuItemClickListener(this::onMenuItemClick); + PopupMenu popupMenu = new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL); + popupMenu.inflate(R.menu.list_reply_policies); + popupMenu.setOnMenuItemClickListener(this::onMenuItemClick); - button.setOnTouchListener(popupMenu.getDragToOpenListener()); - button.setOnClickListener(v->popupMenu.show()); - input.getEditText().setHint(context.getString(R.string.sk_list_name_hint)); - findViewById(R.id.exclusive) - .setOnClickListener(v -> exclusiveSwitch.setChecked(!exclusiveSwitch.isChecked())); + button.setOnTouchListener(popupMenu.getDragToOpenListener()); + button.setOnClickListener(v->popupMenu.show()); + input.getEditText().setHint(context.getString(R.string.sk_list_name_hint)); + 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) { - input.getEditText().setText(title); - exclusiveSwitch.setChecked(exclusive); - if (policy != null) setRepliesPolicy(policy); - } + public void applyList(String title, boolean exclusive, @Nullable FollowList.RepliesPolicy policy) { + input.getEditText().setText(title); + exclusiveSwitch.setChecked(exclusive); + if (policy != null) setRepliesPolicy(policy); + } - public String getTitle() { - return input.getEditText().getText().toString(); - } + public String getTitle() { + return input.getEditText().getText().toString(); + } - public ListTimeline.RepliesPolicy getRepliesPolicy() { - return policy; - } + public FollowList.RepliesPolicy getRepliesPolicy() { + return policy; + } - public boolean isExclusive() { - return exclusiveSwitch.isChecked(); - } + public boolean isExclusive() { + return exclusiveSwitch.isChecked(); + } - public void setRepliesPolicy(@NonNull ListTimeline.RepliesPolicy policy) { - this.policy = policy; - switch (policy) { - case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed); - case LIST -> button.setText(R.string.sk_list_replies_policy_list); - case NONE -> button.setText(R.string.sk_list_replies_policy_none); - } - } + public void setRepliesPolicy(@NonNull FollowList.RepliesPolicy policy) { + this.policy = policy; + switch (policy) { + case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed); + case LIST -> button.setText(R.string.sk_list_replies_policy_list); + case NONE -> button.setText(R.string.sk_list_replies_policy_none); + } + } - private boolean onMenuItemClick(MenuItem i) { - if (i.getItemId() == R.id.reply_policy_none) { - setRepliesPolicy(ListTimeline.RepliesPolicy.NONE); - } else if (i.getItemId() == R.id.reply_policy_followed) { - setRepliesPolicy(ListTimeline.RepliesPolicy.FOLLOWED); - } else if (i.getItemId() == R.id.reply_policy_list) { - setRepliesPolicy(ListTimeline.RepliesPolicy.LIST); - } - return true; - } + private boolean onMenuItemClick(MenuItem i) { + if (i.getItemId() == R.id.reply_policy_none) { + setRepliesPolicy(FollowList.RepliesPolicy.NONE); + } else if (i.getItemId() == R.id.reply_policy_followed) { + setRepliesPolicy(FollowList.RepliesPolicy.FOLLOWED); + } else if (i.getItemId() == R.id.reply_policy_list) { + setRepliesPolicy(FollowList.RepliesPolicy.LIST); + } + return true; + } - public ListEditor(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } + public ListEditor(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } - public ListEditor(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } + public ListEditor(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } - public ListEditor(Context context) { - this(context, null); - } + public ListEditor(Context context) { + this(context, null); + } }