Skip to content

[Catalog][DatePicker] navigation bar has no contrast if edge to edge setting is on #4502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Catalog][DatePicker] navigation bar has no contrast if edge to edge setting is on #4502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc5fb20
[Catalog][DatePicker] navigation bar has no contrast if edge to edge …
manabu-nakamura Dec 23, 2024
0e84e33
[Catalog][DatePicker] navigation bar has no contrast if edge to edge …
manabu-nakamura Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import android.content.Context;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableString;
Expand All @@ -33,6 +34,7 @@
import androidx.annotation.AttrRes;
import androidx.annotation.Nullable;
import androidx.core.util.Pair;
import androidx.fragment.app.Fragment;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.datepicker.CalendarConstraints;
import com.google.android.material.datepicker.CompositeDateValidator;
Expand All @@ -41,6 +43,7 @@
import com.google.android.material.datepicker.MaterialDatePicker;
import com.google.android.material.snackbar.Snackbar;
import io.material.catalog.feature.DemoFragment;
import io.material.catalog.windowpreferences.WindowPreferencesManager;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
Expand Down Expand Up @@ -163,16 +166,31 @@ public View onCreateDemoView(
builder.setCalendarConstraints(constraintsBuilder.build());
MaterialDatePicker<?> picker = builder.build();
addSnackBarListeners(picker);
picker.show(getChildFragmentManager(), picker.toString());
picker.show(getChildFragmentManager(), "MaterialDatePicker");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change picker.toString() to a string constant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it to find the fragment by findFragmentByTag("MaterialDatePicker").

navigationBarContrast(picker, view);
} catch (IllegalArgumentException e) {
snackbar.setText(e.getMessage());
snackbar.show();
}
});

Fragment fragment = getChildFragmentManager().findFragmentByTag("MaterialDatePicker");
if (fragment instanceof MaterialDatePicker<?>) {
navigationBarContrast((MaterialDatePicker<?>) fragment, view);
}

return view;
}

private void navigationBarContrast(MaterialDatePicker<?> materialDatePicker, View view) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
view.post(() -> {
materialDatePicker.requireDialog().getWindow().setNavigationBarContrastEnforced(
!new WindowPreferencesManager(requireContext()).isEdgeToEdgeEnabled());
});
}
}

private MaterialDatePicker.Builder<?> setupDateSelectorBuilder(
int selectionModeChoice, int selectionChoice, int inputModeChoice) {

Expand Down