drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-14 08:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Migrate last TextView to Material Components

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
android/app/src/main/java/app/organicmaps/ChartController.java
View File

@@ -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;

5
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -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);
}
}

6
android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
View File

@@ -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

6
android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
View File

@@ -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);
}

10
android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
View File

@@ -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<CategoriesAdapter.ViewHolde
if (viewType == ViewType.CATEGORY)
{
view = mInflater.inflate(R.layout.item_search_category, parent, false);
viewHolder = new ViewHolder(view, (TextView) view);
viewHolder = new ViewHolder(view, (MaterialTextView) view);
}
else
{
@@ -138,7 +140,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
{
@NonNull
private final TextView mTitle;
private final MaterialTextView mTitle;
@NonNull
private final View mView;
@@ -166,7 +168,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
return mEnglishResources.getString(categoryId);
}
ViewHolder(@NonNull View v, @NonNull TextView tv)
ViewHolder(@NonNull View v, @NonNull MaterialTextView tv)
{
super(v);
mView = v;

28
android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
View File

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

8
android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
View File

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

6
android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
View File

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

16
android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
View File

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

6
android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
View File

@@ -8,7 +8,6 @@ import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
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.highlight.Highlight;
import com.github.mikephil.charting.utils.MPPointF;
import com.google.android.material.textview.MaterialTextView;
@SuppressLint("ViewConstructor")
public class FloatingMarkerView extends RelativeLayout implements IMarker
@@ -34,10 +34,10 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
private View mInfoFloatingContainer;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mAltitudeView;
private MaterialTextView mAltitudeView;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mDistanceValueView;
private MaterialTextView mDistanceValueView;
@SuppressWarnings("NullableProblems")
@NonNull
private View mFloatingTriangle;

3
android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
View File

@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -66,7 +65,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
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);
if (!checkDate.isEmpty())