msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Simplification

Browse Source
master
M66B 1 week ago
parent 30da5ecb3a
commit de97def0ee
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File

35
app/src/main/java/eu/faircode/email/ActivityBase.java
Unescape View File

@ -104,7 +104,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
} }
@Override @Override
public void setContentView(View view) { public void setContentView(@NonNull View view) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); boolean hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE);
boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false); boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false);
@ -192,7 +192,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
View cf = view.findViewById(R.id.content_frame); View cf = view.findViewById(R.id.content_frame);
View content = (cf == null ? view : cf); View content = (cf == null ? view : cf);
int cpad = (content == null ? 0 : content.getPaddingBottom()); int cpad = content.getPaddingBottom();
ViewCompat.setOnApplyWindowInsetsListener(holder, (v, windowInsets) -> { ViewCompat.setOnApplyWindowInsetsListener(holder, (v, windowInsets) -> {
try { try {
@ -212,7 +212,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
changed = true; changed = true;
mlp.rightMargin = insets.right; mlp.rightMargin = insets.right;
} }
if (!edge_to_edge || content == null) if (!edge_to_edge)
if (mlp.bottomMargin != insets.bottom) { if (mlp.bottomMargin != insets.bottom) {
changed = true; changed = true;
mlp.bottomMargin = insets.bottom; mlp.bottomMargin = insets.bottom;
@ -232,24 +232,21 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
} }
if (edge_to_edge) { if (edge_to_edge) {
if (content != null) { Insets nav = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
Insets nav = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()); int pad = Math.max(0, cpad + (nav.bottom - nav.top));
int pad = Math.max(0, cpad + (nav.bottom - nav.top)); Snackbar.SnackbarLayout sl = Helper.findSnackbarLayout(content.getRootView());
Snackbar.SnackbarLayout sl = Helper.findSnackbarLayout(content.getRootView()); if (sl != null) {
if (sl != null) { pad = cpad;
pad = cpad; if (sl.getPaddingBottom() != nav.bottom - nav.top)
if (sl.getPaddingBottom() != nav.bottom - nav.top) sl.setPaddingRelative(
sl.setPaddingRelative( sl.getPaddingStart(), sl.getPaddingTop(),
sl.getPaddingStart(), sl.getPaddingTop(), sl.getPaddingEnd(), nav.bottom - nav.top);
sl.getPaddingEnd(), nav.bottom - nav.top);
}
if (pad != content.getPaddingBottom())
content.setPaddingRelative(
content.getPaddingStart(), content.getPaddingTop(),
content.getPaddingEnd(), pad);
} }
if (pad != content.getPaddingBottom())
content.setPaddingRelative(
content.getPaddingStart(), content.getPaddingTop(),
content.getPaddingEnd(), pad);
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }

Write Preview
Loading…
Cancel
Save