Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9930 from osmandapp/dynamic_divider

Browse source 
Bottom sheet dynamic buttons
This commit is contained in:
Vitaliy 2020-10-05 12:14:40 +03:00 committed by GitHub
commit cdc903e3db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 247 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
OsmAnd/res/layout/bottom_buttons_vertical.xml Normal file
View file

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/buttons_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="center"
android:orientation="vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingTop="@dimen/content_padding_small"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_small">
<include
android:id="@+id/third_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height"
android:visibility="gone"
tools:visibility="visible" />
<View
android:id="@+id/buttons_divider_top"
android:layout_width="match_parent"
android:layout_height="@dimen/content_padding"
android:visibility="gone"
tools:visibility="visible" />
<include
android:id="@+id/right_bottom_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height"
android:visibility="gone"
tools:visibility="visible" />
<View
android:id="@+id/buttons_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/content_padding"
tools:visibility="visible" />
<include
android:id="@+id/dismiss_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height" />
</LinearLayout>

6
OsmAnd/res/layout/bottom_sheet_menu_base.xml
View file

@ -35,10 +35,8 @@
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="bottom"
android:visibility="gone"
android:background="@drawable/bg_contextmenu_shadow_top_light" />
android:background="@drawable/bg_contextmenu_shadow_top_light"
android:visibility="gone" />
</FrameLayout>
<include layout="@layout/bottom_buttons" />
</LinearLayout>

187
OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
View file

