[android] Migrate last TextView to Material Components

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-01 18:21:34 +02:00
committed by x7z4w
parent 452f582d45
commit b7d275eda8
27 changed files with 93 additions and 80 deletions

View File

@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.view.View; import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import app.organicmaps.sdk.Framework; 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.formatter.ValueFormatter;
import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener; import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
import com.google.android.material.textview.MaterialTextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -55,10 +56,10 @@ public class ChartController implements OnChartValueSelectedListener
private MarkerView mCurrentLocationMarkerView; private MarkerView mCurrentLocationMarkerView;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mMaxAltitude; private MaterialTextView mMaxAltitude;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mMinAltitude; private MaterialTextView mMinAltitude;
@NonNull @NonNull
private final Context mContext; private final Context mContext;
private long mTrackId = Utils.INVALID_ID; private long mTrackId = Utils.INVALID_ID;

View File

@@ -33,7 +33,6 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultLauncher; 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.appbar.MaterialToolbar;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.textview.MaterialTextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
@@ -719,7 +720,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!TextUtils.isEmpty(appName)) if (!TextUtils.isEmpty(appName))
{ {
setTitle(appName); setTitle(appName);
((TextView) mPointChooser.findViewById(R.id.title)).setText(appName); ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
} }
} }

View File

@@ -2,10 +2,12 @@ package app.organicmaps.maplayer;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener; import app.organicmaps.adapter.OnItemClickListener;
@@ -14,7 +16,7 @@ class LayerHolder extends RecyclerView.ViewHolder
@NonNull @NonNull
final ImageView mButton; final ImageView mButton;
@NonNull @NonNull
final TextView mTitle; final MaterialTextView mTitle;
@NonNull @NonNull
final View mNewMarker; final View mNewMarker;
@Nullable @Nullable

View File

@@ -6,13 +6,15 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmApplication; import app.organicmaps.MwmApplication;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.Framework;
@@ -319,7 +321,7 @@ public class RoutingPlanController extends ToolbarController
UiUtils.show(mDrivingOptionsBtnContainer); UiUtils.show(mDrivingOptionsBtnContainer);
boolean hasAnyOptions = RoutingOptions.hasAnyOptions() && !isRulerType(); boolean hasAnyOptions = RoutingOptions.hasAnyOptions() && !isRulerType();
UiUtils.showIf(hasAnyOptions, mDrivingOptionsImage); 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); title.setText(hasAnyOptions ? R.string.change_driving_options_btn : R.string.define_to_avoid_btn);
} }

View File

