diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java index 0ca215e9..22e13f87 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java @@ -56,7 +56,6 @@ import androidx.appcompat.widget.SearchView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Lifecycle; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.adapter.FragmentStateAdapter; @@ -141,7 +140,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi binding.getRoot().bringChildToFront(binding.appBar); setupToolbar(binding.toolbar, R.string.Modules, R.menu.menu_modules); - binding.viewPager.setAdapter(new PagerAdapter(requireActivity())); + binding.viewPager.setAdapter(new PagerAdapter(this)); binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { @Override public void onPageSelected(int position) { @@ -337,17 +336,16 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi } public static class ModuleListFragment extends Fragment { - private final int position; - private final ModulesFragment fragment; - - public ModuleListFragment(int position, ModulesFragment fragment) { - this.position = position; - this.fragment = fragment; - } @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + ModulesFragment fragment = (ModulesFragment) getParentFragment(); + Bundle arguments = getArguments(); + if (fragment == null || arguments == null) { + return null; + } + int position = arguments.getInt("position"); ItemRepoRecyclerviewBinding binding = ItemRepoRecyclerviewBinding.inflate(getLayoutInflater(), container, false); if (fragment.adapters.size() == 1) { WindowInsetsHelperKt.setInitialPadding(binding.recyclerView, 0, ResourcesKt.resolveDimensionPixelOffset(requireActivity().getTheme(), R.attr.actionBarSize, 0), 0, 0); @@ -375,20 +373,29 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi private class PagerAdapter extends FragmentStateAdapter { - public PagerAdapter(@NonNull FragmentActivity fragmentActivity) { - super(fragmentActivity); + public PagerAdapter(@NonNull Fragment fragment) { + super(fragment); } @NonNull @Override public Fragment createFragment(int position) { - return new ModuleListFragment(position, ModulesFragment.this); + Bundle bundle = new Bundle(); + bundle.putInt("position", position); + Fragment fragment = new ModuleListFragment(); + fragment.setArguments(bundle); + return fragment; } @Override public int getItemCount() { return adapters.size(); } + + @Override + public long getItemId(int position) { + return position; + } } private class ModuleAdapter extends EmptyStateRecyclerView.EmptyStateAdapter implements Filterable { diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 09937de5..f339a249 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -84,7 +84,6 @@ ¿Quieres desinstalar este módulo? Desinstalado %1$s Fallo en la desinstalación - Usuario %d Instalar al usuario %s ¿Quieres instalar %1$s al usuario %2$s? Se recomienda que lo instales manualmente; forzar la instalación a través de LSPosed puede causar problemas. %1$s instalado %2$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8498ad4d..8ed99397 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -88,7 +88,6 @@ Échec de la désinstallation Ajout de %1$s à l’utilisateur %2$s Échec de l\’ajout du module - Utilisateur %d Installation dans utilisateur %s Vous voulez installer %1$s dans l’utilisateur %2$s? Il est recommandé de l’installer manuellement, fercer l’installation via LSPosed pourrait causer des problèmes. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b38c31eb..7bd0d4ad 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -89,7 +89,6 @@ %2$s 사용자에 %1$s 추가 모듈 추가 실패 - 사용자 %d %s 사용자에게 설치 %2$s 사용자에게 %1$s을(를) 설치하시겠습니까? 수동으로 설치하는 것이 좋습니다. LSPosed를 통해 강제로 설치하면 문제가 발생할 수 있습니다. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c98728f6..3706fa4c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -180,7 +180,6 @@ Module toevoegen aan gebruiker Toegevoegd %1$s naar gebruiker %2$s Het toevoegen van de module is mislukt - Gebruiker %d Installeer naar gebruiker %s Wil je installeren %1$s naar gebruiker %2$s? Het wordt aanbevolen om handmatig te installeren, het forceren van installatie via LSPosed kan problemen veroorzaken. Pandemic-XDA]]> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f628548e..d08eb9c0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -88,7 +88,6 @@ Falha ao desinstalar Adicionado %1$s ao usuário %2$s Falha ao adicinar módulo - Usuário %d Instalar ao usuário %s Deseja instalar %1$s ao usuário %2$s? Recomenda-se instalar manualmente, forçar a instalação via LSPosed pode causar problemas. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f7102ff0..b25da9bb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -86,7 +86,6 @@ 要卸载此模块吗? 已卸载%1$s 卸载失败 - 用户 %d 安装到用户 %s 要安装 %1$s 到用户 %2$s 吗?建议手动安装或多开,通过 LSPosed 强制安装可能会出现问题。 已安装 %1$s 到用户 %2$s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6f6fa789..b9124a80 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -88,7 +88,6 @@ 移除失敗 已安裝 %1$s 到使用者 %2$s 安裝模組失敗 - 使用者 %d 安裝到使用者 %s 要安裝 %1$s 到使用者 %2$s 嗎?建議手動安裝或多開,透過 LSPosed 強制安裝可能會出現問題。 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index cd4de515..db18f122 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -22,6 +22,4 @@ 48dp 48dp 32dp - 400dp - 8dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8094063a..0b48e168 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,6 @@ Uninstall unsuccessful Added %1$s to user %2$s Adding module failed - User %d Install to user %s Want to install %1$s to user %2$s? It is recommended to install manually, forcing installation via LSPosed may cause problems.