@ -8,11 +8,11 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Build;
import android.os.Bundle;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnScrollChangedListener;
import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
@ -50,8 +50,11 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
protected int themeRes;
protected View dismissButton;
protected View rightButton;
protected View thirdButton;
private View buttonsShadow;
private LinearLayout itemsContainer;
private LinearLayout buttonsContainer;
@StringRes
protected int dismissButtonStringRes = R.string.shared_string_cancel;
@ -74,45 +77,21 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
createMenuItems(savedInstanceState);
Context ctx = requireContext();
View mainView = View.inflate(new ContextThemeWrapper(ctx, themeRes), R.layout.bottom_sheet_menu_base, null);
Activity activity = requireActivity();
LayoutInflater themedInflater = UiUtilities.getInflater(activity, nightMode);
View mainView = themedInflater.inflate(R.layout.bottom_sheet_menu_base, null);
if (useScrollableItemsContainer()) {
itemsContainer = (LinearLayout) mainView.findViewById(R.id.scrollable_items_container);
itemsContainer = mainView.findViewById(R.id.scrollable_items_container);
} else {
mainView.findViewById(R.id.scroll_view).setVisibility(View.GONE);
itemsContainer = (LinearLayout) mainView.findViewById(R.id.non_scrollable_items_container);
itemsContainer = mainView.findViewById(R.id.non_scrollable_items_container);
itemsContainer.setVisibility(View.VISIBLE);
}
buttonsShadow = mainView.findViewById(R.id.buttons_shadow);
inflateMenuItems();
dismissButton = mainView.findViewById(R.id.dismiss_button);
UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), getDismissButtonTextId());
dismissButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onDismissButtonClickAction();
dismiss();
}
});
if (hideButtonsContainer()) {
mainView.findViewById(R.id.buttons_container).setVisibility(View.GONE);
} else {
int rightBottomButtonTextId = getRightBottomButtonTextId();
if (rightBottomButtonTextId != DEFAULT_VALUE) {
mainView.findViewById(R.id.buttons_divider).setVisibility(View.VISIBLE);
rightButton = mainView.findViewById(R.id.right_bottom_button);
UiUtilities.setupDialogButton(nightMode, rightButton, getRightBottomButtonType(), rightBottomButtonTextId);
rightButton.setVisibility(View.VISIBLE);
rightButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onRightBottomButtonClick();
}
});
}
}
updateBottomButtons();
setupScrollShadow(mainView);
setupBottomButtons((ViewGroup) mainView);
setupHeightAndBackground(mainView);
return mainView;
}
@ -199,7 +178,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
if (contentView.getHeight() > contentHeight) {
if (useScrollableItemsContainer() || useExpandableList()) {
contentView.getLayoutParams().height = contentHeight;
mainView.findViewById(R.id.buttons_shadow).setVisibility(View.VISIBLE);
buttonsShadow.setVisibility(View.VISIBLE);
} else {
contentView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
}
@ -222,7 +201,18 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
private int getContentHeight(int availableScreenHeight) {
int customHeight = getCustomHeight();
int maxHeight = availableScreenHeight - getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_height);
int buttonsHeight;
if (useVerticalButtons()) {
int padding = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
int buttonHeight = getResources().getDimensionPixelSize(R.dimen.dialog_button_height);
buttonsHeight = (buttonHeight + padding) * 2 + getFirstDividerHeight();
if (getThirdBottomButtonTextId() != DEFAULT_VALUE) {
buttonsHeight += buttonHeight + getSecondDividerHeight();
}
} else {
buttonsHeight = getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_height);
}
int maxHeight = availableScreenHeight - buttonsHeight;
if (customHeight != DEFAULT_VALUE && customHeight <= maxHeight) {
return customHeight;
}
@ -280,6 +270,18 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
}
protected int getThirdBottomButtonTextId() {
return DEFAULT_VALUE;
}
protected DialogButtonType getThirdBottomButtonType() {
return DialogButtonType.PRIMARY;
}
protected void onThirdBottomButtonClick() {
}
protected boolean isDismissButtonEnabled() {
return true;
}
@ -288,6 +290,42 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
return true;
}
protected void setupBottomButtons(ViewGroup view) {
Activity activity = requireActivity();
LayoutInflater themedInflater = UiUtilities.getInflater(activity, nightMode);
if (!hideButtonsContainer()) {
if (useVerticalButtons()) {
buttonsContainer = (LinearLayout) themedInflater.inflate(R.layout.bottom_buttons_vertical, view);
setupThirdButton();
} else {
buttonsContainer = (LinearLayout) themedInflater.inflate(R.layout.bottom_buttons, view);
}
setupRightButton();
setupDismissButton();
updateBottomButtons();
}
}
boolean useVerticalButtons() {
Activity activity = requireActivity();
int rightBottomButtonTextId = getRightBottomButtonTextId();
if (getDismissButtonTextId() != DEFAULT_VALUE && rightBottomButtonTextId != DEFAULT_VALUE) {
if (getThirdBottomButtonTextId() != DEFAULT_VALUE) {
return true;
}
String rightButtonText = getString(rightBottomButtonTextId);
boolean portrait = AndroidUiHelper.isOrientationPortrait(activity);
int outerPadding = getResources().getDimensionPixelSize(R.dimen.content_padding);
int innerPadding = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
int dialogWidth = portrait ? AndroidUtils.getScreenWidth(activity) : getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
int availableTextWidth = (dialogWidth - (outerPadding * 3 + innerPadding * 4)) / 2;
int measuredTextWidth = AndroidUtils.getTextWidth(getResources().getDimensionPixelSize(R.dimen.default_desc_text_size), rightButtonText);
return measuredTextWidth > availableTextWidth;
}
return false;
}
protected void updateBottomButtons() {
if (dismissButton != null) {
boolean enabled = isDismissButtonEnabled();
@ -301,6 +339,66 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
}
}
private void setupDismissButton() {
dismissButton = buttonsContainer.findViewById(R.id.dismiss_button);
int buttonTextId = getDismissButtonTextId();
if (buttonTextId != DEFAULT_VALUE) {
UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), buttonTextId);
dismissButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onDismissButtonClickAction();
dismiss();
}
});
}
AndroidUiHelper.updateVisibility(dismissButton, buttonTextId != DEFAULT_VALUE);
}
private void setupRightButton() {
rightButton = buttonsContainer.findViewById(R.id.right_bottom_button);
int buttonTextId = getRightBottomButtonTextId();
if (buttonTextId != DEFAULT_VALUE) {
UiUtilities.setupDialogButton(nightMode, rightButton, getRightBottomButtonType(), buttonTextId);
rightButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onRightBottomButtonClick();
}
});
}
View divider = buttonsContainer.findViewById(R.id.buttons_divider);
divider.getLayoutParams().height = getFirstDividerHeight();
AndroidUiHelper.updateVisibility(rightButton, buttonTextId != DEFAULT_VALUE);
AndroidUiHelper.updateVisibility(divider, buttonTextId != DEFAULT_VALUE);
}
protected int getFirstDividerHeight() {
return getResources().getDimensionPixelSize(R.dimen.content_padding);
}
private void setupThirdButton() {
thirdButton = buttonsContainer.findViewById(R.id.third_button);
int buttonTextId = getThirdBottomButtonTextId();
if (buttonTextId != DEFAULT_VALUE) {
UiUtilities.setupDialogButton(nightMode, thirdButton, getThirdBottomButtonType(), buttonTextId);
thirdButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onThirdBottomButtonClick();
}
});
}
View divider = buttonsContainer.findViewById(R.id.buttons_divider_top);
divider.getLayoutParams().height = getSecondDividerHeight();
AndroidUiHelper.updateVisibility(thirdButton, buttonTextId != DEFAULT_VALUE);
AndroidUiHelper.updateVisibility(divider, buttonTextId != DEFAULT_VALUE);
}
protected int getSecondDividerHeight() {
return getResources().getDimensionPixelSize(R.dimen.content_padding);
}
@ColorRes
protected int getBgColorId() {
return nightMode ? R.color.list_background_color_dark : R.color.list_background_color_light;
@ -325,7 +423,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
private LayerDrawable createBackgroundDrawable(@NonNull Context ctx, @DrawableRes int shadowDrawableResId) {
Drawable shadowDrawable = ContextCompat.getDrawable(ctx, shadowDrawableResId);
Drawable[] layers = new Drawable[]{shadowDrawable, getColoredBg(ctx)};
Drawable[] layers = new Drawable[] {shadowDrawable, getColoredBg(ctx)};
return new LayerDrawable(layers);
}
@ -335,4 +433,21 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
}
return !app.getSettings().isLightContent();
}
private void setupScrollShadow(View view) {
final View scrollView;
if (useScrollableItemsContainer()) {
scrollView = view.findViewById(R.id.scroll_view);
} else {
scrollView = itemsContainer;
}
scrollView.getViewTreeObserver().addOnScrollChangedListener(new OnScrollChangedListener() {
@Override
public void onScrollChanged() {
boolean scrollToBottomAvailable = scrollView.canScrollVertically(1);
AndroidUiHelper.updateVisibility(buttonsShadow, scrollToBottomAvailable);
}
});
}
}