@@ -8,13 +8,15 @@ import android.content.res.Resources;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.search.DisplayedCategories; import app.organicmaps.sdk.search.DisplayedCategories;
import app.organicmaps.sdk.util.Language; import app.organicmaps.sdk.util.Language;
@@ -112,7 +114,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
if (viewType == ViewType.CATEGORY) if (viewType == ViewType.CATEGORY)
{ {
view = mInflater.inflate(R.layout.item_search_category, parent, false); view = mInflater.inflate(R.layout.item_search_category, parent, false);
viewHolder = new ViewHolder(view, (TextView) view); viewHolder = new ViewHolder(view, (MaterialTextView) view);
} }
else else
{ {
@@ -138,7 +140,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
{ {
@NonNull @NonNull
private final TextView mTitle; private final MaterialTextView mTitle;
@NonNull @NonNull
private final View mView; private final View mView;
@@ -166,7 +168,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
return mEnglishResources.getString(categoryId); return mEnglishResources.getString(categoryId);
} }
ViewHolder(@NonNull View v, @NonNull TextView tv) ViewHolder(@NonNull View v, @NonNull MaterialTextView tv)
{ {
super(v); super(v);
mView = v; mView = v;

View File

@@ -5,12 +5,14 @@ import android.content.res.Resources;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.AttrRes; import androidx.annotation.AttrRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.search.SearchResult; import app.organicmaps.sdk.search.SearchResult;
import app.organicmaps.util.Graphics; import app.organicmaps.util.Graphics;
@@ -42,11 +44,11 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
BaseResultViewHolder(@NonNull View view) BaseResultViewHolder(@NonNull View view)
{ {
super(view); super(view);
if (view instanceof TextView) if (view instanceof MaterialTextView)
{ {
int tintAttr = getTintAttr(); int tintAttr = getTintAttr();
if (tintAttr != 0) if (tintAttr != 0)
Graphics.tint((TextView) view, tintAttr); Graphics.tint((MaterialTextView) view, tintAttr);
} }
view.setOnClickListener(v -> processClick(mResult, mOrder)); view.setOnClickListener(v -> processClick(mResult, mOrder));
} }
@@ -56,7 +58,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
{ {
mResult = result; mResult = result;
mOrder = order; mOrder = order;
final TextView titleView = getTitleView(); final MaterialTextView titleView = getTitleView();
if (titleView != null) if (titleView != null)
titleView.setText(mResult.getFormattedTitle(titleView.getContext())); titleView.setText(mResult.getFormattedTitle(titleView.getContext()));
@@ -68,7 +70,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
return androidx.appcompat.R.attr.colorAccent; return androidx.appcompat.R.attr.colorAccent;
} }
abstract TextView getTitleView(); abstract MaterialTextView getTitleView();
abstract void processClick(SearchResult result, int order); abstract void processClick(SearchResult result, int order);
} }
@@ -81,9 +83,9 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
} }
@Override @Override
TextView getTitleView() MaterialTextView getTitleView()
{ {
return (TextView) itemView; return (MaterialTextView) itemView;
} }
@Override @Override
@@ -98,15 +100,15 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
@NonNull @NonNull
final View mFrame; final View mFrame;
@NonNull @NonNull
final TextView mName; final MaterialTextView mName;
@NonNull @NonNull
final TextView mOpen; final MaterialTextView mOpen;
@NonNull @NonNull
final TextView mDescription; final MaterialTextView mDescription;
@NonNull @NonNull
final TextView mRegion; final MaterialTextView mRegion;
@NonNull @NonNull
final TextView mDistance; final MaterialTextView mDistance;
@Override @Override
int getTintAttr() int getTintAttr()
@@ -126,7 +128,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
} }
@Override @Override
TextView getTitleView() MaterialTextView getTitleView()
{ {
return mName; return mName;
} }

View File

@@ -3,9 +3,11 @@ package app.organicmaps.search;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmApplication; import app.organicmaps.MwmApplication;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.routing.RoutingController; import app.organicmaps.sdk.routing.RoutingController;
@@ -25,12 +27,12 @@ class SearchHistoryAdapter extends RecyclerView.Adapter<SearchHistoryAdapter.Vie
public static class ViewHolder extends RecyclerView.ViewHolder public static class ViewHolder extends RecyclerView.ViewHolder
{ {
private final TextView mText; private final MaterialTextView mText;
public ViewHolder(View itemView) public ViewHolder(View itemView)
{ {
super(itemView); super(itemView);
mText = (TextView) itemView; mText = (MaterialTextView) itemView;
Graphics.tint(mText); Graphics.tint(mText);
} }
} }

View File

@@ -7,13 +7,13 @@ import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
@@ -26,11 +26,11 @@ public class PlaceholderView extends LinearLayout
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mTitle; private MaterialTextView mTitle;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mSubtitle; private MaterialTextView mSubtitle;
private int mImgMaxHeight; private int mImgMaxHeight;
private int mImgMinHeight; private int mImgMinHeight;

View File

@@ -3,10 +3,12 @@ package app.organicmaps.widget.placepage;
import android.content.Context; import android.content.Context;
import android.view.View; import android.view.View;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.widget.NestedScrollView; import androidx.core.widget.NestedScrollView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.ChartController; import app.organicmaps.ChartController;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.Framework;
@@ -29,22 +31,22 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
private NestedScrollView mScrollView; private NestedScrollView mScrollView;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mTitle; private MaterialTextView mTitle;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mAscent; private MaterialTextView mAscent;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mDescent; private MaterialTextView mDescent;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mMaxAltitude; private MaterialTextView mMaxAltitude;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mMinAltitude; private MaterialTextView mMinAltitude;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mTime; private MaterialTextView mTime;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private ChartController mChartController; private ChartController mChartController;

View File

