diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml index f2a2d565b..e2f0a05b5 100644 --- a/Habitica/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -46,8 +46,7 @@ android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar" app:layout_collapseMode="pin" - app:popupTheme="@style/Theme.AppCompat.Light" - android:fitsSystemWindows="true"/> + app:popupTheme="@style/Theme.AppCompat.Light" /> + app:tabMode="fixed" /> {}, throwable -> {}); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { Window window = getWindow(); - window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha)); + } getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java index d3b498bed..115c56d40 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java @@ -178,9 +178,11 @@ public class LoginActivity extends BaseActivity backgroundContainer.post(() -> backgroundContainer.scrollTo(0, backgroundContainer.getBottom())); backgroundContainer.setScrollingEnabled(false); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { Window window = getWindow(); - window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha)); + } getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 8cafe6a37..a507cfd4e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -289,9 +289,11 @@ public class MainActivity extends BaseActivity implements Action1, Ha drawer.setSelectionAtPosition(1, false); sideAvatarView = new AvatarView(this, true, false, false); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { Window window = getWindow(); - window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha)); + } getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); toolbar.setPadding(0, getStatusBarHeight(), 0, 0); float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics());