diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java index 52a7def1..6687ae6b 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java @@ -51,7 +51,7 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba } setupWindowInsets(binding.snackbar, binding.recyclerView); final boolean isWhiteListMode = isWhiteListMode(); - appAdapter = isCompat ? new CompatListAdapter(this, binding) : new BlackListAdapter(this, isWhiteListMode, binding); + appAdapter = isCompat ? new CompatListAdapter(this) : new BlackListAdapter(this, isWhiteListMode); appAdapter.setHasStableIds(true); binding.recyclerView.setAdapter(appAdapter); binding.recyclerView.setLayoutManager(new LinearLayoutManager(this)); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java index e50c28f4..cc588246 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java @@ -103,7 +103,7 @@ public class MainActivity extends BaseActivity implements RepoLoader.RepoListene binding.statusIcon.setImageDrawable(getDrawable(R.drawable.ic_error)); } notifyDataSetChanged(); - new Thread(() -> new BlackListAdapter(getApplicationContext(), AppHelper.isWhiteListMode(), null).generateCheckedList()); + new Thread(() -> new BlackListAdapter(getApplicationContext(), AppHelper.isWhiteListMode()).generateCheckedList()); } private int extractIntPart(String str) { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java index 171919fd..e2a2a902 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java @@ -24,7 +24,6 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import androidx.transition.TransitionManager; import com.google.android.material.snackbar.Snackbar; @@ -158,7 +157,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi } }); adapter.addAll(showList); - TransitionManager.beginDelayedTransition(binding.recyclerView); adapter.notifyDataSetChanged(); moduleUtil.updateModulesList(false); binding.swipeRefreshLayout.setRefreshing(false); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java index 5392fb4a..2bc9c6aa 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java @@ -501,7 +501,7 @@ public class SettingsActivity extends BaseActivity { prefPretendXposedInstaller.setOnPreferenceChangeListener((preference, newValue) -> { boolean enabled = (Boolean) newValue; if (enabled) { - new BlackListAdapter(getContext(), AppHelper.isWhiteListMode(), null).generateCheckedList(); + new BlackListAdapter(getContext(), AppHelper.isWhiteListMode()).generateCheckedList(); FileOutputStream fos = null; try { fos = new FileOutputStream(pretendXposedInstallerFlag.getPath()); @@ -533,7 +533,7 @@ public class SettingsActivity extends BaseActivity { prefHideEdXposedManager.setOnPreferenceChangeListener((preference, newValue) -> { boolean enabled = (Boolean) newValue; if (enabled) { - new BlackListAdapter(getContext(), AppHelper.isWhiteListMode(), null).generateCheckedList(); + new BlackListAdapter(getContext(), AppHelper.isWhiteListMode()).generateCheckedList(); FileOutputStream fos = null; try { fos = new FileOutputStream(hideEdXposedManagerFlag.getPath()); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java index f4e3a11d..5cd4168a 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java @@ -17,11 +17,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.widget.SwitchCompat; import androidx.recyclerview.widget.RecyclerView; -import androidx.transition.TransitionManager; import org.meowcat.edxposed.manager.R; import org.meowcat.edxposed.manager.XposedApp; -import org.meowcat.edxposed.manager.databinding.ActivityBlackListBinding; import org.meowcat.edxposed.manager.util.InstallApkUtil; import java.text.DateFormat; @@ -44,11 +42,9 @@ public class AppAdapter extends RecyclerView.Adapter impl private PackageManager pm; private ApplicationFilter filter; private Comparator cmp; - private ActivityBlackListBinding binding; - AppAdapter(Context context, ActivityBlackListBinding binding) { + AppAdapter(Context context) { this.context = context; - this.binding = binding; fullList = showList = Collections.emptyList(); checkedList = Collections.emptyList(); filter = new ApplicationFilter(); @@ -276,7 +272,6 @@ public class AppAdapter extends RecyclerView.Adapter impl @Override protected void publishResults(CharSequence constraint, FilterResults results) { - TransitionManager.beginDelayedTransition(binding.recyclerView); notifyDataSetChanged(); } } diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java index 1b6b5b1f..f958bb69 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java @@ -6,7 +6,6 @@ import android.widget.CompoundButton; import org.meowcat.edxposed.manager.R; import org.meowcat.edxposed.manager.XposedApp; -import org.meowcat.edxposed.manager.databinding.ActivityBlackListBinding; import org.meowcat.edxposed.manager.util.ModuleUtil; import org.meowcat.edxposed.manager.util.ToastUtil; @@ -19,8 +18,8 @@ public class BlackListAdapter extends AppAdapter { private volatile boolean isWhiteListMode; private List checkedList; - public BlackListAdapter(Context context, boolean isWhiteListMode, ActivityBlackListBinding binding) { - super(context, binding); + public BlackListAdapter(Context context, boolean isWhiteListMode) { + super(context); this.isWhiteListMode = isWhiteListMode; } diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/CompatListAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/CompatListAdapter.java index ed90b8dd..20272096 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/CompatListAdapter.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/CompatListAdapter.java @@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo; import android.widget.CompoundButton; import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.ActivityBlackListBinding; import org.meowcat.edxposed.manager.util.ToastUtil; import java.util.List; @@ -14,8 +13,8 @@ public class CompatListAdapter extends AppAdapter { private List checkedList; - public CompatListAdapter(Context context, ActivityBlackListBinding binding) { - super(context, binding); + public CompatListAdapter(Context context) { + super(context); } @Override