@@ -8,7 +8,6 @@ import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import app.organicmaps.R; import app.organicmaps.R;
@@ -19,6 +18,7 @@ import com.github.mikephil.charting.components.IMarker;
import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.utils.MPPointF; import com.github.mikephil.charting.utils.MPPointF;
import com.google.android.material.textview.MaterialTextView;
@SuppressLint("ViewConstructor") @SuppressLint("ViewConstructor")
public class FloatingMarkerView extends RelativeLayout implements IMarker public class FloatingMarkerView extends RelativeLayout implements IMarker
@@ -34,10 +34,10 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
private View mInfoFloatingContainer; private View mInfoFloatingContainer;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mAltitudeView; private MaterialTextView mAltitudeView;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private TextView mDistanceValueView; private MaterialTextView mDistanceValueView;
@SuppressWarnings("NullableProblems") @SuppressWarnings("NullableProblems")
@NonNull @NonNull
private View mFloatingTriangle; private View mFloatingTriangle;

View File

@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -66,7 +65,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter); mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter);
} }
private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, TextView checkDateView) private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, MaterialTextView checkDateView)
{ {
final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS); final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS);
if (!checkDate.isEmpty()) if (!checkDate.isEmpty())

View File

@@ -7,7 +7,7 @@
android:orientation="vertical" android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:background="@color/black_primary"> tools:background="@color/black_primary">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -16,7 +16,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/highest_altitude" android:id="@+id/highest_altitude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
android:paddingEnd="@dimen/margin_quarter_plus" android:paddingEnd="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_eighth" android:paddingBottom="@dimen/margin_eighth"
android:textSize="@dimen/text_size_body_5" /> android:textSize="@dimen/text_size_body_5" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/lowest_altitude" android:id="@+id/lowest_altitude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -9,7 +9,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
android:layout_marginEnd="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_quarter"
app:srcCompat="@drawable/ic_ascent" app:srcCompat="@drawable/ic_ascent"
app:tint="?elevationProfilePropIconTint" /> app:tint="?elevationProfilePropIconTint" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/ascent" android:id="@+id/ascent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
android:textAppearance="@style/MwmTextAppearance.Body3" android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="10000 m" /> tools:text="10000 m" />
</LinearLayout> </LinearLayout>
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/ascent_container" android:layout_below="@+id/ascent_container"
@@ -91,7 +91,7 @@
android:layout_marginEnd="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_quarter"
app:srcCompat="@drawable/ic_descent" app:srcCompat="@drawable/ic_descent"
app:tint="?elevationProfilePropIconTint" /> app:tint="?elevationProfilePropIconTint" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/descent" android:id="@+id/descent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
android:textAppearance="@style/MwmTextAppearance.Body3" android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="10000 m" /> tools:text="10000 m" />
</LinearLayout> </LinearLayout>
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/descent_container" android:layout_below="@+id/descent_container"
@@ -129,7 +129,7 @@
android:layout_marginEnd="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_quarter"
app:srcCompat="@drawable/ic_maxalt" app:srcCompat="@drawable/ic_maxalt"
app:tint="?elevationProfilePropIconTint" /> app:tint="?elevationProfilePropIconTint" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/max_altitude" android:id="@+id/max_altitude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
android:textAppearance="@style/MwmTextAppearance.Body3" android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="10000 m" /> tools:text="10000 m" />
</LinearLayout> </LinearLayout>
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/max_height_container" android:layout_below="@+id/max_height_container"
@@ -167,7 +167,7 @@
android:layout_marginEnd="@dimen/margin_half" android:layout_marginEnd="@dimen/margin_half"
app:srcCompat="@drawable/ic_minalt" app:srcCompat="@drawable/ic_minalt"
app:tint="?elevationProfilePropIconTint" /> app:tint="?elevationProfilePropIconTint" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/min_altitude" android:id="@+id/min_altitude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
android:textAppearance="@style/MwmTextAppearance.Body3" android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="10000 m" /> tools:text="10000 m" />
</LinearLayout> </LinearLayout>
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/min_elevation_container" android:layout_below="@+id/min_elevation_container"
@@ -208,7 +208,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/elevation_profile_difficulty" android:text="@string/elevation_profile_difficulty"
@@ -220,13 +220,13 @@
android:layout_marginStart="@dimen/margin_half_plus_eight" android:layout_marginStart="@dimen/margin_half_plus_eight"
android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin" android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/difficulty_level_1" android:id="@+id/difficulty_level_1"
android:layout_width="@dimen/elevation_profile_difficulty_dot_size" android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
android:layout_height="@dimen/elevation_profile_difficulty_dot_size" android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
android:background="@drawable/dot_elevation_difficulty" android:background="@drawable/dot_elevation_difficulty"
android:enabled="false" /> android:enabled="false" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/difficulty_level_2" android:id="@+id/difficulty_level_2"
android:layout_width="@dimen/elevation_profile_difficulty_dot_size" android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
android:layout_height="@dimen/elevation_profile_difficulty_dot_size" android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
@@ -234,7 +234,7 @@
android:layout_marginEnd="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_quarter"
android:background="@drawable/dot_elevation_difficulty" android:background="@drawable/dot_elevation_difficulty"
android:enabled="false" /> android:enabled="false" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/difficulty_level_3" android:id="@+id/difficulty_level_3"
android:layout_width="@dimen/elevation_profile_difficulty_dot_size" android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
android:layout_height="@dimen/elevation_profile_difficulty_dot_size" android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
@@ -250,7 +250,7 @@
android:layout_toEndOf="@id/difficulty_container" android:layout_toEndOf="@id/difficulty_container"
android:gravity="end" android:gravity="end"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/elevation_profile_time" android:text="@string/elevation_profile_time"

