From 0eb64b7ecfd9c9750af02670151fcfea24687a3b Mon Sep 17 00:00:00 2001 From: nazar-kutz Date: Tue, 20 Apr 2021 11:23:27 +0300 Subject: [PATCH] fix after merge --- .../src/net/osmand/plus/base/ModeSelectionBottomSheet.java | 2 +- .../plus/base/MultipleSelectionWithModeBottomSheet.java | 2 +- OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java | 7 ++++--- .../net/osmand/plus/download/SelectIndexesUiHelper.java | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/base/ModeSelectionBottomSheet.java b/OsmAnd/src/net/osmand/plus/base/ModeSelectionBottomSheet.java index f8355c8805..a19e304299 100644 --- a/OsmAnd/src/net/osmand/plus/base/ModeSelectionBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/base/ModeSelectionBottomSheet.java @@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; import net.osmand.plus.R; -import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.RadioItem; import java.util.Collections; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/base/MultipleSelectionWithModeBottomSheet.java b/OsmAnd/src/net/osmand/plus/base/MultipleSelectionWithModeBottomSheet.java index 261e8dfdea..9ac4948937 100644 --- a/OsmAnd/src/net/osmand/plus/base/MultipleSelectionWithModeBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/base/MultipleSelectionWithModeBottomSheet.java @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; -import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.RadioItem; import java.util.List; diff --git a/OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java b/OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java index 18c91f8cf5..f861500078 100644 --- a/OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java @@ -19,8 +19,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.simpleitems.SimpleDividerItem; import net.osmand.plus.helpers.AndroidUiHelper; -import net.osmand.plus.widgets.MultiStateToggleButton; -import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.MultiStateToggleButton; +import net.osmand.plus.widgets.multistatetoggle.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.TextToggleButton; import net.osmand.util.Algorithms; import net.osmand.view.ThreeStateCheckbox; @@ -91,7 +92,7 @@ public abstract class SelectionBottomSheet extends MenuBottomSheetDialogFragment secondaryDescription = view.findViewById(R.id.secondary_description); selectedSize = view.findViewById(R.id.selected_size); toggleContainer = view.findViewById(R.id.custom_radio_buttons); - radioGroup = new MultiStateToggleButton(app, toggleContainer, nightMode); + radioGroup = new TextToggleButton(app, toggleContainer, nightMode); selectAllButton = view.findViewById(R.id.select_all_button); checkBoxTitle = view.findViewById(R.id.check_box_title); checkBox = view.findViewById(R.id.check_box); diff --git a/OsmAnd/src/net/osmand/plus/download/SelectIndexesUiHelper.java b/OsmAnd/src/net/osmand/plus/download/SelectIndexesUiHelper.java index f7835ce348..845082daae 100644 --- a/OsmAnd/src/net/osmand/plus/download/SelectIndexesUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/download/SelectIndexesUiHelper.java @@ -15,8 +15,9 @@ import net.osmand.plus.base.SelectionBottomSheet; import net.osmand.plus.base.SelectionBottomSheet.OnApplySelectionListener; import net.osmand.plus.base.SelectionBottomSheet.OnUiInitializedAdapter; import net.osmand.plus.base.SelectionBottomSheet.SelectableItem; -import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener; -import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.RadioItem; +import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener; +import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem; import net.osmand.util.Algorithms; import java.text.DateFormat; @@ -176,7 +177,7 @@ public class SelectIndexesUiHelper { private RadioItem createSrtmRadioBtn(int titleId, final boolean useMeters) { String title = Algorithms.capitalizeFirstLetter(app.getString(titleId)); - RadioItem radioItem = new RadioItem(title); + RadioItem radioItem = new TextRadioItem(title); radioItem.setOnClickListener(new OnRadioItemClickListener() { @Override public boolean onRadioItemClick(RadioItem radioItem, View view) {