WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[app] Fix module list padding when only one user (#574)

This commit is contained in:
tehcneko 2021-05-14 20:57:05 +08:00 committed by GitHub
parent 3334a6b511
commit c13f4c90d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/org/lsposed/manager/ui/activity/ModulesActivity.java
View File

@ -81,6 +81,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import rikka.core.res.ResourcesKt;
import rikka.insets.WindowInsetsHelperKt;
import rikka.recyclerview.RecyclerViewKt;
import rikka.widget.borderview.BorderRecyclerView;
@ -118,11 +120,10 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override
public void onPageSelected(int position) {
BorderRecyclerView recyclerView = findViewById(R.id.recyclerView);
BorderRecyclerView recyclerView = binding.viewPager.findViewWithTag(position);
if (recyclerView != null) {
binding.appBar.setRaised(!recyclerView.getBorderViewDelegate().isShowingTopBorder());
}
}
});
@ -146,24 +147,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
moduleUtil = ModuleUtil.getInstance();
pm = getPackageManager();
moduleUtil.addListener(this);
int[] users = ConfigManager.getUsers();
if (users != null) {
if (users.length != 1) {
ArrayList<String> titles = new ArrayList<>();
for (int userId : users) {
var adapter = new ModuleAdapter(userId);
adapter.setHasStableIds(true);
adapters.add(adapter);
titles.add(getString(R.string.user_title, userId));
}
new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(titles.get(position))).attach();
} else {
var adapter = new ModuleAdapter(0);
adapter.setHasStableIds(true);
adapters.add(adapter);
binding.tabLayout.setVisibility(View.GONE);
}
}
if (ConfigManager.getXposedVersionName() == null) {
Toast.makeText(this, R.string.lsposed_not_active, Toast.LENGTH_LONG).show();
finish();
@ -189,6 +172,28 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
@Override
protected void onResume() {
super.onResume();
int[] users = ConfigManager.getUsers();
if (users != null) {
adapters.clear();
if (users.length != 1) {
binding.viewPager.setUserInputEnabled(true);
ArrayList<String> titles = new ArrayList<>();
for (int userId : users) {
var adapter = new ModuleAdapter(userId);
adapter.setHasStableIds(true);
adapters.add(adapter);
titles.add(getString(R.string.user_title, userId));
}
new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(titles.get(position))).attach();
binding.tabLayout.setVisibility(View.VISIBLE);
} else {
binding.viewPager.setUserInputEnabled(false);
var adapter = new ModuleAdapter(0);
adapter.setHasStableIds(true);
adapters.add(adapter);
binding.tabLayout.setVisibility(View.GONE);
}
}
adapters.forEach(ModuleAdapter::refresh);
}
@ -291,6 +296,10 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
@Override
public void onBindViewHolder(@NonNull PagerAdapter.ViewHolder holder, int position) {
if (getItemCount() == 1) {
WindowInsetsHelperKt.setInitialPadding(holder.recyclerView, 0, ResourcesKt.resolveDimensionPixelOffset(getTheme(), R.attr.actionBarSize, 0), 0, 0);
}
holder.recyclerView.setTag(position);
holder.recyclerView.setAdapter(adapters.get(position));
holder.recyclerView.setLayoutManager(new LinearLayoutManagerFix(ModulesActivity.this));
holder.recyclerView.getBorderViewDelegate().setBorderVisibilityChangedListener((top, oldTop, bottom, oldBottom) -> binding.appBar.setRaised(!top));
@ -320,7 +329,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
ModuleAdapter(int userId) {
this.userId = userId;
refresh();
}
@NonNull

10
app/src/main/java/org/lsposed/manager/ui/activity/RepoItemActivity.java
View File

@ -118,12 +118,8 @@ public class RepoItemActivity extends BaseActivity implements RepoLoader.Listene
binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override
public void onPageSelected(int position) {
BorderView borderView;
if (position == 0) {
borderView = findViewById(R.id.scrollView);
} else {
borderView = findViewById(R.id.recyclerView);
}
BorderView borderView = binding.viewPager.findViewWithTag(position);
if (borderView != null) {
binding.appBar.setRaised(!borderView.getBorderViewDelegate().isShowingTopBorder());
}
@ -381,6 +377,7 @@ public class RepoItemActivity extends BaseActivity implements RepoLoader.Listene
case 0:
holder.textView.setTransformationMethod(new LinkTransformationMethod(RepoItemActivity.this));
holder.scrollView.getBorderViewDelegate().setBorderVisibilityChangedListener((top, oldTop, bottom, oldBottom) -> binding.appBar.setRaised(!top));
holder.scrollView.setTag(position);
markwon.setMarkdown(holder.textView, module.getReadme());
break;
case 1:
@ -390,6 +387,7 @@ public class RepoItemActivity extends BaseActivity implements RepoLoader.Listene
} else {
holder.recyclerView.setAdapter(new InformationAdapter(module));
}
holder.recyclerView.setTag(position);
holder.recyclerView.setLayoutManager(new LinearLayoutManagerFix(RepoItemActivity.this));
holder.recyclerView.getBorderViewDelegate().setBorderVisibilityChangedListener((top, oldTop, bottom, oldBottom) -> binding.appBar.setRaised(!top));
RecyclerViewKt.fixEdgeEffect(holder.recyclerView, false, true);