mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 13:03:36 +00:00
[android] Migrate last ImageView to Material Components
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
committed by
jeanbaptisteC
parent
ad7d051b10
commit
1aea5dd82e
@@ -6,13 +6,15 @@ import android.content.res.TypedArray;
|
|||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
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 app.organicmaps.R;
|
import app.organicmaps.R;
|
||||||
import app.organicmaps.util.UiUtils;
|
import app.organicmaps.util.UiUtils;
|
||||||
|
|
||||||
@@ -20,7 +22,7 @@ public class PlaceholderView extends LinearLayout
|
|||||||
{
|
{
|
||||||
@SuppressWarnings("NullableProblems")
|
@SuppressWarnings("NullableProblems")
|
||||||
@NonNull
|
@NonNull
|
||||||
private ImageView mImage;
|
private ShapeableImageView mImage;
|
||||||
|
|
||||||
@SuppressWarnings("NullableProblems")
|
@SuppressWarnings("NullableProblems")
|
||||||
@NonNull
|
@NonNull
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import android.text.style.ForegroundColorSpan;
|
|||||||
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.ImageView;
|
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import androidx.activity.result.ActivityResultLauncher;
|
import androidx.activity.result.ActivityResultLauncher;
|
||||||
@@ -79,6 +78,7 @@ import app.organicmaps.widget.placepage.sections.PlacePageTrackFragment;
|
|||||||
import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
|
import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
|
||||||
import com.google.android.material.appbar.MaterialToolbar;
|
import com.google.android.material.appbar.MaterialToolbar;
|
||||||
import com.google.android.material.button.MaterialButton;
|
import com.google.android.material.button.MaterialButton;
|
||||||
|
import com.google.android.material.imageview.ShapeableImageView;
|
||||||
import com.google.android.material.textview.MaterialTextView;
|
import com.google.android.material.textview.MaterialTextView;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
@@ -148,9 +148,9 @@ public class PlacePageView extends Fragment
|
|||||||
private View mAddOrganisation;
|
private View mAddOrganisation;
|
||||||
private View mAddPlace;
|
private View mAddPlace;
|
||||||
private View mEditTopSpace;
|
private View mEditTopSpace;
|
||||||
private ImageView mColorIcon;
|
private ShapeableImageView mColorIcon;
|
||||||
private MaterialTextView mTvCategory;
|
private MaterialTextView mTvCategory;
|
||||||
private ImageView mEditBookmark;
|
private ShapeableImageView mEditBookmark;
|
||||||
|
|
||||||
// Data
|
// Data
|
||||||
private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
|
private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
android:text="you"
|
android:text="you"
|
||||||
android:textColor="@color/base_accent"
|
android:textColor="@color/base_accent"
|
||||||
android:textSize="@dimen/text_size_icon_title" />
|
android:textSize="@dimen/text_size_icon_title" />
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/image"
|
android:id="@+id/image"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:layout_width="@dimen/margin_base_plus_quarter"
|
android:layout_width="@dimen/margin_base_plus_quarter"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/margin_quarter"
|
android:layout_marginEnd="@dimen/margin_quarter"
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:layout_width="@dimen/margin_base_plus_quarter"
|
android:layout_width="@dimen/margin_base_plus_quarter"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/margin_quarter"
|
android:layout_marginEnd="@dimen/margin_quarter"
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/margin_quarter"
|
android:layout_marginEnd="@dimen/margin_quarter"
|
||||||
@@ -161,7 +161,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/margin_half"
|
android:layout_marginEnd="@dimen/margin_half"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
tools:background="@color/black_54"
|
tools:background="@color/black_54"
|
||||||
tools:ignore="Overdraw">
|
tools:ignore="Overdraw">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/image"
|
android:id="@+id/image"
|
||||||
android:layout_width="@dimen/elevation_profile_marker_width"
|
android:layout_width="@dimen/elevation_profile_marker_width"
|
||||||
android:layout_height="@dimen/elevation_profile_marker_width"
|
android:layout_height="@dimen/elevation_profile_marker_width"
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
android:layout_toEndOf="@id/image"
|
android:layout_toEndOf="@id/image"
|
||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
tools:ignore="UnusedAttribute">
|
tools:ignore="UnusedAttribute">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/floating_triangle"
|
android:id="@+id/floating_triangle"
|
||||||
android:layout_width="@dimen/margin_half"
|
android:layout_width="@dimen/margin_half"
|
||||||
android:layout_height="@dimen/margin_base"
|
android:layout_height="@dimen/margin_base"
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
android:maxWidth="@dimen/dialog_min_height"
|
android:maxWidth="@dimen/dialog_min_height"
|
||||||
android:padding="@dimen/margin_quarter_plus"
|
android:padding="@dimen/margin_quarter_plus"
|
||||||
tools:ignore="UnusedAttribute">
|
tools:ignore="UnusedAttribute">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/distance_icon"
|
android:id="@+id/distance_icon"
|
||||||
android:layout_width="@dimen/margin_half_plus"
|
android:layout_width="@dimen/margin_half_plus"
|
||||||
android:layout_height="@dimen/margin_half_plus"
|
android:layout_height="@dimen/margin_half_plus"
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/triangle"
|
android:id="@+id/triangle"
|
||||||
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"
|
||||||
|
|||||||
@@ -192,7 +192,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?ppBackground"
|
android:background="?ppBackground"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/item_icon"
|
android:id="@+id/item_icon"
|
||||||
android:layout_width="@dimen/place_page_icon_size"
|
android:layout_width="@dimen/place_page_icon_size"
|
||||||
android:layout_height="@dimen/place_page_icon_size"
|
android:layout_height="@dimen/place_page_icon_size"
|
||||||
@@ -217,7 +217,7 @@
|
|||||||
android:background="?clickableBackground"
|
android:background="?clickableBackground"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
tools:text="@string/categories" />
|
tools:text="@string/categories" />
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
android:id="@+id/edit_Bookmark"
|
android:id="@+id/edit_Bookmark"
|
||||||
style="@style/MwmWidget.Editor.MetadataIcon"
|
style="@style/MwmWidget.Editor.MetadataIcon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
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/image"
|
android:id="@+id/image"
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
android:text="@string/editor_add_select_location"
|
android:text="@string/editor_add_select_location"
|
||||||
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
|
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
|
||||||
|
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
app:tint="@color/image_view"
|
app:tint="@color/image_view"
|
||||||
android:id="@+id/done"
|
android:id="@+id/done"
|
||||||
app:srcCompat="@drawable/ic_done"
|
app:srcCompat="@drawable/ic_done"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
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"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ImageView
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
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"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
|||||||
Reference in New Issue
Block a user