fix provider setup layout after switching to API 35

2 files changed, 7 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
index 191db42b..82eddae6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
@@ -155,7 +155,7 @@ public class SetupActivity extends AppCompatActivity implements SetupActivityCal
         });
         binding.viewPager.setAdapter(adapter);
         binding.viewPager.setUserInputEnabled(false);
-
+        ViewHelper.applyInsetsToViewMargin(binding.bottomNavigation, true, false, true, true);
 
         binding.setupNextButton.setOnClickListener(v -> {
             int currentPos = binding.viewPager.getCurrentItem();
@@ -265,6 +265,7 @@ public class SetupActivity extends AppCompatActivity implements SetupActivityCal
 
     private void setupActionBar() {
         setSupportActionBar(binding.toolbar);
+        ViewHelper.applyInsetsToViewPadding(binding.toolbar, false, true, false, false);
         final ActionBar actionBar = getSupportActionBar();
         Context context = actionBar.getThemedContext();
         actionBar.setDisplayOptions(DISPLAY_SHOW_CUSTOM);
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index a63592f4..c5366397 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -5,7 +5,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:weightSum="1"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/colorPrimary_transparent"
+    >
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
@@ -23,14 +25,15 @@
         android:layout_below="@id/toolbar"
         android:layout_alignParentBottom="true"
         android:layout_weight="1"
+        android:background="@color/white"
         />
 
     <RelativeLayout
+        android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="@dimen/setup_bottom_bar"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/stdpadding"
-        android:background="@color/colorPrimary_transparent"
         >
         <LinearLayout
             android:layout_width="match_parent"