From 572901ec9d7e86479863ad098375401ce397cbfe Mon Sep 17 00:00:00 2001 From: Grishka Date: Sat, 21 Oct 2023 11:52:15 +0300 Subject: [PATCH] minor fixes --- .../android/fragments/CreateListAddMembersFragment.java | 8 ++++++++ .../android/fragments/CreateListFragment.java | 2 ++ .../fragments/account_list/AddNewListMembersFragment.java | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java index 655a0050a..de49a3680 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewStub; import android.view.WindowInsets; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.FrameLayout; import android.widget.TextView; @@ -189,6 +190,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem searchFragment=null; dismissingSearchFragment=false; }).start(); + getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0); } private void onNextClick(View v){ @@ -270,6 +272,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem @Override protected void onConfigureViewHolder(AccountViewHolder holder){ holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false); + holder.setOnLongClickListener(vh->false); Button button=holder.getButton(); button.setPadding(V.dp(24), 0, V.dp(24), 0); button.setMinimumWidth(0); @@ -309,4 +312,9 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem button.setTextColor(ta.getColorStateList(0)); ta.recycle(); } + + @Override + protected void loadRelationships(List accounts){ + // no-op + } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java index 441dc4b36..e238416ce 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.view.WindowInsets; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import com.squareup.otto.Subscribe; @@ -129,6 +130,7 @@ public class CreateListFragment extends BaseEditListFragment{ args.putParcelable("list", Parcels.wrap(followList)); args.putBoolean("needLoadMembers", needLoadMembers); Nav.go(getActivity(), CreateListAddMembersFragment.class, args); + getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0); } @Subscribe diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java index 635448418..755338a7a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java @@ -67,6 +67,7 @@ public class AddNewListMembersFragment extends AccountSearchFragment{ @Override protected void onConfigureViewHolder(AccountViewHolder holder){ holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false); + holder.setOnLongClickListener(vh->false); Button button=holder.getButton(); button.setPadding(V.dp(24), 0, V.dp(24), 0); button.setMinimumWidth(0); @@ -108,6 +109,11 @@ public class AddNewListMembersFragment extends AccountSearchFragment{ ta.recycle(); } + @Override + protected void loadRelationships(List accounts){ + // no-op + } + public interface Listener{ boolean isAccountInList(AccountViewModel account); void addAccountToList(AccountViewModel account, Runnable onDone);