PeterCxy/Shelter
8
11
Fork 2
Code Issues Pull requests Projects Releases Activity

ui: Handle system bar insets in SetupWizardActivity

Browse source
This commit is contained in:
Peter Cai 2024-10-05 17:37:53 -04:00
parent c06e64ffe8
commit 1c4101ba2f
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/net/typeblog/shelter/ui/SetupWizardActivity.java
View file

@ -1,11 +1,15 @@
package net.typeblog.shelter.ui;
import androidx.activity.EdgeToEdge;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContract;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import android.app.admin.DevicePolicyManager;
@ -44,6 +48,7 @@ public class SetupWizardActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
EdgeToEdge.enable(this);
super.onCreate(savedInstanceState);
// The user could click on the "finish provisioning" notification while having removed
// this activity from the recents stack, in which case the notification will start a new
@ -219,6 +224,25 @@ public class SetupWizardActivity extends AppCompatActivity {
mWizard.setLayoutBackground(ContextCompat.getDrawable(inflater.getContext(), R.color.colorAccent));
return view;
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ViewCompat.setOnApplyWindowInsetsListener(mWizard, (v, windowInsets) -> {
Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
mWizard.setDecorPaddingTop(insets.top);
NavigationBar nav = mWizard.getNavigationBar();
ViewGroup.LayoutParams params = nav.getLayoutParams();
params.height += insets.bottom;
nav.setLayoutParams(params);
nav.setPadding(nav.getPaddingLeft(), nav.getPaddingTop(), nav.getPaddingRight(), insets.bottom);
return WindowInsetsCompat.CONSUMED;
});
}
}
protected static abstract class TextWizardFragment extends BaseWizardFragment {

22
app/src/main/res/layout/activity_setup_wizard.xml
View file

@ -1,8 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/setup_wizard_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.SetupWizardActivity" />
xmlns:app="http://schemas.android.com/apk/res-auto">
<View
android:id="@+id/status_bar_spacer"
android:background="?attr/colorAccent"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/setup_wizard_container"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<FrameLayout
android:id="@+id/setup_wizard_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.SetupWizardActivity" />
</androidx.constraintlayout.widget.ConstraintLayout>