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

Implement edge-to-edge experience (#24)

This commit is contained in:
tehcneko 2021-01-31 23:04:57 +08:00 committed by GitHub
parent 27e58a30df
commit 4a9f0959bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java
View File

@ -54,6 +54,7 @@ public class AppListActivity extends BaseActivity {
scopeAdapter.setHasStableIds(true);
binding.recyclerView.setAdapter(scopeAdapter);
binding.recyclerView.setLayoutManager(new LinearLayoutManagerFix(this));
setupRecyclerViewInsets(binding.recyclerView, binding.getRoot());
FastScrollerBuilder fastScrollerBuilder = new FastScrollerBuilder(binding.recyclerView);
if (!preferences.getBoolean("md2", true)) {
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,

18
app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java
View File

@ -6,8 +6,10 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Build;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -15,6 +17,10 @@ import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@ -98,6 +104,18 @@ public class BaseActivity extends AppCompatActivity {
theme = getTheme(this) + getCustomTheme() + preferences.getBoolean("md2", true);
}
protected void setupRecyclerViewInsets(View recyclerView, View root) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, (v, insets) -> {
Insets insets1 = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
root.setPadding(insets1.left, insets1.top, insets1.right, 0);
v.setPadding(0, 0, 0, insets1.bottom);
return WindowInsetsCompat.CONSUMED;
});
}
}
public int getThemedColor(int id) {
TypedArray typedArray = getTheme().obtainStyledAttributes(new int[]{id});
int color = typedArray.getColor(0, 0);

1
app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java
View File

@ -86,6 +86,7 @@ public class LogsActivity extends BaseActivity {
binding.recyclerView.setAdapter(adapter);
layoutManager = new LinearLayoutManagerFix(this);
binding.recyclerView.setLayoutManager(layoutManager);
setupRecyclerViewInsets(binding.recyclerView, binding.getRoot());
if (Files.exists(Paths.get(Constants.getBaseDir(), "conf/disable_verbose_log"))) {
binding.slidingTabs.setVisibility(View.GONE);
}

10
app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java
View File

@ -32,7 +32,7 @@ import io.github.lsposed.manager.Constants;
import io.github.lsposed.manager.R;
import io.github.lsposed.manager.adapters.AppHelper;
import io.github.lsposed.manager.adapters.ScopeAdapter;
import io.github.lsposed.manager.databinding.ActivityModulesBinding;
import io.github.lsposed.manager.databinding.ActivityAppListBinding;
import io.github.lsposed.manager.util.GlideApp;
import io.github.lsposed.manager.util.LinearLayoutManagerFix;
import io.github.lsposed.manager.util.ModuleUtil;
@ -42,7 +42,7 @@ import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleListener {
ActivityModulesBinding binding;
ActivityAppListBinding binding;
private int installedXposedVersion;
private ApplicationFilter filter;
private SearchView searchView;
@ -94,10 +94,11 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityModulesBinding.inflate(getLayoutInflater());
binding = ActivityAppListBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
setSupportActionBar(binding.toolbar);
binding.toolbar.setNavigationOnClickListener(view -> finish());
binding.toolbar.setNavigationOnClickListener(view -> onBackPressed());
binding.masterSwitch.setVisibility(View.GONE);
ActionBar bar = getSupportActionBar();
if (bar != null) {
bar.setDisplayHomeAsUpEnabled(true);
@ -118,6 +119,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
moduleUtil.addListener(this);
binding.recyclerView.setAdapter(adapter);
binding.recyclerView.setLayoutManager(new LinearLayoutManagerFix(this));
setupRecyclerViewInsets(binding.recyclerView, binding.getRoot());
FastScrollerBuilder fastScrollerBuilder = new FastScrollerBuilder(binding.recyclerView);
if (!preferences.getBoolean("md2", true)) {
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,

32
app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java
View File

@ -3,16 +3,24 @@ package io.github.lsposed.manager.ui.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.preference.Preference;
import androidx.preference.SwitchPreferenceCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.takisoft.preferencex.PreferenceFragmentCompat;
import com.takisoft.preferencex.SimpleMenuPreference;
@ -27,6 +35,7 @@ import io.github.lsposed.manager.R;
import io.github.lsposed.manager.databinding.ActivitySettingsBinding;
import io.github.lsposed.manager.ui.fragment.StatusDialogBuilder;
import io.github.lsposed.manager.ui.widget.IntegerListPreference;
import io.github.lsposed.manager.ui.widget.RecyclerViewBugFixed;
public class SettingsActivity extends BaseActivity {
private static final String KEY_PREFIX = SettingsActivity.class.getName() + '.';
@ -63,6 +72,14 @@ public class SettingsActivity extends BaseActivity {
getSupportFragmentManager().beginTransaction()
.add(R.id.container, new SettingsFragment()).commit();
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
ViewCompat.setOnApplyWindowInsetsListener(binding.getRoot(), (v, insets) -> {
Insets insets1 = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
binding.getRoot().setPadding(insets1.left, insets1.top, insets1.right, 0);
return insets;
});
}
}
private void restart() {
@ -271,5 +288,20 @@ public class SettingsActivity extends BaseActivity {
return (enabled == Files.exists(flag));
}
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
RecyclerView recyclerView = getListView();
recyclerView.setClipToPadding(false);
recyclerView.setEdgeEffectFactory(new RecyclerViewBugFixed.AlwaysClipToPaddingEdgeEffectFactory());
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, (v, insets) -> {
Insets insets1 = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
v.setPadding(0, 0, 0, insets1.bottom);
return WindowInsetsCompat.CONSUMED;
});
}
}
}
}

5
app/src/main/res/layout/activity_app_list.xml
View File

@ -37,8 +37,6 @@
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
@ -46,10 +44,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

3
app/src/main/res/layout/activity_logs.xml
View File

@ -48,6 +48,7 @@
android:id="@+id/recyclerView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical" />
android:orientation="vertical"
android:clipToPadding="false" />
</HorizontalScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

36
app/src/main/res/layout/activity_modules.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/snackbar"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?actionBarTheme"
app:liftOnScrollTargetViewId="@id/recyclerView">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?colorActionBar"
app:popupTheme="?actionBarPopupTheme" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<io.github.lsposed.manager.ui.widget.RecyclerViewBugFixed
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>