View File

@@ -49,7 +49,7 @@
android:layout_height="@dimen/margin_half_plus" android:layout_height="@dimen/margin_half_plus"
app:srcCompat="@drawable/ic_distance_travelled" app:srcCompat="@drawable/ic_distance_travelled"
app:tint="?ppFloatingMarkerIconColor" /> app:tint="?ppFloatingMarkerIconColor" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/distance_value" android:id="@+id/distance_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
android:layout_width="@dimen/margin_half_plus_eight" android:layout_width="@dimen/margin_half_plus_eight"
android:layout_height="@dimen/margin_half_plus_eight" android:layout_height="@dimen/margin_half_plus_eight"
app:srcCompat="?elevationProfileSelectedPointTriangle" /> app:srcCompat="?elevationProfileSelectedPointTriangle" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/altitude" android:id="@+id/altitude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -9,7 +9,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/layers_text" android:id="@+id/layers_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -33,7 +33,7 @@
tools:visibility="visible" /> tools:visibility="visible" />
</FrameLayout> </FrameLayout>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.TextView.Search" style="@style/MwmWidget.TextView.Search"
android:drawablePadding="@dimen/margin_base" android:drawablePadding="@dimen/margin_base"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MwmWidget.TextView.Search" style="@style/MwmWidget.TextView.Search"
android:text="@string/clear_search" android:text="@string/clear_search"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MwmWidget.TextView.Search" style="@style/MwmWidget.TextView.Search"
android:text="@string/p2p_your_location" android:text="@string/p2p_your_location"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <com.google.android.material.textview.MaterialTextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"

View File

@@ -9,7 +9,7 @@
android:padding="@dimen/margin_base" android:padding="@dimen/margin_base"
tools:background="#20FF0000"> tools:background="#20FF0000">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/title" android:id="@+id/title"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -20,7 +20,7 @@
android:maxLines="2" android:maxLines="2"
tools:text="Long long title that wraps to multiple lines"/> tools:text="Long long title that wraps to multiple lines"/>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/description" android:id="@+id/description"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
android:ellipsize="end" android:ellipsize="end"
tools:text="Hotel \u2022 \u2605\u2605\u2605\u2605\u2605"/> tools:text="Hotel \u2022 \u2605\u2605\u2605\u2605\u2605"/>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/open" android:id="@+id/open"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
android:text="@string/closed" android:text="@string/closed"
android:textAppearance="@style/MwmTextAppearance.Body3" /> android:textAppearance="@style/MwmTextAppearance.Body3" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/region" android:id="@+id/region"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
android:ellipsize="end" android:ellipsize="end"
tools:text="Russia, Moscow &amp; Central, Moscow"/> tools:text="Russia, Moscow &amp; Central, Moscow"/>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/distance" android:id="@+id/distance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.TextView.Search" style="@style/MwmWidget.TextView.Search"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <com.google.android.material.textview.MaterialTextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/subtitle" android:id="@+id/subtitle"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <com.google.android.material.textview.MaterialTextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/title" android:id="@+id/title"

View File

@@ -11,7 +11,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" /> android:background="@null" />
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/margin_half" android:paddingTop="@dimen/margin_half"

View File

@@ -20,7 +20,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/margin_half"> android:padding="@dimen/margin_half">
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
<TextView <com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?panel" android:background="?panel"