diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java index 811f0bd55..8707568c2 100644 --- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java @@ -15,14 +15,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AutoCompleteTextView; import android.widget.GridLayout; -import android.widget.Toast; + import androidx.annotation.CallSuper; import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import androidx.appcompat.widget.SwitchCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; @@ -44,9 +43,9 @@ import app.organicmaps.util.Graphics; import app.organicmaps.util.InputUtils; import app.organicmaps.util.UiUtils; import com.google.android.material.button.MaterialButton; -import com.google.android.material.card.MaterialCardView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.imageview.ShapeableImageView; +import com.google.android.material.materialswitch.MaterialSwitch; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textview.MaterialTextView; @@ -117,9 +116,9 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private MaterialTextView mPhone; private MaterialButton mEditPhoneLink; private MaterialTextView mCuisine; - private SwitchCompat mWifi; + private MaterialSwitch mWifi; private MaterialTextView mSelfService; - private SwitchCompat mOutdoorSeating; + private MaterialSwitch mOutdoorSeating; // Default Metadata entries. private static final class MetadataEntry diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java index 1f9d2a346..f21efe29e 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java @@ -11,7 +11,6 @@ import android.widget.LinearLayout; import androidx.annotation.IdRes; import androidx.annotation.IntRange; import androidx.annotation.Nullable; -import androidx.appcompat.widget.SwitchCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; @@ -25,6 +24,7 @@ import app.organicmaps.sdk.util.Utils; import app.organicmaps.util.UiUtils; import com.google.android.material.button.MaterialButton; import com.google.android.material.checkbox.MaterialCheckBox; +import com.google.android.material.materialswitch.MaterialSwitch; import com.google.android.material.textview.MaterialTextView; import java.util.ArrayList; import java.util.Arrays; @@ -195,7 +195,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter days = new SparseArray<>(7); View allday; - SwitchCompat swAllday; + MaterialSwitch swAllday; View schedule; View openClose; View open; diff --git a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java index 6e1a213e4..39068b997 100644 --- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java @@ -8,7 +8,9 @@ import android.view.ViewGroup; import android.widget.CompoundButton; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.widget.SwitchCompat; + +import com.google.android.material.materialswitch.MaterialSwitch; + import app.organicmaps.R; import app.organicmaps.base.BaseMwmToolbarFragment; import app.organicmaps.sdk.routing.RoutingController; @@ -88,34 +90,34 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment private void initViews(@NonNull View root) { - SwitchCompat tollsBtn = root.findViewById(R.id.avoid_tolls_btn); + MaterialSwitch tollsBtn = root.findViewById(R.id.avoid_tolls_btn); tollsBtn.setChecked(RoutingOptions.hasOption(RoadType.Toll)); CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll, root); tollsBtn.setOnCheckedChangeListener(tollBtnListener); - SwitchCompat motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn); + MaterialSwitch motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn); motorwaysBtn.setChecked(RoutingOptions.hasOption(RoadType.Motorway)); CompoundButton.OnCheckedChangeListener motorwayBtnListener = new ToggleRoutingOptionListener(RoadType.Motorway, root); motorwaysBtn.setOnCheckedChangeListener(motorwayBtnListener); - SwitchCompat ferriesBtn = root.findViewById(R.id.avoid_ferries_btn); + MaterialSwitch ferriesBtn = root.findViewById(R.id.avoid_ferries_btn); ferriesBtn.setChecked(RoutingOptions.hasOption(RoadType.Ferry)); CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry, root); ferriesBtn.setOnCheckedChangeListener(ferryBtnListener); - SwitchCompat dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn); + MaterialSwitch dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn); dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty)); dirtyRoadsBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Paved) || RoutingOptions.hasOption(RoadType.Dirty)); CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty, root); dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener); - SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn); + MaterialSwitch stepsBtn = root.findViewById(R.id.avoid_steps_btn); stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps)); CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps, root); stepsBtn.setOnCheckedChangeListener(stepsBtnListener); - SwitchCompat pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn); + MaterialSwitch pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn); pavedBtn.setChecked(RoutingOptions.hasOption(RoadType.Paved)); pavedBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Dirty) || RoutingOptions.hasOption(RoadType.Paved)); CompoundButton.OnCheckedChangeListener pavedBtnListener = new ToggleRoutingOptionListener(RoadType.Paved, root); @@ -144,8 +146,8 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment else RoutingOptions.removeOption(mRoadType); - SwitchCompat dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn); - SwitchCompat pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn); + MaterialSwitch dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn); + MaterialSwitch pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn); if (mRoadType == RoadType.Dirty) { pavedBtn.setEnabled(!isChecked); diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml index 02cb19775..8460d0b16 100644 --- a/android/app/src/main/res/layout/fragment_driving_options.xml +++ b/android/app/src/main/res/layout/fragment_driving_options.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:textColor="?android:attr/textColorPrimary"/> - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content"/>