This commit is contained in:
tehcneko committed 2021-03-17 22:22:24 +08:00
1 parent 97fbe73edf
commit a857e2db56
9 files changed
+10 -56

No files matched your search

@@ -122,6 +122,5 @@ public abstract class EhActivity extends MaterialActivity {
}
}
});
}
}
@@ -41,7 +41,6 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.view.WindowCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import com.google.android.material.navigation.NavigationView;
@@ -574,8 +573,9 @@ public final class MainActivity extends StageActivity
* If activity is running, show snack bar, otherwise show toast
*/
public void showTip(CharSequence message, int length) {
if (null != mDrawerLayout) {
Snackbar.make(mDrawerLayout, message,
View view = findViewById(R.id.snackbar);
if (null != view) {
Snackbar.make(view, message,
length == BaseScene.LENGTH_LONG ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
} else {
Toast.makeText(this, message,
@@ -1,17 +1,11 @@
package com.hippo.ehviewer.ui.fragment;
import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
@@ -60,21 +54,6 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
((SettingsActivity) requireActivity()).showTip(message, length);
}
@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.setClipChildren(false);
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;
});
}
}
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
@@ -125,8 +125,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import rikka.recyclerview.RecyclerViewKt;
@SuppressLint("RtlHardcoded")
public final class GalleryListScene extends BaseScene
implements SearchBar.Helper, SearchBar.OnStateChangeListener, FastScroller.OnDragHandlerListener,
@@ -21,7 +21,6 @@ import android.graphics.Canvas;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowInsets;
import android.widget.FrameLayout;
import com.hippo.ehviewer.R;
@@ -154,9 +153,4 @@ public class StageLayout extends FrameLayout {
return super.drawChild(canvas, child, drawingTime);
}
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
return insets;
}
}