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

[app] Use margin instead of padding (#1432)

This commit is contained in:
LoveSy 2021-11-23 22:26:38 +08:00 committed by GitHub
parent afdfd58a13
commit 69fe97b66e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -175,7 +175,7 @@ dependencies {
implementation("androidx.slidingpanelayout:slidingpanelayout:1.2.0-beta01") implementation("androidx.slidingpanelayout:slidingpanelayout:1.2.0-beta01")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.github.bumptech.glide:glide:$glideVersion") implementation("com.github.bumptech.glide:glide:$glideVersion")
implementation("com.google.android.material:material:1.5.0-alpha05") implementation("com.google.android.material:material:1.5.0-beta01")
implementation("com.google.code.gson:gson:2.8.9") implementation("com.google.code.gson:gson:2.8.9")
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.2")) implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.2"))
implementation("com.squareup.okhttp3:okhttp") implementation("com.squareup.okhttp3:okhttp")

8
app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java
View File

@ -61,7 +61,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.request.transition.Transition;
import com.google.android.material.checkbox.MaterialCheckBox; import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import org.lsposed.lspd.models.Application; import org.lsposed.lspd.models.Application;
@ -70,6 +69,7 @@ import org.lsposed.manager.BuildConfig;
import org.lsposed.manager.ConfigManager; import org.lsposed.manager.ConfigManager;
import org.lsposed.manager.R; import org.lsposed.manager.R;
import org.lsposed.manager.databinding.ItemModuleBinding; import org.lsposed.manager.databinding.ItemModuleBinding;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import org.lsposed.manager.ui.fragment.AppListFragment; import org.lsposed.manager.ui.fragment.AppListFragment;
import org.lsposed.manager.ui.fragment.CompileDialogFragment; import org.lsposed.manager.ui.fragment.CompileDialogFragment;
import org.lsposed.manager.ui.widget.EmptyStateRecyclerView; import org.lsposed.manager.ui.widget.EmptyStateRecyclerView;
@ -221,7 +221,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter<Scope
int itemId = item.getItemId(); int itemId = item.getItemId();
if (itemId == R.id.use_recommended) { if (itemId == R.id.use_recommended) {
if (!checkedList.isEmpty()) { if (!checkedList.isEmpty()) {
new MaterialAlertDialogBuilder(activity) new BlurBehindDialogBuilder(activity)
.setMessage(R.string.use_recommended_message) .setMessage(R.string.use_recommended_message)
.setPositiveButton(android.R.string.ok, (dialog, which) -> { .setPositiveButton(android.R.string.ok, (dialog, which) -> {
checkRecommended(); checkRecommended();
@ -291,7 +291,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter<Scope
if (info.packageName.equals("android")) { if (info.packageName.equals("android")) {
ConfigManager.reboot(false); ConfigManager.reboot(false);
} else { } else {
new MaterialAlertDialogBuilder(activity) new BlurBehindDialogBuilder(activity)
.setTitle(R.string.force_stop_dlg_title) .setTitle(R.string.force_stop_dlg_title)
.setMessage(R.string.force_stop_dlg_text) .setMessage(R.string.force_stop_dlg_text)
.setPositiveButton(android.R.string.ok, (dialog, which) -> ConfigManager.forceStopPackage(info.packageName, info.uid / 100000)) .setPositiveButton(android.R.string.ok, (dialog, which) -> ConfigManager.forceStopPackage(info.packageName, info.uid / 100000))
@ -656,7 +656,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter<Scope
public void onBackPressed() { public void onBackPressed() {
fragment.searchView.clearFocus(); fragment.searchView.clearFocus();
if (!refreshing && fragment.binding.masterSwitch.isChecked() && checkedList.isEmpty()) { if (!refreshing && fragment.binding.masterSwitch.isChecked() && checkedList.isEmpty()) {
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity); var builder = new BlurBehindDialogBuilder(activity);
builder.setMessage(!recommendedList.isEmpty() ? R.string.no_scope_selected_has_recommended : R.string.no_scope_selected); builder.setMessage(!recommendedList.isEmpty() ? R.string.no_scope_selected_has_recommended : R.string.no_scope_selected);
if (!recommendedList.isEmpty()) { if (!recommendedList.isEmpty()) {
builder.setPositiveButton(android.R.string.ok, (dialog, which) -> { builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {

4
app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
View File

@ -33,11 +33,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.material.color.DynamicColors; import com.google.android.material.color.DynamicColors;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.lsposed.manager.BuildConfig; import org.lsposed.manager.BuildConfig;
import org.lsposed.manager.ConfigManager; import org.lsposed.manager.ConfigManager;
import org.lsposed.manager.R; import org.lsposed.manager.R;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import org.lsposed.manager.ui.dialog.FlashDialogBuilder; import org.lsposed.manager.ui.dialog.FlashDialogBuilder;
import org.lsposed.manager.util.NavUtil; import org.lsposed.manager.util.NavUtil;
import org.lsposed.manager.util.ThemeUtil; import org.lsposed.manager.util.ThemeUtil;
@ -61,7 +61,7 @@ public class BaseActivity extends MaterialActivity {
if (!ConfigManager.isBinderAlive()) return; if (!ConfigManager.isBinderAlive()) return;
var version = ConfigManager.getXposedVersionCode(); var version = ConfigManager.getXposedVersionCode();
if (BuildConfig.VERSION_CODE == version) return; if (BuildConfig.VERSION_CODE == version) return;
new MaterialAlertDialogBuilder(this) new BlurBehindDialogBuilder(this)
.setMessage(getString(R.string.version_mismatch, version, BuildConfig.VERSION_CODE)) .setMessage(getString(R.string.version_mismatch, version, BuildConfig.VERSION_CODE))
.setPositiveButton(android.R.string.ok, (dialog, id) -> { .setPositiveButton(android.R.string.ok, (dialog, id) -> {
if (UpdateUtil.canInstall()) { if (UpdateUtil.canInstall()) {

4
app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java
View File

@ -34,13 +34,13 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatDialogFragment; import androidx.appcompat.app.AppCompatDialogFragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import org.lsposed.manager.App; import org.lsposed.manager.App;
import org.lsposed.manager.R; import org.lsposed.manager.R;
import org.lsposed.manager.databinding.FragmentCompileDialogBinding; import org.lsposed.manager.databinding.FragmentCompileDialogBinding;
import org.lsposed.manager.receivers.LSPManagerServiceHolder; import org.lsposed.manager.receivers.LSPManagerServiceHolder;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -66,7 +66,7 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
FragmentCompileDialogBinding binding = FragmentCompileDialogBinding.inflate(LayoutInflater.from(requireActivity()), null, false); FragmentCompileDialogBinding binding = FragmentCompileDialogBinding.inflate(LayoutInflater.from(requireActivity()), null, false);
final PackageManager pm = requireContext().getPackageManager(); final PackageManager pm = requireContext().getPackageManager();
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity()) var builder = new BlurBehindDialogBuilder(requireActivity())
.setIcon(appInfo.loadIcon(pm)) .setIcon(appInfo.loadIcon(pm))
.setTitle(appInfo.loadLabel(pm)) .setTitle(appInfo.loadLabel(pm))
.setView(binding.getRoot()); .setView(binding.getRoot());

4
app/src/main/java/org/lsposed/manager/ui/fragment/LogsFragment.java
View File

@ -47,7 +47,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
@ -56,6 +55,7 @@ import org.lsposed.manager.ConfigManager;
import org.lsposed.manager.R; import org.lsposed.manager.R;
import org.lsposed.manager.databinding.FragmentLogsBinding; import org.lsposed.manager.databinding.FragmentLogsBinding;
import org.lsposed.manager.databinding.ItemLogBinding; import org.lsposed.manager.databinding.ItemLogBinding;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import org.lsposed.manager.util.SimpleStatefulAdaptor; import org.lsposed.manager.util.SimpleStatefulAdaptor;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -246,7 +246,7 @@ public class LogsFragment extends BaseFragment {
@Override @Override
synchronized protected void onPreExecute() { synchronized protected void onPreExecute() {
mProgressDialog = new MaterialAlertDialogBuilder(requireActivity()).create(); mProgressDialog = new BlurBehindDialogBuilder(requireActivity()).create();
mProgressDialog.setMessage(getString(R.string.loading)); mProgressDialog.setMessage(getString(R.string.loading));
mProgressDialog.setCancelable(false); mProgressDialog.setCancelable(false);
handler.postDelayed(mRunnable, 300); handler.postDelayed(mRunnable, 300);

8
app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java
View File

@ -62,7 +62,6 @@ import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.request.transition.Transition;
import com.google.android.material.checkbox.MaterialCheckBox; import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator; import com.google.android.material.tabs.TabLayoutMediator;
@ -77,6 +76,7 @@ import org.lsposed.manager.databinding.FragmentPagerBinding;
import org.lsposed.manager.databinding.ItemModuleBinding; import org.lsposed.manager.databinding.ItemModuleBinding;
import org.lsposed.manager.databinding.ItemRepoRecyclerviewBinding; import org.lsposed.manager.databinding.ItemRepoRecyclerviewBinding;
import org.lsposed.manager.repo.RepoLoader; import org.lsposed.manager.repo.RepoLoader;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import org.lsposed.manager.ui.widget.EmptyStateRecyclerView; import org.lsposed.manager.ui.widget.EmptyStateRecyclerView;
import org.lsposed.manager.util.GlideApp; import org.lsposed.manager.util.GlideApp;
import org.lsposed.manager.util.ModuleUtil; import org.lsposed.manager.util.ModuleUtil;
@ -201,7 +201,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi
} }
}); });
pickAdaptor.refresh(); pickAdaptor.refresh();
var dialog = new MaterialAlertDialogBuilder(requireActivity()) var dialog = new BlurBehindDialogBuilder(requireActivity())
.setTitle(getString(R.string.install_to_user, user.name)) .setTitle(getString(R.string.install_to_user, user.name))
.setView(binding.getRoot()) .setView(binding.getRoot())
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
@ -254,7 +254,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi
} }
private void installModuleToUser(ModuleUtil.InstalledModule module, UserInfo user) { private void installModuleToUser(ModuleUtil.InstalledModule module, UserInfo user) {
new MaterialAlertDialogBuilder(requireActivity()) new BlurBehindDialogBuilder(requireActivity())
.setTitle(getString(R.string.install_to_user, user.name)) .setTitle(getString(R.string.install_to_user, user.name))
.setMessage(getString(R.string.install_to_user_message, module.getAppName(), user.name)) .setMessage(getString(R.string.install_to_user_message, module.getAppName(), user.name))
.setPositiveButton(android.R.string.ok, (dialog, which) -> .setPositiveButton(android.R.string.ok, (dialog, which) ->
@ -303,7 +303,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi
ConfigManager.startActivityAsUserWithFeature(new Intent(ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", selectedModule.packageName, null)), selectedModule.userId); ConfigManager.startActivityAsUserWithFeature(new Intent(ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", selectedModule.packageName, null)), selectedModule.userId);
return true; return true;
} else if (itemId == R.id.menu_uninstall) { } else if (itemId == R.id.menu_uninstall) {
new MaterialAlertDialogBuilder(requireActivity()) new BlurBehindDialogBuilder(requireActivity())
.setTitle(selectedModule.getAppName()) .setTitle(selectedModule.getAppName())
.setMessage(R.string.module_uninstall_message) .setMessage(R.string.module_uninstall_message)
.setPositiveButton(android.R.string.ok, (dialog, which) -> .setPositiveButton(android.R.string.ok, (dialog, which) ->

4
app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java
View File

@ -44,7 +44,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.button.MaterialButton; import com.google.android.material.button.MaterialButton;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.CircularProgressIndicator; import com.google.android.material.progressindicator.CircularProgressIndicator;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
@ -63,6 +62,7 @@ import org.lsposed.manager.repo.model.Collaborator;
import org.lsposed.manager.repo.model.OnlineModule; import org.lsposed.manager.repo.model.OnlineModule;
import org.lsposed.manager.repo.model.Release; import org.lsposed.manager.repo.model.Release;
import org.lsposed.manager.repo.model.ReleaseAsset; import org.lsposed.manager.repo.model.ReleaseAsset;
import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
import org.lsposed.manager.ui.widget.EmptyStateRecyclerView; import org.lsposed.manager.ui.widget.EmptyStateRecyclerView;
import org.lsposed.manager.ui.widget.LinkifyTextView; import org.lsposed.manager.ui.widget.LinkifyTextView;
import org.lsposed.manager.util.NavUtil; import org.lsposed.manager.util.NavUtil;
@ -381,7 +381,7 @@ public class RepoItemFragment extends BaseFragment implements RepoLoader.Listene
holder.viewAssets.setOnClickListener(v -> { holder.viewAssets.setOnClickListener(v -> {
ArrayList<String> names = new ArrayList<>(); ArrayList<String> names = new ArrayList<>();
assets.forEach(releaseAsset -> names.add(releaseAsset.getName())); assets.forEach(releaseAsset -> names.add(releaseAsset.getName()));
new MaterialAlertDialogBuilder(requireActivity()) new BlurBehindDialogBuilder(requireActivity())
.setItems(names.toArray(new String[0]), (dialog, which) -> NavUtil.startURL(requireActivity(), assets.get(which).getDownloadUrl())) .setItems(names.toArray(new String[0]), (dialog, which) -> NavUtil.startURL(requireActivity(), assets.get(which).getDownloadUrl()))
.show(); .show();
}); });

1
app/src/main/res/layout/dialog_recyclerview.xml
View File

@ -19,6 +19,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="?attr/dialogPreferredPadding"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">

2
app/src/main/res/layout/fragment_app_list.xml
View File

@ -39,7 +39,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="0dp" android:elevation="0dp"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:fitsSystemWindowsInsets="top" app:layout_fitsSystemWindowsInsets="top"
app:layout_scrollFlags="scroll|enterAlways" /> app:layout_scrollFlags="scroll|enterAlways" />
<rikka.widget.switchbar.SwitchBar <rikka.widget.switchbar.SwitchBar

2
app/src/main/res/layout/fragment_logs.xml
View File

@ -38,7 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="0dp" android:elevation="0dp"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:fitsSystemWindowsInsets="top" app:layout_fitsSystemWindowsInsets="top"
app:layout_scrollFlags="scroll|enterAlways" /> app:layout_scrollFlags="scroll|enterAlways" />
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout

2
app/src/main/res/layout/fragment_pager.xml
View File

@ -39,7 +39,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="0dp" android:elevation="0dp"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:fitsSystemWindowsInsets="top" app:layout_fitsSystemWindowsInsets="top"
app:layout_scrollEffect="none" app:layout_scrollEffect="none"
app:layout_scrollFlags="scroll|enterAlways" /> app:layout_scrollFlags="scroll|enterAlways" />

4
app/src/main/res/layout/fragment_repo.xml
View File

@ -36,8 +36,10 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar_layout" android:id="@+id/collapsing_toolbar_layout"
style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutMediumSize" android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:forceApplySystemWindowInsetTop="true"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar

7
app/src/main/res/layout/fragment_settings.xml
View File

@ -36,10 +36,11 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar_layout" android:id="@+id/collapsing_toolbar_layout"
style="?attr/collapsingToolbarLayoutMediumStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutMediumSize" android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:titleCollapseMode="fade">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"