mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-02 13:14:39 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2021-12-30 15:33:09 +01:00
parent ca71550be7
commit dcdf09f841
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ActivityView.java
View file

@ -1032,15 +1032,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (nav_pinned)
return getDrawerWidthPinned();
else {
int actionBarHeight = Helper.getActionBarHeight(this);
DisplayMetrics dm = getResources().getDisplayMetrics();
int actionBarHeight;
TypedValue tv = new TypedValue();
if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))
actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, dm);
else
actionBarHeight = Helper.dp2pixels(this, 56);
int screenWidth = Math.min(dm.widthPixels, dm.heightPixels);
// Screen width 320 - action bar 56 = 264 dp
// Icons 6 x (24 width + 2x6 padding) = 216 dp

12
app/src/main/java/eu/faircode/email/Helper.java
View file

@ -62,6 +62,7 @@ import android.text.Spannable;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@ -612,6 +613,17 @@ public class Helper {
// View
static int getActionBarHeight(Context context) {
int actionBarHeight;
TypedValue tv = new TypedValue();
if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
DisplayMetrics dm = context.getResources().getDisplayMetrics();
return TypedValue.complexToDimensionPixelSize(tv.data, dm);
}
else
return Helper.dp2pixels(context, 56);
}
static Intent getChooser(Context context, Intent intent) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
PackageManager pm = context.getPackageManager();