75
OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
View file

@ -1,7 +1,6 @@
package net.osmand.plus.measurementtool;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -9,9 +8,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.UiUtilities.DialogButtonType;
import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemButton;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
@ -35,39 +33,6 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
items.add(new DividerSpaceItem(getContext(),
getResources().getDimensionPixelSize(R.dimen.bottom_sheet_exit_button_margin)));
items.add(new BottomSheetItemButton.Builder()
.setButtonType(UiUtilities.DialogButtonType.SECONDARY)
.setTitle(getString(R.string.shared_string_exit))
.setLayoutId(R.layout.bottom_sheet_button)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Fragment targetFragment = getTargetFragment();
if (targetFragment != null) {
targetFragment.onActivityResult(REQUEST_CODE, EXIT_RESULT_CODE, null);
}
dismiss();
}
})
.create());
items.add(new DividerSpaceItem(getContext(),
getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin)));
items.add(new BottomSheetItemButton.Builder()
.setTitle(getString(R.string.shared_string_save))
.setLayoutId(R.layout.bottom_sheet_button)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Fragment targetFragment = getTargetFragment();
if (targetFragment != null) {
targetFragment.onActivityResult(REQUEST_CODE, SAVE_RESULT_CODE, null);
}
dismiss();
}
})
.create());
}
@Override
@ -75,6 +40,44 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
return R.string.shared_string_cancel;
}
@Override
protected int getRightBottomButtonTextId() {
return R.string.shared_string_save;
}
@Override
protected int getThirdBottomButtonTextId() {
return R.string.shared_string_exit;
}
@Override
public int getSecondDividerHeight() {
return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin);
}
@Override
protected void onRightBottomButtonClick() {
Fragment targetFragment = getTargetFragment();
if (targetFragment != null) {
targetFragment.onActivityResult(REQUEST_CODE, SAVE_RESULT_CODE, null);
}
dismiss();
}
@Override
protected void onThirdBottomButtonClick() {
Fragment targetFragment = getTargetFragment();
if (targetFragment != null) {
targetFragment.onActivityResult(REQUEST_CODE, EXIT_RESULT_CODE, null);
}
dismiss();
}
@Override
protected DialogButtonType getThirdBottomButtonType() {
return (DialogButtonType.SECONDARY);
}
public static void showInstance(@NonNull FragmentManager fragmentManager, @Nullable Fragment targetFragment) {
if (!fragmentManager.isStateSaved()) {
ExitBottomSheetDialogFragment fragment = new ExitBottomSheetDialogFragment();