diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java index aa0af954b..6ec611157 100644 --- a/android/app/src/main/java/app/organicmaps/ChartController.java +++ b/android/app/src/main/java/app/organicmaps/ChartController.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import android.view.View; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import app.organicmaps.sdk.Framework; @@ -28,6 +27,8 @@ import com.github.mikephil.charting.data.LineDataSet; import com.github.mikephil.charting.formatter.ValueFormatter; import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.listener.OnChartValueSelectedListener; +import com.google.android.material.textview.MaterialTextView; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -55,10 +56,10 @@ public class ChartController implements OnChartValueSelectedListener private MarkerView mCurrentLocationMarkerView; @SuppressWarnings("NullableProblems") @NonNull - private TextView mMaxAltitude; + private MaterialTextView mMaxAltitude; @SuppressWarnings("NullableProblems") @NonNull - private TextView mMinAltitude; + private MaterialTextView mMinAltitude; @NonNull private final Context mContext; private long mTrackId = Utils.INVALID_ID; diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 27c07690f..d10c7cc20 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -33,7 +33,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.TextView; import android.widget.Toast; import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResultLauncher; @@ -133,6 +132,8 @@ import app.organicmaps.widget.placepage.PlacePageViewModel; import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.textview.MaterialTextView; + import java.util.ArrayList; import java.util.Objects; @@ -719,7 +720,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (!TextUtils.isEmpty(appName)) { setTitle(appName); - ((TextView) mPointChooser.findViewById(R.id.title)).setText(appName); + ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName); } } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java index a348ff8ef..ab75e58f4 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java @@ -2,10 +2,12 @@ package app.organicmaps.maplayer; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.textview.MaterialTextView; + import app.organicmaps.R; import app.organicmaps.adapter.OnItemClickListener; @@ -14,7 +16,7 @@ class LayerHolder extends RecyclerView.ViewHolder @NonNull final ImageView mButton; @NonNull - final TextView mTitle; + final MaterialTextView mTitle; @NonNull final View mNewMarker; @Nullable diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java index 926bb34ae..2ce0bbc90 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java @@ -6,13 +6,15 @@ import android.os.Bundle; import android.view.View; import android.widget.CompoundButton; import android.widget.RadioGroup; -import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; + +import com.google.android.material.textview.MaterialTextView; + import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.sdk.Framework; @@ -319,7 +321,7 @@ public class RoutingPlanController extends ToolbarController UiUtils.show(mDrivingOptionsBtnContainer); boolean hasAnyOptions = RoutingOptions.hasAnyOptions() && !isRulerType(); UiUtils.showIf(hasAnyOptions, mDrivingOptionsImage); - TextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title); + MaterialTextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title); title.setText(hasAnyOptions ? R.string.change_driving_options_btn : R.string.define_to_avoid_btn); } diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java index 658d6d53d..53d80fc89 100644 --- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java @@ -8,13 +8,15 @@ import android.content.res.Resources; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import androidx.annotation.DrawableRes; import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.textview.MaterialTextView; + import app.organicmaps.R; import app.organicmaps.sdk.search.DisplayedCategories; import app.organicmaps.sdk.util.Language; @@ -112,7 +114,7 @@ class CategoriesAdapter extends RecyclerView.Adapter processClick(mResult, mOrder)); } @@ -56,7 +58,7 @@ class SearchAdapter extends RecyclerView.Adapter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -